@arthurreira/analytics 0.3.0 → 0.5.0

package/dist/client.js

@@ -15,13 +15,31 @@ var BASE_FIELDS = (sessionId, eventType, path) => ({
   page_url: typeof window !== "undefined" ? window.location.href : ""
 });
 async function createSession(apiUrl, apiKey, visitorId) {
+  const sessionData = { visitor_id: visitorId };
+  if (typeof window !== "undefined") {
+    const nav = navigator;
+    sessionData.language = navigator.language || null;
+    sessionData.screen_width = screen.width || null;
+    sessionData.screen_height = screen.height || null;
+    sessionData.viewport_width = window.innerWidth || null;
+    sessionData.viewport_height = window.innerHeight || null;
+    sessionData.referrer = document.referrer || null;
+    sessionData.landing_page = window.location.pathname || null;
+    sessionData.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || null;
+    const params = new URLSearchParams(window.location.search);
+    sessionData.utm_source = params.get("utm_source");
+    sessionData.utm_medium = params.get("utm_medium");
+    sessionData.utm_campaign = params.get("utm_campaign");
+    sessionData.utm_term = params.get("utm_term");
+    sessionData.utm_content = params.get("utm_content");
+  }
   const response = await fetch(`${apiUrl}/sessions`, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${apiKey}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify({ visitor_id: visitorId })
+    body: JSON.stringify(sessionData)
   });
   const data = await response.json();
   return data.id;
@@ -88,6 +106,23 @@ async function trackCTA(apiUrl, apiKey, sessionId, path, ctaId, ctaVariant) {
 }
 
 // src/hooks/useAnalytics.ts
+var SESSION_EXPIRY_MINUTES = 30;
+async function getOrCreateSession(apiUrl, apiKey, visitorId) {
+  const storedSessionId = localStorage.getItem("af_session_id");
+  const lastActivity = localStorage.getItem("af_session_last_activity");
+  const now = Date.now();
+  if (storedSessionId && lastActivity) {
+    const minutesSinceActivity = (now - parseInt(lastActivity)) / 1e3 / 60;
+    if (minutesSinceActivity < SESSION_EXPIRY_MINUTES) {
+      localStorage.setItem("af_session_last_activity", String(now));
+      return storedSessionId;
+    }
+  }
+  const newSessionId = await createSession(apiUrl, apiKey, visitorId);
+  localStorage.setItem("af_session_id", newSessionId);
+  localStorage.setItem("af_session_last_activity", String(now));
+  return newSessionId;
+}
 function useAnalytics(apiUrl, apiKey) {
   const sessionId = useRef(null);
   const pendingEvents = useRef([]);
@@ -96,14 +131,34 @@ function useAnalytics(apiUrl, apiKey) {
     if (typeof window === "undefined") return;
     const visitor_id = localStorage.getItem("af_analytics_visitor_id") || crypto.randomUUID();
     localStorage.setItem("af_analytics_visitor_id", visitor_id);
-    createSession(apiUrl, apiKey, visitor_id).then((id) => {
+    getOrCreateSession(apiUrl, apiKey, visitor_id).then((id) => {
       sessionId.current = id;
       pendingEvents.current.forEach((fn) => fn());
       pendingEvents.current = [];
     });
   }, []);
+  useEffect(() => {
+    if (typeof window === "undefined") return;
+    const sendEnd = () => {
+      if (!sessionId.current) return;
+      navigator.sendBeacon(`${apiUrl}/sessions/${sessionId.current}/end`);
+      localStorage.removeItem("af_session_id");
+      localStorage.removeItem("af_session_last_activity");
+    };
+    const handleVisibility = () => {
+      if (document.visibilityState === "hidden") sendEnd();
+    };
+    const handleUnload = () => sendEnd();
+    document.addEventListener("visibilitychange", handleVisibility);
+    window.addEventListener("beforeunload", handleUnload);
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibility);
+      window.removeEventListener("beforeunload", handleUnload);
+    };
+  }, [apiUrl]);
   function enqueueOrRun(fn) {
     if (sessionId.current) {
+      localStorage.setItem("af_session_last_activity", String(Date.now()));
       fn();
     } else {
       pendingEvents.current.push(fn);

package/dist/index.js

@@ -6,13 +6,31 @@ var BASE_FIELDS = (sessionId, eventType, path) => ({
   page_url: typeof window !== "undefined" ? window.location.href : ""
 });
 async function createSession(apiUrl, apiKey, visitorId) {
+  const sessionData = { visitor_id: visitorId };
+  if (typeof window !== "undefined") {
+    const nav = navigator;
+    sessionData.language = navigator.language || null;
+    sessionData.screen_width = screen.width || null;
+    sessionData.screen_height = screen.height || null;
+    sessionData.viewport_width = window.innerWidth || null;
+    sessionData.viewport_height = window.innerHeight || null;
+    sessionData.referrer = document.referrer || null;
+    sessionData.landing_page = window.location.pathname || null;
+    sessionData.timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || null;
+    const params = new URLSearchParams(window.location.search);
+    sessionData.utm_source = params.get("utm_source");
+    sessionData.utm_medium = params.get("utm_medium");
+    sessionData.utm_campaign = params.get("utm_campaign");
+    sessionData.utm_term = params.get("utm_term");
+    sessionData.utm_content = params.get("utm_content");
+  }
   const response = await fetch(`${apiUrl}/sessions`, {
     method: "POST",
     headers: {
       "Authorization": `Bearer ${apiKey}`,
       "Content-Type": "application/json"
     },
-    body: JSON.stringify({ visitor_id: visitorId })
+    body: JSON.stringify(sessionData)
   });
   const data = await response.json();
   return data.id;

package/package.json

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