@mparticle/web-sdk 2.14.1 → 2.15.1

package/dist/mparticle.js

@@ -719,7 +719,7 @@ var mParticle = (function () {
       TriggerUploadType: TriggerUploadType
     };
 
-    var version = "2.14.1";
+    var version = "2.15.1";
 
     var Constants = {
       sdkVersion: version,
@@ -4448,10 +4448,14 @@ var mParticle = (function () {
         if (mpInstance._Consent.isEnabledForUserConsent(filteringConsentRuleValues, mpInstance.Identity.getCurrentUser())) {
           var img = document.createElement('img');
           mpInstance.Logger.verbose(Messages$2.InformationMessages.CookieSync);
-          img.src = url;
-          cookieSyncDates[moduleId.toString()] = new Date().getTime();
 
-          mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(mpid, cookieSyncDates);
+          img.onload = function () {
+            cookieSyncDates[moduleId.toString()] = new Date().getTime();
+
+            mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(mpid, cookieSyncDates);
+          };
+
+          img.src = url;
         }
       };
     }
@@ -5202,6 +5206,10 @@ var mParticle = (function () {
       this.SDKConfig = createSDKConfig(config); // Set configuration to default settings
 
       if (config) {
+        if (config.deviceId) {
+          this.deviceId = config.deviceId;
+        }
+
         if (config.hasOwnProperty('isDevelopmentMode')) {
           this.SDKConfig.isDevelopmentMode = mpInstance._Helpers.returnConvertedBoolean(config.isDevelopmentMode);
         } else {
@@ -5826,8 +5834,8 @@ var mParticle = (function () {
         for (i = 0, l = cookies.length; i < l; i++) {
           try {
             parts = cookies[i].split('=');
-            name = mpInstance._Helpers.decoded(parts.shift());
-            cookie = mpInstance._Helpers.decoded(parts.join('='));
+            name = parts.shift();
+            cookie = parts.join('=');
           } catch (e) {
             mpInstance.Logger.verbose('Unable to parse cookie: ' + name + '. Skipping.');
           }
@@ -6406,6 +6414,11 @@ var mParticle = (function () {
         return mpInstance._Store.deviceId;
       };
 
+      this.setDeviceId = function (guid) {
+        mpInstance._Store.deviceId = guid;
+        self.update();
+      };
+
       this.resetPersistence = function () {
         removeLocalStorage(StorageNames$1.localStorageName);
         removeLocalStorage(StorageNames$1.localStorageNameV3);
@@ -6655,7 +6668,16 @@ var mParticle = (function () {
       };
 
       this.logCommerceEvent = function (commerceEvent, attrs, options) {
-        mpInstance.Logger.verbose(Messages$6.InformationMessages.StartingLogCommerceEvent);
+        mpInstance.Logger.verbose(Messages$6.InformationMessages.StartingLogCommerceEvent); // If a developer typos the ProductActionType, the event category will be
+        // null, resulting in kit forwarding errors on the server.
+        // The check for `ProductAction` is required to denote that these are
+        // ProductAction events, and not impression or promotions
+
+        if (commerceEvent.ProductAction && commerceEvent.EventCategory === null) {
+          mpInstance.Logger.error('Commerce event not sent.  The mParticle.ProductActionType you passed was invalid. Re-check your code.');
+          return;
+        }
+
         attrs = mpInstance._Helpers.sanitizeAttributes(attrs, commerceEvent.EventName);
 
         if (mpInstance._Helpers.canLog()) {
@@ -7263,9 +7285,10 @@ var mParticle = (function () {
             filterUserIdentities(clonedEvent, mpInstance._Store.activeForwarders[i].userIdentityFilters); // Check user attribute filtering rules
 
             clonedEvent.UserAttributes = mpInstance._Helpers.filterUserAttributes(clonedEvent.UserAttributes, mpInstance._Store.activeForwarders[i].userAttributeFilters);
-            mpInstance.Logger.verbose('Sending message to forwarder: ' + mpInstance._Store.activeForwarders[i].name);
 
             if (mpInstance._Store.activeForwarders[i].process) {
+              mpInstance.Logger.verbose('Sending message to forwarder: ' + mpInstance._Store.activeForwarders[i].name);
+
               var result = mpInstance._Store.activeForwarders[i].process(clonedEvent);
 
               if (result) {
@@ -10221,10 +10244,14 @@ var mParticle = (function () {
 
 
       this.reset = function (instance) {
-        instance._Persistence.resetPersistence();
+        try {
+          instance._Persistence.resetPersistence();
 
-        if (instance._Store) {
-          delete instance._Store;
+          if (instance._Store) {
+            delete instance._Store;
+          }
+        } catch (error) {
+          console.error('Cannot reset mParticle', error);
         }
       };
 
@@ -10260,7 +10287,7 @@ var mParticle = (function () {
 
 
       this.ready = function (f) {
-        if (self._Store.isInitialized && typeof f === 'function') {
+        if (self.isInitialized() && typeof f === 'function') {
           f();
         } else {
           self._preInit.readyQueue.push(f);
@@ -10284,10 +10311,39 @@ var mParticle = (function () {
 
 
       this.setAppVersion = function (version) {
+        var queued = queueIfNotInitialized(function () {
+          self.setAppVersion(version);
+        }, self);
+        if (queued) return;
         self._Store.SDKConfig.appVersion = version;
 
         self._Persistence.update();
       };
+      /**
+       * Sets the device id
+       * @method setDeviceId
+       * @param {String} name device ID (UUIDv4-formatted string)
+       */
+
+
+      this.setDeviceId = function (guid) {
+        var queued = queueIfNotInitialized(function () {
+          self.setDeviceId(guid);
+        }, self);
+        if (queued) return;
+
+        this._Persistence.setDeviceId(guid);
+      };
+      /**
+       * Returns a boolean for whether or not the SDKhas been fully initialized
+       * @method isInitialized
+       * @return {Boolean} a boolean for whether or not the SDK has been fully initialized
+       */
+
+
+      this.isInitialized = function () {
+        return self._Store ? self._Store.isInitialized : false;
+      };
       /**
        * Gets the app name
        * @method getAppName
@@ -10306,6 +10362,10 @@ var mParticle = (function () {
 
 
       this.setAppName = function (name) {
+        var queued = queueIfNotInitialized(function () {
+          self.setAppName(name);
+        }, self);
+        if (queued) return;
         self._Store.SDKConfig.appName = name;
       };
       /**
@@ -10354,6 +10414,11 @@ var mParticle = (function () {
 
 
       this.setPosition = function (lat, lng) {
+        var queued = queueIfNotInitialized(function () {
+          self.setPosition(lat, lng);
+        }, self);
+        if (queued) return;
+
         self._SessionManager.resetSessionTimer();
 
         if (typeof lat === 'number' && typeof lng === 'number') {
@@ -10392,12 +10457,10 @@ var mParticle = (function () {
 
 
       this.logBaseEvent = function (event, eventOptions) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.logBaseEvent(event, eventOptions);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.logBaseEvent(event, eventOptions);
+        }, self);
+        if (queued) return;
 
         self._SessionManager.resetSessionTimer();
 
@@ -10429,12 +10492,10 @@ var mParticle = (function () {
 
 
       this.logEvent = function (eventName, eventType, eventInfo, customFlags, eventOptions) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.logEvent(eventName, eventType, eventInfo, customFlags, eventOptions);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.logEvent(eventName, eventType, eventInfo, customFlags, eventOptions);
+        }, self);
+        if (queued) return;
 
         self._SessionManager.resetSessionTimer();
 
@@ -10475,12 +10536,10 @@ var mParticle = (function () {
 
 
       this.logError = function (error, attrs) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.logError(error, attrs);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.logError(error, attrs);
+        }, self);
+        if (queued) return;
 
         self._SessionManager.resetSessionTimer();
 
@@ -10552,12 +10611,10 @@ var mParticle = (function () {
 
 
       this.logPageView = function (eventName, attrs, customFlags, eventOptions) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.logPageView(eventName, attrs, customFlags, eventOptions);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.logPageView(eventName, attrs, customFlags, eventOptions);
+        }, self);
+        if (queued) return;
 
         self._SessionManager.resetSessionTimer();
 
@@ -10725,12 +10782,10 @@ var mParticle = (function () {
          * @param {String} code The currency code
          */
         setCurrencyCode: function setCurrencyCode(code) {
-          if (!self._Store.isInitialized) {
-            self.ready(function () {
-              self.eCommerce.setCurrencyCode(code);
-            });
-            return;
-          }
+          var queued = queueIfNotInitialized(function () {
+            self.eCommerce.setCurrencyCode(code);
+          }, self);
+          if (queued) return;
 
           if (typeof code !== 'string') {
             self.Logger.error('Code must be a string');
@@ -10837,12 +10892,10 @@ var mParticle = (function () {
          * @param {Object} [eventOptions] For Event-level Configuration Options
          */
         logProductAction: function logProductAction(productActionType, product, attrs, customFlags, transactionAttributes, eventOptions) {
-          if (!self._Store.isInitialized) {
-            self.ready(function () {
-              self.eCommerce.logProductAction(productActionType, product, attrs, customFlags, transactionAttributes, eventOptions);
-            });
-            return;
-          }
+          var queued = queueIfNotInitialized(function () {
+            self.eCommerce.logProductAction(productActionType, product, attrs, customFlags, transactionAttributes, eventOptions);
+          }, self);
+          if (queued) return;
 
           self._SessionManager.resetSessionTimer();
 
@@ -10891,12 +10944,10 @@ var mParticle = (function () {
          * @param {Object} [eventOptions] For Event-level Configuration Options
          */
         logPromotion: function logPromotion(type, promotion, attrs, customFlags, eventOptions) {
-          if (!self._Store.isInitialized) {
-            self.ready(function () {
-              self.eCommerce.logPromotion(type, promotion, attrs, customFlags, eventOptions);
-            });
-            return;
-          }
+          var queued = queueIfNotInitialized(function () {
+            self.eCommerce.logPromotion(type, promotion, attrs, customFlags, eventOptions);
+          }, self);
+          if (queued) return;
 
           self._SessionManager.resetSessionTimer();
 
@@ -10913,12 +10964,10 @@ var mParticle = (function () {
          * @param {Object} [eventOptions] For Event-level Configuration Options
          */
         logImpression: function logImpression(impression, attrs, customFlags, eventOptions) {
-          if (!self._Store.isInitialized) {
-            self.ready(function () {
-              self.eCommerce.logImpression(impression, attrs, customFlags, eventOptions);
-            });
-            return;
-          }
+          var queued = queueIfNotInitialized(function () {
+            self.eCommerce.logImpression(impression, attrs, customFlags, eventOptions);
+          }, self);
+          if (queued) return;
 
           self._SessionManager.resetSessionTimer();
 
@@ -10962,16 +11011,13 @@ var mParticle = (function () {
        */
 
       this.setSessionAttribute = function (key, value) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.setSessionAttribute(key, value);
-          });
-          return;
-        } // Logs to cookie
+        var queued = queueIfNotInitialized(function () {
+          self.setSessionAttribute(key, value);
+        }, self);
+        if (queued) return; // Logs to cookie
         // And logs to in-memory object
         // Example: mParticle.setSessionAttribute('location', '33431');
 
-
         if (self._Helpers.canLog()) {
           if (!self._Helpers.Validators.isValidAttributeValue(value)) {
             self.Logger.error(Messages$9.ErrorMessages.BadAttribute);
@@ -11011,12 +11057,10 @@ var mParticle = (function () {
 
 
       this.setOptOut = function (isOptingOut) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.setOptOut(isOptingOut);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.setOptOut(isOptingOut);
+        }, self);
+        if (queued) return;
 
         self._SessionManager.resetSessionTimer();
 
@@ -11054,12 +11098,10 @@ var mParticle = (function () {
 
 
       this.setIntegrationAttribute = function (integrationId, attrs) {
-        if (!self._Store.isInitialized) {
-          self.ready(function () {
-            self.setIntegrationAttribute(integrationId, attrs);
-          });
-          return;
-        }
+        var queued = queueIfNotInitialized(function () {
+          self.setIntegrationAttribute(integrationId, attrs);
+        }, self);
+        if (queued) return;
 
         if (typeof integrationId !== 'number') {
           self.Logger.error('integrationId must be a number');
@@ -11223,7 +11265,11 @@ var mParticle = (function () {
           mpInstance._ForwardingStatsUploader.startForwardingStatsTimer();
         }
 
-        mpInstance._Forwarders.processForwarders(config, mpInstance._APIClient.prepareForwardingStats); // Call mParticle._Store.SDKConfig.identityCallback when identify was not called due to a reload or a sessionId already existing
+        mpInstance._Forwarders.processForwarders(config, mpInstance._APIClient.prepareForwardingStats);
+
+        mpInstance._SessionManager.initialize();
+
+        mpInstance._Events.logAST(); // Call mParticle._Store.SDKConfig.identityCallback when identify was not called due to a reload or a sessionId already existing
 
 
         if (!mpInstance._Store.identifyCalled && mpInstance._Store.SDKConfig.identityCallback && currentUser && currentUser.getMPID()) {
@@ -11251,10 +11297,6 @@ var mParticle = (function () {
             }
           });
         }
-
-        mpInstance._SessionManager.initialize();
-
-        mpInstance._Events.logAST();
       }
 
       mpInstance._Store.isInitialized = true; // Call any functions that are waiting for the library to be initialized
@@ -11375,6 +11417,17 @@ var mParticle = (function () {
       }
     }
 
+    function queueIfNotInitialized(func, self) {
+      if (!self.isInitialized()) {
+        self.ready(function () {
+          func();
+        });
+        return true;
+      }
+
+      return false;
+    }
+
     var _BatchValidator = /*#__PURE__*/ function () {
         function _BatchValidator() {
             classCallCheck(this, _BatchValidator);
@@ -11508,6 +11561,14 @@ var mParticle = (function () {
         return self.getInstance().getDeviceId();
       };
 
+      this.setDeviceId = function (guid) {
+        return self.getInstance().setDeviceId(guid);
+      };
+
+      this.isInitialized = function () {
+        return self.getInstance().isInitialized();
+      };
+
       this.startNewSession = function () {
         self.getInstance().startNewSession();
       };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mparticle/web-sdk",
-    "version": "2.14.1",
+    "version": "2.15.1",
     "description": "mParticle core SDK for web applications",
     "license": "Apache-2.0",
     "keywords": [

package/src/cookieSyncManager.js

@@ -144,13 +144,14 @@ export default function cookieSyncManager(mpInstance) {
             var img = document.createElement('img');
 
             mpInstance.Logger.verbose(Messages.InformationMessages.CookieSync);
-
+            img.onload = function() {
+                cookieSyncDates[moduleId.toString()] = new Date().getTime();
+                mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(
+                    mpid,
+                    cookieSyncDates
+                );
+            };
             img.src = url;
-            cookieSyncDates[moduleId.toString()] = new Date().getTime();
-            mpInstance._Persistence.saveUserCookieSyncDatesToPersistence(
-                mpid,
-                cookieSyncDates
-            );
         }
     };
 }

package/src/events.js

@@ -319,6 +319,20 @@ export default function Events(mpInstance) {
             Messages.InformationMessages.StartingLogCommerceEvent
         );
 
+        // If a developer typos the ProductActionType, the event category will be
+        // null, resulting in kit forwarding errors on the server.
+        // The check for `ProductAction` is required to denote that these are
+        // ProductAction events, and not impression or promotions
+        if (
+            commerceEvent.ProductAction &&
+            commerceEvent.EventCategory === null
+        ) {
+            mpInstance.Logger.error(
+                'Commerce event not sent.  The mParticle.ProductActionType you passed was invalid. Re-check your code.'
+            );
+            return;
+        }
+
         attrs = mpInstance._Helpers.sanitizeAttributes(
             attrs,
             commerceEvent.EventName

package/src/forwarders.js

@@ -369,12 +369,11 @@ export default function Forwarders(mpInstance, kitBlocker) {
                     mpInstance._Store.activeForwarders[i].userAttributeFilters
                 );
 
-                mpInstance.Logger.verbose(
-                    'Sending message to forwarder: ' +
-                        mpInstance._Store.activeForwarders[i].name
-                );
-
                 if (mpInstance._Store.activeForwarders[i].process) {
+                    mpInstance.Logger.verbose(
+                        'Sending message to forwarder: ' +
+                            mpInstance._Store.activeForwarders[i].name
+                    );
                     var result = mpInstance._Store.activeForwarders[i].process(
                         clonedEvent
                     );