@sailfish-ai/recorder 1.1.1 → 1.1.3

package/README.md

@@ -1,3 +1,3 @@
 # JS/TS Record-Only Package
 
-## TODO - Rename all Sailfish to GrepLion!
+## TODO - Rename all Sailfish to GrepLion

package/dist/index.js

@@ -141,7 +141,7 @@ export function matchUrlWithWildcard(url, patterns) {
 }
 // Updated XMLHttpRequest interceptor with single check function
 function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo) {
-    const originalOpen = XMLHttpRequest.prototype.open;
+    // Store references to the original (or patched) send method
     const originalSend = XMLHttpRequest.prototype.send;
     const sessionId = getOrSetSessionId();
     // Combine default and passed domains
@@ -149,10 +149,7 @@ function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo) {
         ...DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT,
         ...domainsToNotPropagateHeaderTo,
     ];
-    XMLHttpRequest.prototype.open = function (...args) {
-        this._url = args[1]; // Store the request URL
-        originalOpen.apply(this, args);
-    };
+    // Override XMLHttpRequest's send method
     XMLHttpRequest.prototype.send = function (...args) {
         const url = this._url;
         // Check if URL matches any domain or path pattern
@@ -165,6 +162,7 @@ function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo) {
 }
 // Updated fetch interceptor with single check function
 function setupFetchInterceptor(domainsToNotPropagateHeaderTo) {
+    // Store a reference to the original fetch function
     const originalFetch = window.fetch;
     const sessionId = getOrSetSessionId();
     // Combine default and passed domains
@@ -172,9 +170,10 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo) {
         ...DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT,
         ...domainsToNotPropagateHeaderTo,
     ];
-    window.fetch = async function (input, init = {}) {
+    // Define our fetch wrapper
+    window.fetch = function (input, init) {
         let url;
-        // Check if input is a string (URL) or a Request object
+        // Determine the URL based on input type
         if (typeof input === "string") {
             url = input;
         }
@@ -182,17 +181,47 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo) {
             url = input.url;
         }
         else {
-            throw new Error("Invalid input type for fetch");
+            // Unknown input type; defer to the original fetch
+            return originalFetch.apply(this, arguments);
         }
         // Check if URL matches any domain or path pattern
         const shouldSkipHeader = matchUrlWithWildcard(url, combinedIgnoreDomains);
-        if (sessionId && !shouldSkipHeader) {
-            init.headers = {
-                ...init.headers,
-                "X-Sf3-Rid": sessionId,
-            };
+        // Use the original fetch if the domain matches the ignore patterns
+        if (shouldSkipHeader) {
+            // Call the original fetch with the original arguments
+            return originalFetch.apply(this, arguments);
+        }
+        // Only modify the request if we need to add the header
+        if (sessionId) {
+            if (input instanceof Request) {
+                // Clone the original request
+                const clonedRequest = input.clone();
+                // Clone the headers and add the custom header
+                const newHeaders = new Headers(clonedRequest.headers);
+                newHeaders.set("X-Sf3-Rid", sessionId);
+                // Create a new Request with the modified headers
+                const modifiedRequest = new Request(clonedRequest, {
+                    headers: newHeaders,
+                });
+                // Call the original fetch with the modified Request
+                return originalFetch.call(this, modifiedRequest);
+            }
+            else {
+                // Input is a URL string
+                // Clone and modify the init object
+                const modifiedInit = { ...init };
+                // Clone the headers
+                const newHeaders = new Headers(init?.headers || {});
+                newHeaders.set("X-Sf3-Rid", sessionId);
+                modifiedInit.headers = newHeaders;
+                // Call the original fetch with the modified init
+                return originalFetch.call(this, input, modifiedInit);
+            }
+        }
+        else {
+            // No sessionId; call the original fetch
+            return originalFetch.apply(this, arguments);
         }
-        return originalFetch(input, init);
     };
 }
 // Main Recording Function