test-proxy-recorder 0.1.7 → 0.1.9

package/dist/{index-CBjvm5rb.d.cts → index-CG-XcFDa.d.cts}

@@ -29,6 +29,7 @@ interface Recording {
     timestamp: string;
     key: string;
     sequence: number;
+    recordingId: number;
 }
 interface WebSocketMessage {
     direction: 'client-to-server' | 'server-to-client';

package/dist/{index-CBjvm5rb.d.ts → index-CG-XcFDa.d.ts}

@@ -29,6 +29,7 @@ interface Recording {
     timestamp: string;
     key: string;
     sequence: number;
+    recordingId: number;
 }
 interface WebSocketMessage {
     direction: 'client-to-server' | 'server-to-client';

package/dist/index.cjs

@@ -6,6 +6,7 @@ var https = require('https');
 var httpProxy = require('http-proxy');
 var ws = require('ws');
 var path = require('path');
+var crypto = require('crypto');
 var filenamify = require('filenamify');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -15,6 +16,7 @@ var http__default = /*#__PURE__*/_interopDefault(http);
 var https__default = /*#__PURE__*/_interopDefault(https);
 var httpProxy__default = /*#__PURE__*/_interopDefault(httpProxy);
 var path__default = /*#__PURE__*/_interopDefault(path);
+var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var filenamify__default = /*#__PURE__*/_interopDefault(filenamify);
 
 // src/ProxyServer.ts
@@ -53,7 +55,6 @@ async function saveRecordingSession(recordingsDir, session) {
     `Saved ${session.recordings.length} HTTP recordings and ${session.websocketRecordings?.length || 0} WebSocket recordings to ${filePath}`
   );
 }
-var QUERY_HASH_LENGTH = 8;
 function getReqID(req) {
   const urlParts = req.url.split("?");
   const pathname = urlParts[0];
@@ -68,7 +69,7 @@ function generateQueryHash(query) {
   if (!query) {
     return "";
   }
-  const hash = Buffer.from(query).toString("base64").replaceAll(/[^a-zA-Z0-9]/g, "").slice(0, Math.max(0, QUERY_HASH_LENGTH));
+  const hash = crypto__default.default.createHash("md5").update(query).digest("hex").slice(0, 16);
   return `_${hash}`;
 }
 
@@ -101,11 +102,14 @@ var ProxyServer = class {
   // Track sequence per request key
   replaySequenceMap;
   // Track replay position per request key
+  recordingIdCounter;
+  // Unique ID for each recording entry
   constructor(targets, recordingsDir) {
     this.targets = targets;
     this.currentTargetIndex = 0;
     this.mode = Modes.transparent;
     this.recordingId = null;
+    this.recordingIdCounter = 0;
     this.replayId = null;
     this.modeTimeout = null;
     this.currentSession = null;
@@ -293,7 +297,6 @@ var ProxyServer = class {
   }
   async saveCurrentSession(filterIncomplete = false) {
     if (!this.currentSession) {
-      console.log("No current session to save");
       return;
     }
     if (filterIncomplete) {
@@ -301,9 +304,6 @@ var ProxyServer = class {
         (r) => !r.response
       ).length;
       if (incompleteCount > 0) {
-        console.log(
-          `Removing ${incompleteCount} incomplete recording(s) without responses`
-        );
         this.currentSession.recordings = this.currentSession.recordings.filter(
           (r) => r.response
         );
@@ -316,10 +316,14 @@ var ProxyServer = class {
   }
   saveRequestRecordSync(req, body) {
     if (!this.currentSession) {
-      console.log("saveRequestRecordSync: No current session");
       return;
     }
     const key = getReqID(req);
+    const currentSequence = this.requestSequenceMap.get(key) || 0;
+    const sequence = currentSequence;
+    this.requestSequenceMap.set(key, currentSequence + 1);
+    const recordingId = this.recordingIdCounter++;
+    req.__recordingId = recordingId;
     const record = {
       request: {
         method: req.method,
@@ -329,45 +333,58 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: -1
-      // Temporary, will be set when response arrives
+      sequence,
+      recordingId
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${sequence}, recordingId: ${recordingId}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
     if (!this.currentSession) {
-      console.log("updateRequestBodySync: No current session");
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `updateRequestBodySync: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
       console.error(
-        `updateRequestBodySync: Could not find request record for ${req.method} ${req.url}`
+        `updateRequestBodySync: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return;
     }
     record.request.body = body || null;
     console.log(
-      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars)`
+      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars, recordingId: ${recordingId})`
     );
   }
   async recordResponse(req, proxyRes) {
     if (!this.currentSession) {
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `recordResponse: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
-      console.error("Request record not found for response:", key);
+      console.error(
+        `recordResponse: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
+      );
       return;
     }
     const chunks = [];
@@ -381,35 +398,28 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      console.log(`Recorded: ${req.method} ${req.url}`);
+      console.log(
+        `Recorded: ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
+      );
     });
   }
   async recordResponseData(req, proxyRes, body) {
     if (!this.currentSession) {
-      console.log("recordResponseData: No current session");
       return false;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
-    );
-    if (!record) {
-      const host = req.headers.host || "unknown";
-      const recordsWithKey = this.currentSession.recordings.filter(
-        (r) => r.key === key
-      );
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
       console.error(
-        `Request record not found for response: ${key} at ${req.method} ${host}${req.url}`
-      );
-      console.error(
-        `  Total recordings: ${this.currentSession.recordings.length}, with this key: ${recordsWithKey.length}`
+        `recordResponseData: No recording ID found on request ${req.method} ${req.url}`
       );
+      return false;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
+    );
+    if (!record) {
       console.error(
-        `  Records with key:`,
-        recordsWithKey.map((r) => ({
-          seq: r.sequence,
-          hasResponse: !!r.response
-        }))
+        `recordResponseData: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return false;
     }
@@ -418,12 +428,8 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    record.timestamp = (/* @__PURE__ */ new Date()).toISOString();
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    record.sequence = currentSequence;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     console.log(
-      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
     );
     return true;
   }
@@ -435,17 +441,29 @@ var ProxyServer = class {
       const host = req.headers.host || "unknown";
       const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => a.sequence - b.sequence);
       if (recordsWithKey.length === 0) {
-        throw new Error(
-          `No recording found for ${key} at ${req.method} ${host}${req.url}`
+        console.warn(
+          `No recording found for ${key} at ${req.method} ${host}${req.url}, returning default response`
         );
+        const defaultResponse = req.method === "GET" ? {
+          data: [],
+          items: [],
+          results: [],
+          updated_at: "0001-01-01T00:00:00Z"
+        } : { success: true };
+        const corsHeaders = this.getCorsHeaders(req);
+        res.writeHead(HTTP_STATUS_OK, {
+          "Content-Type": "application/json",
+          ...corsHeaders
+        });
+        res.end(JSON.stringify(defaultResponse));
+        return;
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
       let record;
-      if (recordsWithKey.length > 1) {
-        record = recordsWithKey[recordsWithKey.length - 1];
+      if (usageCount < recordsWithKey.length) {
+        record = recordsWithKey[usageCount];
       } else {
-        const recordIndex = usageCount % recordsWithKey.length;
-        record = recordsWithKey[recordIndex];
+        record = recordsWithKey[recordsWithKey.length - 1];
       }
       console.log(
         `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import http from 'node:http';
-export { C as ControlRequest, M as Mode, P as PlaywrightTestInfo, R as Recording, a as RecordingSession, W as WebSocketRecording, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from './index-CBjvm5rb.cjs';
+export { C as ControlRequest, M as Mode, P as PlaywrightTestInfo, R as Recording, a as RecordingSession, W as WebSocketRecording, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from './index-CG-XcFDa.cjs';
 import '@playwright/test';
 
 declare class ProxyServer {
@@ -14,6 +14,7 @@ declare class ProxyServer {
     private recordingsDir;
     private requestSequenceMap;
     private replaySequenceMap;
+    private recordingIdCounter;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import http from 'node:http';
-export { C as ControlRequest, M as Mode, P as PlaywrightTestInfo, R as Recording, a as RecordingSession, W as WebSocketRecording, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from './index-CBjvm5rb.js';
+export { C as ControlRequest, M as Mode, P as PlaywrightTestInfo, R as Recording, a as RecordingSession, W as WebSocketRecording, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from './index-CG-XcFDa.js';
 import '@playwright/test';
 
 declare class ProxyServer {
@@ -14,6 +14,7 @@ declare class ProxyServer {
     private recordingsDir;
     private requestSequenceMap;
     private replaySequenceMap;
+    private recordingIdCounter;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;

package/dist/index.mjs

@@ -4,6 +4,7 @@ import https from 'https';
 import httpProxy from 'http-proxy';
 import { WebSocket, WebSocketServer } from 'ws';
 import path from 'path';
+import crypto from 'crypto';
 import filenamify from 'filenamify';
 
 // src/ProxyServer.ts
@@ -42,7 +43,6 @@ async function saveRecordingSession(recordingsDir, session) {
     `Saved ${session.recordings.length} HTTP recordings and ${session.websocketRecordings?.length || 0} WebSocket recordings to ${filePath}`
   );
 }
-var QUERY_HASH_LENGTH = 8;
 function getReqID(req) {
   const urlParts = req.url.split("?");
   const pathname = urlParts[0];
@@ -57,7 +57,7 @@ function generateQueryHash(query) {
   if (!query) {
     return "";
   }
-  const hash = Buffer.from(query).toString("base64").replaceAll(/[^a-zA-Z0-9]/g, "").slice(0, Math.max(0, QUERY_HASH_LENGTH));
+  const hash = crypto.createHash("md5").update(query).digest("hex").slice(0, 16);
   return `_${hash}`;
 }
 
@@ -90,11 +90,14 @@ var ProxyServer = class {
   // Track sequence per request key
   replaySequenceMap;
   // Track replay position per request key
+  recordingIdCounter;
+  // Unique ID for each recording entry
   constructor(targets, recordingsDir) {
     this.targets = targets;
     this.currentTargetIndex = 0;
     this.mode = Modes.transparent;
     this.recordingId = null;
+    this.recordingIdCounter = 0;
     this.replayId = null;
     this.modeTimeout = null;
     this.currentSession = null;
@@ -282,7 +285,6 @@ var ProxyServer = class {
   }
   async saveCurrentSession(filterIncomplete = false) {
     if (!this.currentSession) {
-      console.log("No current session to save");
       return;
     }
     if (filterIncomplete) {
@@ -290,9 +292,6 @@ var ProxyServer = class {
         (r) => !r.response
       ).length;
       if (incompleteCount > 0) {
-        console.log(
-          `Removing ${incompleteCount} incomplete recording(s) without responses`
-        );
         this.currentSession.recordings = this.currentSession.recordings.filter(
           (r) => r.response
         );
@@ -305,10 +304,14 @@ var ProxyServer = class {
   }
   saveRequestRecordSync(req, body) {
     if (!this.currentSession) {
-      console.log("saveRequestRecordSync: No current session");
       return;
     }
     const key = getReqID(req);
+    const currentSequence = this.requestSequenceMap.get(key) || 0;
+    const sequence = currentSequence;
+    this.requestSequenceMap.set(key, currentSequence + 1);
+    const recordingId = this.recordingIdCounter++;
+    req.__recordingId = recordingId;
     const record = {
       request: {
         method: req.method,
@@ -318,45 +321,58 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: -1
-      // Temporary, will be set when response arrives
+      sequence,
+      recordingId
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${sequence}, recordingId: ${recordingId}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
     if (!this.currentSession) {
-      console.log("updateRequestBodySync: No current session");
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `updateRequestBodySync: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
       console.error(
-        `updateRequestBodySync: Could not find request record for ${req.method} ${req.url}`
+        `updateRequestBodySync: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return;
     }
     record.request.body = body || null;
     console.log(
-      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars)`
+      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars, recordingId: ${recordingId})`
     );
   }
   async recordResponse(req, proxyRes) {
     if (!this.currentSession) {
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `recordResponse: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
-      console.error("Request record not found for response:", key);
+      console.error(
+        `recordResponse: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
+      );
       return;
     }
     const chunks = [];
@@ -370,35 +386,28 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      console.log(`Recorded: ${req.method} ${req.url}`);
+      console.log(
+        `Recorded: ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
+      );
     });
   }
   async recordResponseData(req, proxyRes, body) {
     if (!this.currentSession) {
-      console.log("recordResponseData: No current session");
       return false;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
-    );
-    if (!record) {
-      const host = req.headers.host || "unknown";
-      const recordsWithKey = this.currentSession.recordings.filter(
-        (r) => r.key === key
-      );
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
       console.error(
-        `Request record not found for response: ${key} at ${req.method} ${host}${req.url}`
-      );
-      console.error(
-        `  Total recordings: ${this.currentSession.recordings.length}, with this key: ${recordsWithKey.length}`
+        `recordResponseData: No recording ID found on request ${req.method} ${req.url}`
       );
+      return false;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
+    );
+    if (!record) {
       console.error(
-        `  Records with key:`,
-        recordsWithKey.map((r) => ({
-          seq: r.sequence,
-          hasResponse: !!r.response
-        }))
+        `recordResponseData: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return false;
     }
@@ -407,12 +416,8 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    record.timestamp = (/* @__PURE__ */ new Date()).toISOString();
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    record.sequence = currentSequence;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     console.log(
-      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
     );
     return true;
   }
@@ -424,17 +429,29 @@ var ProxyServer = class {
       const host = req.headers.host || "unknown";
       const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => a.sequence - b.sequence);
       if (recordsWithKey.length === 0) {
-        throw new Error(
-          `No recording found for ${key} at ${req.method} ${host}${req.url}`
+        console.warn(
+          `No recording found for ${key} at ${req.method} ${host}${req.url}, returning default response`
         );
+        const defaultResponse = req.method === "GET" ? {
+          data: [],
+          items: [],
+          results: [],
+          updated_at: "0001-01-01T00:00:00Z"
+        } : { success: true };
+        const corsHeaders = this.getCorsHeaders(req);
+        res.writeHead(HTTP_STATUS_OK, {
+          "Content-Type": "application/json",
+          ...corsHeaders
+        });
+        res.end(JSON.stringify(defaultResponse));
+        return;
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
       let record;
-      if (recordsWithKey.length > 1) {
-        record = recordsWithKey[recordsWithKey.length - 1];
+      if (usageCount < recordsWithKey.length) {
+        record = recordsWithKey[usageCount];
       } else {
-        const recordIndex = usageCount % recordsWithKey.length;
-        record = recordsWithKey[recordIndex];
+        record = recordsWithKey[recordsWithKey.length - 1];
       }
       console.log(
         `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`

package/dist/playwright/index.d.cts

@@ -1,3 +1,3 @@
 import '@playwright/test';
-export { P as PlaywrightTestInfo, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from '../index-CBjvm5rb.cjs';
+export { P as PlaywrightTestInfo, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from '../index-CG-XcFDa.cjs';
 import 'node:http';

package/dist/playwright/index.d.ts

@@ -1,3 +1,3 @@
 import '@playwright/test';
-export { P as PlaywrightTestInfo, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from '../index-CBjvm5rb.js';
+export { P as PlaywrightTestInfo, g as generateSessionId, p as playwrightProxy, s as setProxyMode, b as startRecording, c as startReplay, d as stopProxy } from '../index-CG-XcFDa.js';
 import 'node:http';

package/dist/proxy.js

@@ -5,6 +5,7 @@ import http from 'http';
 import https from 'https';
 import httpProxy from 'http-proxy';
 import { WebSocket, WebSocketServer } from 'ws';
+import crypto from 'crypto';
 import filenamify from 'filenamify';
 
 // src/cli.ts
@@ -76,7 +77,6 @@ async function saveRecordingSession(recordingsDir2, session) {
     `Saved ${session.recordings.length} HTTP recordings and ${session.websocketRecordings?.length || 0} WebSocket recordings to ${filePath}`
   );
 }
-var QUERY_HASH_LENGTH = 8;
 function getReqID(req) {
   const urlParts = req.url.split("?");
   const pathname = urlParts[0];
@@ -91,7 +91,7 @@ function generateQueryHash(query) {
   if (!query) {
     return "";
   }
-  const hash = Buffer.from(query).toString("base64").replaceAll(/[^a-zA-Z0-9]/g, "").slice(0, Math.max(0, QUERY_HASH_LENGTH));
+  const hash = crypto.createHash("md5").update(query).digest("hex").slice(0, 16);
   return `_${hash}`;
 }
 
@@ -124,11 +124,14 @@ var ProxyServer = class {
   // Track sequence per request key
   replaySequenceMap;
   // Track replay position per request key
+  recordingIdCounter;
+  // Unique ID for each recording entry
   constructor(targets2, recordingsDir2) {
     this.targets = targets2;
     this.currentTargetIndex = 0;
     this.mode = Modes.transparent;
     this.recordingId = null;
+    this.recordingIdCounter = 0;
     this.replayId = null;
     this.modeTimeout = null;
     this.currentSession = null;
@@ -316,7 +319,6 @@ var ProxyServer = class {
   }
   async saveCurrentSession(filterIncomplete = false) {
     if (!this.currentSession) {
-      console.log("No current session to save");
       return;
     }
     if (filterIncomplete) {
@@ -324,9 +326,6 @@ var ProxyServer = class {
         (r) => !r.response
       ).length;
       if (incompleteCount > 0) {
-        console.log(
-          `Removing ${incompleteCount} incomplete recording(s) without responses`
-        );
         this.currentSession.recordings = this.currentSession.recordings.filter(
           (r) => r.response
         );
@@ -339,10 +338,14 @@ var ProxyServer = class {
   }
   saveRequestRecordSync(req, body) {
     if (!this.currentSession) {
-      console.log("saveRequestRecordSync: No current session");
       return;
     }
     const key = getReqID(req);
+    const currentSequence = this.requestSequenceMap.get(key) || 0;
+    const sequence = currentSequence;
+    this.requestSequenceMap.set(key, currentSequence + 1);
+    const recordingId = this.recordingIdCounter++;
+    req.__recordingId = recordingId;
     const record = {
       request: {
         method: req.method,
@@ -352,45 +355,58 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: -1
-      // Temporary, will be set when response arrives
+      sequence,
+      recordingId
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${sequence}, recordingId: ${recordingId}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
     if (!this.currentSession) {
-      console.log("updateRequestBodySync: No current session");
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `updateRequestBodySync: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
       console.error(
-        `updateRequestBodySync: Could not find request record for ${req.method} ${req.url}`
+        `updateRequestBodySync: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return;
     }
     record.request.body = body || null;
     console.log(
-      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars)`
+      `updateRequestBodySync: Updated body for ${req.method} ${req.url} (${body.length} chars, recordingId: ${recordingId})`
     );
   }
   async recordResponse(req, proxyRes) {
     if (!this.currentSession) {
       return;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
+      console.error(
+        `recordResponse: No recording ID found on request ${req.method} ${req.url}`
+      );
+      return;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
     );
     if (!record) {
-      console.error("Request record not found for response:", key);
+      console.error(
+        `recordResponse: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
+      );
       return;
     }
     const chunks = [];
@@ -404,35 +420,28 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      console.log(`Recorded: ${req.method} ${req.url}`);
+      console.log(
+        `Recorded: ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
+      );
     });
   }
   async recordResponseData(req, proxyRes, body) {
     if (!this.currentSession) {
-      console.log("recordResponseData: No current session");
       return false;
     }
-    const key = getReqID(req);
-    const record = this.currentSession.recordings.findLast(
-      (r) => r.key === key && !r.response
-    );
-    if (!record) {
-      const host = req.headers.host || "unknown";
-      const recordsWithKey = this.currentSession.recordings.filter(
-        (r) => r.key === key
-      );
+    const recordingId = req.__recordingId;
+    if (recordingId === void 0) {
       console.error(
-        `Request record not found for response: ${key} at ${req.method} ${host}${req.url}`
-      );
-      console.error(
-        `  Total recordings: ${this.currentSession.recordings.length}, with this key: ${recordsWithKey.length}`
+        `recordResponseData: No recording ID found on request ${req.method} ${req.url}`
       );
+      return false;
+    }
+    const record = this.currentSession.recordings.find(
+      (r) => r.recordingId === recordingId
+    );
+    if (!record) {
       console.error(
-        `  Records with key:`,
-        recordsWithKey.map((r) => ({
-          seq: r.sequence,
-          hasResponse: !!r.response
-        }))
+        `recordResponseData: Could not find recording with ID ${recordingId} for ${req.method} ${req.url}`
       );
       return false;
     }
@@ -441,12 +450,8 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    record.timestamp = (/* @__PURE__ */ new Date()).toISOString();
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    record.sequence = currentSequence;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     console.log(
-      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence}, recordingId: ${recordingId})`
     );
     return true;
   }
@@ -458,17 +463,29 @@ var ProxyServer = class {
       const host = req.headers.host || "unknown";
       const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => a.sequence - b.sequence);
       if (recordsWithKey.length === 0) {
-        throw new Error(
-          `No recording found for ${key} at ${req.method} ${host}${req.url}`
+        console.warn(
+          `No recording found for ${key} at ${req.method} ${host}${req.url}, returning default response`
         );
+        const defaultResponse = req.method === "GET" ? {
+          data: [],
+          items: [],
+          results: [],
+          updated_at: "0001-01-01T00:00:00Z"
+        } : { success: true };
+        const corsHeaders = this.getCorsHeaders(req);
+        res.writeHead(HTTP_STATUS_OK, {
+          "Content-Type": "application/json",
+          ...corsHeaders
+        });
+        res.end(JSON.stringify(defaultResponse));
+        return;
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
       let record;
-      if (recordsWithKey.length > 1) {
-        record = recordsWithKey[recordsWithKey.length - 1];
+      if (usageCount < recordsWithKey.length) {
+        record = recordsWithKey[usageCount];
       } else {
-        const recordIndex = usageCount % recordsWithKey.length;
-        record = recordsWithKey[recordIndex];
+        record = recordsWithKey[recordsWithKey.length - 1];
       }
       console.log(
         `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "test-proxy-recorder",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "HTTP proxy server for recording and replaying network requests in testing. Works seamlessly with Playwright testing framework.",
   "type": "module",
   "main": "dist/index.mjs",