@sailfish-ai/recorder 1.8.7 → 1.8.8

package/dist/index.js

@@ -403,6 +403,11 @@ function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo = []) {
         let finished = false;
         const requestBody = args[0]; // Capture the request body/payload
         const requestHeaders = { ...this._capturedRequestHeaders }; // Capture request headers
+        // Filter out internal Sailfish headers from the captured headers
+        delete requestHeaders[xSf3RidHeader];
+        if (funcSpanHeader) {
+            delete requestHeaders[funcSpanHeader.name];
+        }
         // 4️⃣ Helper to emit networkRequestFinished
         const emitFinished = (success, status, errorMsg, responseData, responseHeaders) => {
             if (finished)
@@ -521,7 +526,8 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo = []) {
         if (!sessionId) {
             return target.apply(thisArg, args);
         }
-        const networkUUID = uuidv4();
+        // Generate a fresh UUID for this request attempt
+        let networkUUID = uuidv4();
         const urlAndStoredUuids = getUrlAndStoredUuids();
         const method = init.method || "GET";
         const startTime = Date.now();
@@ -569,12 +575,20 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo = []) {
                 console.warn("[Sailfish] Failed to capture request data:", e);
             }
         }
+        // Filter out internal Sailfish headers from captured headers
+        delete requestHeaders[xSf3RidHeader];
+        const funcSpanHeaderName = getFuncSpanHeader()?.name;
+        if (funcSpanHeaderName) {
+            delete requestHeaders[funcSpanHeaderName];
+        }
         try {
             let response = await injectHeader(target, thisArg, input, init, sessionId, urlAndStoredUuids.page_visit_uuid, networkUUID);
             let isRetry = false;
             // Retry logic for 400/403 before logging finished event
             if (BAD_HTTP_STATUS.includes(response.status)) {
                 DEBUG && console.log("Perform retry as status was fail:", response);
+                // Generate a NEW UUID for the retry request so each request has a unique ID
+                networkUUID = uuidv4();
                 response = await retryWithoutPropagateHeaders(target, thisArg, args, url);
                 isRetry = true;
             }

package/dist/recorder.cjs

@@ -428,7 +428,7 @@ function initializeWebSocket(e, a, u) {
     const a2 = document.createElement("a");
     return a2.href = e2, `${a2.hostname}${a2.port ? `:${a2.port}` : ""}`;
   })(e), w2 = new URL(e).protocol;
-  return te = new $(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a}&sessionId=${u}&sender=JS%2FTS&version=1.8.7`, [], { connectionTimeout: 3e4 }), te.addEventListener("open", () => {
+  return te = new $(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a}&sessionId=${u}&sender=JS%2FTS&version=1.8.8`, [], { connectionTimeout: 3e4 }), te.addEventListener("open", () => {
     Q && (console.log("[Sailfish] WebSocket connection opened"), console.log("[Sailfish] Function span tracking state: " + (se ? "ENABLED" : "DISABLED"))), (async () => {
       try {
         ne = true, await flushNotifyQueue(), await flushBufferedEvents();
@@ -7178,9 +7178,10 @@ function setupFetchInterceptor(e = []) {
       C2 = x2.href;
     }
     return shouldSkipHeadersPropagation(C2, e) ? a2.apply(m2, w2) : (async function injectHeaderWrapper(e2, a3, u2, m3, w3, C3, x3) {
-      var _a2, _b;
+      var _a2, _b, _c2;
       if (!C3) return e2.apply(a3, u2);
-      const I3 = v4(), _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
+      let I3 = v4();
+      const _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
       let D2, F2 = {};
       try {
         if (m3 instanceof Request) {
@@ -7201,8 +7202,11 @@ function setupFetchInterceptor(e = []) {
       } catch (e3) {
         up && console.warn("[Sailfish] Failed to capture request data:", e3);
       }
+      delete F2[b];
+      const U2 = (_a2 = getFuncSpanHeader()) == null ? void 0 : _a2.name;
+      U2 && delete F2[U2];
       try {
-        let U2 = await (async function injectHeader(e3, a4, u3, m4, w4, C4, x4) {
+        let U3 = await (async function injectHeader(e3, a4, u3, m4, w4, C4, x4) {
           const I4 = getFuncSpanHeader();
           if (u3 instanceof Request) {
             const _3 = u3.clone(), O3 = new Headers(_3.headers);
@@ -7215,7 +7219,7 @@ function setupFetchInterceptor(e = []) {
             return O3.set(b, `${w4}/${C4}/${x4}`), I4 && (O3.set(I4.name, I4.value), up && console.log("[Sailfish] Added funcspan header to HTTP fetch:", { url: "string" == typeof u3 ? u3 : u3.href, header: I4.name })), _3.headers = O3, await e3.call(a4, u3, _3);
           }
         })(e2, a3, m3, w3, C3, _2.page_visit_uuid, I3), B2 = false;
-        dp.includes(U2.status) && (up && console.log("Perform retry as status was fail:", U2), U2 = await (async function retryWithoutPropagateHeaders(e3, a4, u3, m4) {
+        dp.includes(U3.status) && (up && console.log("Perform retry as status was fail:", U3), I3 = v4(), U3 = await (async function retryWithoutPropagateHeaders(e3, a4, u3, m4) {
           try {
             let m5 = u3[0], w4 = u3[1] || {};
             if ("string" == typeof m5 || m5 instanceof URL) {
@@ -7234,27 +7238,27 @@ function setupFetchInterceptor(e = []) {
             throw up && console.log(`Retry without ${b} for ${m4} also failed:`, e4), e4;
           }
         })(e2, a3, u2, x3), B2 = true);
-        const $2 = Date.now(), z2 = U2.status, j2 = U2.ok, V2 = j2 ? "" : `Request Error: ${U2.statusText}`;
+        const $2 = Date.now(), z2 = U3.status, j2 = U3.ok, V2 = j2 ? "" : `Request Error: ${U3.statusText}`;
         let q2;
         try {
-          const e3 = U2.clone();
+          const e3 = U3.clone();
           q2 = await e3.text();
         } catch (e3) {
           up && console.warn("[Sailfish] Failed to capture response data:", e3), q2 = null;
         }
         let H2 = null;
         try {
-          H2 = {}, U2.headers.forEach((e3, a4) => {
+          H2 = {}, U3.headers.forEach((e3, a4) => {
             H2[a4] = e3;
           });
         } catch (e3) {
           up && console.warn("[Sailfish] Failed to capture response headers:", e3), H2 = null;
         }
-        return sendEvent({ type: 27, timestamp: $2, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U2;
+        return sendEvent({ type: 27, timestamp: $2, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U3;
       } catch (m4) {
-        const w4 = Date.now(), b2 = false, U2 = ((_a2 = m4.response) == null ? void 0 : _a2.status) || 500, B2 = m4.message || "Fetch request failed";
-        if (m4 instanceof TypeError && ((_b = m4 == null ? void 0 : m4.message) == null ? void 0 : _b.toLowerCase().includes(hp.toLowerCase()))) return e2.apply(a3, u2);
-        throw sendEvent({ type: 27, timestamp: w4, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: w4, response_code: U2, success: b2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
+        const w4 = Date.now(), b2 = false, U3 = ((_b = m4.response) == null ? void 0 : _b.status) || 500, B2 = m4.message || "Fetch request failed";
+        if (m4 instanceof TypeError && ((_c2 = m4 == null ? void 0 : m4.message) == null ? void 0 : _c2.toLowerCase().includes(hp.toLowerCase()))) return e2.apply(a3, u2);
+        throw sendEvent({ type: 27, timestamp: w4, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: w4, response_code: U3, success: b2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
       }
     })(a2, m2, w2, x2, I2, u, C2);
   } });
@@ -7319,7 +7323,9 @@ async function startRecording({ apiKey: e, backendApi: a = "https://api-service.
         }
         const O3 = Date.now();
         let E3 = false;
-        const D3 = a3[0], F3 = { ...this._capturedRequestHeaders }, emitFinished = (e3, a4, u3, b2, C4) => {
+        const D3 = a3[0], F3 = { ...this._capturedRequestHeaders };
+        delete F3[b], _3 && delete F3[_3.name];
+        const emitFinished = (e3, a4, u3, b2, C4) => {
           if (E3) return;
           E3 = true;
           const I4 = Date.now();

package/dist/recorder.js

@@ -427,7 +427,7 @@ function initializeWebSocket(e, a, u) {
     const a2 = document.createElement("a");
     return a2.href = e2, `${a2.hostname}${a2.port ? `:${a2.port}` : ""}`;
   })(e), w2 = new URL(e).protocol;
-  return ne = new $(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a}&sessionId=${u}&sender=JS%2FTS&version=1.8.7`, [], { connectionTimeout: 3e4 }), ne.addEventListener("open", () => {
+  return ne = new $(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a}&sessionId=${u}&sender=JS%2FTS&version=1.8.8`, [], { connectionTimeout: 3e4 }), ne.addEventListener("open", () => {
     ee && (console.log("[Sailfish] WebSocket connection opened"), console.log("[Sailfish] Function span tracking state: " + (ie ? "ENABLED" : "DISABLED"))), (async () => {
       try {
         re = true, await flushNotifyQueue(), await flushBufferedEvents();
@@ -7191,9 +7191,10 @@ function setupFetchInterceptor(e = []) {
       C2 = x2.href;
     }
     return shouldSkipHeadersPropagation(C2, e) ? a2.apply(m2, w2) : (async function injectHeaderWrapper(e2, a3, u2, m3, w3, C3, x3) {
-      var _a2, _b;
+      var _a2, _b, _c2;
       if (!C3) return e2.apply(a3, u2);
-      const I3 = v4(), _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
+      let I3 = v4();
+      const _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
       let D2, F2 = {};
       try {
         if (m3 instanceof Request) {
@@ -7214,8 +7215,11 @@ function setupFetchInterceptor(e = []) {
       } catch (e3) {
         pp && console.warn("[Sailfish] Failed to capture request data:", e3);
       }
+      delete F2[b];
+      const U2 = (_a2 = getFuncSpanHeader()) == null ? void 0 : _a2.name;
+      U2 && delete F2[U2];
       try {
-        let U2 = await (async function injectHeader(e3, a4, u3, m4, w4, C4, x4) {
+        let U3 = await (async function injectHeader(e3, a4, u3, m4, w4, C4, x4) {
           const I4 = getFuncSpanHeader();
           if (u3 instanceof Request) {
             const _3 = u3.clone(), O3 = new Headers(_3.headers);
@@ -7228,7 +7232,7 @@ function setupFetchInterceptor(e = []) {
             return O3.set(b, `${w4}/${C4}/${x4}`), I4 && (O3.set(I4.name, I4.value), pp && console.log("[Sailfish] Added funcspan header to HTTP fetch:", { url: "string" == typeof u3 ? u3 : u3.href, header: I4.name })), _3.headers = O3, await e3.call(a4, u3, _3);
           }
         })(e2, a3, m3, w3, C3, _2.page_visit_uuid, I3), B2 = false;
-        hp.includes(U2.status) && (pp && console.log("Perform retry as status was fail:", U2), U2 = await (async function retryWithoutPropagateHeaders(e3, a4, u3, m4) {
+        hp.includes(U3.status) && (pp && console.log("Perform retry as status was fail:", U3), I3 = v4(), U3 = await (async function retryWithoutPropagateHeaders(e3, a4, u3, m4) {
           try {
             let m5 = u3[0], w4 = u3[1] || {};
             if ("string" == typeof m5 || m5 instanceof URL) {
@@ -7247,27 +7251,27 @@ function setupFetchInterceptor(e = []) {
             throw pp && console.log(`Retry without ${b} for ${m4} also failed:`, e4), e4;
           }
         })(e2, a3, u2, x3), B2 = true);
-        const $2 = Date.now(), z2 = U2.status, j2 = U2.ok, V2 = j2 ? "" : `Request Error: ${U2.statusText}`;
+        const $2 = Date.now(), z2 = U3.status, j2 = U3.ok, V2 = j2 ? "" : `Request Error: ${U3.statusText}`;
         let q2;
         try {
-          const e3 = U2.clone();
+          const e3 = U3.clone();
           q2 = await e3.text();
         } catch (e3) {
           pp && console.warn("[Sailfish] Failed to capture response data:", e3), q2 = null;
         }
         let H2 = null;
         try {
-          H2 = {}, U2.headers.forEach((e3, a4) => {
+          H2 = {}, U3.headers.forEach((e3, a4) => {
             H2[a4] = e3;
           });
         } catch (e3) {
           pp && console.warn("[Sailfish] Failed to capture response headers:", e3), H2 = null;
         }
-        return sendEvent({ type: 27, timestamp: $2, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U2;
+        return sendEvent({ type: 27, timestamp: $2, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U3;
       } catch (m4) {
-        const w4 = Date.now(), b2 = false, U2 = ((_a2 = m4.response) == null ? void 0 : _a2.status) || 500, B2 = m4.message || "Fetch request failed";
-        if (m4 instanceof TypeError && ((_b = m4 == null ? void 0 : m4.message) == null ? void 0 : _b.toLowerCase().includes(fp.toLowerCase()))) return e2.apply(a3, u2);
-        throw sendEvent({ type: 27, timestamp: w4, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: w4, response_code: U2, success: b2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
+        const w4 = Date.now(), b2 = false, U3 = ((_b = m4.response) == null ? void 0 : _b.status) || 500, B2 = m4.message || "Fetch request failed";
+        if (m4 instanceof TypeError && ((_c2 = m4 == null ? void 0 : m4.message) == null ? void 0 : _c2.toLowerCase().includes(fp.toLowerCase()))) return e2.apply(a3, u2);
+        throw sendEvent({ type: 27, timestamp: w4, sessionId: C3, data: { request_id: I3, session_id: C3, timestamp_start: E2, timestamp_end: w4, response_code: U3, success: b2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
       }
     })(a2, m2, w2, x2, I2, u, C2);
   } });
@@ -7332,7 +7336,9 @@ async function startRecording({ apiKey: e, backendApi: a = "https://api-service.
         }
         const O3 = Date.now();
         let E3 = false;
-        const D3 = a3[0], F3 = { ...this._capturedRequestHeaders }, emitFinished = (e3, a4, u3, b2, C4) => {
+        const D3 = a3[0], F3 = { ...this._capturedRequestHeaders };
+        delete F3[b], _3 && delete F3[_3.name];
+        const emitFinished = (e3, a4, u3, b2, C4) => {
           if (E3) return;
           E3 = true;
           const I4 = Date.now();

package/dist/recorder.umd.cjs

@@ -430,7 +430,7 @@
       const a3 = document.createElement("a");
       return a3.href = e3, `${a3.hostname}${a3.port ? `:${a3.port}` : ""}`;
     })(e2), w2 = new URL(e2).protocol;
-    return ne = new z(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a2}&sessionId=${u2}&sender=JS%2FTS&version=1.8.7`, [], { connectionTimeout: 3e4 }), ne.addEventListener("open", () => {
+    return ne = new z(`${"https:" === w2 ? "wss" : "ws"}://${m2}/ws/notify/?apiKey=${a2}&sessionId=${u2}&sender=JS%2FTS&version=1.8.8`, [], { connectionTimeout: 3e4 }), ne.addEventListener("open", () => {
       ee && (console.log("[Sailfish] WebSocket connection opened"), console.log("[Sailfish] Function span tracking state: " + (ie ? "ENABLED" : "DISABLED"))), (async () => {
         try {
           re = true, await flushNotifyQueue(), await flushBufferedEvents();
@@ -7180,9 +7180,10 @@
         b2 = x2.href;
       }
       return shouldSkipHeadersPropagation(b2, e2) ? a3.apply(m2, w2) : (async function injectHeaderWrapper(e3, a4, u3, m3, w3, b3, x3) {
-        var _a2, _b;
+        var _a2, _b, _c2;
         if (!b3) return e3.apply(a4, u3);
-        const I3 = v4(), _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
+        let I3 = v4();
+        const _2 = getUrlAndStoredUuids(), O2 = w3.method || "GET", E2 = Date.now();
         let D2, F2 = {};
         try {
           if (m3 instanceof Request) {
@@ -7203,8 +7204,11 @@
         } catch (e4) {
           pp && console.warn("[Sailfish] Failed to capture request data:", e4);
         }
+        delete F2[C];
+        const U2 = (_a2 = getFuncSpanHeader()) == null ? void 0 : _a2.name;
+        U2 && delete F2[U2];
         try {
-          let U2 = await (async function injectHeader(e4, a5, u4, m4, w4, b4, x4) {
+          let U3 = await (async function injectHeader(e4, a5, u4, m4, w4, b4, x4) {
             const I4 = getFuncSpanHeader();
             if (u4 instanceof Request) {
               const _3 = u4.clone(), O3 = new Headers(_3.headers);
@@ -7217,7 +7221,7 @@
               return O3.set(C, `${w4}/${b4}/${x4}`), I4 && (O3.set(I4.name, I4.value), pp && console.log("[Sailfish] Added funcspan header to HTTP fetch:", { url: "string" == typeof u4 ? u4 : u4.href, header: I4.name })), _3.headers = O3, await e4.call(a5, u4, _3);
             }
           })(e3, a4, m3, w3, b3, _2.page_visit_uuid, I3), B2 = false;
-          hp.includes(U2.status) && (pp && console.log("Perform retry as status was fail:", U2), U2 = await (async function retryWithoutPropagateHeaders(e4, a5, u4, m4) {
+          hp.includes(U3.status) && (pp && console.log("Perform retry as status was fail:", U3), I3 = v4(), U3 = await (async function retryWithoutPropagateHeaders(e4, a5, u4, m4) {
             try {
               let m5 = u4[0], w4 = u4[1] || {};
               if ("string" == typeof m5 || m5 instanceof URL) {
@@ -7236,27 +7240,27 @@
               throw pp && console.log(`Retry without ${C} for ${m4} also failed:`, e5), e5;
             }
           })(e3, a4, u3, x3), B2 = true);
-          const $2 = Date.now(), z2 = U2.status, j2 = U2.ok, V2 = j2 ? "" : `Request Error: ${U2.statusText}`;
+          const $2 = Date.now(), z2 = U3.status, j2 = U3.ok, V2 = j2 ? "" : `Request Error: ${U3.statusText}`;
           let q2;
           try {
-            const e4 = U2.clone();
+            const e4 = U3.clone();
             q2 = await e4.text();
           } catch (e4) {
             pp && console.warn("[Sailfish] Failed to capture response data:", e4), q2 = null;
           }
           let H2 = null;
           try {
-            H2 = {}, U2.headers.forEach((e4, a5) => {
+            H2 = {}, U3.headers.forEach((e4, a5) => {
               H2[a5] = e4;
             });
           } catch (e4) {
             pp && console.warn("[Sailfish] Failed to capture response headers:", e4), H2 = null;
           }
-          return sendEvent({ type: 27, timestamp: $2, sessionId: b3, data: { request_id: I3, session_id: b3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U2;
+          return sendEvent({ type: 27, timestamp: $2, sessionId: b3, data: { request_id: I3, session_id: b3, timestamp_start: E2, timestamp_end: $2, response_code: z2, success: j2, error: V2, method: O2, url: x3, retry_without_trace_id: B2, request_headers: F2, request_body: D2, response_headers: H2, response_body: q2 }, ..._2 }), U3;
         } catch (m4) {
-          const w4 = Date.now(), C2 = false, U2 = ((_a2 = m4.response) == null ? void 0 : _a2.status) || 500, B2 = m4.message || "Fetch request failed";
-          if (m4 instanceof TypeError && ((_b = m4 == null ? void 0 : m4.message) == null ? void 0 : _b.toLowerCase().includes(fp.toLowerCase()))) return e3.apply(a4, u3);
-          throw sendEvent({ type: 27, timestamp: w4, sessionId: b3, data: { request_id: I3, session_id: b3, timestamp_start: E2, timestamp_end: w4, response_code: U2, success: C2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
+          const w4 = Date.now(), C2 = false, U3 = ((_b = m4.response) == null ? void 0 : _b.status) || 500, B2 = m4.message || "Fetch request failed";
+          if (m4 instanceof TypeError && ((_c2 = m4 == null ? void 0 : m4.message) == null ? void 0 : _c2.toLowerCase().includes(fp.toLowerCase()))) return e3.apply(a4, u3);
+          throw sendEvent({ type: 27, timestamp: w4, sessionId: b3, data: { request_id: I3, session_id: b3, timestamp_start: E2, timestamp_end: w4, response_code: U3, success: C2, error: B2, method: O2, url: x3, request_headers: F2, request_body: D2, response_body: null }, ..._2 }), m4;
         }
       })(a3, m2, w2, x2, I2, u2, b2);
     } });
@@ -7321,7 +7325,9 @@
           }
           const O3 = Date.now();
           let E3 = false;
-          const D3 = a4[0], F3 = { ...this._capturedRequestHeaders }, emitFinished = (e4, a5, u4, b4, C2) => {
+          const D3 = a4[0], F3 = { ...this._capturedRequestHeaders };
+          delete F3[C], _3 && delete F3[_3.name];
+          const emitFinished = (e4, a5, u4, b4, C2) => {
             if (E3) return;
             E3 = true;
             const I4 = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sailfish-ai/recorder",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "publishPublicly": true,
   "type": "module",
   "main": "dist/recorder.cjs",