@tryghost/webhook-mock-receiver 2.3.16 → 2.3.18

package/lib/WebhookMockReceiver.js

@@ -1,10 +1,14 @@
 const { AssertionError } = require('assert');
 const { URL } = require('url');
-const nock = require('nock');
+const nockModule = require('nock');
+const nock = nockModule.default || nockModule;
 const pWaitFor = require('p-wait-for').default;
 class WebhookMockReceiver {
     constructor({ snapshotManager }) {
         this.snapshotManager = snapshotManager;
+        // Bumped by mock() and reset() so reply callbacks from a superseded
+        // mock can't record into the current one
+        this._mockGeneration = 0;
         this.recordRequest = this.recordRequest.bind(this);
     }
 
@@ -15,7 +19,9 @@ class WebhookMockReceiver {
 
     async receivedRequest() {
         // @NOTE: figure out a better waiting mechanism here, don't allow it to hang forever
-        await pWaitFor(() => this._receiver.isDone());
+        // Nock marks the interceptor done when the request matches, before the
+        // async reply callback records it, so wait for both
+        await pWaitFor(() => this._receiver.isDone() && this.headers !== undefined);
     }
 
     /**
@@ -25,21 +31,50 @@ class WebhookMockReceiver {
      */
     mock(url) {
         const parsedURL = new URL(url);
-        const recordRequest = this.recordRequest;
+        const mockGeneration = ++this._mockGeneration;
+        const recordRequest = (...args) => {
+            if (mockGeneration === this._mockGeneration) {
+                this.recordRequest(...args);
+            }
+        };
+        this.body = undefined;
+        this.headers = undefined;
 
         this._receiver = nock(parsedURL.origin)
-            .post(parsedURL.pathname, function (body) {
-                recordRequest(body, this);
-                // let the nock continue with the response
-                return true;
-            })
-            .reply(200, { status: 'OK' });
+            .post(parsedURL.pathname)
+            .reply(
+                200,
+                async function (...args) {
+                    if (args.length === 1) {
+                        // Nock 15 passes a Fetch Request; older versions pass URI and body.
+                        const request = args[0];
+                        const text = await request.text();
+                        let body = text;
+                        if (
+                            text &&
+                            request.headers.get('content-type')?.includes('application/json')
+                        ) {
+                            try {
+                                body = JSON.parse(text);
+                            } catch {
+                                // Preserve non-JSON payloads, as Nock's body matcher does.
+                            }
+                        }
+                        recordRequest(body, { headers: Object.fromEntries(request.headers) });
+                    } else {
+                        recordRequest(args[1], this.req);
+                    }
+                    return { status: 'OK' };
+                },
+                { 'Content-Length': '15' },
+            );
 
         return this;
     }
 
     reset() {
         nock.cleanAll();
+        this._mockGeneration += 1;
         this._receiver = undefined;
         this.body = undefined;
         this.headers = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/webhook-mock-receiver",
-  "version": "2.3.16",
+  "version": "2.3.18",
   "license": "MIT",
   "author": "Ghost Foundation",
   "repository": {
@@ -21,18 +21,18 @@
   },
   "devDependencies": {
     "got": "16.0.0",
-    "nock": "14.0.17",
+    "nock": "15.0.1",
     "sinon": "22.1.0"
   },
   "peerDependencies": {
-    "nock": "^13.0.0 || ^14.0.0"
+    "nock": "^13.0.0 || ^14.0.0 || ^15.0.0"
   },
   "engines": {
     "node": "^22.12.0 || >=24.0.0"
   },
   "scripts": {
     "dev": "echo \"Implement me!\"",
-    "test": "NODE_ENV=testing vitest run --coverage",
+    "test": "NODE_ENV=testing vitest run --config ../../vitest.config.ts --root . --coverage",
     "lint": "oxlint -c ../../.oxlintrc.json .",
     "posttest": "pnpm run lint"
   }