test-proxy-recorder 0.1.8 → 0.1.10

package/README.md

@@ -102,7 +102,7 @@ Create `e2e/global-teardown.ts`:
 import { setProxyMode } from 'test-proxy-recorder';
 
 async function globalTeardown() {
-  await setProxyMode('transparent');
+  await setProxyMode('transparent').catch(err => { console.error(err) });
 }
 
 export default globalTeardown;
@@ -247,7 +247,7 @@ Create `e2e/global-teardown.ts`:
 import { setProxyMode } from 'test-proxy-recorder';
 
 async function globalTeardown() {
-  await setProxyMode('transparent');
+  await setProxyMode('transparent').catch(err => { console.error(err) });
 }
 
 export default globalTeardown;

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

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

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

@@ -28,7 +28,7 @@ interface Recording {
     response?: RecordedResponse;
     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}`;
 }
 
@@ -97,24 +98,25 @@ var ProxyServer = class {
   proxy;
   currentSession;
   recordingsDir;
-  requestSequenceMap;
-  // Track sequence per request key
-  replaySequenceMap;
-  // Track replay position per request key
+  recordingIdCounter;
+  // Unique ID for each recording entry
+  replaySessions;
+  // Track multiple concurrent replay sessions by recording ID
   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;
     this.recordingsDir = recordingsDir;
-    this.requestSequenceMap = /* @__PURE__ */ new Map();
-    this.replaySequenceMap = /* @__PURE__ */ new Map();
+    this.replaySessions = /* @__PURE__ */ new Map();
     this.proxy = httpProxy__default.default.createProxyServer({
       secure: false,
-      changeOrigin: true
+      changeOrigin: true,
+      ws: true
     });
     this.setupProxyEventHandlers();
   }
@@ -182,6 +184,43 @@ var ProxyServer = class {
     this.currentTargetIndex = (this.currentTargetIndex + 1) % this.targets.length;
     return target;
   }
+  /**
+   * Extract recording ID from request cookie
+   * Used for concurrent replay session routing
+   * @param req The incoming HTTP request
+   * @returns The recording ID from cookie, or null if not found
+   */
+  getRecordingIdFromCookie(req) {
+    const cookies = req.headers.cookie;
+    if (!cookies) {
+      return null;
+    }
+    const match = cookies.match(/proxy-recording-id=([^;]+)/);
+    return match ? decodeURIComponent(match[1]) : null;
+  }
+  /**
+   * Get or create a replay session state for a given recording ID
+   * @param recordingId The recording ID to get/create session for
+   * @returns The replay session state
+   */
+  getOrCreateReplaySession(recordingId) {
+    let session = this.replaySessions.get(recordingId);
+    if (session) {
+      session.lastAccessTime = Date.now();
+    } else {
+      session = {
+        recordingId,
+        servedRecordingIdsByKey: /* @__PURE__ */ new Map(),
+        loadedSession: null,
+        lastAccessTime: Date.now()
+      };
+      this.replaySessions.set(recordingId, session);
+      console.log(
+        `[CONCURRENT REPLAY] Created new session for recording: ${recordingId}`
+      );
+    }
+    return session;
+  }
   parseGetParams(req) {
     const url = new URL(req.url || "", `http://${req.headers.host}`);
     const mode = url.searchParams.get("mode");
@@ -198,16 +237,25 @@ var ProxyServer = class {
       let data;
       if (req.method === "GET") {
         data = this.parseGetParams(req);
-      } else {
+      } else if (req.method === "POST") {
         const body = await readRequestBody(req);
-        console.log("MODE CHANGE (POST)", body);
+        console.log(`MODE CHANGE (${req.method})`, body);
         data = JSON.parse(body);
+      } else {
+        return;
       }
       const { mode, id, timeout: requestTimeout } = data;
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
       await this.switchMode(mode, id);
       this.setupModeTimeout(timeout);
+      if (mode === Modes.replay && id) {
+        res.setHeader(
+          "Set-Cookie",
+          `proxy-recording-id=${encodeURIComponent(id)}; HttpOnly; Path=/; SameSite=Lax`
+        );
+        console.log(`[CONCURRENT REPLAY] Set cookie for recording: ${id}`);
+      }
       sendJsonResponse(res, HTTP_STATUS_OK, {
         success: true,
         mode: this.mode,
@@ -222,14 +270,12 @@ var ProxyServer = class {
     }
   }
   clearModeTimeout() {
-    if (this.modeTimeout) {
-      clearTimeout(this.modeTimeout);
-      this.modeTimeout = null;
-    }
+    clearTimeout(this.modeTimeout || 0);
+    this.modeTimeout = null;
   }
   async switchMode(mode, id) {
-    if (this.currentSession) {
-      console.log("Switching mode, saving current session first");
+    console.log(`Switching to ${mode.toUpperCase()} mode`);
+    if (this.currentSession && this.mode === Modes.record) {
       await this.saveCurrentSession(true);
       console.log("Session saved, continuing with mode switch");
     }
@@ -239,11 +285,17 @@ var ProxyServer = class {
         break;
       }
       case Modes.record: {
+        if (!id) {
+          throw new Error("Record ID is required");
+        }
         this.switchToRecordMode(id);
         break;
       }
       case Modes.replay: {
-        this.switchToReplayMode(id);
+        if (!id) {
+          throw new Error("Replay ID is required");
+        }
+        await this.switchToReplayMode(id);
         break;
       }
       default: {
@@ -260,36 +312,33 @@ var ProxyServer = class {
     console.log("Switched to transparent mode");
   }
   switchToRecordMode(id) {
-    if (!id) {
-      throw new Error("Record ID is required");
-    }
     this.mode = Modes.record;
     this.recordingId = id;
     this.replayId = null;
     this.currentSession = { id, recordings: [], websocketRecordings: [] };
-    this.requestSequenceMap.clear();
     console.log(`Switched to record mode with ID: ${id}`);
   }
-  switchToReplayMode(id) {
-    if (!id) {
-      throw new Error("Replay ID is required");
-    }
+  async switchToReplayMode(id) {
     this.mode = Modes.replay;
     this.replayId = id;
     this.recordingId = null;
     this.currentSession = null;
-    this.replaySequenceMap.clear();
+    const session = this.replaySessions.get(id);
+    if (session) {
+      session.servedRecordingIdsByKey.clear();
+      console.log(`Reset served recordings tracker for session: ${id}`);
+    } else {
+      this.getOrCreateReplaySession(id);
+    }
     console.log(`Switched to replay mode with ID: ${id}`);
   }
   setupModeTimeout(timeout) {
-    if (timeout && timeout > 0) {
-      this.modeTimeout = setTimeout(async () => {
-        console.log("Timeout reached, switching back to transparent mode");
-        await this.saveCurrentSession(true);
-        this.switchToTransparentMode();
-        this.modeTimeout = null;
-      }, timeout);
-    }
+    this.modeTimeout = setTimeout(async () => {
+      console.log("Timeout reached, switching back to transparent mode");
+      await this.saveCurrentSession(true);
+      this.switchToTransparentMode();
+      this.modeTimeout = null;
+    }, timeout);
   }
   async saveCurrentSession(filterIncomplete = false) {
     if (!this.currentSession) {
@@ -315,6 +364,8 @@ var ProxyServer = class {
       return;
     }
     const key = getReqID(req);
+    const recordingId = this.recordingIdCounter++;
+    req.__recordingId = recordingId;
     const record = {
       request: {
         method: req.method,
@@ -324,44 +375,57 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: -1
-      // Temporary, will be set when response arrives
+      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}, recordingId: ${recordingId}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
     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(
+        `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 = [];
@@ -375,34 +439,28 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      console.log(`Recorded: ${req.method} ${req.url}`);
+      console.log(
+        `Recorded: ${req.method} ${req.url} (recordingId: ${recordingId})`
+      );
     });
   }
   async recordResponseData(req, proxyRes, body) {
     if (!this.currentSession) {
       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;
     }
@@ -411,34 +469,78 @@ 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} (recordingId: ${recordingId})`
     );
     return true;
   }
   async handleReplayRequest(req, res) {
+    const recordingId = this.getRecordingIdFromCookie(req) || this.replayId;
+    if (!recordingId) {
+      const corsHeaders = this.getCorsHeaders(req);
+      res.writeHead(HTTP_STATUS_BAD_REQUEST, {
+        "Content-Type": "application/json",
+        ...corsHeaders
+      });
+      res.end(JSON.stringify({ error: "No replay session active" }));
+      return;
+    }
     const key = getReqID(req);
-    const filePath = getRecordingPath(this.recordingsDir, this.replayId);
+    const filePath = getRecordingPath(this.recordingsDir, recordingId);
     try {
-      const session = await loadRecordingSession(filePath);
+      const sessionState = this.getOrCreateReplaySession(recordingId);
+      if (!sessionState.loadedSession) {
+        sessionState.loadedSession = await loadRecordingSession(filePath);
+        console.log(`[REPLAY] Loaded recording session: ${recordingId}`);
+      }
+      const session = sessionState.loadedSession;
+      if (!sessionState.servedRecordingIdsByKey.has(key)) {
+        sessionState.servedRecordingIdsByKey.set(key, /* @__PURE__ */ new Set());
+      }
+      const servedForThisKey = sessionState.servedRecordingIdsByKey.get(key);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => a.sequence - b.sequence);
+      const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => a.recordingId - b.recordingId);
       if (recordsWithKey.length === 0) {
-        throw new Error(
-          `No recording found for ${key} at ${req.method} ${host}${req.url}`
+        const errorMsg = `No recording found for ${key} at ${req.method} ${host}${req.url}`;
+        console.error(`[REPLAY ERROR] ${errorMsg} (session: ${recordingId})`);
+        console.error(
+          `[REPLAY ERROR] This request was not made during recording - possible test non-determinism`
+        );
+        const errorResponse = {
+          error: "No recording found",
+          message: errorMsg,
+          key,
+          sessionId: recordingId
+        };
+        const corsHeaders = this.getCorsHeaders(req);
+        res.writeHead(HTTP_STATUS_NOT_FOUND, {
+          "Content-Type": "application/json",
+          ...corsHeaders
+        });
+        res.end(JSON.stringify(errorResponse));
+        return;
+      }
+      const requestCount = servedForThisKey.size + 1;
+      console.log(
+        `[REPLAY REQUEST #${requestCount}] ${req.method} ${req.url} (session: ${recordingId}, total: ${recordsWithKey.length}, served: ${servedForThisKey.size})`
+      );
+      let record;
+      for (const rec of recordsWithKey) {
+        if (!servedForThisKey.has(rec.recordingId)) {
+          record = rec;
+          break;
+        }
+      }
+      if (!record) {
+        console.log(
+          `[REPLAY WARNING] All ${recordsWithKey.length} recordings already served for ${key} (session: ${recordingId}), reusing last one`
         );
+        record = recordsWithKey[recordsWithKey.length - 1];
       }
-      const usageCount = this.replaySequenceMap.get(key) || 0;
-      const recordIndex = usageCount % recordsWithKey.length;
-      const record = recordsWithKey[recordIndex];
+      servedForThisKey.add(record.recordingId);
       console.log(
-        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`
+        `[REPLAY SERVING] recordingId: ${record.recordingId}, session: ${recordingId}, body_len: ${record.response?.body?.length || 0}`
       );
-      this.replaySequenceMap.set(key, usageCount + 1);
       if (!record.response) {
         throw new Error(
           `No response recorded for this request: ${req.method} ${host}${req.url}`
@@ -504,6 +606,7 @@ var ProxyServer = class {
       this.proxy.web(req, res, { target });
     }
   }
+  // TODO: check if can handle streaming requests
   async bufferAndProxyRequest(req, res, target) {
     const chunks = [];
     req.on("data", (chunk) => {

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-CjM3evKb.cjs';
 import '@playwright/test';
 
 declare class ProxyServer {
@@ -12,8 +12,8 @@ declare class ProxyServer {
     private proxy;
     private currentSession;
     private recordingsDir;
-    private requestSequenceMap;
-    private replaySequenceMap;
+    private recordingIdCounter;
+    private replaySessions;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;
@@ -28,6 +28,19 @@ declare class ProxyServer {
     private getCorsHeaders;
     private addCorsHeaders;
     private getTarget;
+    /**
+     * Extract recording ID from request cookie
+     * Used for concurrent replay session routing
+     * @param req The incoming HTTP request
+     * @returns The recording ID from cookie, or null if not found
+     */
+    private getRecordingIdFromCookie;
+    /**
+     * Get or create a replay session state for a given recording ID
+     * @param recordingId The recording ID to get/create session for
+     * @returns The replay session state
+     */
+    private getOrCreateReplaySession;
     private parseGetParams;
     private handleControlRequest;
     private clearModeTimeout;

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-CjM3evKb.js';
 import '@playwright/test';
 
 declare class ProxyServer {
@@ -12,8 +12,8 @@ declare class ProxyServer {
     private proxy;
     private currentSession;
     private recordingsDir;
-    private requestSequenceMap;
-    private replaySequenceMap;
+    private recordingIdCounter;
+    private replaySessions;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;
@@ -28,6 +28,19 @@ declare class ProxyServer {
     private getCorsHeaders;
     private addCorsHeaders;
     private getTarget;
+    /**
+     * Extract recording ID from request cookie
+     * Used for concurrent replay session routing
+     * @param req The incoming HTTP request
+     * @returns The recording ID from cookie, or null if not found
+     */
+    private getRecordingIdFromCookie;
+    /**
+     * Get or create a replay session state for a given recording ID
+     * @param recordingId The recording ID to get/create session for
+     * @returns The replay session state
+     */
+    private getOrCreateReplaySession;
     private parseGetParams;
     private handleControlRequest;
     private clearModeTimeout;