mixpanel-browser 2.54.0 → 2.55.0

package/dist/mixpanel.umd.js

@@ -4513,7 +4513,7 @@
 
     var Config = {
         DEBUG: false,
-        LIB_VERSION: '2.54.0'
+        LIB_VERSION: '2.55.0'
     };
 
     /* eslint camelcase: "off", eqeqeq: "off" */
@@ -7081,7 +7081,11 @@
     RequestBatcher.prototype.scheduleFlush = function(flushMS) {
         this.flushInterval = flushMS;
         if (!this.stopped) { // don't schedule anymore if batching has been stopped
-            this.timeoutID = setTimeout(_.bind(this.flush, this), this.flushInterval);
+            this.timeoutID = setTimeout(_.bind(function() {
+                if (!this.stopped) {
+                    this.flush();
+                }
+            }, this), this.flushInterval);
         }
     };
 
@@ -7310,7 +7314,7 @@
     ]);
 
     function isUserEvent(ev) {
-        return ev.type === EventType.IncrementalSnapshot && ACTIVE_SOURCES.has(ev.source);
+        return ev.type === EventType.IncrementalSnapshot && ACTIVE_SOURCES.has(ev.data.source);
     }
 
     var MixpanelRecorder = function(mixpanelInstance) {
@@ -7348,7 +7352,7 @@
         return this._mixpanel.get_config(configVar);
     };
 
-    MixpanelRecorder.prototype.startRecording = function () {
+    MixpanelRecorder.prototype.startRecording = function (shouldStopBatcher) {
         if (this._stopRecording !== null) {
             logger.log('Recording already in progress, skipping startRecording.');
             return;
@@ -7366,7 +7370,14 @@
 
         this.replayId = _.UUID();
 
-        this.batcher.start();
+        if (shouldStopBatcher) {
+            // this is the case when we're starting recording after a reset
+            // and don't want to send anything over the network until there's
+            // actual user activity
+            this.batcher.stop();
+        } else {
+            this.batcher.start();
+        }
 
         var resetIdleTimeout = _.bind(function () {
             clearTimeout(this.idleTimeoutId);
@@ -7380,6 +7391,10 @@
             'emit': _.bind(function (ev) {
                 this.batcher.enqueue(ev);
                 if (isUserEvent(ev)) {
+                    if (this.batcher.stopped) {
+                        // start flushing again after user activity
+                        this.batcher.start();
+                    }
                     resetIdleTimeout();
                 }
             }, this),
@@ -7399,7 +7414,7 @@
 
     MixpanelRecorder.prototype.resetRecording = function () {
         this.stopRecording();
-        this.startRecording();
+        this.startRecording(true);
     };
 
     MixpanelRecorder.prototype.stopRecording = function () {
@@ -7408,7 +7423,14 @@
             this._stopRecording = null;
         }
 
-        this.batcher.flush(); // flush any remaining events
+        if (this.batcher.stopped) {
+            // never got user activity to flush after reset, so just clear the batcher
+            this.batcher.clear();
+        } else {
+            // flush any remaining events from running batcher
+            this.batcher.flush();
+            this.batcher.stop();
+        }
         this.replayId = null;
 
         clearTimeout(this.idleTimeoutId);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "mixpanel-browser",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "description": "The official Mixpanel JavaScript browser client library",
   "main": "dist/mixpanel.cjs.js",
+  "module": "dist/mixpanel.module.js",
   "directories": {
     "test": "tests"
   },

package/src/config.js

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

package/src/recorder/index.js

@@ -28,7 +28,7 @@ var ACTIVE_SOURCES = new Set([
 ]);
 
 function isUserEvent(ev) {
-    return ev.type === EventType.IncrementalSnapshot && ACTIVE_SOURCES.has(ev.source);
+    return ev.type === EventType.IncrementalSnapshot && ACTIVE_SOURCES.has(ev.data.source);
 }
 
 var MixpanelRecorder = function(mixpanelInstance) {
@@ -66,7 +66,7 @@ MixpanelRecorder.prototype.get_config = function(configVar) {
     return this._mixpanel.get_config(configVar);
 };
 
-MixpanelRecorder.prototype.startRecording = function () {
+MixpanelRecorder.prototype.startRecording = function (shouldStopBatcher) {
     if (this._stopRecording !== null) {
         logger.log('Recording already in progress, skipping startRecording.');
         return;
@@ -84,7 +84,14 @@ MixpanelRecorder.prototype.startRecording = function () {
 
     this.replayId = _.UUID();
 
-    this.batcher.start();
+    if (shouldStopBatcher) {
+        // this is the case when we're starting recording after a reset
+        // and don't want to send anything over the network until there's
+        // actual user activity
+        this.batcher.stop();
+    } else {
+        this.batcher.start();
+    }
 
     var resetIdleTimeout = _.bind(function () {
         clearTimeout(this.idleTimeoutId);
@@ -98,6 +105,10 @@ MixpanelRecorder.prototype.startRecording = function () {
         'emit': _.bind(function (ev) {
             this.batcher.enqueue(ev);
             if (isUserEvent(ev)) {
+                if (this.batcher.stopped) {
+                    // start flushing again after user activity
+                    this.batcher.start();
+                }
                 resetIdleTimeout();
             }
         }, this),
@@ -117,7 +128,7 @@ MixpanelRecorder.prototype.startRecording = function () {
 
 MixpanelRecorder.prototype.resetRecording = function () {
     this.stopRecording();
-    this.startRecording();
+    this.startRecording(true);
 };
 
 MixpanelRecorder.prototype.stopRecording = function () {
@@ -126,7 +137,14 @@ MixpanelRecorder.prototype.stopRecording = function () {
         this._stopRecording = null;
     }
 
-    this.batcher.flush(); // flush any remaining events
+    if (this.batcher.stopped) {
+        // never got user activity to flush after reset, so just clear the batcher
+        this.batcher.clear();
+    } else {
+        // flush any remaining events from running batcher
+        this.batcher.flush();
+        this.batcher.stop();
+    }
     this.replayId = null;
 
     clearTimeout(this.idleTimeoutId);

package/src/request-batcher.js

@@ -97,7 +97,11 @@ RequestBatcher.prototype.resetFlush = function() {
 RequestBatcher.prototype.scheduleFlush = function(flushMS) {
     this.flushInterval = flushMS;
     if (!this.stopped) { // don't schedule anymore if batching has been stopped
-        this.timeoutID = setTimeout(_.bind(this.flush, this), this.flushInterval);
+        this.timeoutID = setTimeout(_.bind(function() {
+            if (!this.stopped) {
+                this.flush();
+            }
+        }, this), this.flushInterval);
     }
 };