@zaplier/sdk 1.0.1 → 1.0.2

package/dist/sdk.js

@@ -6310,8 +6310,8 @@
          */
         async makeRequest(endpoint, data, method = "POST") {
             const url = `${this.config.apiEndpoint}${endpoint}`;
-            // Always use standard fetch to get the response JSON (which contains visitorId)
-            // Use anti-adblock as a parallel fallback method if standard fetch fails
+            // Always try standard fetch first to get the response JSON (which contains visitorId)
+            // Use anti-adblock as fallback if standard fetch is blocked or fails
             const options = {
                 method,
                 headers: {
@@ -6322,7 +6322,12 @@
                 options.body = JSON.stringify(data);
             }
             try {
-                const response = await fetch(url, options);
+                // Add timeout to detect if fetch is blocked/hanging
+                const fetchWithTimeout = Promise.race([
+                    fetch(url, options),
+                    new Promise((_, reject) => setTimeout(() => reject(new Error("Fetch timeout - possibly blocked")), 5000)),
+                ]);
+                const response = await fetchWithTimeout;
                 if (!response.ok) {
                     throw new Error(`HTTP ${response.status}: ${response.statusText}`);
                 }
@@ -6338,23 +6343,30 @@
                 return jsonResponse;
             }
             catch (error) {
-                // If standard fetch fails, try anti-adblock as fallback
+                // If standard fetch fails (blocked, timeout, or network error), try anti-adblock as fallback
                 if (this.antiAdblockManager && method === "POST") {
+                    if (this.config.debug) {
+                        console.warn(`[Zaplier] Standard fetch failed (${error instanceof Error ? error.message : String(error)}), trying anti-adblock fallback`);
+                    }
                     try {
                         const result = await this.antiAdblockManager.send(data, endpoint);
                         if (result.success) {
                             if (this.config.debug) {
                                 console.log(`[Zaplier] Request sent via ${result.method} (${result.latency}ms) as fallback`);
                             }
-                            // Try to get response from a separate request
-                            // Note: This is a limitation - we can't get visitorId from anti-adblock transports
-                            // But at least the event was sent
+                            // Event was successfully sent via anti-adblock fallback
+                            // Note: visitorId will be obtained on the next successful request
+                            // (either standard fetch or anti-adblock) when the backend responds with it
+                            // This is acceptable because:
+                            // 1. The event was successfully tracked
+                            // 2. The visitorId will be available after the next event is sent
+                            // 3. Making an additional GET request here could also be blocked
                             return { success: true, method: result.method };
                         }
                     }
                     catch (antiAdblockError) {
                         if (this.config.debug) {
-                            console.warn("[Zaplier] Both standard fetch and anti-adblock failed");
+                            console.warn("[Zaplier] Both standard fetch and anti-adblock failed:", antiAdblockError);
                         }
                     }
                 }