turn comments

Author: rmi22186

src/mp-instance.ts

@@ -67,7 +67,7 @@ export type IntegrationDelays = Dictionary<boolean>;
 // https://go.mparticle.com/work/SQDSDKS-6949
 export interface IMParticleWebSDKInstance extends MParticleWebSDK {
     // Private Properties
-    _timer: ForegroundTimer;
+    _timeOnSiteTimer: ForegroundTimer;
     _APIClient: IAPIClient;
     _Consent: IConsent;
     _CookieSyncManager: ICookieSyncManager;
@@ -151,7 +151,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
         }
     }
     this.init = function(apiKey, config) {
-        self._timer = new ForegroundTimer(apiKey);
+        stimeOnSiteTimer = new ForegroundTimer(apiKey);
         if (!config) {
             console.warn(
                 'You did not pass a config object to init(). mParticle will not initialize properly'

src/serverModel.ts

@@ -345,7 +345,7 @@ export default function ServerModel(
                         event.data,
                         event.name
                     ),
-                    // ActiveTimeOnSite: mpInstance._timer.getTimeInForeground(),
+                    // ActiveTimeOnSite: mpInstance._timeOnSiteTimer.getTimeInForeground(),
                     SourceMessageId:
                         event.sourceMessageId ||
                         mpInstance._Helpers.generateUniqueId(),

src/sessionManager.ts

@@ -132,7 +132,7 @@ export default function SessionManager(
             });
 
             mpInstance._Store.nullifySession();
-            mpInstance._timer.resetTimer();
+            mpInstance._timeOnSiteTimer.resetTimer();
             return;
         }
 
@@ -144,6 +144,8 @@ export default function SessionManager(
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.AbandonEndSession
             );
+            mpInstance._timeOnSiteTimer.resetTimer();
+
             return;
         }
 
@@ -156,6 +158,8 @@ export default function SessionManager(
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.NoSessionToEnd
             );
+            mpInstance._timeOnSiteTimer.resetTimer();
+
             return;
         }
 
@@ -182,7 +186,7 @@ export default function SessionManager(
             }
         }
 
-        mpInstance._timer.resetTimer();
+        mpInstance._timeOnSiteTimer.resetTimer();
 
     };
 

test/jest/foregroundTimeTracker.spec.ts

@@ -6,6 +6,8 @@ describe('ForegroundTimeTracker', () => {
     const mockStorageKey = `mp-time-${apiKey}`;
 
     beforeEach(() => {
+        // Although in Jest, document.hidden should be false by default, we force it to be this way
+        // to ensure the page is in the foreground
         Object.defineProperty(document, 'hidden', { value: false, configurable: true });
         jest.useFakeTimers();
         localStorage.clear();
@@ -16,7 +18,6 @@ describe('ForegroundTimeTracker', () => {
         jest.restoreAllMocks();
     });
 
-    // in Jest, document.hidden by default is false
     it('should initialize with correct localStorage key', () => {
         foregroundTimeTracker = new ForegroundTimeTracker(apiKey);
         expect(foregroundTimeTracker['localStorageName']).toBe(mockStorageKey);