group session check

Author: alexanderkirtzel

packages/sources/walkerjs/src/__tests__/session.test.ts

@@ -94,6 +94,7 @@ describe('Session', () => {
     expect(mockDataLayer).toHaveBeenCalledTimes(0);
     elb('walker consent', { marketing: true });
     elb('walker consent', { marketing: true });
+    elb('walker consent', { marketing: true });
 
     expect(mockDataLayer).toHaveBeenCalledTimes(1);
     expect(mockDataLayer).toHaveBeenCalledWith(
@@ -103,6 +104,17 @@ describe('Session', () => {
       }),
     );
 
+    elb('walker run');
+    expect(mockDataLayer).toHaveBeenCalledTimes(2);
+    expect(mockDataLayer).toHaveBeenCalledWith(
+      expect.objectContaining({
+        event: 'session start',
+        data: expect.objectContaining({
+          count: 2,
+        }),
+      }),
+    );
+
     Object.defineProperty(window, 'location', {
       value: originalLocation,
     });

packages/sources/walkerjs/src/lib/session.ts

@@ -26,23 +26,14 @@ export function sessionStart(
   const sessionConfig = assign(instance.config.session || {}, options.config);
   const sessionData = assign(instance.config.sessionStatic, options.data);
 
-  // Track the last processed group to prevent duplicate processing
-  let lastProcessedGroup: string;
-
   // A wrapper for the callback
   const cb: SessionCallback = (session, instance, defaultCb) => {
-    // Skip if we've already processed this group
-    if (instance && instance.group === lastProcessedGroup) return;
-
     let result: void | undefined | WalkerOS.SessionData;
     if (sessionConfig.cb !== false)
       // Run either the default callback or the provided one
       result = (sessionConfig.cb || defaultCb)(session, instance, defaultCb);
 
     if (isSameType(instance, {} as SourceWalkerjs.Instance)) {
-      // Remember this group has been processed
-      lastProcessedGroup = instance.group;
-
       // Assign the session
       instance.session = session;
 

packages/utils/src/web/session/sessionStart.ts

@@ -2,6 +2,7 @@ import type { WalkerOS } from '@elbwalker/types';
 import type { SessionStorageConfig } from './';
 import { sessionStorage, sessionWindow } from './';
 import { elb as elbOrg } from '../elb';
+import { isDefined } from '../../core/is';
 
 export interface SessionConfig extends SessionStorageConfig {
   consent?: string;
@@ -47,7 +48,17 @@ function callFuncAndCb(
 }
 
 function onConsentFn(config: SessionConfig, cb?: SessionCallback | false) {
+  // Track the last processed group to prevent duplicate processing
+  let lastProcessedGroup: string | undefined;
+
   const func = (instance: WalkerOS.Instance, consent: WalkerOS.Consent) => {
+    // Skip if we've already processed this group
+    if (isDefined(lastProcessedGroup) && lastProcessedGroup === instance?.group)
+      return;
+
+    // Remember this group has been processed
+    lastProcessedGroup = instance?.group;
+
     let sessionFn: SessionFunction = () => sessionWindow(config); // Window by default
 
     if (config.consent && consent[config.consent])