test-proxy-recorder 0.1.6 → 0.1.7

package/dist/index.cjs

@@ -144,11 +144,10 @@ var ProxyServer = class {
       return;
     }
     if (!res.headersSent) {
-      const origin = req.headers.origin;
+      const corsHeaders = this.getCorsHeaders(req);
       res.writeHead(HTTP_STATUS_BAD_GATEWAY, {
         "Content-Type": "application/json",
-        "Access-Control-Allow-Origin": origin || "*",
-        "Access-Control-Allow-Credentials": "true"
+        ...corsHeaders
       });
     }
     res.end(JSON.stringify({ error: "Proxy error", message: err.message }));
@@ -159,24 +158,51 @@ var ProxyServer = class {
       this.recordResponse(req, proxyRes);
     }
   }
-  addCorsHeaders(proxyRes, req) {
+  /**
+   * Get CORS headers for a given request
+   * @param req The incoming HTTP request
+   * @returns An object containing CORS headers
+   */
+  getCorsHeaders(req) {
     const origin = req.headers.origin;
-    proxyRes.headers["access-control-allow-origin"] = origin || "*";
-    proxyRes.headers["access-control-allow-credentials"] = "true";
-    proxyRes.headers["access-control-allow-headers"] = req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization";
-    proxyRes.headers["access-control-allow-methods"] = "GET, POST, PUT, DELETE, PATCH, OPTIONS";
-    proxyRes.headers["access-control-expose-headers"] = "*";
+    return {
+      "access-control-allow-origin": origin || "*",
+      "access-control-allow-credentials": "true",
+      "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
+      "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      "access-control-expose-headers": "*"
+    };
+  }
+  addCorsHeaders(proxyRes, req) {
+    const corsHeaders = this.getCorsHeaders(req);
+    Object.assign(proxyRes.headers, corsHeaders);
   }
   getTarget() {
     const target = this.targets[this.currentTargetIndex];
     this.currentTargetIndex = (this.currentTargetIndex + 1) % this.targets.length;
     return target;
   }
+  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");
+    }
+    return { mode, id, timeout };
+  }
   async handleControlRequest(req, res) {
     try {
-      const body = await readRequestBody(req);
-      console.log("MODE CHANGE", body);
-      const data = JSON.parse(body);
+      let data;
+      if (req.method === "GET") {
+        data = this.parseGetParams(req);
+      } else {
+        const body = await readRequestBody(req);
+        console.log("MODE CHANGE (POST)", body);
+        data = JSON.parse(body);
+      }
       const { mode, id, timeout: requestTimeout } = data;
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -270,10 +296,6 @@ var ProxyServer = class {
       console.log("No current session to save");
       return;
     }
-    if (this.currentSession.recordings.length === 0 && this.currentSession.websocketRecordings.length === 0) {
-      console.log("Session has no recordings, skipping save");
-      return;
-    }
     if (filterIncomplete) {
       const incompleteCount = this.currentSession.recordings.filter(
         (r) => !r.response
@@ -298,8 +320,6 @@ var ProxyServer = class {
       return;
     }
     const key = getReqID(req);
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     const record = {
       request: {
         method: req.method,
@@ -309,12 +329,13 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: currentSequence
+      sequence: -1
+      // Temporary, will be set when response arrives
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${currentSequence}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
@@ -360,7 +381,6 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      await this.saveCurrentSession();
       console.log(`Recorded: ${req.method} ${req.url}`);
     });
   }
@@ -398,9 +418,12 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    await this.saveCurrentSession();
+    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}`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
     );
     return true;
   }
@@ -410,19 +433,22 @@ var ProxyServer = class {
     try {
       const session = await loadRecordingSession(filePath);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter(
-        (r) => r.key === key && r.response
-      );
+      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}`
         );
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
-      const recordIndex = usageCount % recordsWithKey.length;
-      const record = recordsWithKey[recordIndex];
+      let record;
+      if (recordsWithKey.length > 1) {
+        record = recordsWithKey[recordsWithKey.length - 1];
+      } else {
+        const recordIndex = usageCount % recordsWithKey.length;
+        record = recordsWithKey[recordIndex];
+      }
       console.log(
-        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, using recording ${recordIndex}/${recordsWithKey.length})`
+        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`
       );
       this.replaySequenceMap.set(key, usageCount + 1);
       if (!record.response) {
@@ -431,14 +457,9 @@ var ProxyServer = class {
         );
       }
       const { statusCode, headers, body } = record.response;
-      const origin = req.headers.origin;
       const responseHeaders = {
         ...headers,
-        "access-control-allow-origin": origin || "*",
-        "access-control-allow-credentials": "true",
-        "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-        "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-        "access-control-expose-headers": "*"
+        ...this.getCorsHeaders(req)
       };
       res.writeHead(statusCode, responseHeaders);
       res.end(body);
@@ -449,11 +470,10 @@ var ProxyServer = class {
   handleReplayError(req, res, err, key, filePath) {
     const isFileNotFound = err instanceof Error && "code" in err && err.code === "ENOENT";
     console.error("Replay error:", err);
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_NOT_FOUND, {
       "Content-Type": "application/json",
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true"
+      ...corsHeaders
     });
     res.end(
       JSON.stringify({
@@ -468,7 +488,8 @@ var ProxyServer = class {
     if (req.method === "OPTIONS") {
       return this.handleCorsPreflightRequest(req, res);
     }
-    if (req.url === CONTROL_ENDPOINT) {
+    const urlPath = req.url?.split("?")[0] || "";
+    if (urlPath === CONTROL_ENDPOINT) {
       return this.handleControlRequest(req, res);
     }
     if (this.mode === Modes.replay) {
@@ -477,12 +498,9 @@ var ProxyServer = class {
     await this.handleProxyRequest(req, res);
   }
   handleCorsPreflightRequest(req, res) {
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_OK, {
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true",
-      "Access-Control-Allow-Headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-      "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      ...corsHeaders,
       "Access-Control-Max-Age": "86400"
       // 24 hours
     });
@@ -542,14 +560,9 @@ var ProxyServer = class {
             proxyRes,
             responseBody.toString("utf8")
           );
-          const origin = req.headers.origin;
           const responseHeaders = {
             ...proxyRes.headers,
-            "access-control-allow-origin": origin || "*",
-            "access-control-allow-credentials": "true",
-            "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-            "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-            "access-control-expose-headers": "*"
+            ...this.getCorsHeaders(req)
           };
           res.writeHead(proxyRes.statusCode || 200, responseHeaders);
           res.end(responseBody);
@@ -614,9 +627,6 @@ var ProxyServer = class {
           if (backendWs.readyState === ws.WebSocket.OPEN) {
             backendWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         backendWs.on("message", (data) => {
           const message = data.toString();
@@ -628,9 +638,6 @@ var ProxyServer = class {
           if (clientWs.readyState === ws.WebSocket.OPEN) {
             clientWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         clientWs.on("error", (err) => {
           console.error("Client WebSocket error:", err);

package/dist/index.d.cts

@@ -20,8 +20,15 @@ declare class ProxyServer {
     private setupProxyEventHandlers;
     private handleProxyError;
     private handleProxyResponse;
+    /**
+     * Get CORS headers for a given request
+     * @param req The incoming HTTP request
+     * @returns An object containing CORS headers
+     */
+    private getCorsHeaders;
     private addCorsHeaders;
     private getTarget;
+    private parseGetParams;
     private handleControlRequest;
     private clearModeTimeout;
     private switchMode;

package/dist/index.d.ts

@@ -20,8 +20,15 @@ declare class ProxyServer {
     private setupProxyEventHandlers;
     private handleProxyError;
     private handleProxyResponse;
+    /**
+     * Get CORS headers for a given request
+     * @param req The incoming HTTP request
+     * @returns An object containing CORS headers
+     */
+    private getCorsHeaders;
     private addCorsHeaders;
     private getTarget;
+    private parseGetParams;
     private handleControlRequest;
     private clearModeTimeout;
     private switchMode;

package/dist/index.mjs

@@ -133,11 +133,10 @@ var ProxyServer = class {
       return;
     }
     if (!res.headersSent) {
-      const origin = req.headers.origin;
+      const corsHeaders = this.getCorsHeaders(req);
       res.writeHead(HTTP_STATUS_BAD_GATEWAY, {
         "Content-Type": "application/json",
-        "Access-Control-Allow-Origin": origin || "*",
-        "Access-Control-Allow-Credentials": "true"
+        ...corsHeaders
       });
     }
     res.end(JSON.stringify({ error: "Proxy error", message: err.message }));
@@ -148,24 +147,51 @@ var ProxyServer = class {
       this.recordResponse(req, proxyRes);
     }
   }
-  addCorsHeaders(proxyRes, req) {
+  /**
+   * Get CORS headers for a given request
+   * @param req The incoming HTTP request
+   * @returns An object containing CORS headers
+   */
+  getCorsHeaders(req) {
     const origin = req.headers.origin;
-    proxyRes.headers["access-control-allow-origin"] = origin || "*";
-    proxyRes.headers["access-control-allow-credentials"] = "true";
-    proxyRes.headers["access-control-allow-headers"] = req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization";
-    proxyRes.headers["access-control-allow-methods"] = "GET, POST, PUT, DELETE, PATCH, OPTIONS";
-    proxyRes.headers["access-control-expose-headers"] = "*";
+    return {
+      "access-control-allow-origin": origin || "*",
+      "access-control-allow-credentials": "true",
+      "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
+      "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      "access-control-expose-headers": "*"
+    };
+  }
+  addCorsHeaders(proxyRes, req) {
+    const corsHeaders = this.getCorsHeaders(req);
+    Object.assign(proxyRes.headers, corsHeaders);
   }
   getTarget() {
     const target = this.targets[this.currentTargetIndex];
     this.currentTargetIndex = (this.currentTargetIndex + 1) % this.targets.length;
     return target;
   }
+  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");
+    }
+    return { mode, id, timeout };
+  }
   async handleControlRequest(req, res) {
     try {
-      const body = await readRequestBody(req);
-      console.log("MODE CHANGE", body);
-      const data = JSON.parse(body);
+      let data;
+      if (req.method === "GET") {
+        data = this.parseGetParams(req);
+      } else {
+        const body = await readRequestBody(req);
+        console.log("MODE CHANGE (POST)", body);
+        data = JSON.parse(body);
+      }
       const { mode, id, timeout: requestTimeout } = data;
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -259,10 +285,6 @@ var ProxyServer = class {
       console.log("No current session to save");
       return;
     }
-    if (this.currentSession.recordings.length === 0 && this.currentSession.websocketRecordings.length === 0) {
-      console.log("Session has no recordings, skipping save");
-      return;
-    }
     if (filterIncomplete) {
       const incompleteCount = this.currentSession.recordings.filter(
         (r) => !r.response
@@ -287,8 +309,6 @@ var ProxyServer = class {
       return;
     }
     const key = getReqID(req);
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     const record = {
       request: {
         method: req.method,
@@ -298,12 +318,13 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: currentSequence
+      sequence: -1
+      // Temporary, will be set when response arrives
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${currentSequence}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
@@ -349,7 +370,6 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      await this.saveCurrentSession();
       console.log(`Recorded: ${req.method} ${req.url}`);
     });
   }
@@ -387,9 +407,12 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    await this.saveCurrentSession();
+    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}`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
     );
     return true;
   }
@@ -399,19 +422,22 @@ var ProxyServer = class {
     try {
       const session = await loadRecordingSession(filePath);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter(
-        (r) => r.key === key && r.response
-      );
+      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}`
         );
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
-      const recordIndex = usageCount % recordsWithKey.length;
-      const record = recordsWithKey[recordIndex];
+      let record;
+      if (recordsWithKey.length > 1) {
+        record = recordsWithKey[recordsWithKey.length - 1];
+      } else {
+        const recordIndex = usageCount % recordsWithKey.length;
+        record = recordsWithKey[recordIndex];
+      }
       console.log(
-        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, using recording ${recordIndex}/${recordsWithKey.length})`
+        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`
       );
       this.replaySequenceMap.set(key, usageCount + 1);
       if (!record.response) {
@@ -420,14 +446,9 @@ var ProxyServer = class {
         );
       }
       const { statusCode, headers, body } = record.response;
-      const origin = req.headers.origin;
       const responseHeaders = {
         ...headers,
-        "access-control-allow-origin": origin || "*",
-        "access-control-allow-credentials": "true",
-        "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-        "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-        "access-control-expose-headers": "*"
+        ...this.getCorsHeaders(req)
       };
       res.writeHead(statusCode, responseHeaders);
       res.end(body);
@@ -438,11 +459,10 @@ var ProxyServer = class {
   handleReplayError(req, res, err, key, filePath) {
     const isFileNotFound = err instanceof Error && "code" in err && err.code === "ENOENT";
     console.error("Replay error:", err);
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_NOT_FOUND, {
       "Content-Type": "application/json",
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true"
+      ...corsHeaders
     });
     res.end(
       JSON.stringify({
@@ -457,7 +477,8 @@ var ProxyServer = class {
     if (req.method === "OPTIONS") {
       return this.handleCorsPreflightRequest(req, res);
     }
-    if (req.url === CONTROL_ENDPOINT) {
+    const urlPath = req.url?.split("?")[0] || "";
+    if (urlPath === CONTROL_ENDPOINT) {
       return this.handleControlRequest(req, res);
     }
     if (this.mode === Modes.replay) {
@@ -466,12 +487,9 @@ var ProxyServer = class {
     await this.handleProxyRequest(req, res);
   }
   handleCorsPreflightRequest(req, res) {
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_OK, {
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true",
-      "Access-Control-Allow-Headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-      "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      ...corsHeaders,
       "Access-Control-Max-Age": "86400"
       // 24 hours
     });
@@ -531,14 +549,9 @@ var ProxyServer = class {
             proxyRes,
             responseBody.toString("utf8")
           );
-          const origin = req.headers.origin;
           const responseHeaders = {
             ...proxyRes.headers,
-            "access-control-allow-origin": origin || "*",
-            "access-control-allow-credentials": "true",
-            "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-            "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-            "access-control-expose-headers": "*"
+            ...this.getCorsHeaders(req)
           };
           res.writeHead(proxyRes.statusCode || 200, responseHeaders);
           res.end(responseBody);
@@ -603,9 +616,6 @@ var ProxyServer = class {
           if (backendWs.readyState === WebSocket.OPEN) {
             backendWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         backendWs.on("message", (data) => {
           const message = data.toString();
@@ -617,9 +627,6 @@ var ProxyServer = class {
           if (clientWs.readyState === WebSocket.OPEN) {
             clientWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         clientWs.on("error", (err) => {
           console.error("Client WebSocket error:", err);

package/dist/proxy.js

@@ -167,11 +167,10 @@ var ProxyServer = class {
       return;
     }
     if (!res.headersSent) {
-      const origin = req.headers.origin;
+      const corsHeaders = this.getCorsHeaders(req);
       res.writeHead(HTTP_STATUS_BAD_GATEWAY, {
         "Content-Type": "application/json",
-        "Access-Control-Allow-Origin": origin || "*",
-        "Access-Control-Allow-Credentials": "true"
+        ...corsHeaders
       });
     }
     res.end(JSON.stringify({ error: "Proxy error", message: err.message }));
@@ -182,24 +181,51 @@ var ProxyServer = class {
       this.recordResponse(req, proxyRes);
     }
   }
-  addCorsHeaders(proxyRes, req) {
+  /**
+   * Get CORS headers for a given request
+   * @param req The incoming HTTP request
+   * @returns An object containing CORS headers
+   */
+  getCorsHeaders(req) {
     const origin = req.headers.origin;
-    proxyRes.headers["access-control-allow-origin"] = origin || "*";
-    proxyRes.headers["access-control-allow-credentials"] = "true";
-    proxyRes.headers["access-control-allow-headers"] = req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization";
-    proxyRes.headers["access-control-allow-methods"] = "GET, POST, PUT, DELETE, PATCH, OPTIONS";
-    proxyRes.headers["access-control-expose-headers"] = "*";
+    return {
+      "access-control-allow-origin": origin || "*",
+      "access-control-allow-credentials": "true",
+      "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
+      "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      "access-control-expose-headers": "*"
+    };
+  }
+  addCorsHeaders(proxyRes, req) {
+    const corsHeaders = this.getCorsHeaders(req);
+    Object.assign(proxyRes.headers, corsHeaders);
   }
   getTarget() {
     const target = this.targets[this.currentTargetIndex];
     this.currentTargetIndex = (this.currentTargetIndex + 1) % this.targets.length;
     return target;
   }
+  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");
+    }
+    return { mode, id, timeout };
+  }
   async handleControlRequest(req, res) {
     try {
-      const body = await readRequestBody(req);
-      console.log("MODE CHANGE", body);
-      const data = JSON.parse(body);
+      let data;
+      if (req.method === "GET") {
+        data = this.parseGetParams(req);
+      } else {
+        const body = await readRequestBody(req);
+        console.log("MODE CHANGE (POST)", body);
+        data = JSON.parse(body);
+      }
       const { mode, id, timeout: requestTimeout } = data;
       const timeout = requestTimeout ?? DEFAULT_TIMEOUT_MS;
       this.clearModeTimeout();
@@ -293,10 +319,6 @@ var ProxyServer = class {
       console.log("No current session to save");
       return;
     }
-    if (this.currentSession.recordings.length === 0 && this.currentSession.websocketRecordings.length === 0) {
-      console.log("Session has no recordings, skipping save");
-      return;
-    }
     if (filterIncomplete) {
       const incompleteCount = this.currentSession.recordings.filter(
         (r) => !r.response
@@ -321,8 +343,6 @@ var ProxyServer = class {
       return;
     }
     const key = getReqID(req);
-    const currentSequence = this.requestSequenceMap.get(key) || 0;
-    this.requestSequenceMap.set(key, currentSequence + 1);
     const record = {
       request: {
         method: req.method,
@@ -332,12 +352,13 @@ var ProxyServer = class {
       },
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       key,
-      sequence: currentSequence
+      sequence: -1
+      // Temporary, will be set when response arrives
     };
     this.currentSession.recordings.push(record);
     console.log(
       // eslint-disable-next-line sonarjs/no-nested-template-literals
-      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, seq: ${currentSequence}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
+      `saveRequestRecordSync: Saved ${req.method} ${req.url} (key: ${key}, body: ${body ? `${body.length} chars` : "null"}, total: ${this.currentSession.recordings.length}, sessionId: ${this.currentSession.id})`
     );
   }
   updateRequestBodySync(req, body) {
@@ -383,7 +404,6 @@ var ProxyServer = class {
         headers: proxyRes.headers,
         body: body || null
       };
-      await this.saveCurrentSession();
       console.log(`Recorded: ${req.method} ${req.url}`);
     });
   }
@@ -421,9 +441,12 @@ var ProxyServer = class {
       headers: proxyRes.headers,
       body: body || null
     };
-    await this.saveCurrentSession();
+    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}`
+      `recordResponseData: Recorded response for ${req.method} ${req.url} (seq: ${record.sequence})`
     );
     return true;
   }
@@ -433,19 +456,22 @@ var ProxyServer = class {
     try {
       const session = await loadRecordingSession(filePath);
       const host = req.headers.host || "unknown";
-      const recordsWithKey = session.recordings.filter(
-        (r) => r.key === key && r.response
-      );
+      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}`
         );
       }
       const usageCount = this.replaySequenceMap.get(key) || 0;
-      const recordIndex = usageCount % recordsWithKey.length;
-      const record = recordsWithKey[recordIndex];
+      let record;
+      if (recordsWithKey.length > 1) {
+        record = recordsWithKey[recordsWithKey.length - 1];
+      } else {
+        const recordIndex = usageCount % recordsWithKey.length;
+        record = recordsWithKey[recordIndex];
+      }
       console.log(
-        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, using recording ${recordIndex}/${recordsWithKey.length})`
+        `Replaying ${req.method} ${req.url} (usage: ${usageCount}, sequence: ${record.sequence}, body_len: ${record.response?.body?.length || 0})`
       );
       this.replaySequenceMap.set(key, usageCount + 1);
       if (!record.response) {
@@ -454,14 +480,9 @@ var ProxyServer = class {
         );
       }
       const { statusCode, headers, body } = record.response;
-      const origin = req.headers.origin;
       const responseHeaders = {
         ...headers,
-        "access-control-allow-origin": origin || "*",
-        "access-control-allow-credentials": "true",
-        "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-        "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-        "access-control-expose-headers": "*"
+        ...this.getCorsHeaders(req)
       };
       res.writeHead(statusCode, responseHeaders);
       res.end(body);
@@ -472,11 +493,10 @@ var ProxyServer = class {
   handleReplayError(req, res, err, key, filePath) {
     const isFileNotFound = err instanceof Error && "code" in err && err.code === "ENOENT";
     console.error("Replay error:", err);
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_NOT_FOUND, {
       "Content-Type": "application/json",
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true"
+      ...corsHeaders
     });
     res.end(
       JSON.stringify({
@@ -491,7 +511,8 @@ var ProxyServer = class {
     if (req.method === "OPTIONS") {
       return this.handleCorsPreflightRequest(req, res);
     }
-    if (req.url === CONTROL_ENDPOINT) {
+    const urlPath = req.url?.split("?")[0] || "";
+    if (urlPath === CONTROL_ENDPOINT) {
       return this.handleControlRequest(req, res);
     }
     if (this.mode === Modes.replay) {
@@ -500,12 +521,9 @@ var ProxyServer = class {
     await this.handleProxyRequest(req, res);
   }
   handleCorsPreflightRequest(req, res) {
-    const origin = req.headers.origin;
+    const corsHeaders = this.getCorsHeaders(req);
     res.writeHead(HTTP_STATUS_OK, {
-      "Access-Control-Allow-Origin": origin || "*",
-      "Access-Control-Allow-Credentials": "true",
-      "Access-Control-Allow-Headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-      "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      ...corsHeaders,
       "Access-Control-Max-Age": "86400"
       // 24 hours
     });
@@ -565,14 +583,9 @@ var ProxyServer = class {
             proxyRes,
             responseBody.toString("utf8")
           );
-          const origin = req.headers.origin;
           const responseHeaders = {
             ...proxyRes.headers,
-            "access-control-allow-origin": origin || "*",
-            "access-control-allow-credentials": "true",
-            "access-control-allow-headers": req.headers["access-control-request-headers"] || "Origin, X-Requested-With, Content-Type, Accept, Authorization",
-            "access-control-allow-methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-            "access-control-expose-headers": "*"
+            ...this.getCorsHeaders(req)
           };
           res.writeHead(proxyRes.statusCode || 200, responseHeaders);
           res.end(responseBody);
@@ -637,9 +650,6 @@ var ProxyServer = class {
           if (backendWs.readyState === WebSocket.OPEN) {
             backendWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         backendWs.on("message", (data) => {
           const message = data.toString();
@@ -651,9 +661,6 @@ var ProxyServer = class {
           if (clientWs.readyState === WebSocket.OPEN) {
             clientWs.send(message);
           }
-          this.saveCurrentSession().catch((error) => {
-            console.error("Failed to save WebSocket recording:", error);
-          });
         });
         clientWs.on("error", (err) => {
           console.error("Client WebSocket error:", err);

package/package.json

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