test-proxy-recorder 0.3.4 → 0.3.5

package/dist/index.cjs

@@ -71,9 +71,9 @@ function processRecordings(recordings) {
   const processedRecordings = [];
   for (const [_key, keyRecordings] of recordingsByKey) {
     keyRecordings.sort((a, b) => a.recordingId - b.recordingId);
-    keyRecordings.forEach((recording, index) => {
+    for (const [index, recording] of keyRecordings.entries()) {
       processedRecordings.push({ ...recording, sequence: index });
-    });
+    }
   }
   processedRecordings.sort((a, b) => a.recordingId - b.recordingId);
   return processedRecordings;
@@ -139,18 +139,22 @@ var ProxyServer = class {
   proxy;
   currentSession;
   recordingsDir;
+  timeoutMs;
   recordingIdCounter;
   // Unique ID for each recording entry
   sequenceCounterByKey;
   // Sequence counter per key (endpoint)
   replaySessions;
   // Track multiple concurrent replay sessions by recording ID
+  sessionEvictionTimer;
+  // Periodic timer to evict idle replay sessions
   recordingPromises;
   // Stack of promises that resolve to completed recordings
   flushPromise;
   // Promise for in-progress flush operation
-  constructor(target, recordingsDir) {
+  constructor(target, recordingsDir, timeoutMs) {
     this.target = target;
+    this.timeoutMs = timeoutMs ?? DEFAULT_TIMEOUT_MS;
     this.mode = Modes.transparent;
     this.recordingId = null;
     this.recordingIdCounter = 0;
@@ -160,6 +164,7 @@ var ProxyServer = class {
     this.currentSession = null;
     this.recordingsDir = recordingsDir;
     this.replaySessions = /* @__PURE__ */ new Map();
+    this.sessionEvictionTimer = null;
     this.recordingPromises = [];
     this.flushPromise = null;
     this.proxy = httpProxy__default.default.createProxyServer({
@@ -222,9 +227,6 @@ var ProxyServer = class {
     const corsHeaders = this.getCorsHeaders(req);
     Object.assign(proxyRes.headers, corsHeaders);
   }
-  getTarget() {
-    return this.target;
-  }
   /**
    * Extract recording ID from custom HTTP header
    * Used for concurrent replay session routing, especially with Next.js
@@ -260,13 +262,7 @@ var ProxyServer = class {
   getRecordingIdFromRequest(req) {
     const fromHeader = this.getRecordingIdFromHeader(req);
     const fromCookie = this.getRecordingIdFromCookie(req);
-    if (fromHeader) {
-      return fromHeader;
-    }
-    if (fromCookie) {
-      return fromCookie;
-    }
-    return null;
+    return fromHeader ?? fromCookie ?? null;
   }
   /**
    * Get or create a replay session state for a given recording ID
@@ -286,6 +282,7 @@ var ProxyServer = class {
         sortedRecordingsByKey: /* @__PURE__ */ new Map()
       };
       this.replaySessions.set(recordingId, session);
+      this.startSessionEvictionTimer();
       console.log(
         `[CONCURRENT REPLAY] Created new session for recording: ${recordingId}`
       );
@@ -297,8 +294,9 @@ var ProxyServer = class {
    * @param sessionId The session ID to clean up
    */
   async cleanupSession(sessionId) {
-    if (this.replaySessions.has(sessionId)) {
-      this.replaySessions.delete(sessionId);
+    this.replaySessions.delete(sessionId);
+    if (this.replaySessions.size === 0) {
+      this.stopSessionEvictionTimer();
     }
     if (this.recordingId === sessionId) {
       await this.saveCurrentSession();
@@ -310,29 +308,44 @@ var ProxyServer = class {
     }
     console.log(`[CLEANUP] Session ${sessionId} cleaned up successfully`);
   }
-  parseGetParams(req) {
-    const url = new URL(req.url || "", `http://${req.headers.host}`);
-    const mode = url.searchParams.get("mode");
-    const id = url.searchParams.get("id") || void 0;
-    const timeoutParam = url.searchParams.get("timeout");
-    const timeout = timeoutParam ? Number.parseInt(timeoutParam, 10) : void 0;
-    if (!mode) {
-      throw new Error("Mode parameter is required");
+  startSessionEvictionTimer() {
+    if (this.sessionEvictionTimer) {
+      return;
     }
-    return { mode, id, timeout };
+    const CHECK_INTERVAL_MS = 3e4;
+    this.sessionEvictionTimer = setInterval(() => {
+      const now = Date.now();
+      for (const [id, session] of this.replaySessions) {
+        if (now - session.lastAccessTime >= this.timeoutMs) {
+          console.log(
+            `[EVICTION] Evicting idle replay session: ${id} (idle for ${Math.round((now - session.lastAccessTime) / 1e3)}s)`
+          );
+          this.replaySessions.delete(id);
+        }
+      }
+      if (this.replaySessions.size === 0) {
+        this.stopSessionEvictionTimer();
+      }
+    }, CHECK_INTERVAL_MS);
+    this.sessionEvictionTimer.unref();
   }
-  async parseControlRequest(req) {
-    if (req.method === "GET") {
-      return this.parseGetParams(req);
-    }
-    if (req.method === "POST") {
-      const body = await readRequestBody(req);
-      console.log(`MODE CHANGE (${req.method})`, body);
-      return JSON.parse(body);
+  stopSessionEvictionTimer() {
+    if (this.sessionEvictionTimer) {
+      clearInterval(this.sessionEvictionTimer);
+      this.sessionEvictionTimer = null;
     }
-    throw new Error("Unsupported control method");
+  }
+  async parseControlBody(req) {
+    const body = await readRequestBody(req);
+    console.log(`MODE CHANGE (${req.method})`, body);
+    return JSON.parse(body);
   }
   async handleControlRequest(req, res) {
+    if (req.method === "HEAD") {
+      res.writeHead(HTTP_STATUS_OK);
+      res.end();
+      return;
+    }
     if (req.method === "GET") {
       sendJsonResponse(res, HTTP_STATUS_OK, {
         recordingsDir: this.recordingsDir,
@@ -341,8 +354,11 @@ var ProxyServer = class {
       });
       return;
     }
+    await this.handleControlPost(req, res);
+  }
+  async handleControlPost(req, res) {
     try {
-      const data = await this.parseControlRequest(req);
+      const data = await this.parseControlBody(req);
       const { mode, id, timeout: requestTimeout, cleanup } = data;
       if (cleanup && id) {
         await this.cleanupSession(id);
@@ -353,29 +369,7 @@ var ProxyServer = class {
         });
         return;
       }
-      if (!mode) {
-        throw new Error(
-          "Mode parameter is required when cleanup is not specified"
-        );
-      }
-      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,
-        id: this.recordingId || this.replayId,
-        timeout,
-        recordingsDir: this.recordingsDir
-      });
+      await this.applyModeChange(res, mode, id, requestTimeout);
     } catch (error) {
       console.error("Control request error:", error);
       sendJsonResponse(res, HTTP_STATUS_BAD_REQUEST, {
@@ -383,6 +377,31 @@ var ProxyServer = class {
       });
     }
   }
+  async applyModeChange(res, mode, id, requestTimeout) {
+    if (!mode) {
+      throw new Error(
+        "Mode parameter is required when cleanup is not specified"
+      );
+    }
+    const timeout = requestTimeout ?? this.timeoutMs;
+    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,
+      id: this.recordingId || this.replayId,
+      timeout,
+      recordingsDir: this.recordingsDir
+    });
+  }
   clearModeTimeout() {
     clearTimeout(this.modeTimeout || 0);
     this.modeTimeout = null;
@@ -422,7 +441,7 @@ var ProxyServer = class {
     this.recordingId = null;
     this.replayId = null;
     this.currentSession = null;
-    clearTimeout(this.modeTimeout || 0);
+    this.clearModeTimeout();
     console.log("Switched to transparent mode");
   }
   switchToRecordMode(id) {
@@ -453,7 +472,7 @@ var ProxyServer = class {
     console.log(`Switched to replay mode with ID: ${id}`);
   }
   setupModeTimeout(timeout) {
-    clearTimeout(this.modeTimeout || 0);
+    this.clearModeTimeout();
     this.modeTimeout = setTimeout(async () => {
       console.log("Timeout reached, switching back to transparent mode");
       await this.saveCurrentSession();
@@ -578,11 +597,10 @@ var ProxyServer = class {
     try {
       const sessionState = this.getOrCreateReplaySession(recordingId);
       if (!sessionState.loadedSession) {
-        const error = new Error(
-          `Recording session file not found: ${filePath}`
+        throw Object.assign(
+          new Error(`Recording session file not found: ${filePath}`),
+          { code: "ENOENT" }
         );
-        error.code = "ENOENT";
-        throw error;
       }
       const servedForThisKey = this.getServedTracker(sessionState, key);
       const host = req.headers.host || "unknown";
@@ -677,7 +695,7 @@ var ProxyServer = class {
     res.end();
   }
   async handleProxyRequest(req, res) {
-    const target = this.getTarget();
+    const target = this.target;
     console.log(`[${this.mode}] ${req.method} ${req.url} -> ${target}`);
     if (this.mode === Modes.record) {
       await this.recordAndProxyRequest(req, res, target);
@@ -803,7 +821,7 @@ var ProxyServer = class {
       this.handleReplayWebSocket(req, socket);
       return;
     }
-    const target = this.getTarget();
+    const target = this.target;
     console.log(`[${this.mode}] WebSocket upgrade ${req.url} -> ${target}`);
     if (this.mode === Modes.record) {
       this.handleRecordWebSocket(req, socket, head, target);
@@ -876,11 +894,12 @@ var ProxyServer = class {
       console.error("WebSocket server error:", err);
     });
   }
-  handleReplayWebSocket(req, socket) {
+  async handleReplayWebSocket(req, socket) {
     const url = req.url || "/";
     const key = `WS_${url.replaceAll("/", "_")}`;
     const filePath = getRecordingPath(this.recordingsDir, this.replayId);
-    loadRecordingSession(filePath).then((session) => {
+    try {
+      const session = await loadRecordingSession(filePath);
       const wsRecording = session.websocketRecordings.find(
         (r) => r.key === key
       );
@@ -946,11 +965,11 @@ var ProxyServer = class {
           console.log("Replay WebSocket closed");
         });
       });
-    }).catch((error) => {
+    } catch (error) {
       console.error("Replay error:", error);
       socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
       socket.destroy();
-    });
+    }
   }
   logServerStartup(port) {
     console.log(`Proxy server running on http://localhost:${port}`);
@@ -961,6 +980,7 @@ var ProxyServer = class {
     );
   }
 };
+var registeredContexts = /* @__PURE__ */ new WeakSet();
 function getProxyPort() {
   const envPort = process.env.TEST_PROXY_RECORDER_PORT;
   if (envPort) {
@@ -979,7 +999,7 @@ async function setProxyMode(mode, sessionId, timeout) {
       id: sessionId,
       ...timeout && { timeout }
     };
-    const response = await fetch(`http://127.0.0.1:${proxyPort}/__control`, {
+    const response = await fetch(`http://localhost:${proxyPort}/__control`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body)
@@ -1002,7 +1022,7 @@ async function cleanupSession(sessionId) {
       cleanup: true,
       id: sessionId
     };
-    const response = await fetch(`http://127.0.0.1:${proxyPort}/__control`, {
+    const response = await fetch(`http://localhost:${proxyPort}/__control`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body)
@@ -1066,7 +1086,7 @@ async function getRecordingsDir() {
   }
   const proxyPort = getProxyPort();
   try {
-    const response = await fetch(`http://127.0.0.1:${proxyPort}/__control`);
+    const response = await fetch(`http://localhost:${proxyPort}/__control`);
     if (response.ok) {
       const data = await response.json();
       if (data.recordingsDir) {
@@ -1153,10 +1173,8 @@ var playwrightProxy = {
       // Ensure the handler applies to all matching requests
     );
     const context = page.context();
-    const contextId = context._guid || "default";
-    const handlerKey = `cleanup_${contextId}`;
-    if (!globalThis[handlerKey]) {
-      globalThis[handlerKey] = true;
+    if (!registeredContexts.has(context)) {
+      registeredContexts.add(context);
       context.on("close", async () => {
         try {
           await cleanupSession(sessionId);
@@ -1166,7 +1184,7 @@ var playwrightProxy = {
             error
           );
         } finally {
-          delete globalThis[handlerKey];
+          registeredContexts.delete(context);
         }
       });
     }

package/dist/index.d.cts

@@ -12,12 +12,14 @@ declare class ProxyServer {
     private proxy;
     private currentSession;
     private recordingsDir;
+    private timeoutMs;
     private recordingIdCounter;
     private sequenceCounterByKey;
     private replaySessions;
+    private sessionEvictionTimer;
     private recordingPromises;
     private flushPromise;
-    constructor(target: string, recordingsDir: string);
+    constructor(target: string, recordingsDir: string, timeoutMs?: number);
     init(): Promise<void>;
     listen(port: number): http.Server;
     private setupProxyEventHandlers;
@@ -29,7 +31,6 @@ declare class ProxyServer {
      */
     private getCorsHeaders;
     private addCorsHeaders;
-    private getTarget;
     /**
      * Extract recording ID from custom HTTP header
      * Used for concurrent replay session routing, especially with Next.js
@@ -61,9 +62,12 @@ declare class ProxyServer {
      * @param sessionId The session ID to clean up
      */
     private cleanupSession;
-    private parseGetParams;
-    private parseControlRequest;
+    private startSessionEvictionTimer;
+    private stopSessionEvictionTimer;
+    private parseControlBody;
     private handleControlRequest;
+    private handleControlPost;
+    private applyModeChange;
     private clearModeTimeout;
     private switchMode;
     private switchToTransparentMode;

package/dist/index.d.ts

@@ -12,12 +12,14 @@ declare class ProxyServer {
     private proxy;
     private currentSession;
     private recordingsDir;
+    private timeoutMs;
     private recordingIdCounter;
     private sequenceCounterByKey;
     private replaySessions;
+    private sessionEvictionTimer;
     private recordingPromises;
     private flushPromise;
-    constructor(target: string, recordingsDir: string);
+    constructor(target: string, recordingsDir: string, timeoutMs?: number);
     init(): Promise<void>;
     listen(port: number): http.Server;
     private setupProxyEventHandlers;
@@ -29,7 +31,6 @@ declare class ProxyServer {
      */
     private getCorsHeaders;
     private addCorsHeaders;
-    private getTarget;
     /**
      * Extract recording ID from custom HTTP header
      * Used for concurrent replay session routing, especially with Next.js
@@ -61,9 +62,12 @@ declare class ProxyServer {
      * @param sessionId The session ID to clean up
      */
     private cleanupSession;
-    private parseGetParams;
-    private parseControlRequest;
+    private startSessionEvictionTimer;
+    private stopSessionEvictionTimer;
+    private parseControlBody;
     private handleControlRequest;
+    private handleControlPost;
+    private applyModeChange;
     private clearModeTimeout;
     private switchMode;
     private switchToTransparentMode;