@grainql/analytics-web 3.2.2 → 3.4.0

package/dist/index.js

@@ -84,7 +84,7 @@ class GrainAnalytics {
         this.debugAgent = null;
         this.isDebugMode = false;
         this.config = {
-            apiUrl: 'https://api.grainql.com',
+            apiUrl: 'https://clientapis.grainql.com',
             authStrategy: 'NONE',
             batchSize: 50,
             flushInterval: 5000, // 5 seconds
@@ -435,38 +435,34 @@ class GrainAnalytics {
     formatEvent(event) {
         const properties = event.properties || {};
         // Auto-enrich events with session-level attribution properties
-        // This ensures UTM parameters and attribution data are available on ALL events, not just page_view
+        // This ensures UTM parameters and attribution data are available on ALL events
         if (!this.config.disableAutoProperties && typeof window !== 'undefined') {
             const hasConsent = this.consentManager.hasConsent('analytics');
-            // Only enrich if not a system event (they handle their own properties)
+            const sessionUTMs = (0, attribution_1.getSessionUTMParameters)();
+            if (sessionUTMs) {
+                if (sessionUTMs.utm_source)
+                    properties.utm_source = sessionUTMs.utm_source;
+                if (sessionUTMs.utm_medium)
+                    properties.utm_medium = sessionUTMs.utm_medium;
+                if (sessionUTMs.utm_campaign)
+                    properties.utm_campaign = sessionUTMs.utm_campaign;
+                if (sessionUTMs.utm_term)
+                    properties.utm_term = sessionUTMs.utm_term;
+                if (sessionUTMs.utm_content)
+                    properties.utm_content = sessionUTMs.utm_content;
+            }
+            // Get first-touch attribution - ALWAYS include for analytics
+            const firstTouch = (0, attribution_1.getFirstTouchAttribution)(this.config.tenantId);
+            if (firstTouch) {
+                properties.first_touch_source = firstTouch.source;
+                properties.first_touch_medium = firstTouch.medium;
+                properties.first_touch_campaign = firstTouch.campaign;
+                properties.first_touch_referrer_category = firstTouch.referrer_category;
+            }
+            // Add session ID if not already present (only with consent for non-system events)
             const isSystemEvent = event.eventName.startsWith('_grain_');
-            if (!isSystemEvent && hasConsent) {
-                // Get session UTM parameters
-                const sessionUTMs = (0, attribution_1.getSessionUTMParameters)();
-                if (sessionUTMs) {
-                    if (sessionUTMs.utm_source)
-                        properties.utm_source = sessionUTMs.utm_source;
-                    if (sessionUTMs.utm_medium)
-                        properties.utm_medium = sessionUTMs.utm_medium;
-                    if (sessionUTMs.utm_campaign)
-                        properties.utm_campaign = sessionUTMs.utm_campaign;
-                    if (sessionUTMs.utm_term)
-                        properties.utm_term = sessionUTMs.utm_term;
-                    if (sessionUTMs.utm_content)
-                        properties.utm_content = sessionUTMs.utm_content;
-                }
-                // Get first-touch attribution
-                const firstTouch = (0, attribution_1.getFirstTouchAttribution)(this.config.tenantId);
-                if (firstTouch) {
-                    properties.first_touch_source = firstTouch.source;
-                    properties.first_touch_medium = firstTouch.medium;
-                    properties.first_touch_campaign = firstTouch.campaign;
-                    properties.first_touch_referrer_category = firstTouch.referrer_category;
-                }
-                // Add session ID if not already present
-                if (!properties.session_id) {
-                    properties.session_id = this.getSessionId();
-                }
+            if (!isSystemEvent && hasConsent && !properties.session_id) {
+                properties.session_id = this.getSessionId();
             }
         }
         return {
@@ -974,19 +970,21 @@ class GrainAnalytics {
         if (this.isDestroyed)
             return;
         const hasConsent = this.consentManager.hasConsent('analytics');
-        // Create event with appropriate user ID
-        // v2.0: Always use IdManager which returns daily rotating ID or permanent ID based on consent
+        // Use formatEvent to ensure attribution properties are added
+        // This is critical for Mission Control analytics
         const event = {
             eventName,
-            userId: this.getEffectiveUserId(), // IdManager handles daily vs permanent based on consent
-            properties: {
-                ...properties,
-                _minimal: !hasConsent, // Flag to indicate minimal tracking (daily rotating ID)
-                _consent_status: hasConsent ? 'granted' : 'pending',
-            },
+            properties,
+        };
+        const formattedEvent = this.formatEvent(event);
+        // Add consent status flags
+        formattedEvent.properties = {
+            ...formattedEvent.properties,
+            _minimal: !hasConsent, // Flag to indicate minimal tracking (daily rotating ID)
+            _consent_status: hasConsent ? 'granted' : 'pending',
         };
         // Bypass consent check for necessary system events
-        this.eventQueue.push(event);
+        this.eventQueue.push(formattedEvent);
         this.eventCountSinceLastHeartbeat++;
         this.log(`Queued system event: ${eventName}`);
         // Consider flushing

package/dist/index.mjs

@@ -43,7 +43,7 @@ export class GrainAnalytics {
         this.debugAgent = null;
         this.isDebugMode = false;
         this.config = {
-            apiUrl: 'https://api.grainql.com',
+            apiUrl: 'https://clientapis.grainql.com',
             authStrategy: 'NONE',
             batchSize: 50,
             flushInterval: 5000, // 5 seconds
@@ -394,38 +394,34 @@ export class GrainAnalytics {
     formatEvent(event) {
         const properties = event.properties || {};
         // Auto-enrich events with session-level attribution properties
-        // This ensures UTM parameters and attribution data are available on ALL events, not just page_view
+        // This ensures UTM parameters and attribution data are available on ALL events
         if (!this.config.disableAutoProperties && typeof window !== 'undefined') {
             const hasConsent = this.consentManager.hasConsent('analytics');
-            // Only enrich if not a system event (they handle their own properties)
+            const sessionUTMs = getSessionUTMParameters();
+            if (sessionUTMs) {
+                if (sessionUTMs.utm_source)
+                    properties.utm_source = sessionUTMs.utm_source;
+                if (sessionUTMs.utm_medium)
+                    properties.utm_medium = sessionUTMs.utm_medium;
+                if (sessionUTMs.utm_campaign)
+                    properties.utm_campaign = sessionUTMs.utm_campaign;
+                if (sessionUTMs.utm_term)
+                    properties.utm_term = sessionUTMs.utm_term;
+                if (sessionUTMs.utm_content)
+                    properties.utm_content = sessionUTMs.utm_content;
+            }
+            // Get first-touch attribution - ALWAYS include for analytics
+            const firstTouch = getFirstTouchAttribution(this.config.tenantId);
+            if (firstTouch) {
+                properties.first_touch_source = firstTouch.source;
+                properties.first_touch_medium = firstTouch.medium;
+                properties.first_touch_campaign = firstTouch.campaign;
+                properties.first_touch_referrer_category = firstTouch.referrer_category;
+            }
+            // Add session ID if not already present (only with consent for non-system events)
             const isSystemEvent = event.eventName.startsWith('_grain_');
-            if (!isSystemEvent && hasConsent) {
-                // Get session UTM parameters
-                const sessionUTMs = getSessionUTMParameters();
-                if (sessionUTMs) {
-                    if (sessionUTMs.utm_source)
-                        properties.utm_source = sessionUTMs.utm_source;
-                    if (sessionUTMs.utm_medium)
-                        properties.utm_medium = sessionUTMs.utm_medium;
-                    if (sessionUTMs.utm_campaign)
-                        properties.utm_campaign = sessionUTMs.utm_campaign;
-                    if (sessionUTMs.utm_term)
-                        properties.utm_term = sessionUTMs.utm_term;
-                    if (sessionUTMs.utm_content)
-                        properties.utm_content = sessionUTMs.utm_content;
-                }
-                // Get first-touch attribution
-                const firstTouch = getFirstTouchAttribution(this.config.tenantId);
-                if (firstTouch) {
-                    properties.first_touch_source = firstTouch.source;
-                    properties.first_touch_medium = firstTouch.medium;
-                    properties.first_touch_campaign = firstTouch.campaign;
-                    properties.first_touch_referrer_category = firstTouch.referrer_category;
-                }
-                // Add session ID if not already present
-                if (!properties.session_id) {
-                    properties.session_id = this.getSessionId();
-                }
+            if (!isSystemEvent && hasConsent && !properties.session_id) {
+                properties.session_id = this.getSessionId();
             }
         }
         return {
@@ -933,19 +929,21 @@ export class GrainAnalytics {
         if (this.isDestroyed)
             return;
         const hasConsent = this.consentManager.hasConsent('analytics');
-        // Create event with appropriate user ID
-        // v2.0: Always use IdManager which returns daily rotating ID or permanent ID based on consent
+        // Use formatEvent to ensure attribution properties are added
+        // This is critical for Mission Control analytics
         const event = {
             eventName,
-            userId: this.getEffectiveUserId(), // IdManager handles daily vs permanent based on consent
-            properties: {
-                ...properties,
-                _minimal: !hasConsent, // Flag to indicate minimal tracking (daily rotating ID)
-                _consent_status: hasConsent ? 'granted' : 'pending',
-            },
+            properties,
+        };
+        const formattedEvent = this.formatEvent(event);
+        // Add consent status flags
+        formattedEvent.properties = {
+            ...formattedEvent.properties,
+            _minimal: !hasConsent, // Flag to indicate minimal tracking (daily rotating ID)
+            _consent_status: hasConsent ? 'granted' : 'pending',
         };
         // Bypass consent check for necessary system events
-        this.eventQueue.push(event);
+        this.eventQueue.push(formattedEvent);
         this.eventCountSinceLastHeartbeat++;
         this.log(`Queued system event: ${eventName}`);
         // Consider flushing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grainql/analytics-web",
-  "version": "3.2.2",
+  "version": "3.4.0",
   "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",