@mparticle/web-sdk 2.51.0 → 2.53.0

package/src/sessionManager.ts

@@ -33,31 +33,24 @@ export default function SessionManager(
 
     this.initialize = function (): void {
         if (mpInstance._Store.sessionId) {
-            const sessionTimeoutInMilliseconds: number =
-                mpInstance._Store.SDKConfig.sessionTimeout * 60000;
-
-            if (
-                new Date() >
-                new Date(
-                    mpInstance._Store.dateLastEventSent.getTime() +
-                        sessionTimeoutInMilliseconds
-                )
-            ) {
+            const { dateLastEventSent, SDKConfig } = mpInstance._Store;
+            const { sessionTimeout } = SDKConfig;
+                
+            if (hasSessionTimedOut(dateLastEventSent?.getTime(), sessionTimeout)) {
                 self.endSession();
                 self.startNewSession();
             } else {
                 // https://go.mparticle.com/work/SQDSDKS-6045
                 // https://go.mparticle.com/work/SQDSDKS-6323
                 const currentUser = mpInstance.Identity.getCurrentUser();
-                const sdkIdentityRequest =
-                    mpInstance._Store.SDKConfig.identifyRequest;
+                const sdkIdentityRequest = SDKConfig.identifyRequest;
 
                 if (
                     hasIdentityRequestChanged(currentUser, sdkIdentityRequest)
                 ) {
                     mpInstance.Identity.identify(
-                        mpInstance._Store.SDKConfig.identifyRequest,
-                        mpInstance._Store.SDKConfig.identityCallback
+                        sdkIdentityRequest,
+                        SDKConfig.identityCallback
                     );
                     mpInstance._Store.identifyCalled = true;
                     mpInstance._Store.SDKConfig.identityCallback = null;
@@ -134,12 +127,7 @@ export default function SessionManager(
         );
 
         if (override) {
-            mpInstance._Events.logEvent({
-                messageType: Types.MessageType.SessionEnd,
-            });
-
-            mpInstance._Store.nullifySession();
-            mpInstance._timeOnSiteTimer?.resetTimer();
+            performSessionEnd();
             return;
         }
 
@@ -152,13 +140,9 @@ export default function SessionManager(
                 Messages.InformationMessages.AbandonEndSession
             );
             mpInstance._timeOnSiteTimer?.resetTimer();
-
             return;
         }
 
-        let sessionTimeoutInMilliseconds: number;
-        let timeSinceLastEventSent: number;
-
         const cookies: IPersistenceMinified =
             mpInstance._Persistence.getPersistence();
 
@@ -167,7 +151,6 @@ export default function SessionManager(
                 Messages.InformationMessages.NoSessionToEnd
             );
             mpInstance._timeOnSiteTimer?.resetTimer();
-
             return;
         }
 
@@ -177,24 +160,15 @@ export default function SessionManager(
         }
 
         if (cookies?.gs?.les) {
-            sessionTimeoutInMilliseconds =
-                mpInstance._Store.SDKConfig.sessionTimeout * 60000;
-            const newDate: number = new Date().getTime();
-            timeSinceLastEventSent = newDate - cookies.gs.les;
-
-            if (timeSinceLastEventSent < sessionTimeoutInMilliseconds) {
-                self.setSessionTimer();
+            const sessionTimeout = mpInstance._Store.SDKConfig.sessionTimeout;
+            
+            if (hasSessionTimedOut(cookies.gs.les, sessionTimeout)) {
+                performSessionEnd();
             } else {
-                mpInstance._Events.logEvent({
-                    messageType: Types.MessageType.SessionEnd,
-                });
-
-                mpInstance._Store.sessionStartDate = null;
-                mpInstance._Store.nullifySession();
+                self.setSessionTimer();
+                mpInstance._timeOnSiteTimer?.resetTimer();
             }
         }
-
-        mpInstance._timeOnSiteTimer?.resetTimer();
     };
 
     this.setSessionTimer = function (): void {
@@ -234,4 +208,35 @@ export default function SessionManager(
             }
         }
     };
+
+    /**
+     * Checks if the session has expired based on the last event timestamp
+     * @param lastEventTimestamp - Unix timestamp in milliseconds of the last event
+     * @param sessionTimeout - Session timeout in minutes
+     * @returns true if the session has expired, false otherwise
+     */
+    function hasSessionTimedOut(lastEventTimestamp: number, sessionTimeout: number): boolean {
+        if (!lastEventTimestamp || !sessionTimeout || sessionTimeout <= 0) {
+            return false;
+        }
+
+        const sessionTimeoutInMilliseconds: number = sessionTimeout * 60000;
+        const timeSinceLastEvent: number = Date.now() - lastEventTimestamp;
+
+        return timeSinceLastEvent >= sessionTimeoutInMilliseconds;
+    }
+
+    /**
+     * Performs session end operations:
+     * - Logs a SessionEnd event
+     * - Nullifies the session ID and related data
+     * - Resets the time-on-site timer
+     */
+    function performSessionEnd(): void {
+        mpInstance._Events.logEvent({
+            messageType: Types.MessageType.SessionEnd,
+        });
+        mpInstance._Store.nullifySession();
+        mpInstance._timeOnSiteTimer?.resetTimer();
+    }
 }

package/src/store.ts

@@ -683,6 +683,7 @@ export default function Store(
     this.nullifySession = (): void => {
         this.sessionId = null;
         this.dateLastEventSent = null;
+        this.sessionStartDate = null;
         this.sessionAttributes = {};
         this.localSessionAttributes = {};
         mpInstance._Persistence.update();

package/src/stub/mparticle.stub.js

@@ -166,6 +166,7 @@ function createAliasRequest() {
         destinationMpid: 'b',
         startTime: new Date().getTime(),
         endTime: new Date().getTime(),
+        scope: 'device',
     };
 }
 

package/src/utils.ts

@@ -206,18 +206,28 @@ const replaceAmpWithAmpersand = (value: string): string => value.replace(/&/
 const createCookieSyncUrl = (
     mpid: MPID,
     pixelUrl: string,
-    redirectUrl?: string
+    redirectUrl?: string,
+    domain?: string
 ): string => {
     const modifiedPixelUrl = replaceAmpWithAmpersand(pixelUrl);
     const modifiedDirectUrl = redirectUrl
         ? replaceAmpWithAmpersand(redirectUrl)
         : null;
 
-    const url = replaceMPID(modifiedPixelUrl, mpid);
+    let url = replaceMPID(modifiedPixelUrl, mpid);
+    
     const redirect = modifiedDirectUrl
         ? replaceMPID(modifiedDirectUrl, mpid)
         : '';
-    return url + encodeURIComponent(redirect);
+    
+    let fullUrl = url + encodeURIComponent(redirect);
+    
+    if (domain) {
+        const separator = fullUrl.includes('?') ? '&' : '?';
+        fullUrl += `${separator}domain=${domain}`;
+    }
+    
+    return fullUrl;
 };
 
 // FIXME: REFACTOR for V3

package/src/logger.js

@@ -1,61 +0,0 @@
-function Logger(config) {
-    var self = this;
-    var logLevel = config.logLevel || 'warning';
-    if (config.hasOwnProperty('logger')) {
-        this.logger = config.logger;
-    } else {
-        this.logger = new ConsoleLogger();
-    }
-
-    this.verbose = function(msg) {
-        if (logLevel !== 'none') {
-            if (self.logger.verbose && logLevel === 'verbose') {
-                self.logger.verbose(msg);
-            }
-        }
-    };
-
-    this.warning = function(msg) {
-        if (logLevel !== 'none') {
-            if (
-                self.logger.warning &&
-                (logLevel === 'verbose' || logLevel === 'warning')
-            ) {
-                self.logger.warning(msg);
-            }
-        }
-    };
-
-    this.error = function(msg) {
-        if (logLevel !== 'none') {
-            if (self.logger.error) {
-                self.logger.error(msg);
-            }
-        }
-    };
-
-    this.setLogLevel = function(newLogLevel) {
-        logLevel = newLogLevel;
-    };
-}
-
-function ConsoleLogger() {
-    this.verbose = function(msg) {
-        if (console && console.info) {
-            console.info(msg);
-        }
-    };
-
-    this.error = function(msg) {
-        if (console && console.error) {
-            console.error(msg);
-        }
-    };
-    this.warning = function(msg) {
-        if (console && console.warn) {
-            console.warn(msg);
-        }
-    };
-}
-
-export default Logger;