@mparticle/web-sdk 2.32.5 → 2.33.1

package/src/mp-instance.ts

@@ -48,6 +48,7 @@ import { IEvents } from './events.interfaces';
 import { IECommerce } from './ecommerce.interfaces';
 import { INativeSdkHelpers } from './nativeSdkHelpers.interfaces';
 import { IPersistence } from './persistence.interfaces';
+import ForegroundTimer from './foregroundTimeTracker';
 
 export interface IErrorLogMessage {
     message?: string;
@@ -84,6 +85,7 @@ export interface IMParticleWebSDKInstance extends MParticleWebSDK {
     _Store: IStore;
     _instanceName: string;
     _preInit: IPreInit;
+    _timeOnSiteTimer: ForegroundTimer; 
 }
 
 const { Messages, HTTPCodes, FeatureFlags } = Constants;

package/src/sdkRuntimeModels.ts

@@ -79,7 +79,9 @@ export interface SDKEvent {
     DataPlan?: SDKDataPlan;
     LaunchReferral?: string;
     ExpandedEventCount: number;
+    ActiveTimeOnSite: number;
 }
+
 export interface SDKGeoLocation {
     lat: number | string;
     lng: number | string;

package/src/sdkToEventsApiConverter.ts

@@ -658,6 +658,7 @@ export function convertBaseEventData(
         custom_attributes: sdkEvent.EventAttributes,
         location: convertSDKLocation(sdkEvent.Location),
         source_message_id: sdkEvent.SourceMessageId,
+        active_time_on_site_ms: sdkEvent.ActiveTimeOnSite
     };
 
     return commonEventData;

package/src/serverModel.ts

@@ -17,7 +17,7 @@ import {
     Dictionary,
     isValidCustomFlagProperty,
 } from './utils';
-import { ServerSettings } from './store';
+import { IntegrationAttributes, ServerSettings } from './store';
 import { MPID } from '@mparticle/web-sdk';
 import {
     IConsentStateV2DTO,
@@ -319,6 +319,7 @@ export default function ServerModel(
             mpInstance._Store.webviewBridgeEnabled
         ) {
             let customFlags: SDKEventCustomFlags = {...event.customFlags};
+            let integrationAttributes: IntegrationAttributes = mpInstance._Store.integrationAttributes;
 
             // https://go.mparticle.com/work/SQDSDKS-5053
             if (mpInstance._Helpers.getFeatureFlag && mpInstance._Helpers.getFeatureFlag(Constants.FeatureFlags.CaptureIntegrationSpecificIds)) {
@@ -328,6 +329,9 @@ export default function ServerModel(
                 mpInstance._IntegrationCapture.capture();
                 const transformedClickIDs = mpInstance._IntegrationCapture.getClickIdsAsCustomFlags();
                 customFlags = {...transformedClickIDs, ...customFlags};
+
+                const transformedIntegrationAttributes = mpInstance._IntegrationCapture.getClickIdsAsIntegrationAttributes();
+                integrationAttributes = {...transformedIntegrationAttributes, ...integrationAttributes};
             }
 
             if (event.hasOwnProperty('toEventAPIObject')) {
@@ -345,6 +349,7 @@ export default function ServerModel(
                         event.data,
                         event.name
                     ),
+                    ActiveTimeOnSite: mpInstance._timeOnSiteTimer?.getTimeInForeground(),
                     SourceMessageId:
                         event.sourceMessageId ||
                         mpInstance._Helpers.generateUniqueId(),
@@ -377,7 +382,7 @@ export default function ServerModel(
                 Package: mpInstance._Store.SDKConfig.package,
                 ClientGeneratedId: mpInstance._Store.clientId,
                 DeviceId: mpInstance._Store.deviceId,
-                IntegrationAttributes: mpInstance._Store.integrationAttributes,
+                IntegrationAttributes: integrationAttributes, 
                 CurrencyCode: mpInstance._Store.currencyCode,
                 DataPlan: mpInstance._Store.SDKConfig.dataPlan
                     ? mpInstance._Store.SDKConfig.dataPlan

package/src/sessionManager.ts

@@ -132,17 +132,20 @@ export default function SessionManager(
             });
 
             mpInstance._Store.nullifySession();
+            mpInstance._timeOnSiteTimer?.resetTimer();
             return;
         }
 
         if (!mpInstance._Helpers.canLog()) {
-            // At this moment, an AbandonedEndSession is defined when on of three things occurs:
+            // At this moment, an AbandonedEndSession is defined when one of three things occurs:
             // - the SDK's store is not enabled because mParticle.setOptOut was called
             // - the devToken is undefined
             // - webviewBridgeEnabled is set to false
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.AbandonEndSession
             );
+            mpInstance._timeOnSiteTimer?.resetTimer();
+
             return;
         }
 
@@ -155,6 +158,8 @@ export default function SessionManager(
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.NoSessionToEnd
             );
+            mpInstance._timeOnSiteTimer?.resetTimer();
+
             return;
         }
 
@@ -180,6 +185,8 @@ export default function SessionManager(
                 mpInstance._Store.nullifySession();
             }
         }
+
+        mpInstance._timeOnSiteTimer?.resetTimer();
     };
 
     this.setSessionTimer = function(): void {

package/src/store.ts

@@ -38,6 +38,7 @@ import {
 } from './persistence.interfaces';
 import { CookieSyncDates, IPixelConfiguration } from './cookieSyncManager';
 import { IMParticleWebSDKInstance } from './mp-instance';
+import ForegroundTimer from './foregroundTimeTracker';
 
 // This represents the runtime configuration of the SDK AFTER
 // initialization has been complete and all settings and
@@ -680,6 +681,7 @@ export default function Store(
 
         if (workspaceToken) {
             this.SDKConfig.workspaceToken = workspaceToken;
+            mpInstance._timeOnSiteTimer = new ForegroundTimer(workspaceToken);
         } else {
             mpInstance.Logger.warning(
                 'You should have a workspaceToken on your config object for security purposes.'

package/src/utils.ts

@@ -292,14 +292,19 @@ interface URLSearchParamsFallback {
 }
 
 const queryStringParserFallback = (url: string): URLSearchParamsFallback => {
-    let params: Dictionary<string> = {};
+    const params: Dictionary<string> = {};
     const queryString = url.split('?')[1] || '';
     const pairs = queryString.split('&');
 
     pairs.forEach(pair => {
-        var [key, value] = pair.split('=');
-        if (key && value) {
-            params[key] = decodeURIComponent(value || '');
+        const [key, ...valueParts] = pair.split('=');
+        const value = valueParts.join('=');
+        if (key && value !== undefined) {
+            try {
+                params[key] = decodeURIComponent(value || '');
+            } catch (e) {
+                console.error(`Failed to decode value for key ${key}: ${e}`);
+            }
         }
     });