@replayio-app-building/netlify-recorder 0.32.0 → 0.34.0

package/dist/index.d.ts

@@ -198,6 +198,10 @@ interface CreateRecordingRequestHandlerOptions extends FinishRequestOptions {
  * after, capturing all outbound network calls and environment variable reads.
  * The captured data is stored via the provided callbacks.
  *
+ * Each request runs inside its own AsyncLocalStorage context so that
+ * concurrent requests in local dev (Netlify Dev) do not bleed into each
+ * other's captured network calls, environment reads, or audit trail tags.
+ *
  * **Response timing:** When the Netlify Functions v2 `context` object is
  * available (with `waitUntil`), the response is returned to the client
  * **immediately** with a pre-generated `X-Replay-Request-Id` header. The
@@ -318,6 +322,7 @@ declare function databaseAuditMonitorTable(sql: SqlFunction, tableName: string,
  */
 declare function databaseAuditDumpLogTable(sql: SqlFunction): Promise<Record<string, unknown>[]>;
 
+declare function runInRequestContext<T>(requestId: string | null, fn: () => Promise<T>): Promise<T>;
 declare function getCurrentRequestId(): string | null;
 
-export { type BackendRequest, type BlobData, type CapturedData, type CreateRecordingRequestHandlerOptions, type EnsureRequestRecordingOptions, type EnvRead, type FinishRequestCallbacks, type FinishRequestOptions, type HandlerResponse$1 as HandlerResponse, type NetlifyEvent, type NetlifyV2Request, type NetworkCall, type RecordingResult, type RequestContext, type RequestInfo, backendRequestsEnsureTable, backendRequestsGet, backendRequestsGetBlobUrl, backendRequestsInsert, backendRequestsList, backendRequestsUpdateStatus, createRecordingRequestHandler, createRequestRecording, databaseAuditDumpLogTable, databaseAuditEnsureLogTable, databaseAuditMonitorTable, databaseCallbacks, ensureRequestRecording, finishRequest, getCurrentRequestId, redactBlobData, startRequest };
+export { type BackendRequest, type BlobData, type CapturedData, type CreateRecordingRequestHandlerOptions, type EnsureRequestRecordingOptions, type EnvRead, type FinishRequestCallbacks, type FinishRequestOptions, type HandlerResponse$1 as HandlerResponse, type NetlifyEvent, type NetlifyV2Request, type NetworkCall, type RecordingResult, type RequestContext, type RequestInfo, backendRequestsEnsureTable, backendRequestsGet, backendRequestsGetBlobUrl, backendRequestsInsert, backendRequestsList, backendRequestsUpdateStatus, createRecordingRequestHandler, createRequestRecording, databaseAuditDumpLogTable, databaseAuditEnsureLogTable, databaseAuditMonitorTable, databaseCallbacks, ensureRequestRecording, finishRequest, getCurrentRequestId, redactBlobData, runInRequestContext, startRequest };

package/dist/index.js

@@ -6,17 +6,29 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/requestState.ts
-var _currentRequestId = null;
-var _callIndex = 0;
-function setCurrentRequestId(id) {
-  _currentRequestId = id;
-  _callIndex = 0;
+import { AsyncLocalStorage } from "async_hooks";
+var als = new AsyncLocalStorage();
+var _fallbackRequestId = null;
+var _fallbackCallIndex = 0;
+function runInRequestContext(requestId, fn) {
+  return als.run(
+    { requestId, callIndex: 0, networkCalls: null, envReads: null },
+    fn
+  );
+}
+function getRequestStore() {
+  return als.getStore();
 }
 function getCurrentRequestId() {
-  return _currentRequestId;
+  const store = als.getStore();
+  return store ? store.requestId : _fallbackRequestId;
 }
 function incrementCallIndex() {
-  return ++_callIndex;
+  const store = als.getStore();
+  if (store) {
+    return ++store.callIndex;
+  }
+  return ++_fallbackCallIndex;
 }
 
 // src/interceptors/network.ts
@@ -40,10 +52,84 @@ function buildSetConfigQueries(requestId, callIndex) {
     { query: "SELECT set_config('app.replay_call_index', $1, true)", params: [String(callIndex)] }
   ];
 }
+var _realOriginalFetch = null;
+var _captureInterceptorInstalled = false;
+function ensureCaptureInterceptor() {
+  if (_captureInterceptorInstalled) return;
+  _captureInterceptorInstalled = true;
+  _realOriginalFetch = globalThis.fetch;
+  const captureFetch = async (input, init) => {
+    const store = getRequestStore();
+    const calls = store?.networkCalls;
+    if (!calls) {
+      return _realOriginalFetch(input, init);
+    }
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const method = init?.method ?? (input instanceof Request ? input.method : "GET");
+    const requestHeaders = {};
+    if (init?.headers) {
+      new Headers(init.headers).forEach((v, k) => {
+        requestHeaders[k] = v;
+      });
+    }
+    const requestBody = typeof init?.body === "string" ? init.body : void 0;
+    const requestId = store.requestId;
+    if (requestId && method.toUpperCase() === "POST" && isNeonSqlRequest(url, requestBody)) {
+      return await handleNeonSqlRequest(
+        _realOriginalFetch,
+        input,
+        init,
+        url,
+        method,
+        requestHeaders,
+        requestBody,
+        requestId,
+        calls
+      );
+    }
+    const response = await _realOriginalFetch(input, init);
+    const responseBody = await response.clone().text();
+    const responseHeaders = {};
+    response.headers.forEach((v, k) => {
+      responseHeaders[k] = v;
+    });
+    calls.push({
+      url,
+      method,
+      requestHeaders,
+      requestBody,
+      responseStatus: response.status,
+      responseHeaders,
+      responseBody,
+      timestamp: Date.now()
+    });
+    return response;
+  };
+  globalThis.fetch = captureFetch;
+}
 function installNetworkInterceptor(mode, calls) {
-  const originalFetch = globalThis.fetch;
-  const consumed = /* @__PURE__ */ new Set();
   if (mode === "capture") {
+    const store = getRequestStore();
+    if (store) {
+      ensureCaptureInterceptor();
+      store.networkCalls = calls;
+      return {
+        restore() {
+          const s = getRequestStore();
+          if (s) s.networkCalls = null;
+        },
+        consumedCount() {
+          return 0;
+        },
+        totalCount() {
+          return calls.length;
+        },
+        unconsumedIndices() {
+          return [];
+        }
+      };
+    }
+    const originalFetch2 = globalThis.fetch;
     const captureFetch = async (input, init) => {
       const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
       const method = init?.method ?? (input instanceof Request ? input.method : "GET");
@@ -57,7 +143,7 @@ function installNetworkInterceptor(mode, calls) {
       const requestId = getCurrentRequestId();
       if (requestId && method.toUpperCase() === "POST" && isNeonSqlRequest(url, requestBody)) {
         return await handleNeonSqlRequest(
-          originalFetch,
+          originalFetch2,
           input,
           init,
           url,
@@ -68,7 +154,7 @@ function installNetworkInterceptor(mode, calls) {
           calls
         );
       }
-      const response = await originalFetch(input, init);
+      const response = await originalFetch2(input, init);
       const responseBody = await response.clone().text();
       const responseHeaders = {};
       response.headers.forEach((v, k) => {
@@ -87,69 +173,84 @@ function installNetworkInterceptor(mode, calls) {
       return response;
     };
     globalThis.fetch = captureFetch;
-  } else {
-    const replayFetch = async (input, init) => {
-      const url = typeof input === "string" ? input : input instanceof URL ? input.href : typeof input === "object" && input !== null && "url" in input ? input.url : String(input);
-      const requestBody = typeof init?.body === "string" ? init.body : void 0;
-      let matchIdx = -1;
+    return {
+      restore() {
+        globalThis.fetch = originalFetch2;
+      },
+      consumedCount() {
+        return 0;
+      },
+      totalCount() {
+        return calls.length;
+      },
+      unconsumedIndices() {
+        return [];
+      }
+    };
+  }
+  const originalFetch = globalThis.fetch;
+  const consumed = /* @__PURE__ */ new Set();
+  const replayFetch = async (input, init) => {
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : typeof input === "object" && input !== null && "url" in input ? input.url : String(input);
+    const requestBody = typeof init?.body === "string" ? init.body : void 0;
+    let matchIdx = -1;
+    for (let i = 0; i < calls.length; i++) {
+      if (consumed.has(i)) continue;
+      const c = calls[i];
+      if (c && c.url === url && c.requestBody === requestBody) {
+        matchIdx = i;
+        break;
+      }
+    }
+    if (matchIdx === -1) {
       for (let i = 0; i < calls.length; i++) {
-        if (consumed.has(i)) continue;
-        const c = calls[i];
-        if (c && c.url === url && c.requestBody === requestBody) {
+        if (!consumed.has(i)) {
           matchIdx = i;
           break;
         }
       }
-      if (matchIdx === -1) {
-        for (let i = 0; i < calls.length; i++) {
-          if (!consumed.has(i)) {
-            matchIdx = i;
-            break;
-          }
-        }
-      }
-      const call = calls[matchIdx];
-      if (matchIdx === -1 || !call) {
-        throw new Error(
-          `No more recorded network calls to replay (exhausted ${calls.length} calls)`
-        );
-      }
-      consumed.add(matchIdx);
-      console.log(
-        `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus}`
+    }
+    const call = calls[matchIdx];
+    if (matchIdx === -1 || !call) {
+      throw new Error(
+        `No more recorded network calls to replay (exhausted ${calls.length} calls)`
       );
-      const body = call.responseBody ?? "";
-      const status = call.responseStatus;
-      return {
-        ok: status >= 200 && status < 300,
-        status,
-        statusText: "",
-        headers: {
-          get: (name) => (call.responseHeaders ?? {})[name.toLowerCase()] ?? null,
-          has: (name) => name.toLowerCase() in (call.responseHeaders ?? {}),
-          forEach: (cb) => {
-            for (const [k, v] of Object.entries(call.responseHeaders ?? {})) cb(v, k);
-          }
-        },
-        text: async () => body,
-        json: async () => JSON.parse(body),
-        clone: () => ({ text: async () => body, json: async () => JSON.parse(body) }),
-        body: null,
-        bodyUsed: false,
-        redirected: false,
-        type: "basic",
-        url: call.url,
-        arrayBuffer: async () => new ArrayBuffer(0),
-        blob: async () => {
-          throw new Error("blob() not supported in replay");
-        },
-        formData: async () => {
-          throw new Error("formData() not supported in replay");
+    }
+    consumed.add(matchIdx);
+    console.log(
+      `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus}`
+    );
+    const body = call.responseBody ?? "";
+    const status = call.responseStatus;
+    return {
+      ok: status >= 200 && status < 300,
+      status,
+      statusText: "",
+      headers: {
+        get: (name) => (call.responseHeaders ?? {})[name.toLowerCase()] ?? null,
+        has: (name) => name.toLowerCase() in (call.responseHeaders ?? {}),
+        forEach: (cb) => {
+          for (const [k, v] of Object.entries(call.responseHeaders ?? {})) cb(v, k);
         }
-      };
+      },
+      text: async () => body,
+      json: async () => JSON.parse(body),
+      clone: () => ({ text: async () => body, json: async () => JSON.parse(body) }),
+      body: null,
+      bodyUsed: false,
+      redirected: false,
+      type: "basic",
+      url: call.url,
+      arrayBuffer: async () => new ArrayBuffer(0),
+      blob: async () => {
+        throw new Error("blob() not supported in replay");
+      },
+      formData: async () => {
+        throw new Error("formData() not supported in replay");
+      }
     };
-    globalThis.fetch = replayFetch;
-  }
+  };
+  globalThis.fetch = replayFetch;
   return {
     restore() {
       globalThis.fetch = originalFetch;
@@ -215,9 +316,59 @@ async function handleNeonSqlRequest(originalFetch, input, init, url, method, req
 }
 
 // src/interceptors/environment.ts
+var _realOriginalEnv = null;
+var _captureProxyInstalled = false;
+function ensureCaptureProxy() {
+  if (_captureProxyInstalled) return;
+  _captureProxyInstalled = true;
+  _realOriginalEnv = process.env;
+  process.env = new Proxy(_realOriginalEnv, {
+    get(target, prop) {
+      const value = target[prop];
+      if (typeof prop === "string" && prop !== "toJSON") {
+        const store = getRequestStore();
+        const reads = store?.envReads;
+        if (reads) {
+          reads.push({ key: prop, value, timestamp: Date.now() });
+        }
+      }
+      return value;
+    },
+    set(target, prop, value) {
+      target[prop] = value;
+      return true;
+    },
+    defineProperty(target, prop, descriptor) {
+      if ("value" in descriptor) {
+        target[prop] = descriptor.value;
+        return true;
+      }
+      return Reflect.defineProperty(target, prop, descriptor);
+    },
+    deleteProperty(target, prop) {
+      delete target[prop];
+      return true;
+    }
+  });
+}
 function installEnvironmentInterceptor(mode, reads) {
   const originalEnv = process.env;
   if (mode === "capture") {
+    const store = getRequestStore();
+    if (store) {
+      ensureCaptureProxy();
+      const now2 = Date.now();
+      for (const key of Object.keys(_realOriginalEnv)) {
+        reads.push({ key, value: _realOriginalEnv[key], timestamp: now2 });
+      }
+      store.envReads = reads;
+      return {
+        restore() {
+          const s = getRequestStore();
+          if (s) s.envReads = null;
+        }
+      };
+    }
     const now = Date.now();
     for (const key of Object.keys(originalEnv)) {
       reads.push({ key, value: originalEnv[key], timestamp: now });
@@ -246,35 +397,39 @@ function installEnvironmentInterceptor(mode, reads) {
         return true;
       }
     });
-  } else {
-    const readMap = /* @__PURE__ */ new Map();
-    for (const read of reads) {
-      readMap.set(read.key, read.value);
-    }
-    process.env = new Proxy(originalEnv, {
-      get(target, prop) {
-        if (typeof prop === "string" && readMap.has(prop)) {
-          return readMap.get(prop);
-        }
-        return target[prop];
-      },
-      set(target, prop, value) {
-        target[prop] = value;
-        return true;
-      },
-      defineProperty(target, prop, descriptor) {
-        if ("value" in descriptor) {
-          target[prop] = descriptor.value;
-          return true;
-        }
-        return Reflect.defineProperty(target, prop, descriptor);
-      },
-      deleteProperty(target, prop) {
-        delete target[prop];
-        return true;
+    return {
+      restore() {
+        process.env = originalEnv;
       }
-    });
+    };
+  }
+  const readMap = /* @__PURE__ */ new Map();
+  for (const read of reads) {
+    readMap.set(read.key, read.value);
   }
+  process.env = new Proxy(originalEnv, {
+    get(target, prop) {
+      if (typeof prop === "string" && readMap.has(prop)) {
+        return readMap.get(prop);
+      }
+      return target[prop];
+    },
+    set(target, prop, value) {
+      target[prop] = value;
+      return true;
+    },
+    defineProperty(target, prop, descriptor) {
+      if ("value" in descriptor) {
+        target[prop] = descriptor.value;
+        return true;
+      }
+      return Reflect.defineProperty(target, prop, descriptor);
+    },
+    deleteProperty(target, prop) {
+      delete target[prop];
+      return true;
+    }
+  });
   return {
     restore() {
       process.env = originalEnv;
@@ -597,82 +752,81 @@ import crypto2 from "crypto";
 function createRecordingRequestHandler(handler, options) {
   return async (event, context) => {
     const requestId = crypto2.randomUUID();
-    setCurrentRequestId(requestId);
-    const reqContext = startRequest(event);
-    let response;
-    try {
-      response = await handler(event, context);
-    } catch (handlerErr) {
-      const errorMessage = handlerErr instanceof Error ? handlerErr.message : String(handlerErr);
-      const errorResponse = {
-        statusCode: 500,
-        body: JSON.stringify({ error: errorMessage })
-      };
-      const finishOpts2 = { ...options, requestId };
-      const ctx2 = context;
-      if (ctx2 && typeof ctx2.waitUntil === "function") {
-        ctx2.waitUntil(
-          finishRequest(reqContext, options.callbacks, errorResponse, finishOpts2).catch(
+    return runInRequestContext(requestId, async () => {
+      const reqContext = startRequest(event);
+      let response;
+      try {
+        response = await handler(event, context);
+      } catch (handlerErr) {
+        const errorMessage = handlerErr instanceof Error ? handlerErr.message : String(handlerErr);
+        const errorResponse = {
+          statusCode: 500,
+          body: JSON.stringify({ error: errorMessage })
+        };
+        const finishOpts2 = { ...options, requestId };
+        const ctx2 = context;
+        if (ctx2 && typeof ctx2.waitUntil === "function") {
+          ctx2.waitUntil(
+            finishRequest(reqContext, options.callbacks, errorResponse, finishOpts2).catch(
+              (finishErr) => {
+                console.error(
+                  `netlify-recorder: background finishRequest failed after handler error (handler: ${options.handlerPath ?? "unknown"})`,
+                  finishErr
+                );
+              }
+            )
+          );
+        } else {
+          await finishRequest(reqContext, options.callbacks, errorResponse, finishOpts2).catch(
             (finishErr) => {
               console.error(
-                `netlify-recorder: background finishRequest failed after handler error (handler: ${options.handlerPath ?? "unknown"})`,
+                `netlify-recorder: finishRequest failed after handler error (handler: ${options.handlerPath ?? "unknown"})`,
                 finishErr
               );
             }
-          )
-        );
-      } else {
-        await finishRequest(reqContext, options.callbacks, errorResponse, finishOpts2).catch(
-          (finishErr) => {
-            console.error(
-              `netlify-recorder: finishRequest failed after handler error (handler: ${options.handlerPath ?? "unknown"})`,
-              finishErr
-            );
+          );
+        }
+        return {
+          ...errorResponse,
+          headers: {
+            ...errorResponse.headers,
+            "X-Replay-Request-Id": requestId
           }
-        );
+        };
       }
-      setCurrentRequestId(null);
-      return {
-        ...errorResponse,
+      reqContext.cleanup();
+      const responseWithHeader = {
+        ...response,
         headers: {
-          ...errorResponse.headers,
+          ...response.headers,
           "X-Replay-Request-Id": requestId
         }
       };
-    }
-    reqContext.cleanup();
-    setCurrentRequestId(null);
-    const responseWithHeader = {
-      ...response,
-      headers: {
-        ...response.headers,
-        "X-Replay-Request-Id": requestId
+      const finishOpts = { ...options, requestId };
+      const ctx = context;
+      if (ctx && typeof ctx.waitUntil === "function") {
+        ctx.waitUntil(
+          finishRequest(reqContext, options.callbacks, response, finishOpts).catch(
+            (err) => {
+              console.error(
+                `netlify-recorder: background finishRequest failed (handler: ${options.handlerPath ?? "unknown"})`,
+                err
+              );
+            }
+          )
+        );
+        return responseWithHeader;
+      }
+      try {
+        await finishRequest(reqContext, options.callbacks, response, finishOpts);
+      } catch (err) {
+        console.error(
+          `netlify-recorder: finishRequest failed (handler: ${options.handlerPath ?? "unknown"})`,
+          err
+        );
       }
-    };
-    const finishOpts = { ...options, requestId };
-    const ctx = context;
-    if (ctx && typeof ctx.waitUntil === "function") {
-      ctx.waitUntil(
-        finishRequest(reqContext, options.callbacks, response, finishOpts).catch(
-          (err) => {
-            console.error(
-              `netlify-recorder: background finishRequest failed (handler: ${options.handlerPath ?? "unknown"})`,
-              err
-            );
-          }
-        )
-      );
       return responseWithHeader;
-    }
-    try {
-      await finishRequest(reqContext, options.callbacks, response, finishOpts);
-    } catch (err) {
-      console.error(
-        `netlify-recorder: finishRequest failed (handler: ${options.handlerPath ?? "unknown"})`,
-        err
-      );
-    }
-    return responseWithHeader;
+    });
   };
 }
 
@@ -1142,6 +1296,7 @@ async function ensureRequestRecording(sql, requestId, options) {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
+      requestId,
       blobDataUrl: request.blob_data_url,
       handlerPath: request.handler_path,
       commitSha: request.commit_sha,
@@ -1267,5 +1422,6 @@ export {
   finishRequest,
   getCurrentRequestId,
   redactBlobData,
+  runInRequestContext,
   startRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@replayio-app-building/netlify-recorder",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "Capture and replay Netlify function executions as Replay recordings",
   "type": "module",
   "exports": {