@arthurreira/analytics 0.9.0 → 0.11.0

package/dist/client.js

@@ -135,9 +135,19 @@ function connectPresence(apiKey, sessionId, wsUrl = DEFAULT_WS_URL) {
   let attempts = 0;
   let intentionalClose = false;
   let retryTimer = null;
+  let targetUrl;
+  try {
+    const u = new URL(wsUrl);
+    u.searchParams.set("api_key", apiKey);
+    u.searchParams.set("session_id", sessionId);
+    targetUrl = u.toString();
+  } catch {
+    return { disconnect: () => {
+    } };
+  }
   function connect() {
     try {
-      ws = new WebSocket(wsUrl);
+      ws = new WebSocket(targetUrl);
     } catch {
       return;
     }
@@ -191,21 +201,28 @@ function useAnalytics(apiUrl, apiKey, options) {
   const pendingEvents = useRef([]);
   const pathname = useRef(typeof window !== "undefined" ? window?.location?.pathname ?? "" : "");
   const presence = useRef(null);
+  const hasSentEnd = useRef(false);
   useEffect(() => {
     if (typeof window === "undefined") return;
     const visitor_id = localStorage.getItem("af_analytics_visitor_id") || crypto.randomUUID();
     localStorage.setItem("af_analytics_visitor_id", visitor_id);
+    let cancelled = false;
     getOrCreateSession(apiUrl, apiKey, visitor_id).then((id) => {
+      if (cancelled) return;
       sessionId.current = id;
       presence.current = connectPresence(apiKey, id, options?.wsUrl);
       pendingEvents.current.forEach((fn) => fn());
       pendingEvents.current = [];
     });
+    return () => {
+      cancelled = true;
+    };
   }, []);
   useEffect(() => {
     if (typeof window === "undefined") return;
     const sendEnd = () => {
-      if (!sessionId.current) return;
+      if (!sessionId.current || hasSentEnd.current) return;
+      hasSentEnd.current = true;
       presence.current?.disconnect();
       presence.current = null;
       navigator.sendBeacon(`${apiUrl}/sessions/${sessionId.current}/end`);

package/dist/index.d.ts

@@ -7,4 +7,10 @@ declare function trackSearch(apiUrl: string, apiKey: string, sessionId: string,
 declare function trackError(apiUrl: string, apiKey: string, sessionId: string, path: string, error: Error): Promise<void>;
 declare function trackCTA(apiUrl: string, apiKey: string, sessionId: string, path: string, ctaId: string, ctaVariant?: string): Promise<void>;
 
-export { createSession, trackCTA, trackClick, trackCopy, trackError, trackPageview, trackScroll, trackSearch };
+declare const DEFAULT_WS_URL = "wss://edge.arthurreira.dev/realtime";
+interface PresenceConnection {
+    disconnect: () => void;
+}
+declare function connectPresence(apiKey: string, sessionId: string, wsUrl?: string): PresenceConnection;
+
+export { DEFAULT_WS_URL, type PresenceConnection, connectPresence, createSession, trackCTA, trackClick, trackCopy, trackError, trackPageview, trackScroll, trackSearch };

package/dist/index.js

@@ -114,7 +114,63 @@ async function trackCTA(apiUrl, apiKey, sessionId, path, ctaId, ctaVariant) {
     cta_variant: ctaVariant || null
   });
 }
+
+// src/lib/presence.ts
+var DEFAULT_WS_URL = "wss://edge.arthurreira.dev/realtime";
+function connectPresence(apiKey, sessionId, wsUrl = DEFAULT_WS_URL) {
+  if (typeof WebSocket === "undefined") {
+    return { disconnect: () => {
+    } };
+  }
+  let ws = null;
+  let attempts = 0;
+  let intentionalClose = false;
+  let retryTimer = null;
+  let targetUrl;
+  try {
+    const u = new URL(wsUrl);
+    u.searchParams.set("api_key", apiKey);
+    u.searchParams.set("session_id", sessionId);
+    targetUrl = u.toString();
+  } catch {
+    return { disconnect: () => {
+    } };
+  }
+  function connect() {
+    try {
+      ws = new WebSocket(targetUrl);
+    } catch {
+      return;
+    }
+    ws.onopen = () => {
+      attempts = 0;
+      ws.send(JSON.stringify({ type: "join", api_key: apiKey, session_id: sessionId }));
+    };
+    ws.onclose = () => {
+      if (intentionalClose || attempts >= 3) return;
+      const delay = Math.pow(2, attempts) * 1e3;
+      attempts++;
+      retryTimer = setTimeout(connect, delay);
+    };
+  }
+  connect();
+  return {
+    disconnect: () => {
+      intentionalClose = true;
+      if (retryTimer !== null) {
+        clearTimeout(retryTimer);
+        retryTimer = null;
+      }
+      if (ws) {
+        ws.close();
+        ws = null;
+      }
+    }
+  };
+}
 export {
+  DEFAULT_WS_URL,
+  connectPresence,
   createSession,
   trackCTA,
   trackClick,

package/package.json

@@ -1,5 +1,5 @@
   {  "name": "@arthurreira/analytics",
-    "version": "0.9.0",
+    "version": "0.11.0",
     "type": "module",
     "scripts": {
       "build": "tsup",