mixpanel-browser 2.61.2 → 2.62.0

package/dist/mixpanel.module.js

@@ -5,6 +5,7 @@ if (typeof(window) === 'undefined') {
         hostname: ''
     };
     win = {
+        crypto: {randomUUID: function() {throw Error('unsupported');}},
         navigator: { userAgent: '', onLine: true },
         document: {
             createElement: function() { return {}; },
@@ -4891,7 +4892,7 @@ var IncrementalSource = /* @__PURE__ */ ((IncrementalSource2) => {
 
 var Config = {
     DEBUG: false,
-    LIB_VERSION: '2.61.2'
+    LIB_VERSION: '2.62.0'
 };
 
 /* eslint camelcase: "off", eqeqeq: "off" */
@@ -5732,71 +5733,27 @@ _.utf8Encode = function(string) {
     return utftext;
 };
 
-_.UUID = (function() {
-
-    // Time-based entropy
-    var T = function() {
-        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 time.toString(16) + Math.floor(ticks).toString(16);
-    };
-
-    // Math.Random entropy
-    var R = function() {
-        return Math.random().toString(16).replace('.', '');
-    };
-
-    // User agent entropy
-    // This function takes the user agent string, and then xors
-    // together each sequence of 8 bytes.  This produces a final
-    // sequence of 8 bytes which it returns as hex.
-    var UA = function() {
-        var ua = userAgent,
-            i, ch, buffer = [],
-            ret = 0;
-
-        function xor(result, byte_array) {
-            var j, tmp = 0;
-            for (j = 0; j < byte_array.length; j++) {
-                tmp |= (buffer[j] << j * 8);
-            }
-            return result ^ tmp;
-        }
-
-        for (i = 0; i < ua.length; i++) {
-            ch = ua.charCodeAt(i);
-            buffer.unshift(ch & 0xFF);
-            if (buffer.length >= 4) {
-                ret = xor(ret, buffer);
-                buffer = [];
-            }
-        }
-
-        if (buffer.length > 0) {
-            ret = xor(ret, buffer);
+_.UUID = function() {
+    try {
+        // use native Crypto API when available
+        return win['crypto']['randomUUID']();
+    } catch (err) {
+        // fall back to generating our own UUID
+        // based on https://gist.github.com/scwood/3bff42cc005cc20ab7ec98f0d8e1d59d
+        var uuid = new Array(36);
+        for (var i = 0; i < 36; i++) {
+            uuid[i] = Math.floor(Math.random() * 16);
         }
+        uuid[14] = 4; // set bits 12-15 of time-high-and-version to 0100
+        uuid[19] = uuid[19] &= ~(1 << 2); // set bit 6 of clock-seq-and-reserved to zero
+        uuid[19] = uuid[19] |= (1 << 3); // set bit 7 of clock-seq-and-reserved to one
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
 
-        return ret.toString(16);
-    };
-
-    return function() {
-        var se = (screen.height * screen.width).toString(16);
-        return (T() + '-' + R() + '-' + UA() + '-' + se + '-' + T());
-    };
-})();
+        return _.map(uuid, function(x) {
+            return x.toString(16);
+        }).join('');
+    }
+};
 
 // _.isBlockedUA()
 // This is to block various web spiders from executing our JS and
@@ -8172,6 +8129,7 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
         this.idleTimeoutId = setTimeout(this._onIdleTimeout, idleTimeoutMs);
         this.idleExpires = new Date().getTime() + idleTimeoutMs;
     }.bind(this);
+    resetIdleTimeout();
 
     var blockSelector = this.getConfig('record_block_selector');
     if (blockSelector === '' || blockSelector === null) {
@@ -8181,6 +8139,10 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
     try {
         this._stopRecording = this._rrwebRecord({
             'emit': function (ev) {
+                if (this.idleExpires && this.idleExpires < ev.timestamp) {
+                    this._onIdleTimeout();
+                    return;
+                }
                 if (isUserEvent(ev)) {
                     if (this.batcher.stopped && new Date().getTime() - this.replayStartTime >= this.recordMinMs) {
                         // start flushing again after user activity
@@ -8217,8 +8179,6 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
         return;
     }
 
-    resetIdleTimeout();
-
     var maxTimeoutMs = this.maxExpires - new Date().getTime();
     this.maxTimeoutId = setTimeout(this._onMaxLengthReached.bind(this), maxTimeoutMs);
 };
@@ -8397,7 +8357,7 @@ SessionRecording.prototype._flushEvents = addOptOutCheckMixpanelLib(function (da
             'replay_start_url': this.replayStartUrl,
             'seq': this.seqNo
         };
-        var eventsJson = _.JSONEncode(data);
+        var eventsJson = JSON.stringify(data);
 
         // send ID management props if they exist
         var deviceId = this._mixpanel.get_property('$device_id');
@@ -10531,7 +10491,7 @@ MixpanelPersistence.prototype.save = function() {
 
     this.storage.set(
         this.name,
-        _.JSONEncode(this['props']),
+        JSONStringify(this['props']),
         this.expire_days,
         this.cross_subdomain,
         this.secure,
@@ -11752,7 +11712,7 @@ MixpanelLib.prototype.disable = function(events) {
 };
 
 MixpanelLib.prototype._encode_data_for_request = function(data) {
-    var encoded_data = _.JSONEncode(data);
+    var encoded_data = JSONStringify(data);
     if (this.get_config('api_payload_format') === PAYLOAD_TYPE_BASE64) {
         encoded_data = _.base64Encode(encoded_data);
     }

package/dist/mixpanel.umd.js

@@ -11,6 +11,7 @@
             hostname: ''
         };
         win = {
+            crypto: {randomUUID: function() {throw Error('unsupported');}},
             navigator: { userAgent: '', onLine: true },
             document: {
                 createElement: function() { return {}; },
@@ -4897,7 +4898,7 @@
 
     var Config = {
         DEBUG: false,
-        LIB_VERSION: '2.61.2'
+        LIB_VERSION: '2.62.0'
     };
 
     /* eslint camelcase: "off", eqeqeq: "off" */
@@ -5738,71 +5739,27 @@
         return utftext;
     };
 
-    _.UUID = (function() {
-
-        // Time-based entropy
-        var T = function() {
-            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 time.toString(16) + Math.floor(ticks).toString(16);
-        };
-
-        // Math.Random entropy
-        var R = function() {
-            return Math.random().toString(16).replace('.', '');
-        };
-
-        // User agent entropy
-        // This function takes the user agent string, and then xors
-        // together each sequence of 8 bytes.  This produces a final
-        // sequence of 8 bytes which it returns as hex.
-        var UA = function() {
-            var ua = userAgent,
-                i, ch, buffer = [],
-                ret = 0;
-
-            function xor(result, byte_array) {
-                var j, tmp = 0;
-                for (j = 0; j < byte_array.length; j++) {
-                    tmp |= (buffer[j] << j * 8);
-                }
-                return result ^ tmp;
-            }
-
-            for (i = 0; i < ua.length; i++) {
-                ch = ua.charCodeAt(i);
-                buffer.unshift(ch & 0xFF);
-                if (buffer.length >= 4) {
-                    ret = xor(ret, buffer);
-                    buffer = [];
-                }
-            }
-
-            if (buffer.length > 0) {
-                ret = xor(ret, buffer);
+    _.UUID = function() {
+        try {
+            // use native Crypto API when available
+            return win['crypto']['randomUUID']();
+        } catch (err) {
+            // fall back to generating our own UUID
+            // based on https://gist.github.com/scwood/3bff42cc005cc20ab7ec98f0d8e1d59d
+            var uuid = new Array(36);
+            for (var i = 0; i < 36; i++) {
+                uuid[i] = Math.floor(Math.random() * 16);
             }
+            uuid[14] = 4; // set bits 12-15 of time-high-and-version to 0100
+            uuid[19] = uuid[19] &= ~(1 << 2); // set bit 6 of clock-seq-and-reserved to zero
+            uuid[19] = uuid[19] |= (1 << 3); // set bit 7 of clock-seq-and-reserved to one
+            uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
 
-            return ret.toString(16);
-        };
-
-        return function() {
-            var se = (screen.height * screen.width).toString(16);
-            return (T() + '-' + R() + '-' + UA() + '-' + se + '-' + T());
-        };
-    })();
+            return _.map(uuid, function(x) {
+                return x.toString(16);
+            }).join('');
+        }
+    };
 
     // _.isBlockedUA()
     // This is to block various web spiders from executing our JS and
@@ -8178,6 +8135,7 @@
             this.idleTimeoutId = setTimeout(this._onIdleTimeout, idleTimeoutMs);
             this.idleExpires = new Date().getTime() + idleTimeoutMs;
         }.bind(this);
+        resetIdleTimeout();
 
         var blockSelector = this.getConfig('record_block_selector');
         if (blockSelector === '' || blockSelector === null) {
@@ -8187,6 +8145,10 @@
         try {
             this._stopRecording = this._rrwebRecord({
                 'emit': function (ev) {
+                    if (this.idleExpires && this.idleExpires < ev.timestamp) {
+                        this._onIdleTimeout();
+                        return;
+                    }
                     if (isUserEvent(ev)) {
                         if (this.batcher.stopped && new Date().getTime() - this.replayStartTime >= this.recordMinMs) {
                             // start flushing again after user activity
@@ -8223,8 +8185,6 @@
             return;
         }
 
-        resetIdleTimeout();
-
         var maxTimeoutMs = this.maxExpires - new Date().getTime();
         this.maxTimeoutId = setTimeout(this._onMaxLengthReached.bind(this), maxTimeoutMs);
     };
@@ -8403,7 +8363,7 @@
                 'replay_start_url': this.replayStartUrl,
                 'seq': this.seqNo
             };
-            var eventsJson = _.JSONEncode(data);
+            var eventsJson = JSON.stringify(data);
 
             // send ID management props if they exist
             var deviceId = this._mixpanel.get_property('$device_id');
@@ -10537,7 +10497,7 @@
 
         this.storage.set(
             this.name,
-            _.JSONEncode(this['props']),
+            JSONStringify(this['props']),
             this.expire_days,
             this.cross_subdomain,
             this.secure,
@@ -11758,7 +11718,7 @@
     };
 
     MixpanelLib.prototype._encode_data_for_request = function(data) {
-        var encoded_data = _.JSONEncode(data);
+        var encoded_data = JSONStringify(data);
         if (this.get_config('api_payload_format') === PAYLOAD_TYPE_BASE64) {
             encoded_data = _.base64Encode(encoded_data);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixpanel-browser",
-  "version": "2.61.2",
+  "version": "2.62.0",
   "description": "The official Mixpanel JavaScript browser client library",
   "main": "dist/mixpanel.cjs.js",
   "module": "dist/mixpanel.module.js",

package/src/config.js

@@ -1,6 +1,6 @@
 var Config = {
     DEBUG: false,
-    LIB_VERSION: '2.61.2'
+    LIB_VERSION: '2.62.0'
 };
 
 export default Config;

package/src/mixpanel-core.js

@@ -1,6 +1,6 @@
 /* eslint camelcase: "off" */
 import Config from './config';
-import { MAX_RECORDING_MS, _, console, userAgent, document, navigator, slice, NOOP_FUNC } from './utils';
+import { MAX_RECORDING_MS, _, console, userAgent, document, navigator, slice, NOOP_FUNC, JSONStringify } from './utils';
 import { isRecordingExpired } from './recorder/utils';
 import { window } from './window';
 import { Autocapture } from './autocapture';
@@ -932,7 +932,7 @@ MixpanelLib.prototype.disable = function(events) {
 };
 
 MixpanelLib.prototype._encode_data_for_request = function(data) {
-    var encoded_data = _.JSONEncode(data);
+    var encoded_data = JSONStringify(data);
     if (this.get_config('api_payload_format') === PAYLOAD_TYPE_BASE64) {
         encoded_data = _.base64Encode(encoded_data);
     }

package/src/mixpanel-persistence.js

@@ -9,7 +9,7 @@ import {
     REMOVE_ACTION,
     UNION_ACTION
 } from './api-actions';
-import { _, console } from './utils';
+import { _, console, JSONStringify } from './utils';
 
 /*
  * Constants
@@ -125,7 +125,7 @@ MixpanelPersistence.prototype.save = function() {
 
     this.storage.set(
         this.name,
-        _.JSONEncode(this['props']),
+        JSONStringify(this['props']),
         this.expire_days,
         this.cross_subdomain,
         this.secure,

package/src/recorder/session-recording.js

@@ -187,6 +187,7 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
         this.idleTimeoutId = setTimeout(this._onIdleTimeout, idleTimeoutMs);
         this.idleExpires = new Date().getTime() + idleTimeoutMs;
     }.bind(this);
+    resetIdleTimeout();
 
     var blockSelector = this.getConfig('record_block_selector');
     if (blockSelector === '' || blockSelector === null) {
@@ -196,6 +197,10 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
     try {
         this._stopRecording = this._rrwebRecord({
             'emit': function (ev) {
+                if (this.idleExpires && this.idleExpires < ev.timestamp) {
+                    this._onIdleTimeout();
+                    return;
+                }
                 if (isUserEvent(ev)) {
                     if (this.batcher.stopped && new Date().getTime() - this.replayStartTime >= this.recordMinMs) {
                         // start flushing again after user activity
@@ -232,8 +237,6 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
         return;
     }
 
-    resetIdleTimeout();
-
     var maxTimeoutMs = this.maxExpires - new Date().getTime();
     this.maxTimeoutId = setTimeout(this._onMaxLengthReached.bind(this), maxTimeoutMs);
 };
@@ -412,7 +415,7 @@ SessionRecording.prototype._flushEvents = addOptOutCheckMixpanelLib(function (da
             'replay_start_url': this.replayStartUrl,
             'seq': this.seqNo
         };
-        var eventsJson = _.JSONEncode(data);
+        var eventsJson = JSON.stringify(data);
 
         // send ID management props if they exist
         var deviceId = this._mixpanel.get_property('$device_id');

package/src/utils.js

@@ -839,71 +839,27 @@ _.utf8Encode = function(string) {
     return utftext;
 };
 
-_.UUID = (function() {
-
-    // Time-based entropy
-    var T = function() {
-        var time = 1 * new Date(); // cross-browser version of Date.now()
-        var ticks;
-        if (window.performance && window.performance.now) {
-            ticks = window.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 time.toString(16) + Math.floor(ticks).toString(16);
-    };
-
-    // Math.Random entropy
-    var R = function() {
-        return Math.random().toString(16).replace('.', '');
-    };
-
-    // User agent entropy
-    // This function takes the user agent string, and then xors
-    // together each sequence of 8 bytes.  This produces a final
-    // sequence of 8 bytes which it returns as hex.
-    var UA = function() {
-        var ua = userAgent,
-            i, ch, buffer = [],
-            ret = 0;
-
-        function xor(result, byte_array) {
-            var j, tmp = 0;
-            for (j = 0; j < byte_array.length; j++) {
-                tmp |= (buffer[j] << j * 8);
-            }
-            return result ^ tmp;
-        }
-
-        for (i = 0; i < ua.length; i++) {
-            ch = ua.charCodeAt(i);
-            buffer.unshift(ch & 0xFF);
-            if (buffer.length >= 4) {
-                ret = xor(ret, buffer);
-                buffer = [];
-            }
-        }
-
-        if (buffer.length > 0) {
-            ret = xor(ret, buffer);
+_.UUID = function() {
+    try {
+        // use native Crypto API when available
+        return window['crypto']['randomUUID']();
+    } catch (err) {
+        // fall back to generating our own UUID
+        // based on https://gist.github.com/scwood/3bff42cc005cc20ab7ec98f0d8e1d59d
+        var uuid = new Array(36);
+        for (var i = 0; i < 36; i++) {
+            uuid[i] = Math.floor(Math.random() * 16);
         }
-
-        return ret.toString(16);
-    };
-
-    return function() {
-        var se = (screen.height * screen.width).toString(16);
-        return (T() + '-' + R() + '-' + UA() + '-' + se + '-' + T());
-    };
-})();
+        uuid[14] = 4; // set bits 12-15 of time-high-and-version to 0100
+        uuid[19] = uuid[19] &= ~(1 << 2); // set bit 6 of clock-seq-and-reserved to zero
+        uuid[19] = uuid[19] |= (1 << 3); // set bit 7 of clock-seq-and-reserved to one
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+
+        return _.map(uuid, function(x) {
+            return x.toString(16);
+        }).join('');
+    }
+};
 
 // _.isBlockedUA()
 // This is to block various web spiders from executing our JS and

package/src/window.js

@@ -5,6 +5,7 @@ if (typeof(window) === 'undefined') {
         hostname: ''
     };
     win = {
+        crypto: {randomUUID: function() {throw Error('unsupported');}},
         navigator: { userAgent: '', onLine: true },
         document: {
             createElement: function() { return {}; },