@grainql/analytics-web 1.7.2 → 1.7.4

package/dist/index.js

@@ -71,10 +71,10 @@ class GrainAnalytics {
         });
     }
     /**
-     * Format UUID for anonymous user ID (remove dashes and prefix with 'temp:')
+     * Generate a proper UUIDv4 identifier for anonymous user ID
      */
-    formatAnonymousUserId(uuid) {
-        return `temp:${uuid.replace(/-/g, '')}`;
+    generateAnonymousUserId() {
+        return this.generateUUID();
     }
     /**
      * Initialize persistent anonymous user ID from localStorage or create new one
@@ -90,9 +90,8 @@ class GrainAnalytics {
                 this.log('Loaded persistent anonymous user ID:', this.persistentAnonymousUserId);
             }
             else {
-                // Generate new anonymous user ID
-                const uuid = this.generateUUID();
-                this.persistentAnonymousUserId = this.formatAnonymousUserId(uuid);
+                // Generate new UUIDv4 anonymous user ID
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
                 localStorage.setItem(storageKey, this.persistentAnonymousUserId);
                 this.log('Generated new persistent anonymous user ID:', this.persistentAnonymousUserId);
             }
@@ -100,15 +99,32 @@ class GrainAnalytics {
         catch (error) {
             this.log('Failed to initialize persistent anonymous user ID:', error);
             // Fallback: generate temporary ID without persistence
-            const uuid = this.generateUUID();
-            this.persistentAnonymousUserId = this.formatAnonymousUserId(uuid);
+            this.persistentAnonymousUserId = this.generateAnonymousUserId();
         }
     }
     /**
      * Get the effective user ID (global userId or persistent anonymous ID)
      */
     getEffectiveUserId() {
-        return this.globalUserId || this.persistentAnonymousUserId || 'anonymous';
+        if (this.globalUserId) {
+            return this.globalUserId;
+        }
+        if (this.persistentAnonymousUserId) {
+            return this.persistentAnonymousUserId;
+        }
+        // Generate a new UUIDv4 identifier as fallback
+        this.persistentAnonymousUserId = this.generateAnonymousUserId();
+        // Try to persist it
+        if (typeof window !== 'undefined') {
+            try {
+                const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+            }
+            catch (error) {
+                this.log('Failed to persist generated anonymous user ID:', error);
+            }
+        }
+        return this.persistentAnonymousUserId;
     }
     log(...args) {
         if (this.config.debug) {
@@ -466,10 +482,26 @@ class GrainAnalytics {
     setUserId(userId) {
         this.log(`Set global user ID: ${userId}`);
         this.globalUserId = userId;
-        // Clear persistent anonymous user ID if setting a real user ID
         if (userId) {
+            // Clear persistent anonymous user ID if setting a real user ID
             this.persistentAnonymousUserId = null;
         }
+        else {
+            // If clearing user ID, ensure we have a UUIDv4 identifier
+            if (!this.persistentAnonymousUserId) {
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
+                // Try to persist the new anonymous ID
+                if (typeof window !== 'undefined') {
+                    try {
+                        const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                        localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+                    }
+                    catch (error) {
+                        this.log('Failed to persist new anonymous user ID:', error);
+                    }
+                }
+            }
+        }
     }
     /**
      * Get current global user ID
@@ -483,6 +515,106 @@ class GrainAnalytics {
     getEffectiveUserIdPublic() {
         return this.getEffectiveUserId();
     }
+    /**
+     * Login with auth token or userId on the fly
+     *
+     * @example
+     * // Login with userId only
+     * client.login({ userId: 'user123' });
+     *
+     * // Login with auth token (automatically sets authStrategy to JWT)
+     * client.login({ authToken: 'jwt-token-here' });
+     *
+     * // Login with both userId and auth token
+     * client.login({ userId: 'user123', authToken: 'jwt-token-here' });
+     *
+     * // Override auth strategy
+     * client.login({ userId: 'user123', authStrategy: 'SERVER_SIDE' });
+     */
+    login(options) {
+        try {
+            if (this.isDestroyed) {
+                const error = new Error('Grain Analytics: Client has been destroyed');
+                const formattedError = this.formatError(error, 'login (client destroyed)');
+                this.logError(formattedError);
+                return;
+            }
+            // Set userId if provided
+            if (options.userId) {
+                this.log(`Login: Setting user ID to ${options.userId}`);
+                this.globalUserId = options.userId;
+                // Clear persistent anonymous user ID since we now have a real user ID
+                this.persistentAnonymousUserId = null;
+            }
+            // Handle auth token if provided
+            if (options.authToken) {
+                this.log('Login: Setting auth token');
+                // Update auth strategy to JWT if not already set
+                if (this.config.authStrategy === 'NONE') {
+                    this.config.authStrategy = 'JWT';
+                }
+                // Create a simple auth provider that returns the provided token
+                this.config.authProvider = {
+                    getToken: () => options.authToken
+                };
+            }
+            // Override auth strategy if provided
+            if (options.authStrategy) {
+                this.log(`Login: Setting auth strategy to ${options.authStrategy}`);
+                this.config.authStrategy = options.authStrategy;
+            }
+            this.log(`Login successful. Effective user ID: ${this.getEffectiveUserId()}`);
+        }
+        catch (error) {
+            const formattedError = this.formatError(error, 'login');
+            this.logError(formattedError);
+        }
+    }
+    /**
+     * Logout and clear user session, fall back to UUIDv4 identifier
+     *
+     * @example
+     * // Logout user and return to anonymous mode
+     * client.logout();
+     *
+     * // After logout, events will use the persistent UUIDv4 identifier
+     * client.track('page_view', { page: 'home' });
+     */
+    logout() {
+        try {
+            if (this.isDestroyed) {
+                const error = new Error('Grain Analytics: Client has been destroyed');
+                const formattedError = this.formatError(error, 'logout (client destroyed)');
+                this.logError(formattedError);
+                return;
+            }
+            this.log('Logout: Clearing user session');
+            // Clear global user ID
+            this.globalUserId = null;
+            // Reset auth strategy to NONE
+            this.config.authStrategy = 'NONE';
+            this.config.authProvider = undefined;
+            // Generate new UUIDv4 identifier if we don't have one
+            if (!this.persistentAnonymousUserId) {
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
+                // Try to persist the new anonymous ID
+                if (typeof window !== 'undefined') {
+                    try {
+                        const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                        localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+                    }
+                    catch (error) {
+                        this.log('Failed to persist new anonymous user ID after logout:', error);
+                    }
+                }
+            }
+            this.log(`Logout successful. Effective user ID: ${this.getEffectiveUserId()}`);
+        }
+        catch (error) {
+            const formattedError = this.formatError(error, 'logout');
+            this.logError(formattedError);
+        }
+    }
     /**
      * Set user properties
      */
@@ -952,7 +1084,8 @@ class GrainAnalytics {
             clearInterval(this.configRefreshTimer);
         }
         this.configRefreshTimer = window.setInterval(() => {
-            if (!this.isDestroyed && this.globalUserId) {
+            if (!this.isDestroyed) {
+                // Use effective userId (will be generated if not set)
                 this.fetchConfig().catch((error) => {
                     const formattedError = this.formatError(error, 'auto-config refresh');
                     this.logError(formattedError);
@@ -974,10 +1107,9 @@ class GrainAnalytics {
      */
     async preloadConfig(immediateKeys = [], properties) {
         try {
-            if (!this.globalUserId) {
-                this.log('Cannot preload config: no user ID set');
-                return;
-            }
+            // Use effective userId (will be generated if not set)
+            const effectiveUserId = this.getEffectiveUserId();
+            this.log(`Preloading config for user: ${effectiveUserId}`);
             const response = await this.fetchConfig({ immediateKeys, properties });
             if (response) {
                 this.startConfigRefreshTimer();

package/dist/index.mjs

@@ -67,10 +67,10 @@ export class GrainAnalytics {
         });
     }
     /**
-     * Format UUID for anonymous user ID (remove dashes and prefix with 'temp:')
+     * Generate a proper UUIDv4 identifier for anonymous user ID
      */
-    formatAnonymousUserId(uuid) {
-        return `temp:${uuid.replace(/-/g, '')}`;
+    generateAnonymousUserId() {
+        return this.generateUUID();
     }
     /**
      * Initialize persistent anonymous user ID from localStorage or create new one
@@ -86,9 +86,8 @@ export class GrainAnalytics {
                 this.log('Loaded persistent anonymous user ID:', this.persistentAnonymousUserId);
             }
             else {
-                // Generate new anonymous user ID
-                const uuid = this.generateUUID();
-                this.persistentAnonymousUserId = this.formatAnonymousUserId(uuid);
+                // Generate new UUIDv4 anonymous user ID
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
                 localStorage.setItem(storageKey, this.persistentAnonymousUserId);
                 this.log('Generated new persistent anonymous user ID:', this.persistentAnonymousUserId);
             }
@@ -96,15 +95,32 @@ export class GrainAnalytics {
         catch (error) {
             this.log('Failed to initialize persistent anonymous user ID:', error);
             // Fallback: generate temporary ID without persistence
-            const uuid = this.generateUUID();
-            this.persistentAnonymousUserId = this.formatAnonymousUserId(uuid);
+            this.persistentAnonymousUserId = this.generateAnonymousUserId();
         }
     }
     /**
      * Get the effective user ID (global userId or persistent anonymous ID)
      */
     getEffectiveUserId() {
-        return this.globalUserId || this.persistentAnonymousUserId || 'anonymous';
+        if (this.globalUserId) {
+            return this.globalUserId;
+        }
+        if (this.persistentAnonymousUserId) {
+            return this.persistentAnonymousUserId;
+        }
+        // Generate a new UUIDv4 identifier as fallback
+        this.persistentAnonymousUserId = this.generateAnonymousUserId();
+        // Try to persist it
+        if (typeof window !== 'undefined') {
+            try {
+                const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+            }
+            catch (error) {
+                this.log('Failed to persist generated anonymous user ID:', error);
+            }
+        }
+        return this.persistentAnonymousUserId;
     }
     log(...args) {
         if (this.config.debug) {
@@ -462,10 +478,26 @@ export class GrainAnalytics {
     setUserId(userId) {
         this.log(`Set global user ID: ${userId}`);
         this.globalUserId = userId;
-        // Clear persistent anonymous user ID if setting a real user ID
         if (userId) {
+            // Clear persistent anonymous user ID if setting a real user ID
             this.persistentAnonymousUserId = null;
         }
+        else {
+            // If clearing user ID, ensure we have a UUIDv4 identifier
+            if (!this.persistentAnonymousUserId) {
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
+                // Try to persist the new anonymous ID
+                if (typeof window !== 'undefined') {
+                    try {
+                        const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                        localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+                    }
+                    catch (error) {
+                        this.log('Failed to persist new anonymous user ID:', error);
+                    }
+                }
+            }
+        }
     }
     /**
      * Get current global user ID
@@ -479,6 +511,106 @@ export class GrainAnalytics {
     getEffectiveUserIdPublic() {
         return this.getEffectiveUserId();
     }
+    /**
+     * Login with auth token or userId on the fly
+     *
+     * @example
+     * // Login with userId only
+     * client.login({ userId: 'user123' });
+     *
+     * // Login with auth token (automatically sets authStrategy to JWT)
+     * client.login({ authToken: 'jwt-token-here' });
+     *
+     * // Login with both userId and auth token
+     * client.login({ userId: 'user123', authToken: 'jwt-token-here' });
+     *
+     * // Override auth strategy
+     * client.login({ userId: 'user123', authStrategy: 'SERVER_SIDE' });
+     */
+    login(options) {
+        try {
+            if (this.isDestroyed) {
+                const error = new Error('Grain Analytics: Client has been destroyed');
+                const formattedError = this.formatError(error, 'login (client destroyed)');
+                this.logError(formattedError);
+                return;
+            }
+            // Set userId if provided
+            if (options.userId) {
+                this.log(`Login: Setting user ID to ${options.userId}`);
+                this.globalUserId = options.userId;
+                // Clear persistent anonymous user ID since we now have a real user ID
+                this.persistentAnonymousUserId = null;
+            }
+            // Handle auth token if provided
+            if (options.authToken) {
+                this.log('Login: Setting auth token');
+                // Update auth strategy to JWT if not already set
+                if (this.config.authStrategy === 'NONE') {
+                    this.config.authStrategy = 'JWT';
+                }
+                // Create a simple auth provider that returns the provided token
+                this.config.authProvider = {
+                    getToken: () => options.authToken
+                };
+            }
+            // Override auth strategy if provided
+            if (options.authStrategy) {
+                this.log(`Login: Setting auth strategy to ${options.authStrategy}`);
+                this.config.authStrategy = options.authStrategy;
+            }
+            this.log(`Login successful. Effective user ID: ${this.getEffectiveUserId()}`);
+        }
+        catch (error) {
+            const formattedError = this.formatError(error, 'login');
+            this.logError(formattedError);
+        }
+    }
+    /**
+     * Logout and clear user session, fall back to UUIDv4 identifier
+     *
+     * @example
+     * // Logout user and return to anonymous mode
+     * client.logout();
+     *
+     * // After logout, events will use the persistent UUIDv4 identifier
+     * client.track('page_view', { page: 'home' });
+     */
+    logout() {
+        try {
+            if (this.isDestroyed) {
+                const error = new Error('Grain Analytics: Client has been destroyed');
+                const formattedError = this.formatError(error, 'logout (client destroyed)');
+                this.logError(formattedError);
+                return;
+            }
+            this.log('Logout: Clearing user session');
+            // Clear global user ID
+            this.globalUserId = null;
+            // Reset auth strategy to NONE
+            this.config.authStrategy = 'NONE';
+            this.config.authProvider = undefined;
+            // Generate new UUIDv4 identifier if we don't have one
+            if (!this.persistentAnonymousUserId) {
+                this.persistentAnonymousUserId = this.generateAnonymousUserId();
+                // Try to persist the new anonymous ID
+                if (typeof window !== 'undefined') {
+                    try {
+                        const storageKey = `grain_anonymous_user_id_${this.config.tenantId}`;
+                        localStorage.setItem(storageKey, this.persistentAnonymousUserId);
+                    }
+                    catch (error) {
+                        this.log('Failed to persist new anonymous user ID after logout:', error);
+                    }
+                }
+            }
+            this.log(`Logout successful. Effective user ID: ${this.getEffectiveUserId()}`);
+        }
+        catch (error) {
+            const formattedError = this.formatError(error, 'logout');
+            this.logError(formattedError);
+        }
+    }
     /**
      * Set user properties
      */
@@ -948,7 +1080,8 @@ export class GrainAnalytics {
             clearInterval(this.configRefreshTimer);
         }
         this.configRefreshTimer = window.setInterval(() => {
-            if (!this.isDestroyed && this.globalUserId) {
+            if (!this.isDestroyed) {
+                // Use effective userId (will be generated if not set)
                 this.fetchConfig().catch((error) => {
                     const formattedError = this.formatError(error, 'auto-config refresh');
                     this.logError(formattedError);
@@ -970,10 +1103,9 @@ export class GrainAnalytics {
      */
     async preloadConfig(immediateKeys = [], properties) {
         try {
-            if (!this.globalUserId) {
-                this.log('Cannot preload config: no user ID set');
-                return;
-            }
+            // Use effective userId (will be generated if not set)
+            const effectiveUserId = this.getEffectiveUserId();
+            this.log(`Preloading config for user: ${effectiveUserId}`);
             const response = await this.fetchConfig({ immediateKeys, properties });
             if (response) {
                 this.startConfigRefreshTimer();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grainql/analytics-web",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "Lightweight TypeScript SDK for sending analytics events and managing remote configurations via Grain's REST API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",