@sailfish-ai/recorder 1.2.2 → 1.2.4

package/dist/index.js

@@ -208,59 +208,62 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagate
         ...DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT,
         ...domainsToNotPropagateHeaderTo,
     ];
-    window.fetch = function (input, init) {
-        let url;
-        // Handle different types of `input` for fetch
-        if (typeof input === "string") {
-            // String URL
-            url = input;
-        }
-        else if (input instanceof Request) {
-            // Request object (we extract the URL)
-            url = input.url;
-        }
-        else if (input instanceof URL) {
-            // URL object
-            url = input.href;
-        }
-        else {
-            // Unsupported input type, skip interception
-            console.warn("Unsupported input type for fetch:", input);
-            return originalFetch.apply(this, arguments);
-        }
-        // Bypass logic for domains listed in the combinedIgnoreDomains
-        if (matchUrlWithWildcard(url, combinedIgnoreDomains)) {
-            return originalFetch.apply(this, arguments);
-        }
-        // Check if the domain should propagate headers
-        const shouldPropagateHeader = domainsToPropagateHeadersTo.length === 0 ||
-            matchUrlWithWildcard(url, domainsToPropagateHeadersTo);
-        // Proceed with fetch if header should propagate and not be excluded
-        if (sessionId && shouldPropagateHeader) {
-            if (input instanceof Request) {
-                // If input is a Request, clone it and modify the headers
-                const clonedRequest = input.clone();
-                const newHeaders = new Headers(clonedRequest.headers);
-                newHeaders.set("X-Sf3-Rid", sessionId);
-                const modifiedRequest = new Request(clonedRequest, {
-                    headers: newHeaders,
-                });
-                return originalFetch.call(this, modifiedRequest);
+    // Proxy to conditionally intercept fetch based on domains
+    window.fetch = new Proxy(originalFetch, {
+        apply: (target, thisArg, args) => {
+            let input = args[0];
+            let init = args[1] || {};
+            let url;
+            // Handle different types of `input` for fetch
+            if (typeof input === "string") {
+                url = input;
+            }
+            else if (input instanceof Request) {
+                url = input.url;
+            }
+            else if (input instanceof URL) {
+                url = input.href;
             }
             else {
-                // For string or URL input, modify init to add headers
-                const modifiedInit = { ...init };
-                const newHeaders = new Headers(init?.headers || {});
-                newHeaders.set("X-Sf3-Rid", sessionId);
-                modifiedInit.headers = newHeaders;
-                return originalFetch.call(this, input, modifiedInit);
+                // Unsupported type, skip interception
+                console.warn("Unsupported input type for fetch:", input);
+                return target.apply(thisArg, args);
             }
-        }
-        else {
-            // No header propagation required, proceed with original fetch
-            return originalFetch.apply(this, arguments);
-        }
-    };
+            // ** Check if we should skip patching fetch entirely for this domain **
+            if (matchUrlWithWildcard(url, combinedIgnoreDomains)) {
+                return target.apply(thisArg, args);
+            }
+            // Check if the domain should propagate the header
+            const shouldPropagateHeader = domainsToPropagateHeadersTo.length === 0 ||
+                matchUrlWithWildcard(url, domainsToPropagateHeadersTo);
+            // ** Skip CORS-sensitive requests **
+            // Ensure we don't modify headers for cross-origin requests to non-whitelisted domains
+            if (!shouldPropagateHeader) {
+                return target.apply(thisArg, args);
+            }
+            // ** Add X-Sf3-Rid header if needed **
+            if (sessionId && shouldPropagateHeader) {
+                if (input instanceof Request) {
+                    const clonedRequest = input.clone();
+                    const newHeaders = new Headers(clonedRequest.headers);
+                    newHeaders.set("X-Sf3-Rid", sessionId);
+                    const modifiedRequest = new Request(clonedRequest, {
+                        headers: newHeaders,
+                    });
+                    return target.call(thisArg, modifiedRequest, init);
+                }
+                else {
+                    const modifiedInit = { ...init };
+                    const newHeaders = new Headers(init.headers || {});
+                    newHeaders.set("X-Sf3-Rid", sessionId);
+                    modifiedInit.headers = newHeaders;
+                    return target.call(thisArg, input, modifiedInit);
+                }
+            }
+            // If no header propagation, return the original fetch call
+            return target.apply(thisArg, args);
+        },
+    });
 }
 // Main Recording Function
 export async function startRecording({ apiKey, backendApi, domainsToPropagateHeaderTo = [], domainsToNotPropagateHeaderTo = [], }) {