@sailfish-ai/recorder 1.2.6 → 1.2.8

package/dist/index.js

@@ -93,6 +93,7 @@ function storeCredentialsAndConnection({ apiKey, backendApi, }) {
 }
 // Utility function to match domains or paths with wildcard support
 export function matchUrlWithWildcard(url, patterns) {
+    console.log(`Calling matchUrlWithWildcard against ${url}`);
     if (!url || typeof url !== "string") {
         throw new Error("Invalid URL input");
     }
@@ -156,9 +157,7 @@ export function matchUrlWithWildcard(url, patterns) {
         return true;
     });
 }
-// Updated XMLHttpRequest interceptor with single check function
-// Updated XMLHttpRequest interceptor to bypass for CORS-sensitive domains
-// Updated XMLHttpRequest interceptor with exclusion handling
+// Updated XMLHttpRequest interceptor with CORS protection
 function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagateHeadersTo = []) {
     const originalOpen = XMLHttpRequest.prototype.open;
     const originalSend = XMLHttpRequest.prototype.send;
@@ -168,29 +167,47 @@ function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo, domainsTo
         ...DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT,
         ...domainsToNotPropagateHeaderTo,
     ];
-    // Store URL during open()
+    // Exclude certain resource types (like images) from being intercepted
+    const resourceExcludeList = ["image", "font", "script"];
+    // Intercept open()
     XMLHttpRequest.prototype.open = function (method, url, ...args) {
+        console.log("Sailfish XMLHttpRequest.prototype.open", method, url);
         this._requestUrl = typeof url === "string" && url.length > 0 ? url : null;
+        // Skip interception for excluded resource types (e.g., images)
+        const resourceType = this.getResponseHeader("content-type");
+        if (resourceType &&
+            resourceExcludeList.some((type) => resourceType.includes(type))) {
+            console.log(`[XML] Skipping resource request for ${url} (type: ${resourceType})`);
+            return originalOpen.apply(this, [method, url, ...args]);
+        }
         return originalOpen.apply(this, [method, url, ...args]);
     };
     // Intercept send()
     XMLHttpRequest.prototype.send = function (...args) {
+        console.log("Sailfish XMLHttpRequest.prototype.send", this._requestUrl);
         const url = this._requestUrl;
         if (!url)
             return originalSend.apply(this, args);
-        // Check if domain should be ignored based on combined ignore list
+        // Skip domain check for certain resources like images or fonts
         if (matchUrlWithWildcard(url, combinedIgnoreDomains)) {
-            console.log([`[XML] [InIgnoreDomains] IGNORE --> ${url}`]);
+            console.log(`[XML] [InIgnoreDomains] IGNORE --> ${url}`);
             return originalSend.apply(this, args);
         }
         // Check if domain should propagate headers
         const shouldPropagateHeader = domainsToPropagateHeadersTo.length === 0 ||
             matchUrlWithWildcard(url, domainsToPropagateHeadersTo);
         if (sessionId && shouldPropagateHeader) {
-            console.log([`[XML] [InPropagateDomans] PROPAGATE FOR --> ${url}`]);
-            this.setRequestHeader("X-Sf3-Rid", sessionId);
+            console.log(`[XML] [InPropagateDomains] PROPAGATE FOR --> ${url}`);
+            try {
+                this.setRequestHeader("X-Sf3-Rid", sessionId);
+            }
+            catch (e) {
+                console.warn(`Could not set X-Sf3-Rid header for ${url}`, e);
+            }
+        }
+        else {
+            console.log(`[XML] [NOT InPropagateDomains] IGNORE --> ${url}`);
         }
-        console.log([`[XML] [NOT InPropagateDomans] IGNORE --> ${url}`]);
         return originalSend.apply(this, args);
     };
 }
@@ -218,6 +235,7 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo, domainsToPropagat
                 url = input.href;
             }
             else {
+                console.log("Unsupported args -->", args);
                 return target.apply(thisArg, args); // Skip unsupported inputs
             }
             // Cache check
@@ -234,16 +252,16 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo, domainsToPropagat
             }
             // Check domain exclusion
             if (matchUrlWithWildcard(url, combinedIgnoreDomains)) {
-                cache.set(url, "ignore");
                 console.log(`[InIgnoreDomains] IGNORE --> ${url}`);
+                cache.set(url, "ignore");
                 return target.apply(thisArg, args);
             }
             // Check domain propagation
             const shouldPropagateHeader = domainsToPropagateHeadersTo.length === 0 ||
                 matchUrlWithWildcard(url, domainsToPropagateHeadersTo);
             if (!shouldPropagateHeader) {
-                cache.set(url, "ignore");
                 console.log(`[NOT InPropagateDomans] IGNORE --> ${url}`);
+                cache.set(url, "ignore");
                 return target.apply(thisArg, args);
             }
             cache.set(url, "propagate");
@@ -262,6 +280,7 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo, domainsToPropagat
                 const modifiedRequest = new Request(clonedRequest, {
                     headers: newHeaders,
                 });
+                console.log(`[modified call] newHeaders --> `, newHeaders);
                 return target.call(thisArg, modifiedRequest, init);
             }
             else {
@@ -270,10 +289,12 @@ function setupFetchInterceptor(domainsToNotPropagateHeadersTo, domainsToPropagat
                 const newHeaders = new Headers(init.headers || {});
                 newHeaders.set("X-Sf3-Rid", sessionId);
                 modifiedInit.headers = newHeaders;
+                console.log(`[modified call] newHeaders --> `, newHeaders);
                 return target.call(thisArg, input, modifiedInit);
             }
         }
         else {
+            console.log("[UNMODIFIED CALL]");
             return target.apply(thisArg, args);
         }
     }