mixpanel-browser 2.46.0 → 2.48.0

package/src/mixpanel-persistence.js

@@ -72,6 +72,9 @@ var MixpanelPersistence = function(config) {
 
 MixpanelPersistence.prototype.properties = function() {
     var p = {};
+
+    this.load();
+
     // Filter out reserved properties
     _.each(this['props'], function(v, k) {
         if (!_.include(RESERVED_PROPERTIES, k)) {
@@ -148,6 +151,7 @@ MixpanelPersistence.prototype.upgrade = function(config) {
 
 MixpanelPersistence.prototype.save = function() {
     if (this.disabled) { return; }
+
     this.storage.set(
         this.name,
         _.JSONEncode(this['props']),
@@ -159,6 +163,11 @@ MixpanelPersistence.prototype.save = function() {
     );
 };
 
+MixpanelPersistence.prototype.load_prop = function(key) {
+    this.load();
+    return this['props'][key];
+};
+
 MixpanelPersistence.prototype.remove = function() {
     // remove both domain and subdomain cookies
     this.storage.remove(this.name, false, this.cookie_domain);
@@ -182,6 +191,8 @@ MixpanelPersistence.prototype.register_once = function(props, default_value, day
         if (typeof(default_value) === 'undefined') { default_value = 'None'; }
         this.expire_days = (typeof(days) === 'undefined') ? this.default_expiry : days;
 
+        this.load();
+
         _.each(props, function(val, prop) {
             if (!this['props'].hasOwnProperty(prop) || this['props'][prop] === default_value) {
                 this['props'][prop] = val;
@@ -203,8 +214,8 @@ MixpanelPersistence.prototype.register = function(props, days) {
     if (_.isObject(props)) {
         this.expire_days = (typeof(days) === 'undefined') ? this.default_expiry : days;
 
+        this.load();
         _.extend(this['props'], props);
-
         this.save();
 
         return true;
@@ -213,19 +224,13 @@ MixpanelPersistence.prototype.register = function(props, days) {
 };
 
 MixpanelPersistence.prototype.unregister = function(prop) {
+    this.load();
     if (prop in this['props']) {
         delete this['props'][prop];
         this.save();
     }
 };
 
-MixpanelPersistence.prototype.update_campaign_params = function() {
-    if (!this.campaign_params_saved) {
-        this.register_once(_.info.campaignParams());
-        this.campaign_params_saved = true;
-    }
-};
-
 MixpanelPersistence.prototype.update_search_keyword = function(referrer) {
     this.register(_.info.searchInfo(referrer));
 };
@@ -246,19 +251,6 @@ MixpanelPersistence.prototype.get_referrer_info = function() {
     });
 };
 
-// safely fills the passed in object with stored properties,
-// does not override any properties defined in both
-// returns the passed in object
-MixpanelPersistence.prototype.safe_merge = function(props) {
-    _.each(this['props'], function(val, prop) {
-        if (!(prop in props)) {
-            props[prop] = val;
-        }
-    });
-
-    return props;
-};
-
 MixpanelPersistence.prototype.update_config = function(config) {
     this.default_expiry = this.expire_days = config['cookie_expiration'];
     this.set_disabled(config['disable_persistence']);
@@ -402,7 +394,7 @@ MixpanelPersistence.prototype._add_to_people_queue = function(queue, data) {
 };
 
 MixpanelPersistence.prototype._pop_from_people_queue = function(queue, data) {
-    var q = this._get_queue(queue);
+    var q = this['props'][this._get_queue_key(queue)];
     if (!_.isUndefined(q)) {
         _.each(data, function(v, k) {
             if (queue === APPEND_ACTION || queue === REMOVE_ACTION) {
@@ -418,11 +410,13 @@ MixpanelPersistence.prototype._pop_from_people_queue = function(queue, data) {
                 delete q[k];
             }
         }, this);
-
-        this.save();
     }
 };
 
+MixpanelPersistence.prototype.load_queue = function(queue) {
+    return this.load_prop(this._get_queue_key(queue));
+};
+
 MixpanelPersistence.prototype._get_queue_key = function(queue) {
     if (queue === SET_ACTION) {
         return SET_QUEUE_KEY;
@@ -443,25 +437,21 @@ MixpanelPersistence.prototype._get_queue_key = function(queue) {
     }
 };
 
-MixpanelPersistence.prototype._get_queue = function(queue) {
-    return this['props'][this._get_queue_key(queue)];
-};
 MixpanelPersistence.prototype._get_or_create_queue = function(queue, default_val) {
     var key = this._get_queue_key(queue);
     default_val = _.isUndefined(default_val) ? {} : default_val;
-
     return this['props'][key] || (this['props'][key] = default_val);
 };
 
 MixpanelPersistence.prototype.set_event_timer = function(event_name, timestamp) {
-    var timers = this['props'][EVENT_TIMERS_KEY] || {};
+    var timers = this.load_prop(EVENT_TIMERS_KEY) || {};
     timers[event_name] = timestamp;
     this['props'][EVENT_TIMERS_KEY] = timers;
     this.save();
 };
 
 MixpanelPersistence.prototype.remove_event_timer = function(event_name) {
-    var timers = this['props'][EVENT_TIMERS_KEY] || {};
+    var timers = this.load_prop(EVENT_TIMERS_KEY) || {};
     var timestamp = timers[event_name];
     if (!_.isUndefined(timestamp)) {
         delete this['props'][EVENT_TIMERS_KEY][event_name];

package/src/utils.js

@@ -830,20 +830,24 @@ _.utf8Encode = function(string) {
 
 _.UUID = (function() {
 
-    // Time/ticks information
-    // 1*new Date() is a cross browser version of Date.now()
+    // Time-based entropy
     var T = function() {
-        var d = 1 * new Date(),
-            i = 0;
-
-        // this while loop figures how many browser ticks go by
-        // before 1*new Date() returns a new number, ie the amount
-        // of ticks that go by per millisecond
-        while (d == 1 * new Date()) {
-            i++;
+        var time = 1 * new Date(); // cross-browser version of Date.now()
+        var ticks;
+        if (win.performance && win.performance.now) {
+            ticks = win.performance.now();
+        } else {
+            // fall back to busy loop
+            ticks = 0;
+
+            // this while loop figures how many browser ticks go by
+            // before 1*new Date() returns a new number, ie the amount
+            // of ticks that go by per millisecond
+            while (time == 1 * new Date()) {
+                ticks++;
+            }
         }
-
-        return d.toString(16) + i.toString(16);
+        return time.toString(16) + Math.floor(ticks).toString(16);
     };
 
     // Math.Random entropy
@@ -898,6 +902,7 @@ var BLOCKED_UA_STRS = [
     'baiduspider',
     'bingbot',
     'bingpreview',
+    'chrome-lighthouse',
     'facebookexternal',
     'petalbot',
     'pinterest',
@@ -1410,21 +1415,42 @@ _.dom_query = (function() {
     };
 })();
 
+var CAMPAIGN_KEYWORDS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term'];
+var CLICK_IDS = ['dclid', 'fbclid', 'gclid', 'ko_click_id', 'li_fat_id', 'msclkid', 'ttclid', 'twclid', 'wbraid'];
+
 _.info = {
-    campaignParams: function() {
-        var campaign_keywords = 'utm_source utm_medium utm_campaign utm_content utm_term'.split(' '),
-            kw = '',
+    campaignParams: function(default_value) {
+        var kw = '',
             params = {};
-        _.each(campaign_keywords, function(kwkey) {
+        _.each(CAMPAIGN_KEYWORDS, function(kwkey) {
             kw = _.getQueryParam(document.URL, kwkey);
             if (kw.length) {
                 params[kwkey] = kw;
+            } else if (default_value !== undefined) {
+                params[kwkey] = default_value;
             }
         });
 
         return params;
     },
 
+    clickParams: function() {
+        var id = '',
+            params = {};
+        _.each(CLICK_IDS, function(idkey) {
+            id = _.getQueryParam(document.URL, idkey);
+            if (id.length) {
+                params[idkey] = id;
+            }
+        });
+
+        return params;
+    },
+
+    marketingParams: function() {
+        return _.extend(_.info.campaignParams(), _.info.clickParams());
+    },
+
     searchEngine: function(referrer) {
         if (referrer.search('https?://(.*)google.([^/?]*)') === 0) {
             return 'google';
@@ -1621,12 +1647,13 @@ _.info = {
         });
     },
 
-    pageviewInfo: function(page) {
+    mpPageViewProperties: function() {
         return _.strip_empty_properties({
-            'mp_page': page,
-            'mp_referrer': document.referrer,
-            'mp_browser': _.info.browser(userAgent, navigator.vendor, windowOpera),
-            'mp_platform': _.info.os()
+            'current_page_title': document.title,
+            'current_domain': win.location.hostname,
+            'current_url_path': win.location.pathname,
+            'current_url_protocol': win.location.protocol,
+            'current_url_search': win.location.search
         });
     }
 };