@mparticle/web-sdk 2.43.0 → 2.43.2

package/src/identity.js

@@ -33,8 +33,14 @@ export default function Identity(mpInstance) {
                 Messages.InformationMessages.StartingLogEvent + ': ' + method
             );
 
-            var identityValidationResult = mpInstance._Helpers.Validators.validateIdentities(
+            // First, remove any falsy identity values and warn about them
+            const cleanedIdentityApiData = mpInstance._Helpers.Validators.removeFalsyIdentityValues(
                 identityApiData,
+                mpInstance.Logger
+            );
+
+            var identityValidationResult = mpInstance._Helpers.Validators.validateIdentities(
+                cleanedIdentityApiData,
                 method
             );
 
@@ -64,6 +70,7 @@ export default function Identity(mpInstance) {
 
             return {
                 valid: true,
+                cleanedIdentities: cleanedIdentityApiData,
             };
         },
 
@@ -237,7 +244,7 @@ export default function Identity(mpInstance) {
 
             if (preProcessResult.valid) {
                 var identityApiRequest = mpInstance._Identity.IdentityRequest.createIdentityRequest(
-                    identityApiData,
+                    preProcessResult.cleanedIdentities,
                     Constants.platform,
                     Constants.sdkVendor,
                     Constants.sdkVersion,
@@ -332,7 +339,7 @@ export default function Identity(mpInstance) {
             if (preProcessResult.valid) {
                 var evt,
                     identityApiRequest = mpInstance._Identity.IdentityRequest.createIdentityRequest(
-                        identityApiData,
+                        preProcessResult.cleanedIdentities,
                         Constants.platform,
                         Constants.sdkVendor,
                         Constants.sdkVersion,
@@ -422,7 +429,7 @@ export default function Identity(mpInstance) {
 
             if (preProcessResult.valid) {
                 var identityApiRequest = mpInstance._Identity.IdentityRequest.createIdentityRequest(
-                    identityApiData,
+                    preProcessResult.cleanedIdentities,
                     Constants.platform,
                     Constants.sdkVendor,
                     Constants.sdkVersion,
@@ -514,11 +521,11 @@ export default function Identity(mpInstance) {
             if (currentUser) {
                 mpid = currentUser.getMPID();
             }
-            var newUserIdentities =
-                identityApiData && identityApiData.userIdentities
-                    ? identityApiData.userIdentities
-                    : {};
             if (preProcessResult.valid) {
+                var newUserIdentities =
+                    identityApiData && identityApiData.userIdentities
+                        ? preProcessResult.cleanedIdentities.userIdentities
+                        : {};
                 var identityApiRequest = mpInstance._Identity.IdentityRequest.createModifyIdentityRequest(
                     currentUser
                         ? currentUser.getUserIdentities().userIdentities

package/src/roktManager.ts

@@ -2,7 +2,7 @@ import { IKitConfigs } from "./configAPIClient";
 import { UserAttributeFilters  } from "./forwarders.interfaces";
 import { IMParticleUser } from "./identity-user-interfaces";
 import KitFilterHelper from "./kitFilterHelper";
-import { Dictionary, parseSettingsString } from "./utils";
+import { Dictionary, parseSettingsString, generateUniqueId, isFunction } from "./utils";
 import { SDKIdentityApi } from "./identity.interfaces";
 import { SDKLoggerApi } from "./sdkRuntimeModels";
 
@@ -34,8 +34,11 @@ export interface IRoktLauncher {
 }
 
 export interface IRoktMessage {
+    messageId: string;
     methodName: string;
     payload: any;
+    resolve?: Function;
+    reject?: Function;
 }
 
 export interface RoktKitFilterSettings {
@@ -76,7 +79,7 @@ export default class RoktManager {
     public kit: IRoktKit = null;
     public filters: RoktKitFilterSettings = {};
     private currentUser: IMParticleUser | null = null;
-    private messageQueue: IRoktMessage[] = [];
+    private messageQueue: Map<string, IRoktMessage> = new Map();
     private sandbox: boolean | null = null;
     private placementAttributesMapping: Dictionary<string>[] = [];
     private identityService: SDKIdentityApi;
@@ -156,11 +159,7 @@ export default class RoktManager {
      */
     public async selectPlacements(options: IRoktSelectPlacementsOptions): Promise<IRoktSelection> {
         if (!this.isReady()) {
-            this.queueMessage({
-                methodName: 'selectPlacements',
-                payload: options,
-            });
-            return Promise.resolve({} as IRoktSelection);
+            return this.deferredCall<IRoktSelection>('selectPlacements', options);
         }
 
         try {
@@ -216,13 +215,9 @@ export default class RoktManager {
         }
     }
 
-    public hashAttributes(attributes: IRoktPartnerAttributes): Promise<Record<string, string>> {
+    public hashAttributes(attributes: IRoktPartnerAttributes): Promise<IRoktPartnerAttributes> {
         if (!this.isReady()) {
-            this.queueMessage({
-                methodName: 'hashAttributes',
-                payload: attributes,
-            });
-            return Promise.resolve({} as Record<string, string>);
+            return this.deferredCall<IRoktPartnerAttributes>('hashAttributes', attributes);
         }
 
         try {
@@ -234,10 +229,7 @@ export default class RoktManager {
 
     public setExtensionData<T>(extensionData: IRoktPartnerExtensionData<T>): void {
         if (!this.isReady()) {
-            this.queueMessage({
-                methodName: 'setExtensionData',
-                payload: extensionData,
-            });
+            this.deferredCall<void>('setExtensionData', extensionData);
             return;
         }
 
@@ -288,17 +280,62 @@ export default class RoktManager {
     }
 
     private processMessageQueue(): void {
-        if (this.messageQueue.length > 0 && this.isReady()) {
-            this.messageQueue.forEach(async (message) => {
-                if (this.kit && message.methodName in this.kit) {
-                    await (this.kit[message.methodName] as Function)(message.payload);
-                }
-            });
-            this.messageQueue = [];
+        if (!this.isReady() || this.messageQueue.size === 0) {
+            return;
         }
+
+        this.logger?.verbose(`RoktManager: Processing ${this.messageQueue.size} queued messages`);
+
+        this.messageQueue.forEach((message) => {
+            if(!(message.methodName in this.kit) || !isFunction(this.kit[message.methodName])) {
+                this.logger?.error(`RoktManager: Method ${message.methodName} not found in kit`);
+                return;
+            }
+
+            this.logger?.verbose(`RoktManager: Processing queued message: ${message.methodName} with payload: ${JSON.stringify(message.payload)}`);
+
+            try {
+                const result = (this.kit[message.methodName] as Function)(message.payload);
+                this.completePendingPromise(message.messageId, result);
+            } catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                this.logger?.error(`RoktManager: Error processing message '${message.methodName}': ${errorMessage}`);
+                this.completePendingPromise(message.messageId, Promise.reject(error));
+            }
+        });
     }
 
     private queueMessage(message: IRoktMessage): void {
-        this.messageQueue.push(message);
+        this.messageQueue.set(message.messageId, message);
+    }
+
+    private deferredCall<T>(methodName: string, payload: any): Promise<T> {
+        return new Promise<T>((resolve, reject) => {
+            const messageId = `${methodName}_${generateUniqueId()}`;
+            
+            this.queueMessage({
+                messageId,
+                methodName,
+                payload,
+                resolve,
+                reject,
+            });
+        });
+    }
+
+    private completePendingPromise(messageId: string | undefined, resultOrError: any): void {
+        if (!messageId || !this.messageQueue.has(messageId)) {
+            return;
+        }
+
+        const message = this.messageQueue.get(messageId)!;
+        
+        if (message.resolve) {
+            Promise.resolve(resultOrError)
+                .then((result) => message.resolve!(result))
+                .catch((error) => message.reject!(error));
+        }
+        
+        this.messageQueue.delete(messageId);
     }
 }

package/src/sessionManager.ts

@@ -5,6 +5,7 @@ import Types from './types';
 import { generateDeprecationMessage } from './utils';
 import { IMParticleUser } from './identity-user-interfaces';
 import { IMParticleWebSDKInstance } from './mp-instance';
+import { hasIdentityRequestChanged } from './identity-utils';
 
 const { Messages } = Constants;
 
@@ -30,7 +31,7 @@ export default function SessionManager(
 ) {
     const self = this;
 
-    this.initialize = function(): void {
+    this.initialize = function (): void {
         if (mpInstance._Store.sessionId) {
             const sessionTimeoutInMilliseconds: number =
                 mpInstance._Store.SDKConfig.sessionTimeout * 60000;
@@ -46,9 +47,14 @@ export default function SessionManager(
                 self.startNewSession();
             } else {
                 // https://go.mparticle.com/work/SQDSDKS-6045
-                const persistence: IPersistenceMinified = mpInstance._Persistence.getPersistence();
-                if (persistence && !persistence.cu) {
-                    // https://go.mparticle.com/work/SQDSDKS-6323
+                // https://go.mparticle.com/work/SQDSDKS-6323
+                const currentUser = mpInstance.Identity.getCurrentUser();
+                const sdkIdentityRequest =
+                    mpInstance._Store.SDKConfig.identifyRequest;
+
+                if (
+                    hasIdentityRequestChanged(currentUser, sdkIdentityRequest)
+                ) {
                     mpInstance.Identity.identify(
                         mpInstance._Store.SDKConfig.identifyRequest,
                         mpInstance._Store.SDKConfig.identityCallback
@@ -62,7 +68,7 @@ export default function SessionManager(
         }
     };
 
-    this.getSession = function(): string {
+    this.getSession = function (): string {
         mpInstance.Logger.warning(
             generateDeprecationMessage(
                 'SessionManager.getSession()',
@@ -73,11 +79,11 @@ export default function SessionManager(
         return this.getSessionId();
     };
 
-    this.getSessionId = function(): string {
+    this.getSessionId = function (): string {
         return mpInstance._Store.sessionId;
     };
 
-    this.startNewSession = function(): void {
+    this.startNewSession = function (): void {
         mpInstance.Logger.verbose(
             Messages.InformationMessages.StartingNewSession
         );
@@ -87,7 +93,8 @@ export default function SessionManager(
                 .generateUniqueId()
                 .toUpperCase();
 
-            const currentUser: IMParticleUser = mpInstance.Identity.getCurrentUser();
+            const currentUser: IMParticleUser =
+                mpInstance.Identity.getCurrentUser();
             const mpid: MPID = currentUser ? currentUser.getMPID() : null;
 
             if (mpid) {
@@ -121,7 +128,7 @@ export default function SessionManager(
         }
     };
 
-    this.endSession = function(override: boolean): void {
+    this.endSession = function (override: boolean): void {
         mpInstance.Logger.verbose(
             Messages.InformationMessages.StartingEndSession
         );
@@ -152,9 +159,10 @@ export default function SessionManager(
         let sessionTimeoutInMilliseconds: number;
         let timeSinceLastEventSent: number;
 
-        const cookies: IPersistenceMinified = mpInstance._Persistence.getPersistence();
+        const cookies: IPersistenceMinified =
+            mpInstance._Persistence.getPersistence();
 
-        if (!cookies || cookies.gs && !cookies.gs.sid) {
+        if (!cookies || (cookies.gs && !cookies.gs.sid)) {
             mpInstance.Logger.verbose(
                 Messages.InformationMessages.NoSessionToEnd
             );
@@ -189,16 +197,16 @@ export default function SessionManager(
         mpInstance._timeOnSiteTimer?.resetTimer();
     };
 
-    this.setSessionTimer = function(): void {
+    this.setSessionTimer = function (): void {
         const sessionTimeoutInMilliseconds: number =
             mpInstance._Store.SDKConfig.sessionTimeout * 60000;
 
-        mpInstance._Store.globalTimer = window.setTimeout(function() {
+        mpInstance._Store.globalTimer = window.setTimeout(function () {
             self.endSession();
         }, sessionTimeoutInMilliseconds);
     };
 
-    this.resetSessionTimer = function(): void {
+    this.resetSessionTimer = function (): void {
         if (!mpInstance._Store.webviewBridgeEnabled) {
             if (!mpInstance._Store.sessionId) {
                 self.startNewSession();
@@ -209,7 +217,7 @@ export default function SessionManager(
         self.startNewSessionIfNeeded();
     };
 
-    this.clearSessionTimeout = function(): void {
+    this.clearSessionTimeout = function (): void {
         clearTimeout(mpInstance._Store.globalTimer);
     };
 

package/src/validators.ts

@@ -40,7 +40,37 @@ const Validators = {
         );
     },
 
-    validateIdentities: function(
+    removeFalsyIdentityValues: function (
+        identityApiData: IdentityApiData,
+        logger: any
+    ): IdentityApiData {
+        if (!identityApiData || !identityApiData.userIdentities) {
+            return identityApiData;
+        }
+
+        const cleanedData = {} as IdentityApiData;
+        const cleanedUserIdentities = { ...identityApiData.userIdentities };
+
+        for (const identityType in identityApiData.userIdentities) {
+            if (identityApiData.userIdentities.hasOwnProperty(identityType)) {
+                const value = identityApiData.userIdentities[identityType];
+
+                // Check if value is falsy (undefined, false, 0, '', etc.) but not null
+                if (value !== null && !value) {
+                    logger.warning(
+                        `Identity value for '${identityType}' is falsy (${value}). This value will be removed from the request.`
+                    );
+                    delete cleanedUserIdentities[identityType];
+                }
+            }
+        }
+
+        cleanedData.userIdentities = cleanedUserIdentities;
+
+        return cleanedData;
+    },
+
+    validateIdentities: function (
         identityApiData: IdentityApiData,
         method?: IdentityAPIMethod
     ): ValidationIdentitiesReturn {