Merge branch 'main' into cache-forceProtectionOff

Author: timokoessler

.github/workflows/benchmark.yml

@@ -1,4 +1,4 @@
-name: Benchmark
+name: 📊 Benchmark
 on:
   push: {}
   workflow_call: {}
@@ -49,8 +49,6 @@ jobs:
       - name: Run shell injection Benchmark
         run: cd benchmarks/shell-injection && node benchmark.js
       - name: Run Hono with Postgres Benchmark
-        # Skip on Node 24.x due to a bug: https://github.com/honojs/node-server/issues/240
-        if: matrix.node-version != '24.x'
         run: cd benchmarks/hono-pg && node benchmark.js
       - name: Run API Discovery Benchmark
         run: cd benchmarks/api-discovery && node benchmark.js

.github/workflows/build-and-release.yml

@@ -1,4 +1,4 @@
-name: Build and release
+name: 🚀 Build and release
 on:
   release:
     types: [created]

.github/workflows/end-to-end-tests.yml

@@ -1,4 +1,4 @@
-name: End to end tests
+name: 🕵️ End to end tests
 on:
   push: {}
   workflow_call: {}
@@ -45,7 +45,7 @@ jobs:
           "CLICKHOUSE_DEFAULT_ACCESS": "MANAGEMENT=1"
         ports:
           - "27019:8123"
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       matrix:
         node-version: [18.x]

.github/workflows/lint-code.yml

@@ -1,4 +1,4 @@
-name: Lint code
+name: 🧹 Lint code
 on: push
 jobs:
   lint:

.github/workflows/unit-test.yml

@@ -1,4 +1,4 @@
-name: Unit tests
+name: 🧪 Unit tests
 on:
   push: {}
   workflow_call: {}
@@ -52,7 +52,7 @@ jobs:
         ports:
           - "27019:8123"
       mongodb-replica:
-        image: bitnami/mongodb:8.0
+        image: bitnami/mongodb:4.4
         env:
           MONGODB_ADVERTISED_HOSTNAME: 127.0.0.1
           MONGODB_REPLICA_SET_MODE: primary
@@ -77,6 +77,14 @@ jobs:
       - name: Add local.aikido.io to /etc/hosts
         run: |
           sudo echo "127.0.0.1 local.aikido.io" | sudo tee -a /etc/hosts
+      - name: "Install Google Cloud SDK"
+        uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2
+        with:
+          install_components: "beta,pubsub-emulator"
+          version: "524.0.0"
+      - name: "Start Pub/Sub emulator"
+        run: |
+          gcloud beta emulators pubsub start --project=sample-project --host-port='0.0.0.0:8085' &
       - run: npm run install-lib-only
       - run: npm run build
       - run: npm run test:ci

.gitignore

@@ -30,3 +30,6 @@ credentials.json
 # Test files
 library/test.txt
 library/test2.txt
+
+# Rust build files
+instrumentation-wasm/target/

README.md

@@ -65,8 +65,8 @@ Zen for Node.js 16+ is compatible with:
 
 ### Cloud providers
 
-* ✅ [`@google-cloud/functions-framework`](https://www.npmjs.com/package/@google-cloud/functions-framework) 3.x
-* ✅ [`@google-cloud/pubsub`](https://www.npmjs.com/package/@google-cloud/pubsub) 4.x
+* ✅ [`@google-cloud/functions-framework`](https://www.npmjs.com/package/@google-cloud/functions-framework) 4.x, 3.x
+* ✅ [`@google-cloud/pubsub`](https://www.npmjs.com/package/@google-cloud/pubsub) 5.x, 4.x
 * ✅ Google Cloud Functions
 * ✅ AWS Lambda
 

benchmarks/hono-pg/package-lock.json

@@ -8,6 +8,7 @@ const checkToken = require("./src/middleware/checkToken");
 const updateConfig = require("./src/handlers/updateConfig");
 const lists = require("./src/handlers/lists");
 const updateLists = require("./src/handlers/updateLists");
+const realtimeConfig = require("./src/handlers/realtimeConfig");
 
 const app = express();
 
@@ -18,6 +19,9 @@ app.use(express.json());
 app.get("/api/runtime/config", checkToken, config);
 app.post("/api/runtime/config", checkToken, updateConfig);
 
+// Realtime polling endpoint
+app.get("/config", checkToken, realtimeConfig);
+
 app.get("/api/runtime/events", checkToken, listEvents);
 app.post("/api/runtime/events", checkToken, captureEvent);
 

end2end/server/app.js

@@ -0,0 +1,14 @@
+const { getAppConfig } = require("../zen/config");
+
+module.exports = function realtimeConfig(req, res) {
+  if (!req.app) {
+    throw new Error("App is missing");
+  }
+
+  const config = getAppConfig(req.app);
+
+  res.json({
+    serviceId: req.app.serviceId,
+    configUpdatedAt: config.configUpdatedAt,
+  });
+};