cryptique-sdk 1.0.2 → 1.0.4

package/lib/umd/index.js

@@ -69,6 +69,7 @@
         SESSION: 'cryptique_session',                    // Primary session storage (sessionStorage)
         SESSION_BACKUP: 'cryptique_session_backup',      // Backup session (localStorage)
         USER_ID: 'mtm_user_id',                          // Persistent user ID (localStorage)
+        DISTINCT_ID: 'cryptique_distinct_id',            // Primary identity (sessionStorage)
         CONSENT: 'mtm_consent',                          // User consent flag (localStorage)
         REFERRER: 'referrer',                            // Stored referrer (localStorage)
         LAST_SESSION: 'cryptique_last_session'           // Last session backup (localStorage)
@@ -118,7 +119,18 @@
 
     // Get Site ID from script tag attribute
     const analyticsScript = document.currentScript || document.querySelector('script[src*="script.js"]') || document.querySelector('script[src*="cryptique"]');
-    const SITE_ID = analyticsScript ? analyticsScript.getAttribute("site-id") : null;
+    let SITE_ID = analyticsScript ? analyticsScript.getAttribute("site-id") : null;
+
+    // Fallback: Check window.Cryptique.siteId or global variable (for npm usage)
+    if (!SITE_ID) {
+      SITE_ID = window.Cryptique?.siteId || window.__CRYPTIQUE_SITE_ID__ || null;
+    }
+
+    // Helper function to get current site ID (checks all sources dynamically)
+    // This allows site ID to be set via init() after SDK loads
+    function getCurrentSiteId() {
+      return SITE_ID || window.Cryptique?.siteId || window.__CRYPTIQUE_SITE_ID__ || null;
+    }
 
     // Parse auto events configuration from script tag attributes
     // Default: auto events disabled, empty disabled paths array
@@ -476,6 +488,71 @@
         }
       },
 
+      /**
+       * Generate anonymous distinct_id (long and unique)
+       * Format: anon_{timestamp}_{userId}_{uuid}_{random}
+       * 
+       * @param {string} userId - User ID to include in distinct_id
+       * @returns {string} Anonymous distinct_id
+       */
+      generateAnonymousDistinctId(userId) {
+        const timestamp = Date.now();
+        const random = Math.random().toString(36).substring(2, 18);
+        const uuid = this.generateUUIDv4();
+        return `anon_${timestamp}_${userId}_${uuid}_${random}`;
+      },
+
+      /**
+       * Generate identified distinct_id
+       * Format: id_{identifyId}
+       * 
+       * @param {string} identifyId - Identify ID (email, username, etc.)
+       * @returns {string} Identified distinct_id
+       */
+      generateIdentifiedDistinctId(identifyId) {
+        return `id_${identifyId}`;
+      },
+
+      /**
+       * Get or create distinct_id
+       * Checks sessionStorage first, then generates new anonymous distinct_id if not found
+       * 
+       * @returns {string} Current distinct_id
+       */
+      getDistinctId() {
+        try {
+          // Check sessionStorage first (primary source)
+          let distinctId = sessionStorage.getItem(CONFIG.STORAGE_KEYS.DISTINCT_ID);
+          
+          if (!distinctId) {
+            // Generate new anonymous distinct_id
+            const userId = this.getUserId();
+            distinctId = this.generateAnonymousDistinctId(userId);
+            sessionStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
+          }
+          
+          return distinctId;
+        } catch (err) {
+          // Fallback: generate temporary distinct_id
+          console.warn('Failed to access sessionStorage for distinct_id:', err);
+          const userId = this.getUserId();
+          return this.generateAnonymousDistinctId(userId);
+        }
+      },
+
+      /**
+       * Set distinct_id in sessionStorage
+       * 
+       * @param {string} distinctId - Distinct ID to set
+       */
+      setDistinctId(distinctId) {
+        try {
+          sessionStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
+        } catch (err) {
+          console.warn('Failed to set distinct_id:', err);
+        }
+      },
+
       /**
        * Get user consent status
        * 
@@ -727,7 +804,7 @@
     let sessionData = {
       // IDs (internal camelCase)
       sessionId: null,        // Will be set by Session ID Management
-      siteId: SITE_ID,
+      siteId: getCurrentSiteId(),
       teamId: null,           // May be set externally or from backend
       userId: null,           // Will be set from StorageManager
       
@@ -1682,7 +1759,9 @@
       initialize() {
         // Ensure all required fields exist (some may already be set)
         if (!sessionData.sessionId) sessionData.sessionId = null;
-        if (!sessionData.siteId) sessionData.siteId = SITE_ID;
+        // Get current SITE_ID (may have been set via init() after SDK loaded)
+        const currentSiteId = SITE_ID || window.Cryptique?.siteId || window.__CRYPTIQUE_SITE_ID__ || null;
+        if (!sessionData.siteId) sessionData.siteId = currentSiteId;
         if (!sessionData.teamId) sessionData.teamId = null;
         if (!sessionData.userId) sessionData.userId = null;
         
@@ -3790,7 +3869,7 @@
         const transformed = {
           // IDs - only session_id (snake_case), no id (PostgreSQL auto-generates it)
           session_id: sourceData.session_id || sourceData.sessionId,
-          site_id: sourceData.site_id || sourceData.siteId || SITE_ID,
+          site_id: sourceData.site_id || sourceData.siteId || getCurrentSiteId() || null,
           team_id: sourceData.team_id || sourceData.teamId || null,
           user_id: sourceData.user_id || sourceData.userId || null,
           
@@ -4110,7 +4189,7 @@
           const country = sessionData.locationData?.country || null;
 
           const utmEventPayload = {
-            siteId: SITE_ID,
+            siteId: getCurrentSiteId(),
             sessionId: sessionData.sessionId,
             userId: sessionData.userId,
             utm_source: utmData.utm_source,
@@ -5727,7 +5806,7 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify(eventData)
           });
@@ -5862,23 +5941,28 @@
             return { success: false, error: 'No user ID' };
           }
 
-          if (!SITE_ID) {
+          const currentSiteId = getCurrentSiteId();
+          if (!currentSiteId) {
             console.error('❌ [Identity] Site ID not found');
             return { success: false, error: 'Site ID not found' };
           }
 
+          // Get current distinct_id
+          const currentDistinctId = StorageManager.getDistinctId();
+
           // Call API endpoint
           const apiUrl = CONFIG.API.TRACK.replace('/track', '/identify');
           const response = await fetch(apiUrl, {
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': currentSiteId
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               sessionId: session.id,
               userId: currentUserId,
+              distinctId: currentDistinctId, // NEW: Pass distinct_id
               identifyId: identifyId.trim()
             })
           });
@@ -5895,20 +5979,31 @@
 
           const result = await response.json();
 
-          // If merge occurred, update localStorage and session data
-          if (result.merged && result.newUserId) {
-            // Update localStorage with new user ID
-            localStorage.setItem(CONFIG.STORAGE_KEYS.USER_ID, result.newUserId);
+          // If merge occurred or distinct_id changed, update sessionStorage and session data
+          if (result.merged && result.newDistinctId) {
+            // Update sessionStorage with new distinct_id
+            StorageManager.setDistinctId(result.newDistinctId);
             
             // Update session data
-            sessionData.userId = result.newUserId;
-            session.userId = result.newUserId;
-            StorageManager.saveSession(session);
+            if (sessionData) {
+              sessionData.distinctId = result.newDistinctId;
+              sessionData.anonymous = false;
+              sessionData.identified = true;
+            }
             
-            // Update userSession
-            userSession.userId = result.newUserId;
+            console.log(`✅ [Identity] Distinct ID merged: ${currentDistinctId} → ${result.newDistinctId}`);
+          } else if (result.distinctId) {
+            // Update to identified distinct_id
+            StorageManager.setDistinctId(result.distinctId);
+            
+            // Update session data
+            if (sessionData) {
+              sessionData.distinctId = result.distinctId;
+              sessionData.anonymous = false;
+              sessionData.identified = true;
+            }
             
-            console.log(`✅ [Identity] User merged: ${currentUserId} → ${result.newUserId}`);
+            console.log(`✅ [Identity] Distinct ID updated: ${currentDistinctId} → ${result.distinctId}`);
           }
 
           return result;
@@ -5918,6 +6013,53 @@
         }
       },
 
+      /**
+       * Reset identity (logout/anonymous)
+       * Generates new anonymous distinct_id and clears identified state
+       * 
+       * @returns {Promise<Object>} Result object with new distinct_id
+       */
+      async reset() {
+        try {
+          // Generate new anonymous distinct_id
+          const userId = StorageManager.getUserId();
+          const newDistinctId = StorageManager.generateAnonymousDistinctId(userId);
+          
+          // Update sessionStorage
+          StorageManager.setDistinctId(newDistinctId);
+          
+          // Update session data
+          const session = StorageManager.loadSession();
+          if (session) {
+            session.distinctId = newDistinctId;
+            session.anonymous = true;
+            session.identified = false;
+            StorageManager.saveSession(session);
+          }
+          
+          // Update sessionData if available
+          if (sessionData) {
+            sessionData.distinctId = newDistinctId;
+            sessionData.anonymous = true;
+            sessionData.identified = false;
+          }
+          
+          // Clear identify_id from storage (if stored separately)
+          try {
+            sessionStorage.removeItem('cryptique_identify_id');
+          } catch (err) {
+            // Ignore errors
+          }
+          
+          console.log(`🔄 [Identity] Reset to anonymous: ${newDistinctId}`);
+          
+          return { success: true, distinctId: newDistinctId };
+        } catch (error) {
+          console.error('❌ [Identity] Error in reset():', error);
+          return { success: false, error: error.message };
+        }
+      },
+
       /**
        * Set wallet address for current user
        * 
@@ -5965,6 +6107,9 @@
 
           console.log(`✅ [Identity] Wallet address set in sessionData: ${trimmedWalletAddress}`);
 
+          // Get current distinct_id
+          const currentDistinctId = StorageManager.getDistinctId();
+
           // Call API endpoint to update user_identity and session in database
           // This handles merging and immediate session update if session exists
           const apiUrl = CONFIG.API.TRACK.replace('/track', '/wallet-address');
@@ -5972,12 +6117,13 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               sessionId: session.id,
               userId: currentUserId,
+              distinctId: currentDistinctId, // NEW: Pass distinct_id
               walletAddress: trimmedWalletAddress
             })
           });
@@ -6446,10 +6592,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               properties: properties
             })
@@ -6496,10 +6642,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               properties: properties
             })
@@ -6546,10 +6692,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               keys: keys
             })
@@ -6602,10 +6748,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               key: key,
               amount: amount
@@ -6659,10 +6805,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               key: key,
               values: values
@@ -6716,10 +6862,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               key: key,
               values: values
@@ -6773,10 +6919,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               key: key,
               values: values
@@ -6825,10 +6971,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId,
               amount: amount,
               properties: properties
@@ -6870,10 +7016,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId
             })
           });
@@ -6913,10 +7059,10 @@
             method: 'POST',
             headers: {
               'Content-Type': 'application/json',
-              'X-Cryptique-Site-Id': SITE_ID
+              'X-Cryptique-Site-Id': getCurrentSiteId()
             },
             body: JSON.stringify({
-              siteId: SITE_ID,
+              siteId: getCurrentSiteId(),
               userId: currentUserId
             })
           });
@@ -6966,6 +7112,7 @@
       // Identity Functions
       identify: IdentityManager.identify.bind(IdentityManager),
       walletAddress: IdentityManager.walletAddress.bind(IdentityManager),
+      reset: IdentityManager.reset.bind(IdentityManager),
       
       // People Functions (Custom Properties)
       people: {
@@ -6987,7 +7134,7 @@
       
       // Session Data Access
       sessionData: sessionData,
-      siteId: SITE_ID,
+      siteId: getCurrentSiteId(),
       getSessionData: function() {
         return sessionData;
       },
@@ -7281,6 +7428,22 @@
       throw new Error('SDK not initialized. Call init() first.');
     },
 
+    /**
+     * Reset user identity to anonymous
+     * 
+     * Generates a new anonymous distinct_id and clears identification.
+     * Useful for privacy/GDPR compliance when user wants to reset their identity.
+     * 
+     * @returns {Promise<Object>} Result object with success status and new distinctId
+     */
+    async reset() {
+      const instance = this.getInstance();
+      if (instance && instance.reset) {
+        return await instance.reset();
+      }
+      throw new Error('SDK not initialized. Call init() first.');
+    },
+
     /**
      * Track a custom event
      * @param {string} eventName - Name of the event

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptique-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "description": "Cryptique Analytics SDK - Comprehensive web analytics and user tracking for modern web applications",
   "main": "lib/cjs/index.js",