@zaplier/sdk 1.0.0 → 1.0.2

package/dist/index.cjs

@@ -4834,7 +4834,7 @@ class ResourceSpoofTransport {
 class WebRTCTransport {
     constructor() {
         this.name = 'webrtc';
-        this.available = typeof RTCPeerConnection !== 'undefined';
+        this.available = typeof globalThis.RTCPeerConnection !== 'undefined';
         this.connected = false;
     }
     async send(data, endpoint) {
@@ -4873,7 +4873,7 @@ class WebRTCTransport {
             return;
         return new Promise((resolve, reject) => {
             try {
-                this.pc = new RTCPeerConnection({
+                this.pc = new globalThis.RTCPeerConnection({
                     iceServers: [{ urls: 'stun:stun.l.google.com:19302' }]
                 });
                 this.dataChannel = this.pc.createDataChannel('tracking', {
@@ -6307,30 +6307,9 @@ class ZaplierSDK {
      * Make HTTP request to backend using anti-adblock system
      */
     async makeRequest(endpoint, data, method = "POST") {
-        // Use anti-adblock manager if available
-        if (this.antiAdblockManager && method === "POST") {
-            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)`);
-                    }
-                    // Return success response for compatibility
-                    return { success: true, method: result.method };
-                }
-                else {
-                    throw new Error(`Anti-adblock failed: ${result.error}`);
-                }
-            }
-            catch (error) {
-                if (this.config.debug) {
-                    console.warn("[Zaplier] Anti-adblock failed, falling back to standard fetch");
-                }
-                // Fall through to standard fetch
-            }
-        }
-        // Fallback to standard fetch
         const url = `${this.config.apiEndpoint}${endpoint}`;
+        // 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: {
@@ -6340,11 +6319,58 @@ class ZaplierSDK {
         if (method === "POST" && data) {
             options.body = JSON.stringify(data);
         }
-        const response = await fetch(url, options);
-        if (!response.ok) {
-            throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+        try {
+            // 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}`);
+            }
+            const jsonResponse = await response.json();
+            // If anti-adblock is enabled, also send via anti-adblock as a backup
+            // (but don't wait for it or use its response)
+            if (this.antiAdblockManager && method === "POST") {
+                // Send in parallel without blocking
+                this.antiAdblockManager.send(data, endpoint).catch(() => {
+                    // Silently fail - we already got the response from standard fetch
+                });
+            }
+            return jsonResponse;
+        }
+        catch (error) {
+            // 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`);
+                        }
+                        // 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:", antiAdblockError);
+                    }
+                }
+            }
+            // Re-throw original error if all methods failed
+            throw error;
         }
-        return response.json();
     }
     /**
      * Process queued events