From 9777b12f0338e0c8d9414359837d190612271771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6ssler?= <info@timokoessler.de>
Date: Sun, 14 Sep 2025 13:01:00 +0200
Subject: [PATCH 1/2] Add Bun support (CJS)

---
 library/agent/hooks/wrapRequire.ts     |  3 ++-
 library/helpers/isFirewallSupported.ts | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/library/agent/hooks/wrapRequire.ts b/library/agent/hooks/wrapRequire.ts
index cb56a0e1e..8ca3f6b18 100644
--- a/library/agent/hooks/wrapRequire.ts
+++ b/library/agent/hooks/wrapRequire.ts
@@ -191,7 +191,8 @@ function patchPackage(this: mod, id: string, originalExports: unknown) {
   // Read the package.json of the required package
   let packageJson: PackageJson | undefined;
   try {
-    packageJson = originalRequire(
+    packageJson = originalRequire.call(
+      this,
       `${pathInfo.base}/package.json`
     ) as PackageJson;
   } catch {
diff --git a/library/helpers/isFirewallSupported.ts b/library/helpers/isFirewallSupported.ts
index 8e1acac31..e051ae7b7 100644
--- a/library/helpers/isFirewallSupported.ts
+++ b/library/helpers/isFirewallSupported.ts
@@ -2,17 +2,6 @@
 import { getMajorNodeVersion } from "./getNodeVersion";
 
 export default function isFirewallSupported() {
-  // @ts-expect-error Unknown type of globalThis
-  if (globalThis.Deno || globalThis.Bun) {
-    // @ts-expect-error Unknown type of globalThis
-    const runtimeName = globalThis.Deno ? "Deno" : "Bun";
-    console.error(
-      `Error: Aikido Firewall does not support ${runtimeName}. If you want support for ${runtimeName}, please contact us: hello@aikido.dev`
-    );
-
-    return false;
-  }
-
   // Check for unsupported Node.js versions
   if (getMajorNodeVersion() < 16) {
     console.error(

From 729043d5faa8cb68c62fae163d0161bc8a4a197a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6ssler?= <info@timokoessler.de>
Date: Sun, 14 Sep 2025 13:06:43 +0200
Subject: [PATCH 2/2] Add deno check again

---
 library/helpers/isFirewallSupported.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/library/helpers/isFirewallSupported.ts b/library/helpers/isFirewallSupported.ts
index e051ae7b7..f2050aa6b 100644
--- a/library/helpers/isFirewallSupported.ts
+++ b/library/helpers/isFirewallSupported.ts
@@ -2,6 +2,16 @@
 import { getMajorNodeVersion } from "./getNodeVersion";
 
 export default function isFirewallSupported() {
+  // @ts-expect-error Unknown type of globalThis
+  if (globalThis.Deno) {
+    const runtimeName = "Deno";
+    console.error(
+      `Error: Aikido Firewall does not support ${runtimeName}. If you want support for ${runtimeName}, please contact us: hello@aikido.dev`
+    );
+
+    return false;
+  }
+
   // Check for unsupported Node.js versions
   if (getMajorNodeVersion() < 16) {
     console.error(