@sailfish-ai/recorder 1.2.0 → 1.2.2

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

@@ -6,6 +6,7 @@ import { fetchCaptureSettings, sendDomainsToNotPropagateHeaderTo, startRecording
 import { initializeRecording } from "./recording";
 // Default list of domains to ignore
 const DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT = [
+    "t.co",
     "identitytoolkit.googleapis.com",
 ];
 const DOMAINS_TO_NOT_RECORD_NETWORK_REQUESTS_TO = [];
@@ -92,7 +93,12 @@ function storeCredentialsAndConnection({ apiKey, backendApi, }) {
 }
 // Utility function to match domains or paths with wildcard support
 export function matchUrlWithWildcard(url, patterns) {
-    const strippedUrl = url.replace(/^[a-zA-Z]+:\/\//, "");
+    if (!url || typeof url !== "string") {
+        throw new Error("Invalid URL input");
+    }
+    // Ensure the URL has a protocol. If not, prepend "http://"
+    const formattedUrl = url.match(/^[a-zA-Z]+:\/\//) ? url : `http://${url}`;
+    const strippedUrl = formattedUrl.replace(/^[a-zA-Z]+:\/\//, "");
     const parsedUrl = new URL("http://" + strippedUrl); // Add a dummy protocol for URL parsing
     const { hostname, pathname, port } = parsedUrl;
     // Handle stripping 'www.' and port
@@ -151,26 +157,49 @@ export function matchUrlWithWildcard(url, patterns) {
     });
 }
 // Updated XMLHttpRequest interceptor with single check function
+// Updated XMLHttpRequest interceptor to bypass for CORS-sensitive domains
 function setupXMLHttpRequestInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagateHeadersTo = []) {
+    const originalOpen = XMLHttpRequest.prototype.open;
     const originalSend = XMLHttpRequest.prototype.send;
     const sessionId = getOrSetSessionId();
+    // Combine default and passed ignore domains
     const combinedIgnoreDomains = [
         ...DOMAINS_TO_NOT_PROPAGATE_HEADER_TO_DEFAULT,
         ...domainsToNotPropagateHeaderTo,
     ];
+    // Store URL during open()
+    XMLHttpRequest.prototype.open = function (method, url, ...args) {
+        // Ensure the URL is a string, otherwise handle gracefully
+        if (typeof url === "string" && url.length > 0) {
+            this._requestUrl = url; // Capture the valid URL
+        }
+        else {
+            console.warn("Invalid or non-string URL passed to XMLHttpRequest:", url);
+            this._requestUrl = null; // Handle invalid or non-string URL
+        }
+        return originalOpen.apply(this, [method, url, ...args]);
+    };
+    // Intercept send()
     XMLHttpRequest.prototype.send = function (...args) {
-        const url = this._url;
-        // Check if URL matches the propagation and exclusion patterns
-        const shouldSkipHeader = matchUrlWithWildcard(url, combinedIgnoreDomains);
+        const url = this._requestUrl;
+        // If no valid URL was captured, proceed without modification
+        if (!url) {
+            return originalSend.apply(this, args);
+        }
+        // Bypass logic for domains listed in the combinedIgnoreDomains
+        if (matchUrlWithWildcard(url, combinedIgnoreDomains)) {
+            return originalSend.apply(this, args);
+        }
+        // Check if the domain should propagate headers
         const shouldPropagateHeader = domainsToPropagateHeadersTo.length === 0 ||
             matchUrlWithWildcard(url, domainsToPropagateHeadersTo);
-        if (sessionId && shouldPropagateHeader && !shouldSkipHeader) {
+        if (sessionId && shouldPropagateHeader) {
             this.setRequestHeader("X-Sf3-Rid", sessionId);
         }
-        originalSend.apply(this, args);
+        return originalSend.apply(this, args);
     };
 }
-// Updated fetch interceptor with single check function
+// Updated fetch interceptor to bypass for CORS-sensitive domains
 function setupFetchInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagateHeadersTo = []) {
     const originalFetch = window.fetch;
     const sessionId = getOrSetSessionId();
@@ -181,22 +210,35 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagate
     ];
     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);
         }
-        // Check if URL matches the propagation and exclusion patterns
-        const shouldSkipHeader = matchUrlWithWildcard(url, combinedIgnoreDomains);
+        // 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 && !shouldSkipHeader) {
+        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);
@@ -206,6 +248,7 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagate
                 return originalFetch.call(this, modifiedRequest);
             }
             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);
@@ -214,12 +257,12 @@ function setupFetchInterceptor(domainsToNotPropagateHeaderTo, domainsToPropagate
             }
         }
         else {
+            // No header propagation required, proceed with original fetch
             return originalFetch.apply(this, arguments);
         }
     };
 }
 // Main Recording Function
-// Main Recording Function
 export async function startRecording({ apiKey, backendApi, domainsToPropagateHeaderTo = [], domainsToNotPropagateHeaderTo = [], }) {
     let sessionId = getOrSetSessionId();
     storeCredentialsAndConnection({ apiKey, backendApi });