cryptique-sdk 1.0.5 → 1.0.7

package/lib/cjs/index.js

@@ -207,6 +207,8 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
    */
   // In-memory cache to prevent race conditions in distinct_id generation
   let _cachedDistinctId = null;
+  // Synchronous lock flag to prevent concurrent distinct_id generation
+  let _isGeneratingDistinctId = false;
 
   const StorageManager = {
     /**
@@ -517,7 +519,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
      * All distinct_ids (anonymous and identified) persist in localStorage
      * Uses in-memory cache to prevent race conditions
      * 
-     * @returns {string} Current distinct_id
+     * @returns {string|Promise<string>} Current distinct_id (may be Promise if generation is in progress)
      */
     getDistinctId() {
       try {
@@ -527,6 +529,19 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           return _cachedDistinctId;
         }
         
+        // If generation is in progress, return cached or wait briefly and retry
+        if (_isGeneratingDistinctId) {
+          // Check cache again - it might have been set by the concurrent call
+          if (_cachedDistinctId) {
+            return _cachedDistinctId;
+          }
+          // If still generating, return a temporary value (shouldn't happen in practice)
+          // This prevents infinite loops
+          const tempId = `temp_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
+          console.warn('⚠️ [Storage] Concurrent distinctId generation detected, returning temporary ID');
+          return tempId;
+        }
+        
         // First check localStorage (persists across sessions for both anonymous and identified)
         let distinctId = localStorage.getItem(CONFIG.STORAGE_KEYS.DISTINCT_ID);
         
@@ -548,21 +563,36 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
         }
         
         // No distinct_id found - generate new anonymous one
-        const userId = this.getUserId();
-        distinctId = this.generateAnonymousDistinctId(userId);
-        
-        // Store in both localStorage (persist) and sessionStorage (current session)
-        localStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
-        sessionStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
-        
-        _cachedDistinctId = distinctId; // Cache it
-        return distinctId;
+        // Set lock BEFORE generating to prevent concurrent generation
+        _isGeneratingDistinctId = true;
+        try {
+          // Double-check localStorage after acquiring lock (another call might have stored it)
+          let checkAgain = localStorage.getItem(CONFIG.STORAGE_KEYS.DISTINCT_ID);
+          if (checkAgain) {
+            sessionStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, checkAgain);
+            _cachedDistinctId = checkAgain;
+            return checkAgain;
+          }
+          
+          const userId = this.getUserId();
+          distinctId = this.generateAnonymousDistinctId(userId);
+          
+          // Store in both localStorage (persist) and sessionStorage (current session)
+          localStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
+          sessionStorage.setItem(CONFIG.STORAGE_KEYS.DISTINCT_ID, distinctId);
+          
+          _cachedDistinctId = distinctId; // Cache it
+          return distinctId;
+        } finally {
+          _isGeneratingDistinctId = false;
+        }
       } catch (err) {
         // Fallback: generate temporary distinct_id
         console.warn('Failed to access storage for distinct_id:', err);
         const userId = this.getUserId();
         const fallbackId = this.generateAnonymousDistinctId(userId);
         _cachedDistinctId = fallbackId; // Cache even fallback
+        _isGeneratingDistinctId = false;
         return fallbackId;
       }
     },
@@ -1814,7 +1844,9 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
       if (!sessionData.siteId) sessionData.siteId = currentSiteId;
       if (!sessionData.teamId) sessionData.teamId = null;
       if (!sessionData.userId) sessionData.userId = null;
-      if (!sessionData.distinctId) sessionData.distinctId = StorageManager.getDistinctId();
+      // Always sync distinctId from storage to ensure consistency (like user_id)
+      // This ensures we use distinct_id from past sessions if it exists
+      sessionData.distinctId = StorageManager.getDistinctId();
       
       // Time fields
       if (!sessionData.startTime) sessionData.startTime = nowIso();
@@ -4208,6 +4240,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           sessionDataToSend.sessionId = SessionIdManager.getOrCreate();
         }
 
+        // Always sync distinctId from storage before sending to backend
+        sessionDataToSend.distinctId = StorageManager.getDistinctId();
+
+
         // Transform to backend format
         const transformedData = DataTransformer.toBackendFormat(sessionDataToSend);
 
@@ -5385,6 +5421,9 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
             // Save session to storage
             StorageManager.saveSession(sessionData);
 
+            // Always sync distinctId from storage before logging/sending to ensure consistency
+            sessionData.distinctId = StorageManager.getDistinctId();
+
             // Console log raw session data intermittently
             console.log('📊 [Session] Raw Session Data:', {
               sessionData: sessionData,
@@ -6089,23 +6128,67 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
     /**
      * Reset identity (logout/anonymous)
      * Generates new anonymous distinct_id and clears identified state
+     * Ensures new anonymous identity exists in backend
      * 
      * @returns {Promise<Object>} Result object with new distinct_id
      */
     async reset() {
       try {
+        // Get current session and user data
+        const session = StorageManager.loadSession();
+        if (!session || !session.id) {
+          console.error('❌ [Identity] No active session found');
+          return { success: false, error: 'No active session' };
+        }
+
+        const currentUserId = StorageManager.getUserId();
+        if (!currentUserId) {
+          console.error('❌ [Identity] No user ID found');
+          return { success: false, error: 'No user ID' };
+        }
+
+        const currentSiteId = getCurrentSiteId();
+        if (!currentSiteId) {
+          console.error('❌ [Identity] Site ID not found');
+          return { success: false, error: 'Site ID not found' };
+        }
+
         // Generate new anonymous distinct_id
-        const userId = StorageManager.getUserId();
-        const newDistinctId = StorageManager.generateAnonymousDistinctId(userId);
+        const newDistinctId = StorageManager.generateAnonymousDistinctId(currentUserId);
         
-        // Clear identified distinct_id from localStorage (setDistinctId will handle this)
-        // Update sessionStorage with new anonymous distinct_id
+        // Call backend endpoint to ensure new anonymous identity exists
+        const apiUrl = CONFIG.API.TRACK.replace('/track', '/reset');
+        const response = await fetch(apiUrl, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-Cryptique-Site-Id': currentSiteId
+          },
+          body: JSON.stringify({
+            siteId: currentSiteId,
+            sessionId: session.id,
+            userId: currentUserId,
+            distinctId: newDistinctId
+          })
+        });
+
+        if (!response.ok) {
+          const errorData = await response.text();
+          console.error('❌ [Identity] Reset API error:', {
+            status: response.status,
+            statusText: response.statusText,
+            error: errorData
+          });
+          throw new Error(`Reset API error: ${response.status} ${response.statusText} - ${errorData}`);
+        }
+
+        const result = await response.json();
+
+        // Update local storage after backend confirms
         StorageManager.setDistinctId(newDistinctId);
-        
-        // Clear the cache to ensure fresh distinct_id generation
         StorageManager.clearDistinctIdCache();
         
-        // Update sessionData first
+        // Update sessionData
         if (sessionData) {
           sessionData.distinctId = newDistinctId;
           sessionData.anonymous = true;
@@ -6113,12 +6196,12 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
         }
         
         // Update stored session
-        const session = StorageManager.loadSession();
-        if (session) {
-          session.distinctId = newDistinctId;
-          session.anonymous = true;
-          session.identified = false;
-          StorageManager.saveSession(session);
+        const updatedSession = StorageManager.loadSession();
+        if (updatedSession) {
+          updatedSession.distinctId = newDistinctId;
+          updatedSession.anonymous = true;
+          updatedSession.identified = false;
+          StorageManager.saveSession(updatedSession);
         }
         
         // Clear identify_id from storage (if stored separately)
@@ -6130,7 +6213,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
         }
         
         console.log(`🔄 [Identity] Reset to anonymous: ${newDistinctId}`);
-        
+
         return { success: true, distinctId: newDistinctId };
       } catch (error) {
         console.error('❌ [Identity] Error in reset():', error);
@@ -6658,14 +6741,20 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
+        // #region agent log
+        fetch('http://127.0.0.1:7242/ingest/0a56a3e4-8313-4f9f-bf29-80309bdcd0db',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'sdkcopy.js:6822',message:'PeopleManager.set entry',data:{currentDistinctId,siteId:getCurrentSiteId()},timestamp:Date.now(),sessionId:'debug-session',runId:'post-fix',hypothesisId:'A'})}).catch(()=>{});
+        // #endregion
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
         const apiUrl = CONFIG.API.TRACK.replace('/track', '/people/set');
+        // #region agent log
+        fetch('http://127.0.0.1:7242/ingest/0a56a3e4-8313-4f9f-bf29-80309bdcd0db',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({location:'sdkcopy.js:6837',message:'PeopleManager.set API call',data:{apiUrl,userId:currentDistinctId,siteId:getCurrentSiteId()},timestamp:Date.now(),sessionId:'debug-session',runId:'post-fix',hypothesisId:'A'})}).catch(()=>{});
+        // #endregion
         const response = await fetch(apiUrl, {
           method: 'POST',
           headers: {
@@ -6674,7 +6763,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             properties: properties
           })
         });
@@ -6708,10 +6797,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -6724,7 +6813,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             properties: properties
           })
         });
@@ -6758,10 +6847,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -6774,7 +6863,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             keys: keys
           })
         });
@@ -6814,10 +6903,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -6830,7 +6919,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             key: key,
             amount: amount
           })
@@ -6871,10 +6960,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -6887,7 +6976,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             key: key,
             values: values
           })
@@ -6928,10 +7017,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -6944,7 +7033,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             key: key,
             values: values
           })
@@ -6985,10 +7074,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -7001,7 +7090,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             key: key,
             values: values
           })
@@ -7037,10 +7126,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
 
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -7053,7 +7142,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId,
+            userId: currentDistinctId,
             amount: amount,
             properties: properties
           })
@@ -7082,10 +7171,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
     async clearCharges() {
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -7098,7 +7187,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId
+            userId: currentDistinctId
           })
         });
 
@@ -7125,10 +7214,10 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
     async deleteUser() {
       try {
         const session = StorageManager.loadSession();
-        const currentUserId = StorageManager.getUserId();
+        const currentDistinctId = StorageManager.getDistinctId();
         
-        if (!session || !currentUserId || !SITE_ID) {
-          console.error('❌ [People] No active session or user ID found');
+        if (!session || !currentDistinctId || !SITE_ID) {
+          console.error('❌ [People] No active session or distinct ID found');
           return { success: false, error: 'No active session' };
         }
 
@@ -7141,7 +7230,7 @@ if (window.Cryptique && window.Cryptique.initialized) ; else {
           },
           body: JSON.stringify({
             siteId: getCurrentSiteId(),
-            userId: currentUserId
+            userId: currentDistinctId
           })
         });