@armco/analytics 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armco/analytics",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Browser Based Analytics interceptor for configured events",
   "main": "index.js",
   "type": "module",

package/session.d.ts

@@ -1,3 +1,4 @@
 export declare function startSession(): string;
 export declare function getSessionId(): string;
+export declare function extendSession(): void;
 export declare function terminateSession(): void;

package/session.js

@@ -8,44 +8,69 @@ function generateSessionId() {
 }
 export function startSession() {
     const sessionId = generateSessionId();
+    const expirationDate = new Date();
+    let tabId = sessionStorage.getItem('tabId');
+    if (!tabId) {
+        const timestamp = expirationDate.getTime();
+        tabId = `${uuidv4()}-${timestamp}`;
+        sessionStorage.setItem('tabId', tabId);
+    }
+    const cookieName = `${SESSION_COOKIE_NAME}-${tabId}`;
+    refreshSessionId(sessionId, cookieName);
+    return sessionId;
+}
+function refreshSessionId(sessionId, cookieName) {
     const expirationDate = new Date();
     expirationDate.setMinutes(expirationDate.getMinutes() + SESSION_EXPIRATION_TIME);
     try {
-        Cookies.set(SESSION_COOKIE_NAME, sessionId, { expires: expirationDate });
+        Cookies.set(cookieName, sessionId, { expires: expirationDate });
     }
     catch (error) {
-        localStorage.setItem(SESSION_COOKIE_NAME, sessionId);
-        localStorageTimeout = setTimeout(() => localStorage.removeItem(SESSION_COOKIE_NAME), SESSION_EXPIRATION_TIME * 1000);
+        clearTimeout(localStorageTimeout);
+        localStorageTimeout = setTimeout(() => localStorage.removeItem(cookieName), SESSION_EXPIRATION_TIME * 1000);
     }
-    return sessionId;
 }
 export function getSessionId() {
     let sessionId;
-    sessionId = Cookies.get(SESSION_COOKIE_NAME);
+    const tabId = sessionStorage.getItem('tabId');
+    if (!tabId) {
+        return startSession();
+    }
+    const cookieName = `${SESSION_COOKIE_NAME}-${tabId}`;
+    sessionId = Cookies.get(cookieName);
     if (!sessionId) {
-        sessionId = localStorage.getItem(SESSION_COOKIE_NAME);
+        sessionId = localStorage.getItem(cookieName);
     }
     if (!sessionId) {
         return startSession();
     }
+    refreshSessionId(sessionId, cookieName);
+    return sessionId;
+}
+export function extendSession() {
+    const tabId = sessionStorage.getItem('tabId');
+    if (!tabId) {
+        return;
+    }
+    const cookieName = `${SESSION_COOKIE_NAME}-${tabId}`;
+    let sessionId = Cookies.get(cookieName);
+    if (!sessionId) {
+        sessionId = localStorage.getItem(cookieName);
+    }
     if (sessionId) {
-        const expirationDate = new Date();
-        expirationDate.setMinutes(expirationDate.getMinutes() + SESSION_EXPIRATION_TIME);
-        try {
-            Cookies.set(SESSION_COOKIE_NAME, sessionId, { expires: expirationDate });
-        }
-        catch (error) {
-            clearTimeout(localStorageTimeout);
-            localStorageTimeout = setTimeout(() => localStorage.removeItem(SESSION_COOKIE_NAME), SESSION_EXPIRATION_TIME * 1000);
-        }
+        refreshSessionId(sessionId, cookieName);
     }
-    return sessionId;
 }
 export function terminateSession() {
+    const tabId = sessionStorage.getItem('tabId');
+    if (!tabId) {
+        return;
+    }
+    const cookieName = `${SESSION_COOKIE_NAME}-${tabId}`;
     if (typeof window !== 'undefined' && window.Cookies) {
-        Cookies.remove(SESSION_COOKIE_NAME);
+        Cookies.remove(cookieName);
     }
     else {
-        localStorage.removeItem(SESSION_COOKIE_NAME);
+        localStorage.removeItem(cookieName);
     }
 }