@replayio-app-building/netlify-recorder 0.59.0 → 0.61.0

package/dist/index.js

@@ -36,6 +36,16 @@ import http from "http";
 import https from "https";
 import zlib from "zlib";
 import { Readable, Writable } from "stream";
+var _lastReplayCallNs = null;
+function replayGapMs() {
+  const now = process.hrtime.bigint();
+  const gapMs = _lastReplayCallNs === null ? 0 : Number(now - _lastReplayCallNs) / 1e6;
+  _lastReplayCallNs = now;
+  return Math.round(gapMs);
+}
+function resetReplayGap() {
+  _lastReplayCallNs = null;
+}
 function isNeonQuery(obj) {
   return typeof obj === "object" && obj !== null && "query" in obj && "params" in obj;
 }
@@ -56,7 +66,7 @@ function buildSetConfigQueries(requestId, callIndex) {
     { query: "SELECT set_config('app.replay_call_index', $1, true)", params: [String(callIndex)] }
   ];
 }
-function patchHttpModules(mode, calls, consumed, silent) {
+function patchHttpModules(mode, calls, consumed, silent, matcher) {
   const origHttpRequest = http.request;
   const origHttpsRequest = https.request;
   function makeInterceptedRequest(mod, origRequest, protocol, args) {
@@ -88,7 +98,7 @@ function patchHttpModules(mode, calls, consumed, silent) {
     const urlStr = `${protocol}//${host}${port}${path}`;
     const method = (options.method || "GET").toUpperCase();
     if (mode === "replay") {
-      return replayHttpRequest(urlStr, method, calls, consumed, callback, silent);
+      return replayHttpRequest(urlStr, method, calls, consumed, matcher, callback, silent);
     }
     const req = origRequest.call(mod, ...args);
     const bodyChunks = [];
@@ -172,24 +182,59 @@ function patchHttpModules(mode, calls, consumed, silent) {
     https.request = origHttpsRequest;
   };
 }
-function replayHttpRequest(url, _method, calls, consumed, callback, silent) {
-  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) {
-      matchIdx = i;
-      break;
-    }
+function bucketPush(map, key, i) {
+  let b = map.get(key);
+  if (!b) {
+    b = { list: [], cur: 0 };
+    map.set(key, b);
   }
-  if (matchIdx === -1) {
+  b.list.push(i);
+}
+function urlBodyKey(url, body) {
+  return body === void 0 ? `${url}\0\0undef` : `${url}\0${body}`;
+}
+var ReplayCallMatcher = class {
+  constructor(calls, consumed) {
+    this.consumed = consumed;
     for (let i = 0; i < calls.length; i++) {
-      if (!consumed.has(i)) {
-        matchIdx = i;
-        break;
-      }
+      this.all.list.push(i);
+      const c = calls[i];
+      if (!c) continue;
+      bucketPush(this.byUrl, c.url, i);
+      bucketPush(this.byUrlBody, urlBodyKey(c.url, c.requestBody), i);
+      if (c.requestBody !== void 0) bucketPush(this.byBody, c.requestBody, i);
+    }
+  }
+  consumed;
+  byUrlBody = /* @__PURE__ */ new Map();
+  byUrl = /* @__PURE__ */ new Map();
+  byBody = /* @__PURE__ */ new Map();
+  all = { list: [], cur: 0 };
+  /** Lowest-index not-yet-consumed entry in a bucket, or -1. Amortized O(1). */
+  take(bucket) {
+    if (!bucket) return -1;
+    while (bucket.cur < bucket.list.length && this.consumed.has(bucket.list[bucket.cur])) {
+      bucket.cur++;
     }
+    return bucket.cur < bucket.list.length ? bucket.list[bucket.cur] : -1;
   }
+  /** fetch matching: exact url+body, then url, then body, then FIFO. */
+  matchFetch(url, requestBody) {
+    let idx = this.take(this.byUrlBody.get(urlBodyKey(url, requestBody)));
+    if (idx === -1) idx = this.take(this.byUrl.get(url));
+    if (idx === -1 && requestBody) idx = this.take(this.byBody.get(requestBody));
+    if (idx === -1) idx = this.take(this.all);
+    return idx;
+  }
+  /** http/https matching: exact url, then FIFO. */
+  matchHttp(url) {
+    let idx = this.take(this.byUrl.get(url));
+    if (idx === -1) idx = this.take(this.all);
+    return idx;
+  }
+};
+function replayHttpRequest(url, _method, calls, consumed, matcher, callback, silent) {
+  const matchIdx = matcher.matchHttp(url);
   const call = calls[matchIdx];
   if (matchIdx === -1 || !call) {
     throw new Error(
@@ -199,14 +244,15 @@ function replayHttpRequest(url, _method, calls, consumed, callback, silent) {
   consumed.add(matchIdx);
   const isPending = call.pending || call.endTime === 0 && call.responseStatus === 0;
   if (!silent) {
+    const gap = replayGapMs();
     if (isPending) {
       console.log(
-        `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => (fire-and-forget, no response captured)`
+        `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => (fire-and-forget, no response captured) [replay gap: ${gap}ms]`
       );
     } else {
       const duration = call.endTime - call.startTime;
       console.log(
-        `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus} (original: ${duration}ms)`
+        `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus} (original: ${duration}ms, replay gap: ${gap}ms)`
       );
     }
   }
@@ -411,46 +457,12 @@ function installNetworkInterceptor(mode, calls, options) {
   }
   const originalFetch = globalThis.fetch;
   const consumed = /* @__PURE__ */ new Set();
+  const matcher = new ReplayCallMatcher(calls, consumed);
+  resetReplayGap();
   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) {
-          matchIdx = i;
-          break;
-        }
-      }
-    }
-    if (matchIdx === -1 && requestBody) {
-      for (let i = 0; i < calls.length; i++) {
-        if (consumed.has(i)) continue;
-        const c = calls[i];
-        if (c && c.requestBody === requestBody) {
-          matchIdx = i;
-          break;
-        }
-      }
-    }
-    if (matchIdx === -1) {
-      for (let i = 0; i < calls.length; i++) {
-        if (!consumed.has(i)) {
-          matchIdx = i;
-          break;
-        }
-      }
-    }
+    const matchIdx = matcher.matchFetch(url, requestBody);
     const call = calls[matchIdx];
     if (matchIdx === -1 || !call) {
       throw new Error(
@@ -460,14 +472,15 @@ function installNetworkInterceptor(mode, calls, options) {
     consumed.add(matchIdx);
     const isPending = call.pending || call.endTime === 0 && call.responseStatus === 0;
     if (!silent) {
+      const gap = replayGapMs();
       if (isPending) {
         console.log(
-          `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => (fire-and-forget, no response captured)`
+          `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => (fire-and-forget, no response captured) [replay gap: ${gap}ms]`
         );
       } else {
         const duration = call.endTime - call.startTime;
         console.log(
-          `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus} (original: ${duration}ms)`
+          `  [network-replay] Consumed call ${consumed.size}/${calls.length}: ${call.method} ${call.url} => ${call.responseStatus} (original: ${duration}ms, replay gap: ${gap}ms)`
         );
       }
     }
@@ -509,7 +522,7 @@ function installNetworkInterceptor(mode, calls, options) {
     };
   };
   globalThis.fetch = replayFetch;
-  const restoreHttp = patchHttpModules("replay", calls, consumed, silent);
+  const restoreHttp = patchHttpModules("replay", calls, consumed, silent, matcher);
   return {
     restore() {
       globalThis.fetch = originalFetch;
@@ -541,6 +554,20 @@ async function handleNeonSqlRequest(originalFetch, input, init, url, method, req
     body: JSON.stringify({ queries: txBody })
   };
   const startTime = Date.now();
+  const entry = {
+    url,
+    method,
+    requestHeaders,
+    requestBody,
+    responseStatus: 0,
+    responseHeaders: {},
+    responseBody: void 0,
+    timestamp: startTime,
+    startTime,
+    endTime: 0,
+    pending: true
+  };
+  calls.push(entry);
   const response = await originalFetch(input, modifiedInit);
   const endTime = Date.now();
   const rawBody = await response.clone().text();
@@ -560,18 +587,12 @@ async function handleNeonSqlRequest(originalFetch, input, init, url, method, req
     } catch {
     }
   }
-  calls.push({
-    url,
-    method,
-    requestHeaders,
-    requestBody,
-    responseStatus: response.status,
-    responseHeaders,
-    responseBody: recordedBody,
-    timestamp: endTime,
-    startTime,
-    endTime
-  });
+  entry.responseStatus = response.status;
+  entry.responseHeaders = responseHeaders;
+  entry.responseBody = recordedBody;
+  entry.timestamp = endTime;
+  entry.endTime = endTime;
+  entry.pending = false;
   return new Response(recordedBody, {
     status: response.status,
     statusText: response.statusText,
@@ -930,8 +951,13 @@ function redactBlobData(blobData) {
       responseBody: scrub(call.responseBody)
     })
   );
+  const redactedHandlerResponse = blobData.handlerResponse ? {
+    ...blobData.handlerResponse,
+    body: scrub(blobData.handlerResponse.body)
+  } : blobData.handlerResponse;
   return {
     ...blobData,
+    handlerResponse: redactedHandlerResponse,
     requestInfo: redactedRequestInfo,
     capturedData: {
       networkCalls: redactedNetworkCalls,
@@ -984,7 +1010,7 @@ async function finishRequest(requestContext, callbacks, response, options) {
       body: typeof response.body === "string" ? response.body : void 0
     },
     originalRequestId: options?.originalRequestId,
-    packageVersion: "0.59.0"
+    packageVersion: "0.61.0"
   };
   const blobData = redactBlobData(rawBlobData);
   const blobContent = JSON.stringify(blobData);
@@ -1384,11 +1410,13 @@ async function createRequestRecording(blobUrlOrData, handlerPath, requestInfo, p
   }
   if (precedingBlobs && precedingBlobs.length > 0) {
     console.log(`  [warm-up] Replaying ${precedingBlobs.length} preceding request(s) to populate module-level state\u2026`);
+    const warmupStartNs = process.hrtime.bigint();
     for (let i = 0; i < precedingBlobs.length; i++) {
       const pb = precedingBlobs[i];
       const netH = installNetworkInterceptor("replay", pb.capturedData.networkCalls, { silent: true });
       const envH = installEnvironmentInterceptor("replay", pb.capturedData.envReads);
       let warmupError;
+      const itemStartNs = process.hrtime.bigint();
       try {
         if (isV2) {
           const url = pb.requestInfo.rawUrl ?? `https://localhost${pb.requestInfo.url}`;
@@ -1420,20 +1448,23 @@ async function createRequestRecording(blobUrlOrData, handlerPath, requestInfo, p
       } catch (err) {
         warmupError = err instanceof Error ? err.message : String(err);
       }
+      const itemMs = Math.round(Number(process.hrtime.bigint() - itemStartNs) / 1e6);
       const consumed = netH.consumedCount();
       const total = netH.totalCount();
       netH.restore();
       envH.restore();
       if (warmupError) {
-        console.error(`  [warm-up ${i + 1}/${precedingBlobs.length}] ${pb.requestInfo.method} ${pb.requestInfo.url} \u2014 ERROR: ${warmupError} (${consumed}/${total} calls)`);
+        console.error(`  [warm-up ${i + 1}/${precedingBlobs.length}] ${pb.requestInfo.method} ${pb.requestInfo.url} \u2014 ERROR: ${warmupError} (${consumed}/${total} calls, ${itemMs}ms real)`);
       } else {
-        console.log(`  [warm-up ${i + 1}/${precedingBlobs.length}] ${pb.requestInfo.method} ${pb.requestInfo.url} \u2014 OK (${consumed}/${total} network calls)`);
+        console.log(`  [warm-up ${i + 1}/${precedingBlobs.length}] ${pb.requestInfo.method} ${pb.requestInfo.url} \u2014 OK (${consumed}/${total} network calls, ${itemMs}ms real)`);
       }
     }
-    console.log(`  [warm-up] Done.`);
+    const warmupMs = Math.round(Number(process.hrtime.bigint() - warmupStartNs) / 1e6);
+    console.log(`  [warm-up] Done. (${precedingBlobs.length} request(s) in ${warmupMs}ms real wall-clock)`);
   }
   try {
     let rawResult;
+    const targetStartNs = process.hrtime.bigint();
     try {
       if (isV2) {
         const url = requestInfo.rawUrl ?? `https://localhost${requestInfo.url}`;
@@ -1485,6 +1516,8 @@ async function createRequestRecording(blobUrlOrData, handlerPath, requestInfo, p
         body: JSON.stringify({ error: errorMessage })
       };
     }
+    const targetMs = Math.round(Number(process.hrtime.bigint() - targetStartNs) / 1e6);
+    console.log(`  [replay] Target handler executed in ${targetMs}ms real wall-clock (${blobData.capturedData.networkCalls.length} network call(s)).`);
     if (blobData.handlerResponse) {
       const replayRes = rawResult;
       const replayResponse = {

package/package.json

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