test-proxy-recorder 0.3.2 → 0.3.3

package/dist/index.cjs

@@ -148,6 +148,8 @@ var ProxyServer = class {
   // Track multiple concurrent replay sessions by recording ID
   recordingPromises;
   // Stack of promises that resolve to completed recordings
+  flushPromise;
+  // Promise for in-progress flush operation
   constructor(targets, recordingsDir) {
     this.targets = targets;
     this.currentTargetIndex = 0;
@@ -161,6 +163,7 @@ var ProxyServer = class {
     this.recordingsDir = recordingsDir;
     this.replaySessions = /* @__PURE__ */ new Map();
     this.recordingPromises = [];
+    this.flushPromise = null;
     this.proxy = httpProxy__default.default.createProxyServer({
       secure: false,
       changeOrigin: true,
@@ -283,7 +286,8 @@ var ProxyServer = class {
         recordingId,
         servedRecordingIdsByKey: /* @__PURE__ */ new Map(),
         loadedSession: null,
-        lastAccessTime: Date.now()
+        lastAccessTime: Date.now(),
+        sortedRecordingsByKey: /* @__PURE__ */ new Map()
       };
       this.replaySessions.set(recordingId, session);
       console.log(
@@ -298,17 +302,14 @@ var ProxyServer = class {
    */
   async cleanupSession(sessionId) {
     if (this.replaySessions.has(sessionId)) {
-      console.log(`[CLEANUP] Removing replay session: ${sessionId}`);
       this.replaySessions.delete(sessionId);
     }
     if (this.recordingId === sessionId) {
-      console.log(`[CLEANUP] Saving and clearing active recording session: ${sessionId}`);
       await this.saveCurrentSession();
       this.currentSession = null;
       this.recordingId = null;
     }
     if (this.replayId === sessionId) {
-      console.log(`[CLEANUP] Clearing active replay session: ${sessionId}`);
       this.replayId = null;
     }
     console.log(`[CLEANUP] Session ${sessionId} cleaned up successfully`);
@@ -357,7 +358,9 @@ var ProxyServer = class {
         return;
       }
       if (!mode) {
-        throw new Error("Mode parameter is required when cleanup is not specified");
+        throw new Error(
+          "Mode parameter is required when cleanup is not specified"
+        );
       }
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -440,12 +443,16 @@ var ProxyServer = class {
     this.replayId = id;
     this.recordingId = null;
     this.currentSession = null;
-    const session = this.replaySessions.get(id);
-    if (session) {
-      session.servedRecordingIdsByKey.clear();
-      console.log(`Reset served recordings tracker for session: ${id}`);
-    } else {
-      this.getOrCreateReplaySession(id);
+    const sessionState = this.getOrCreateReplaySession(id);
+    sessionState.servedRecordingIdsByKey.clear();
+    sessionState.sortedRecordingsByKey.clear();
+    const filePath = getRecordingPath(this.recordingsDir, id);
+    try {
+      sessionState.loadedSession = await loadRecordingSession(filePath);
+      console.log(`[REPLAY] Loaded recording session: ${id}`);
+    } catch (error) {
+      console.error(`[REPLAY ERROR] Failed to load session ${id}:`, error);
+      sessionState.loadedSession = null;
     }
     console.log(`Switched to replay mode with ID: ${id}`);
   }
@@ -459,21 +466,32 @@ var ProxyServer = class {
     }, timeout);
   }
   async flushPendingRecordings() {
+    if (this.flushPromise) {
+      await this.flushPromise;
+      return;
+    }
     if (this.recordingPromises.length === 0) {
       return;
     }
-    const results = await Promise.allSettled(this.recordingPromises);
-    if (this.currentSession) {
-      for (const result of results) {
-        if (result.status === "fulfilled" && result.value) {
-          this.currentSession.recordings.push(result.value);
+    this.flushPromise = (async () => {
+      try {
+        const results = await Promise.allSettled(this.recordingPromises);
+        if (this.currentSession) {
+          for (const result of results) {
+            if (result.status === "fulfilled" && result.value) {
+              this.currentSession.recordings.push(result.value);
+            }
+          }
+          console.log(
+            `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
+          );
         }
+        this.recordingPromises = [];
+      } finally {
+        this.flushPromise = null;
       }
-      console.log(
-        `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
-      );
-    }
-    this.recordingPromises = [];
+    })();
+    await this.flushPromise;
   }
   async saveCurrentSession() {
     if (!this.currentSession) {
@@ -523,20 +541,25 @@ var ProxyServer = class {
     );
     return recordingId;
   }
-  async ensureSessionLoaded(recordingId, filePath) {
-    const sessionState = this.getOrCreateReplaySession(recordingId);
-    if (!sessionState.loadedSession) {
-      sessionState.loadedSession = await loadRecordingSession(filePath);
-      console.log(`[REPLAY] Loaded recording session: ${recordingId}`);
-    }
-    return sessionState;
-  }
   getServedTracker(sessionState, key) {
     if (!sessionState.servedRecordingIdsByKey.has(key)) {
       sessionState.servedRecordingIdsByKey.set(key, /* @__PURE__ */ new Set());
     }
     return sessionState.servedRecordingIdsByKey.get(key);
   }
+  getSortedRecordings(sessionState, key) {
+    if (sessionState.sortedRecordingsByKey.has(key)) {
+      return sessionState.sortedRecordingsByKey.get(key);
+    }
+    const session = sessionState.loadedSession;
+    const sortedRecords = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
+      const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
+      const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
+      return aSeq - bSeq;
+    });
+    sessionState.sortedRecordingsByKey.set(key, sortedRecords);
+    return sortedRecords;
+  }
   selectReplayRecord(recordsWithKey, servedForThisKey, key, recordingId) {
     for (const rec of recordsWithKey) {
       if (!servedForThisKey.has(rec.recordingId)) {
@@ -557,18 +580,17 @@ var ProxyServer = class {
     const key = getReqID(req);
     const filePath = getRecordingPath(this.recordingsDir, recordingId);
     try {
-      const sessionState = await this.ensureSessionLoaded(
-        recordingId,
-        filePath
-      );
-      const session = sessionState.loadedSession;
+      const sessionState = this.getOrCreateReplaySession(recordingId);
+      if (!sessionState.loadedSession) {
+        const error = new Error(
+          `Recording session file not found: ${filePath}`
+        );
+        error.code = "ENOENT";
+        throw error;
+      }
       const servedForThisKey = this.getServedTracker(sessionState, key);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
-        const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
-        const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
-        return aSeq - bSeq;
-      });
+      const recordsWithKey = this.getSortedRecordings(sessionState, key);
       if (recordsWithKey.length === 0) {
         const errorMsg = `No recording found for ${key} at ${req.method} ${host}${req.url}`;
         console.error(`[REPLAY ERROR] ${errorMsg} (session: ${recordingId})`);
@@ -779,7 +801,6 @@ var ProxyServer = class {
       })();
     });
     this.recordingPromises.push(recordingPromise);
-    await recordingPromise;
   }
   handleUpgrade(req, socket, head) {
     if (this.mode === Modes.replay) {
@@ -973,7 +994,6 @@ async function setProxyMode(mode, sessionId, timeout) {
       throw new Error(`Failed to set proxy mode: ${text}`);
     }
     await response.json();
-    console.log(`Proxy mode set to: ${mode} (session: ${sessionId})`);
   } catch (error) {
     console.error(`Error setting proxy mode:`, error);
     throw error;
@@ -997,9 +1017,8 @@ async function cleanupSession(sessionId) {
       throw new Error(`Failed to cleanup session: ${text}`);
     }
     await response.json();
-    console.log(`Session cleaned up: ${sessionId}`);
   } catch (error) {
-    console.error(`Error cleaning up session:`, error);
+    console.error(`Error cleaning up session: ${sessionId}`, error);
     throw error;
   }
 }
@@ -1072,9 +1091,6 @@ async function setupClientSideRecording(page, sessionId, mode, url) {
   const harFileName = sessionId.replaceAll("/", "__");
   const recordingsDir = await getRecordingsDir();
   const harPath = path2__default.default.join(recordingsDir, `${harFileName}.har`);
-  console.log(
-    `[Client-Side Recording] Setting up HAR for session: ${sessionId}, mode: ${mode}, path: ${harPath}`
-  );
   try {
     await page.routeFromHAR(harPath, {
       url,
@@ -1107,41 +1123,27 @@ var playwrightProxy = {
     await page.setExtraHTTPHeaders({
       [RECORDING_ID_HEADER]: sessionId
     });
-    console.log(`[Setup] Setting proxy mode: ${mode}, session: ${sessionId}`);
     await setProxyMode(mode, sessionId, timeout);
-    console.log(`[Setup] Proxy mode set successfully`);
     if (clientSideOptions?.url) {
-      console.log(`[Setup] Setting up client-side recording with pattern: ${clientSideOptions.url}`);
       await setupClientSideRecording(
         page,
         sessionId,
         mode,
         clientSideOptions.url
       );
-      console.log(`[Setup] Client-side recording setup complete`);
     }
     const proxyPort = process.env.TEST_PROXY_RECORDER_PORT || "8100";
     const proxyUrl = `localhost:${proxyPort}`;
-    console.log(`[Setup] Registering proxy route handler for: ${proxyUrl}`);
     await page.route(
       (url) => {
         const urlStr = url.toString();
         const matches = urlStr.includes(proxyUrl);
-        if (matches) {
-          console.log(`[Route Matcher] Matched proxy request: ${urlStr}`);
-        }
         return matches;
       },
       async (route) => {
         try {
-          const url = route.request().url();
-          const method = route.request().method();
           const headers = route.request().headers();
-          const hadHeader = !!headers[RECORDING_ID_HEADER];
           headers[RECORDING_ID_HEADER] = sessionId;
-          console.log(
-            `[Route Intercept] ${method} ${url} (had header: ${hadHeader}, adding session: ${sessionId})`
-          );
           await route.continue({ headers });
         } catch (error) {
           console.error(
@@ -1154,7 +1156,6 @@ var playwrightProxy = {
       { times: Infinity }
       // Ensure the handler applies to all matching requests
     );
-    console.log(`[Setup] Proxy route handler registered`);
     const context = page.context();
     const contextId = context._guid || "default";
     const handlerKey = `cleanup_${contextId}`;
@@ -1162,9 +1163,6 @@ var playwrightProxy = {
       globalThis[handlerKey] = true;
       context.on("close", async () => {
         try {
-          console.log(
-            `[Cleanup] Browser context closed, cleaning up session: ${sessionId}`
-          );
           await cleanupSession(sessionId);
         } catch (error) {
           console.warn(

package/dist/index.d.cts

@@ -17,6 +17,7 @@ declare class ProxyServer {
     private sequenceCounterByKey;
     private replaySessions;
     private recordingPromises;
+    private flushPromise;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;
@@ -73,8 +74,8 @@ declare class ProxyServer {
     private flushPendingRecordings;
     private saveCurrentSession;
     private getRecordingIdOrError;
-    private ensureSessionLoaded;
     private getServedTracker;
+    private getSortedRecordings;
     private selectReplayRecord;
     private handleReplayRequest;
     private handleReplayError;

package/dist/index.d.ts

@@ -17,6 +17,7 @@ declare class ProxyServer {
     private sequenceCounterByKey;
     private replaySessions;
     private recordingPromises;
+    private flushPromise;
     constructor(targets: string[], recordingsDir: string);
     init(): Promise<void>;
     listen(port: number): http.Server;
@@ -73,8 +74,8 @@ declare class ProxyServer {
     private flushPendingRecordings;
     private saveCurrentSession;
     private getRecordingIdOrError;
-    private ensureSessionLoaded;
     private getServedTracker;
+    private getSortedRecordings;
     private selectReplayRecord;
     private handleReplayRequest;
     private handleReplayError;

package/dist/index.mjs

@@ -136,6 +136,8 @@ var ProxyServer = class {
   // Track multiple concurrent replay sessions by recording ID
   recordingPromises;
   // Stack of promises that resolve to completed recordings
+  flushPromise;
+  // Promise for in-progress flush operation
   constructor(targets, recordingsDir) {
     this.targets = targets;
     this.currentTargetIndex = 0;
@@ -149,6 +151,7 @@ var ProxyServer = class {
     this.recordingsDir = recordingsDir;
     this.replaySessions = /* @__PURE__ */ new Map();
     this.recordingPromises = [];
+    this.flushPromise = null;
     this.proxy = httpProxy.createProxyServer({
       secure: false,
       changeOrigin: true,
@@ -271,7 +274,8 @@ var ProxyServer = class {
         recordingId,
         servedRecordingIdsByKey: /* @__PURE__ */ new Map(),
         loadedSession: null,
-        lastAccessTime: Date.now()
+        lastAccessTime: Date.now(),
+        sortedRecordingsByKey: /* @__PURE__ */ new Map()
       };
       this.replaySessions.set(recordingId, session);
       console.log(
@@ -286,17 +290,14 @@ var ProxyServer = class {
    */
   async cleanupSession(sessionId) {
     if (this.replaySessions.has(sessionId)) {
-      console.log(`[CLEANUP] Removing replay session: ${sessionId}`);
       this.replaySessions.delete(sessionId);
     }
     if (this.recordingId === sessionId) {
-      console.log(`[CLEANUP] Saving and clearing active recording session: ${sessionId}`);
       await this.saveCurrentSession();
       this.currentSession = null;
       this.recordingId = null;
     }
     if (this.replayId === sessionId) {
-      console.log(`[CLEANUP] Clearing active replay session: ${sessionId}`);
       this.replayId = null;
     }
     console.log(`[CLEANUP] Session ${sessionId} cleaned up successfully`);
@@ -345,7 +346,9 @@ var ProxyServer = class {
         return;
       }
       if (!mode) {
-        throw new Error("Mode parameter is required when cleanup is not specified");
+        throw new Error(
+          "Mode parameter is required when cleanup is not specified"
+        );
       }
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -428,12 +431,16 @@ var ProxyServer = class {
     this.replayId = id;
     this.recordingId = null;
     this.currentSession = null;
-    const session = this.replaySessions.get(id);
-    if (session) {
-      session.servedRecordingIdsByKey.clear();
-      console.log(`Reset served recordings tracker for session: ${id}`);
-    } else {
-      this.getOrCreateReplaySession(id);
+    const sessionState = this.getOrCreateReplaySession(id);
+    sessionState.servedRecordingIdsByKey.clear();
+    sessionState.sortedRecordingsByKey.clear();
+    const filePath = getRecordingPath(this.recordingsDir, id);
+    try {
+      sessionState.loadedSession = await loadRecordingSession(filePath);
+      console.log(`[REPLAY] Loaded recording session: ${id}`);
+    } catch (error) {
+      console.error(`[REPLAY ERROR] Failed to load session ${id}:`, error);
+      sessionState.loadedSession = null;
     }
     console.log(`Switched to replay mode with ID: ${id}`);
   }
@@ -447,21 +454,32 @@ var ProxyServer = class {
     }, timeout);
   }
   async flushPendingRecordings() {
+    if (this.flushPromise) {
+      await this.flushPromise;
+      return;
+    }
     if (this.recordingPromises.length === 0) {
       return;
     }
-    const results = await Promise.allSettled(this.recordingPromises);
-    if (this.currentSession) {
-      for (const result of results) {
-        if (result.status === "fulfilled" && result.value) {
-          this.currentSession.recordings.push(result.value);
+    this.flushPromise = (async () => {
+      try {
+        const results = await Promise.allSettled(this.recordingPromises);
+        if (this.currentSession) {
+          for (const result of results) {
+            if (result.status === "fulfilled" && result.value) {
+              this.currentSession.recordings.push(result.value);
+            }
+          }
+          console.log(
+            `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
+          );
         }
+        this.recordingPromises = [];
+      } finally {
+        this.flushPromise = null;
       }
-      console.log(
-        `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
-      );
-    }
-    this.recordingPromises = [];
+    })();
+    await this.flushPromise;
   }
   async saveCurrentSession() {
     if (!this.currentSession) {
@@ -511,20 +529,25 @@ var ProxyServer = class {
     );
     return recordingId;
   }
-  async ensureSessionLoaded(recordingId, filePath) {
-    const sessionState = this.getOrCreateReplaySession(recordingId);
-    if (!sessionState.loadedSession) {
-      sessionState.loadedSession = await loadRecordingSession(filePath);
-      console.log(`[REPLAY] Loaded recording session: ${recordingId}`);
-    }
-    return sessionState;
-  }
   getServedTracker(sessionState, key) {
     if (!sessionState.servedRecordingIdsByKey.has(key)) {
       sessionState.servedRecordingIdsByKey.set(key, /* @__PURE__ */ new Set());
     }
     return sessionState.servedRecordingIdsByKey.get(key);
   }
+  getSortedRecordings(sessionState, key) {
+    if (sessionState.sortedRecordingsByKey.has(key)) {
+      return sessionState.sortedRecordingsByKey.get(key);
+    }
+    const session = sessionState.loadedSession;
+    const sortedRecords = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
+      const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
+      const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
+      return aSeq - bSeq;
+    });
+    sessionState.sortedRecordingsByKey.set(key, sortedRecords);
+    return sortedRecords;
+  }
   selectReplayRecord(recordsWithKey, servedForThisKey, key, recordingId) {
     for (const rec of recordsWithKey) {
       if (!servedForThisKey.has(rec.recordingId)) {
@@ -545,18 +568,17 @@ var ProxyServer = class {
     const key = getReqID(req);
     const filePath = getRecordingPath(this.recordingsDir, recordingId);
     try {
-      const sessionState = await this.ensureSessionLoaded(
-        recordingId,
-        filePath
-      );
-      const session = sessionState.loadedSession;
+      const sessionState = this.getOrCreateReplaySession(recordingId);
+      if (!sessionState.loadedSession) {
+        const error = new Error(
+          `Recording session file not found: ${filePath}`
+        );
+        error.code = "ENOENT";
+        throw error;
+      }
       const servedForThisKey = this.getServedTracker(sessionState, key);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
-        const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
-        const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
-        return aSeq - bSeq;
-      });
+      const recordsWithKey = this.getSortedRecordings(sessionState, key);
       if (recordsWithKey.length === 0) {
         const errorMsg = `No recording found for ${key} at ${req.method} ${host}${req.url}`;
         console.error(`[REPLAY ERROR] ${errorMsg} (session: ${recordingId})`);
@@ -767,7 +789,6 @@ var ProxyServer = class {
       })();
     });
     this.recordingPromises.push(recordingPromise);
-    await recordingPromise;
   }
   handleUpgrade(req, socket, head) {
     if (this.mode === Modes.replay) {
@@ -961,7 +982,6 @@ async function setProxyMode(mode, sessionId, timeout) {
       throw new Error(`Failed to set proxy mode: ${text}`);
     }
     await response.json();
-    console.log(`Proxy mode set to: ${mode} (session: ${sessionId})`);
   } catch (error) {
     console.error(`Error setting proxy mode:`, error);
     throw error;
@@ -985,9 +1005,8 @@ async function cleanupSession(sessionId) {
       throw new Error(`Failed to cleanup session: ${text}`);
     }
     await response.json();
-    console.log(`Session cleaned up: ${sessionId}`);
   } catch (error) {
-    console.error(`Error cleaning up session:`, error);
+    console.error(`Error cleaning up session: ${sessionId}`, error);
     throw error;
   }
 }
@@ -1060,9 +1079,6 @@ async function setupClientSideRecording(page, sessionId, mode, url) {
   const harFileName = sessionId.replaceAll("/", "__");
   const recordingsDir = await getRecordingsDir();
   const harPath = path2.join(recordingsDir, `${harFileName}.har`);
-  console.log(
-    `[Client-Side Recording] Setting up HAR for session: ${sessionId}, mode: ${mode}, path: ${harPath}`
-  );
   try {
     await page.routeFromHAR(harPath, {
       url,
@@ -1095,41 +1111,27 @@ var playwrightProxy = {
     await page.setExtraHTTPHeaders({
       [RECORDING_ID_HEADER]: sessionId
     });
-    console.log(`[Setup] Setting proxy mode: ${mode}, session: ${sessionId}`);
     await setProxyMode(mode, sessionId, timeout);
-    console.log(`[Setup] Proxy mode set successfully`);
     if (clientSideOptions?.url) {
-      console.log(`[Setup] Setting up client-side recording with pattern: ${clientSideOptions.url}`);
       await setupClientSideRecording(
         page,
         sessionId,
         mode,
         clientSideOptions.url
       );
-      console.log(`[Setup] Client-side recording setup complete`);
     }
     const proxyPort = process.env.TEST_PROXY_RECORDER_PORT || "8100";
     const proxyUrl = `localhost:${proxyPort}`;
-    console.log(`[Setup] Registering proxy route handler for: ${proxyUrl}`);
     await page.route(
       (url) => {
         const urlStr = url.toString();
         const matches = urlStr.includes(proxyUrl);
-        if (matches) {
-          console.log(`[Route Matcher] Matched proxy request: ${urlStr}`);
-        }
         return matches;
       },
       async (route) => {
         try {
-          const url = route.request().url();
-          const method = route.request().method();
           const headers = route.request().headers();
-          const hadHeader = !!headers[RECORDING_ID_HEADER];
           headers[RECORDING_ID_HEADER] = sessionId;
-          console.log(
-            `[Route Intercept] ${method} ${url} (had header: ${hadHeader}, adding session: ${sessionId})`
-          );
           await route.continue({ headers });
         } catch (error) {
           console.error(
@@ -1142,7 +1144,6 @@ var playwrightProxy = {
       { times: Infinity }
       // Ensure the handler applies to all matching requests
     );
-    console.log(`[Setup] Proxy route handler registered`);
     const context = page.context();
     const contextId = context._guid || "default";
     const handlerKey = `cleanup_${contextId}`;
@@ -1150,9 +1151,6 @@ var playwrightProxy = {
       globalThis[handlerKey] = true;
       context.on("close", async () => {
         try {
-          console.log(
-            `[Cleanup] Browser context closed, cleaning up session: ${sessionId}`
-          );
           await cleanupSession(sessionId);
         } catch (error) {
           console.warn(

package/dist/playwright/index.cjs

@@ -46,7 +46,6 @@ async function setProxyMode(mode, sessionId, timeout) {
       throw new Error(`Failed to set proxy mode: ${text}`);
     }
     await response.json();
-    console.log(`Proxy mode set to: ${mode} (session: ${sessionId})`);
   } catch (error) {
     console.error(`Error setting proxy mode:`, error);
     throw error;
@@ -70,9 +69,8 @@ async function cleanupSession(sessionId) {
       throw new Error(`Failed to cleanup session: ${text}`);
     }
     await response.json();
-    console.log(`Session cleaned up: ${sessionId}`);
   } catch (error) {
-    console.error(`Error cleaning up session:`, error);
+    console.error(`Error cleaning up session: ${sessionId}`, error);
     throw error;
   }
 }
@@ -145,9 +143,6 @@ async function setupClientSideRecording(page, sessionId, mode, url) {
   const harFileName = sessionId.replaceAll("/", "__");
   const recordingsDir = await getRecordingsDir();
   const harPath = path__default.default.join(recordingsDir, `${harFileName}.har`);
-  console.log(
-    `[Client-Side Recording] Setting up HAR for session: ${sessionId}, mode: ${mode}, path: ${harPath}`
-  );
   try {
     await page.routeFromHAR(harPath, {
       url,
@@ -180,41 +175,27 @@ var playwrightProxy = {
     await page.setExtraHTTPHeaders({
       [RECORDING_ID_HEADER]: sessionId
     });
-    console.log(`[Setup] Setting proxy mode: ${mode}, session: ${sessionId}`);
     await setProxyMode(mode, sessionId, timeout);
-    console.log(`[Setup] Proxy mode set successfully`);
     if (clientSideOptions?.url) {
-      console.log(`[Setup] Setting up client-side recording with pattern: ${clientSideOptions.url}`);
       await setupClientSideRecording(
         page,
         sessionId,
         mode,
         clientSideOptions.url
       );
-      console.log(`[Setup] Client-side recording setup complete`);
     }
     const proxyPort = process.env.TEST_PROXY_RECORDER_PORT || "8100";
     const proxyUrl = `localhost:${proxyPort}`;
-    console.log(`[Setup] Registering proxy route handler for: ${proxyUrl}`);
     await page.route(
       (url) => {
         const urlStr = url.toString();
         const matches = urlStr.includes(proxyUrl);
-        if (matches) {
-          console.log(`[Route Matcher] Matched proxy request: ${urlStr}`);
-        }
         return matches;
       },
       async (route) => {
         try {
-          const url = route.request().url();
-          const method = route.request().method();
           const headers = route.request().headers();
-          const hadHeader = !!headers[RECORDING_ID_HEADER];
           headers[RECORDING_ID_HEADER] = sessionId;
-          console.log(
-            `[Route Intercept] ${method} ${url} (had header: ${hadHeader}, adding session: ${sessionId})`
-          );
           await route.continue({ headers });
         } catch (error) {
           console.error(
@@ -227,7 +208,6 @@ var playwrightProxy = {
       { times: Infinity }
       // Ensure the handler applies to all matching requests
     );
-    console.log(`[Setup] Proxy route handler registered`);
     const context = page.context();
     const contextId = context._guid || "default";
     const handlerKey = `cleanup_${contextId}`;
@@ -235,9 +215,6 @@ var playwrightProxy = {
       globalThis[handlerKey] = true;
       context.on("close", async () => {
         try {
-          console.log(
-            `[Cleanup] Browser context closed, cleaning up session: ${sessionId}`
-          );
           await cleanupSession(sessionId);
         } catch (error) {
           console.warn(

package/dist/playwright/index.mjs

@@ -40,7 +40,6 @@ async function setProxyMode(mode, sessionId, timeout) {
       throw new Error(`Failed to set proxy mode: ${text}`);
     }
     await response.json();
-    console.log(`Proxy mode set to: ${mode} (session: ${sessionId})`);
   } catch (error) {
     console.error(`Error setting proxy mode:`, error);
     throw error;
@@ -64,9 +63,8 @@ async function cleanupSession(sessionId) {
       throw new Error(`Failed to cleanup session: ${text}`);
     }
     await response.json();
-    console.log(`Session cleaned up: ${sessionId}`);
   } catch (error) {
-    console.error(`Error cleaning up session:`, error);
+    console.error(`Error cleaning up session: ${sessionId}`, error);
     throw error;
   }
 }
@@ -139,9 +137,6 @@ async function setupClientSideRecording(page, sessionId, mode, url) {
   const harFileName = sessionId.replaceAll("/", "__");
   const recordingsDir = await getRecordingsDir();
   const harPath = path.join(recordingsDir, `${harFileName}.har`);
-  console.log(
-    `[Client-Side Recording] Setting up HAR for session: ${sessionId}, mode: ${mode}, path: ${harPath}`
-  );
   try {
     await page.routeFromHAR(harPath, {
       url,
@@ -174,41 +169,27 @@ var playwrightProxy = {
     await page.setExtraHTTPHeaders({
       [RECORDING_ID_HEADER]: sessionId
     });
-    console.log(`[Setup] Setting proxy mode: ${mode}, session: ${sessionId}`);
     await setProxyMode(mode, sessionId, timeout);
-    console.log(`[Setup] Proxy mode set successfully`);
     if (clientSideOptions?.url) {
-      console.log(`[Setup] Setting up client-side recording with pattern: ${clientSideOptions.url}`);
       await setupClientSideRecording(
         page,
         sessionId,
         mode,
         clientSideOptions.url
       );
-      console.log(`[Setup] Client-side recording setup complete`);
     }
     const proxyPort = process.env.TEST_PROXY_RECORDER_PORT || "8100";
     const proxyUrl = `localhost:${proxyPort}`;
-    console.log(`[Setup] Registering proxy route handler for: ${proxyUrl}`);
     await page.route(
       (url) => {
         const urlStr = url.toString();
         const matches = urlStr.includes(proxyUrl);
-        if (matches) {
-          console.log(`[Route Matcher] Matched proxy request: ${urlStr}`);
-        }
         return matches;
       },
       async (route) => {
         try {
-          const url = route.request().url();
-          const method = route.request().method();
           const headers = route.request().headers();
-          const hadHeader = !!headers[RECORDING_ID_HEADER];
           headers[RECORDING_ID_HEADER] = sessionId;
-          console.log(
-            `[Route Intercept] ${method} ${url} (had header: ${hadHeader}, adding session: ${sessionId})`
-          );
           await route.continue({ headers });
         } catch (error) {
           console.error(
@@ -221,7 +202,6 @@ var playwrightProxy = {
       { times: Infinity }
       // Ensure the handler applies to all matching requests
     );
-    console.log(`[Setup] Proxy route handler registered`);
     const context = page.context();
     const contextId = context._guid || "default";
     const handlerKey = `cleanup_${contextId}`;
@@ -229,9 +209,6 @@ var playwrightProxy = {
       globalThis[handlerKey] = true;
       context.on("close", async () => {
         try {
-          console.log(
-            `[Cleanup] Browser context closed, cleaning up session: ${sessionId}`
-          );
           await cleanupSession(sessionId);
         } catch (error) {
           console.warn(

package/dist/proxy.js

@@ -172,6 +172,8 @@ var ProxyServer = class {
   // Track multiple concurrent replay sessions by recording ID
   recordingPromises;
   // Stack of promises that resolve to completed recordings
+  flushPromise;
+  // Promise for in-progress flush operation
   constructor(targets2, recordingsDir2) {
     this.targets = targets2;
     this.currentTargetIndex = 0;
@@ -185,6 +187,7 @@ var ProxyServer = class {
     this.recordingsDir = recordingsDir2;
     this.replaySessions = /* @__PURE__ */ new Map();
     this.recordingPromises = [];
+    this.flushPromise = null;
     this.proxy = httpProxy.createProxyServer({
       secure: false,
       changeOrigin: true,
@@ -307,7 +310,8 @@ var ProxyServer = class {
         recordingId,
         servedRecordingIdsByKey: /* @__PURE__ */ new Map(),
         loadedSession: null,
-        lastAccessTime: Date.now()
+        lastAccessTime: Date.now(),
+        sortedRecordingsByKey: /* @__PURE__ */ new Map()
       };
       this.replaySessions.set(recordingId, session);
       console.log(
@@ -322,17 +326,14 @@ var ProxyServer = class {
    */
   async cleanupSession(sessionId) {
     if (this.replaySessions.has(sessionId)) {
-      console.log(`[CLEANUP] Removing replay session: ${sessionId}`);
       this.replaySessions.delete(sessionId);
     }
     if (this.recordingId === sessionId) {
-      console.log(`[CLEANUP] Saving and clearing active recording session: ${sessionId}`);
       await this.saveCurrentSession();
       this.currentSession = null;
       this.recordingId = null;
     }
     if (this.replayId === sessionId) {
-      console.log(`[CLEANUP] Clearing active replay session: ${sessionId}`);
       this.replayId = null;
     }
     console.log(`[CLEANUP] Session ${sessionId} cleaned up successfully`);
@@ -381,7 +382,9 @@ var ProxyServer = class {
         return;
       }
       if (!mode) {
-        throw new Error("Mode parameter is required when cleanup is not specified");
+        throw new Error(
+          "Mode parameter is required when cleanup is not specified"
+        );
       }
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -464,12 +467,16 @@ var ProxyServer = class {
     this.replayId = id;
     this.recordingId = null;
     this.currentSession = null;
-    const session = this.replaySessions.get(id);
-    if (session) {
-      session.servedRecordingIdsByKey.clear();
-      console.log(`Reset served recordings tracker for session: ${id}`);
-    } else {
-      this.getOrCreateReplaySession(id);
+    const sessionState = this.getOrCreateReplaySession(id);
+    sessionState.servedRecordingIdsByKey.clear();
+    sessionState.sortedRecordingsByKey.clear();
+    const filePath = getRecordingPath(this.recordingsDir, id);
+    try {
+      sessionState.loadedSession = await loadRecordingSession(filePath);
+      console.log(`[REPLAY] Loaded recording session: ${id}`);
+    } catch (error) {
+      console.error(`[REPLAY ERROR] Failed to load session ${id}:`, error);
+      sessionState.loadedSession = null;
     }
     console.log(`Switched to replay mode with ID: ${id}`);
   }
@@ -483,21 +490,32 @@ var ProxyServer = class {
     }, timeout);
   }
   async flushPendingRecordings() {
+    if (this.flushPromise) {
+      await this.flushPromise;
+      return;
+    }
     if (this.recordingPromises.length === 0) {
       return;
     }
-    const results = await Promise.allSettled(this.recordingPromises);
-    if (this.currentSession) {
-      for (const result of results) {
-        if (result.status === "fulfilled" && result.value) {
-          this.currentSession.recordings.push(result.value);
+    this.flushPromise = (async () => {
+      try {
+        const results = await Promise.allSettled(this.recordingPromises);
+        if (this.currentSession) {
+          for (const result of results) {
+            if (result.status === "fulfilled" && result.value) {
+              this.currentSession.recordings.push(result.value);
+            }
+          }
+          console.log(
+            `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
+          );
         }
+        this.recordingPromises = [];
+      } finally {
+        this.flushPromise = null;
       }
-      console.log(
-        `Flushed ${results.length} recordings to session (total: ${this.currentSession.recordings.length})`
-      );
-    }
-    this.recordingPromises = [];
+    })();
+    await this.flushPromise;
   }
   async saveCurrentSession() {
     if (!this.currentSession) {
@@ -547,20 +565,25 @@ var ProxyServer = class {
     );
     return recordingId;
   }
-  async ensureSessionLoaded(recordingId, filePath) {
-    const sessionState = this.getOrCreateReplaySession(recordingId);
-    if (!sessionState.loadedSession) {
-      sessionState.loadedSession = await loadRecordingSession(filePath);
-      console.log(`[REPLAY] Loaded recording session: ${recordingId}`);
-    }
-    return sessionState;
-  }
   getServedTracker(sessionState, key) {
     if (!sessionState.servedRecordingIdsByKey.has(key)) {
       sessionState.servedRecordingIdsByKey.set(key, /* @__PURE__ */ new Set());
     }
     return sessionState.servedRecordingIdsByKey.get(key);
   }
+  getSortedRecordings(sessionState, key) {
+    if (sessionState.sortedRecordingsByKey.has(key)) {
+      return sessionState.sortedRecordingsByKey.get(key);
+    }
+    const session = sessionState.loadedSession;
+    const sortedRecords = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
+      const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
+      const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
+      return aSeq - bSeq;
+    });
+    sessionState.sortedRecordingsByKey.set(key, sortedRecords);
+    return sortedRecords;
+  }
   selectReplayRecord(recordsWithKey, servedForThisKey, key, recordingId) {
     for (const rec of recordsWithKey) {
       if (!servedForThisKey.has(rec.recordingId)) {
@@ -581,18 +604,17 @@ var ProxyServer = class {
     const key = getReqID(req);
     const filePath = getRecordingPath(this.recordingsDir, recordingId);
     try {
-      const sessionState = await this.ensureSessionLoaded(
-        recordingId,
-        filePath
-      );
-      const session = sessionState.loadedSession;
+      const sessionState = this.getOrCreateReplaySession(recordingId);
+      if (!sessionState.loadedSession) {
+        const error = new Error(
+          `Recording session file not found: ${filePath}`
+        );
+        error.code = "ENOENT";
+        throw error;
+      }
       const servedForThisKey = this.getServedTracker(sessionState, key);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter((r) => r.key === key && r.response).toSorted((a, b) => {
-        const aSeq = a.sequence !== void 0 ? a.sequence : a.recordingId;
-        const bSeq = b.sequence !== void 0 ? b.sequence : b.recordingId;
-        return aSeq - bSeq;
-      });
+      const recordsWithKey = this.getSortedRecordings(sessionState, key);
       if (recordsWithKey.length === 0) {
         const errorMsg = `No recording found for ${key} at ${req.method} ${host}${req.url}`;
         console.error(`[REPLAY ERROR] ${errorMsg} (session: ${recordingId})`);
@@ -803,7 +825,6 @@ var ProxyServer = class {
       })();
     });
     this.recordingPromises.push(recordingPromise);
-    await recordingPromise;
   }
   handleUpgrade(req, socket, head) {
     if (this.mode === Modes.replay) {

package/package.json

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