saasco-sdk 0.1.26 → 0.1.27

package/index.cjs.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var uuid = require('@lukeed/uuid');
+var psl = require('psl');
 var zod = require('zod');
 
-var version = "0.1.26";
+var version = "0.1.27";
 
 const timezones = {
   'Asia/Barnaul': 'RU',
@@ -496,12 +497,80 @@ const PREF = 'saasco-sdk';
 const SESSION_DURATION = 1000 * 60 * 30;
 const USER_DURATION = 1000 * 60 * 60 * 24 * 365;
 const data = {};
+function getRootDomain() {
+  if (isServer) return;
+  const hostname = window.location.hostname;
+  if (!psl.isValid(hostname)) {
+    // If not a valid domain, don't set domain (for localhost, IP addresses, etc.)
+    return undefined;
+  }
+  const parsed = psl.parse(hostname);
+  if ('domain' in parsed && parsed.domain) {
+    return parsed.domain;
+  }
+  return undefined;
+}
+function setCookie(name, value, ttl) {
+  if (isServer) return;
+  const expires = new Date(Date.now() + ttl).toUTCString();
+  const domain = getRootDomain();
+  const cookieString = `${name}=${encodeURIComponent(value)}; expires=${expires}; path=/${domain ? `; domain=.${domain}` : ''}`;
+  document.cookie = cookieString;
+}
+function getCookie(name) {
+  if (isServer) return null;
+  const nameEQ = name + '=';
+  const ca = document.cookie.split(';');
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i];
+    while (c.charAt(0) === ' ') c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) === 0) {
+      return decodeURIComponent(c.substring(nameEQ.length, c.length));
+    }
+  }
+  return null;
+}
+function deleteCookie(name) {
+  if (isServer) return;
+  const domain = getRootDomain();
+  const cookieString = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/${domain ? `; domain=.${domain}` : ''}`;
+  document.cookie = cookieString;
+}
+function migrateFromLocalStorage() {
+  if (isServer) return;
+  const keysToMigrate = [`${PREF}-session-id`, `${PREF}-anonymous-id`, `${PREF}-user-id`, `${PREF}-session-utm-context`];
+  keysToMigrate.forEach(key => {
+    try {
+      const value = localStorage.getItem(key);
+      if (value) {
+        // Parse the stored data to get the original TTL
+        const item = JSON.parse(value);
+        const now = new Date().getTime();
+        // Check if the data is still valid
+        if (item.expiry > now) {
+          // Calculate remaining TTL
+          const remainingTtl = item.expiry - now;
+          // Store in cookie with remaining TTL
+          setCookie(key, value, remainingTtl);
+          // Remove from localStorage after successful migration
+          localStorage.removeItem(key);
+        } else {
+          // Data has expired, just remove it
+          localStorage.removeItem(key);
+        }
+      }
+    } catch (error) {
+      // If there's an error parsing the data, remove the corrupted item
+      localStorage.removeItem(key);
+    }
+  });
+}
 function storeData(key, value, ttl) {
-  const item = {
-    value,
-    expiry: new Date().getTime() + ttl
-  };
   if (isServer) {
+    const item = {
+      value,
+      expiry: new Date().getTime() + ttl
+    };
     if (value === undefined) {
       delete data[key];
       return;
@@ -510,8 +579,11 @@ function storeData(key, value, ttl) {
     return;
   }
   const fullKey = `${PREF}-${key}`;
-  if (value === undefined) return window.localStorage.removeItem(fullKey);
-  localStorage.setItem(fullKey, JSON.stringify(item));
+  if (value === undefined) {
+    deleteCookie(fullKey);
+    return;
+  }
+  setCookie(fullKey, JSON.stringify(value), ttl);
 }
 function retrieveData(key) {
   if (isServer) {
@@ -524,17 +596,17 @@ function retrieveData(key) {
     return item.value;
   }
   const fullKey = `${PREF}-${key}`;
-  const itemStr = localStorage.getItem(fullKey);
+  const itemStr = getCookie(fullKey);
   if (!itemStr) {
     return null;
   }
-  const item = JSON.parse(itemStr);
-  const now = new Date();
-  if (now.getTime() > item.expiry) {
-    localStorage.removeItem(fullKey);
+  try {
+    return JSON.parse(itemStr);
+  } catch (error) {
+    // If JSON parsing fails, remove the corrupted cookie
+    deleteCookie(fullKey);
     return null;
   }
-  return item.value;
 }
 function getSessionId() {
   return retrieveData(`session-id`);
@@ -620,6 +692,8 @@ class Saasco {
     if (isBrowser) {
       window.saasco = this;
     }
+    // Migrate existing localStorage data to cookies for cross-subdomain support
+    migrateFromLocalStorage();
     this.log('Saasco initialized', this.config);
     if (this.config.debug) this.log('Debug mode active. This will log all events to the console.');
     if (!this.config.enabled) this.log('Analytics is disabled. No requests will be sent to the server.');

package/index.esm.js

@@ -1,8 +1,9 @@
 import { __awaiter } from 'tslib';
 import { v4 } from '@lukeed/uuid';
+import { isValid, parse } from 'psl';
 import { z } from 'zod';
 
-var version = "0.1.26";
+var version = "0.1.27";
 
 const timezones = {
   'Asia/Barnaul': 'RU',
@@ -492,12 +493,80 @@ const PREF = 'saasco-sdk';
 const SESSION_DURATION = 1000 * 60 * 30;
 const USER_DURATION = 1000 * 60 * 60 * 24 * 365;
 const data = {};
+function getRootDomain() {
+  if (isServer) return;
+  const hostname = window.location.hostname;
+  if (!isValid(hostname)) {
+    // If not a valid domain, don't set domain (for localhost, IP addresses, etc.)
+    return undefined;
+  }
+  const parsed = parse(hostname);
+  if ('domain' in parsed && parsed.domain) {
+    return parsed.domain;
+  }
+  return undefined;
+}
+function setCookie(name, value, ttl) {
+  if (isServer) return;
+  const expires = new Date(Date.now() + ttl).toUTCString();
+  const domain = getRootDomain();
+  const cookieString = `${name}=${encodeURIComponent(value)}; expires=${expires}; path=/${domain ? `; domain=.${domain}` : ''}`;
+  document.cookie = cookieString;
+}
+function getCookie(name) {
+  if (isServer) return null;
+  const nameEQ = name + '=';
+  const ca = document.cookie.split(';');
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i];
+    while (c.charAt(0) === ' ') c = c.substring(1, c.length);
+    if (c.indexOf(nameEQ) === 0) {
+      return decodeURIComponent(c.substring(nameEQ.length, c.length));
+    }
+  }
+  return null;
+}
+function deleteCookie(name) {
+  if (isServer) return;
+  const domain = getRootDomain();
+  const cookieString = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/${domain ? `; domain=.${domain}` : ''}`;
+  document.cookie = cookieString;
+}
+function migrateFromLocalStorage() {
+  if (isServer) return;
+  const keysToMigrate = [`${PREF}-session-id`, `${PREF}-anonymous-id`, `${PREF}-user-id`, `${PREF}-session-utm-context`];
+  keysToMigrate.forEach(key => {
+    try {
+      const value = localStorage.getItem(key);
+      if (value) {
+        // Parse the stored data to get the original TTL
+        const item = JSON.parse(value);
+        const now = new Date().getTime();
+        // Check if the data is still valid
+        if (item.expiry > now) {
+          // Calculate remaining TTL
+          const remainingTtl = item.expiry - now;
+          // Store in cookie with remaining TTL
+          setCookie(key, value, remainingTtl);
+          // Remove from localStorage after successful migration
+          localStorage.removeItem(key);
+        } else {
+          // Data has expired, just remove it
+          localStorage.removeItem(key);
+        }
+      }
+    } catch (error) {
+      // If there's an error parsing the data, remove the corrupted item
+      localStorage.removeItem(key);
+    }
+  });
+}
 function storeData(key, value, ttl) {
-  const item = {
-    value,
-    expiry: new Date().getTime() + ttl
-  };
   if (isServer) {
+    const item = {
+      value,
+      expiry: new Date().getTime() + ttl
+    };
     if (value === undefined) {
       delete data[key];
       return;
@@ -506,8 +575,11 @@ function storeData(key, value, ttl) {
     return;
   }
   const fullKey = `${PREF}-${key}`;
-  if (value === undefined) return window.localStorage.removeItem(fullKey);
-  localStorage.setItem(fullKey, JSON.stringify(item));
+  if (value === undefined) {
+    deleteCookie(fullKey);
+    return;
+  }
+  setCookie(fullKey, JSON.stringify(value), ttl);
 }
 function retrieveData(key) {
   if (isServer) {
@@ -520,17 +592,17 @@ function retrieveData(key) {
     return item.value;
   }
   const fullKey = `${PREF}-${key}`;
-  const itemStr = localStorage.getItem(fullKey);
+  const itemStr = getCookie(fullKey);
   if (!itemStr) {
     return null;
   }
-  const item = JSON.parse(itemStr);
-  const now = new Date();
-  if (now.getTime() > item.expiry) {
-    localStorage.removeItem(fullKey);
+  try {
+    return JSON.parse(itemStr);
+  } catch (error) {
+    // If JSON parsing fails, remove the corrupted cookie
+    deleteCookie(fullKey);
     return null;
   }
-  return item.value;
 }
 function getSessionId() {
   return retrieveData(`session-id`);
@@ -616,6 +688,8 @@ class Saasco {
     if (isBrowser) {
       window.saasco = this;
     }
+    // Migrate existing localStorage data to cookies for cross-subdomain support
+    migrateFromLocalStorage();
     this.log('Saasco initialized', this.config);
     if (this.config.debug) this.log('Debug mode active. This will log all events to the console.');
     if (!this.config.enabled) this.log('Analytics is disabled. No requests will be sent to the server.');

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "saasco-sdk",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "dependencies": {
     "tslib": "^2.3.0",
     "@lukeed/uuid": "^2.0.1",
-    "zod": "^3.22.4"
+    "zod": "^3.22.4",
+    "psl": "^1.9.0"
   },
   "main": "./index.cjs.js",
   "typings": "./src/index.d.ts",