mixpanel-browser 2.65.0 → 2.67.0

package/src/index.d.ts

@@ -0,0 +1,408 @@
+export type Persistence = "cookie" | "localStorage";
+
+export type ApiPayloadFormat = "base64" | "json";
+
+export type PushItem = Array<string | Dict>;
+
+export type Query = string | Element | Element[];
+
+export interface Dict {
+  [key: string]: any;
+}
+
+export interface RequestOptions {
+  transport?: "xhr" | "sendBeacon" | undefined;
+  send_immediately?: boolean | undefined;
+}
+
+export interface XhrHeadersDef {
+  [header: string]: any;
+}
+
+export interface HasOptedInOutOptions {
+  persistence_type: Persistence;
+  cookie_prefix: string;
+}
+
+export interface ClearOptOutInOutOptions extends HasOptedInOutOptions {
+  cookie_expiration: number;
+  cross_subdomain_cookie: boolean;
+  secure_cookie: boolean;
+}
+
+export interface InTrackingOptions extends ClearOptOutInOutOptions {
+  track: () => void;
+  track_event_name: string;
+  track_properties: Dict;
+}
+
+export interface OutTrackingOptions extends ClearOptOutInOutOptions {
+  delete_user: boolean;
+}
+
+export interface RegisterOptions {
+  persistent: boolean;
+}
+
+export type TrackPageView =
+  | boolean
+  | "url-with-path"
+  | "url-with-path-and-query-string"
+  | "full-url";
+
+export interface AutocaptureConfig {
+  /**
+   * When set to `true`, Mixpanel will track element clicks. It will not track textContent unless `capture_text_content` is also set to `true`.
+   * @default true
+   */
+  click?: boolean;
+  /**
+   * When set to `true`, Mixpanel will track when an input is provided. It will not capture input content.
+   * @default true
+   */
+  input?: boolean;
+  /**
+   * When set, Mixpanel will collect pageviews when some components of the URL change — including UTM parameters.
+   * @default 'full-url'
+   */
+  pageview?: TrackPageView;
+  /**
+   * When set, Mixpanel will collect page scrolls at specified scroll intervals.
+   * @default true
+   */
+  scroll?: boolean;
+  /**
+   * When set to `true`, Mixpanel will track form submissions (but not submission content).
+   * @default true
+   */
+  submit?: boolean;
+  /**
+   * When set to `true`, Mixpanel will capture the textContent of any element.
+   * @default false
+   */
+  capture_text_content?: boolean;
+  /** Enables specification of additional attributes to track. */
+  capture_extra_attrs?: string[];
+  /**
+   * Establishes the scroll depth intervals which trigger `Page Scroll` event.
+   * @default [25, 50, 75, 100]
+   */
+  scroll_depth_percent_checkpoints?: number[];
+  /**
+   * When set to true, overrides `scroll_depth_percentage_checkpoints` and captures all scroll events.
+   * @default false
+   */
+  scroll_capture_all?: boolean;
+  /** Opts out specific pages from Autocapture. */
+  block_url_regexes?: RegExp[];
+  /** Opts in specific pages to Autocapture. */
+  allow_url_regexes?: RegExp[];
+  /** Opts out specific classes from Autocapture. */
+  block_selectors?: string[];
+  /** Opts in specific classes to Autocapture. */
+  allow_selectors?: string[];
+  /** Opts out specific attributes from Autocapture. */
+  block_attrs?: string[];
+  /**
+   * A user-provided function that determines whether a specific element should be
+   * tracked via Autocapture or not. The function receives the element as its first
+   * argument, and the DOM event as its second argument, and should return `true` if
+   * the element should be tracked (otherwise the element will NOT be tracked).
+   */
+  allow_element_callback?: (element: Element, event: Event) => boolean;
+  /**
+   * A user-provided function that determines whether a specific element should be
+   * blocked from tracking via Autocapture or not. The function receives the element
+   * as its first argument, and the DOM event as its second argument, and should
+   * return `true` if the element should be blocked.
+   */
+  block_element_callback?: (element: Element, event: Event) => boolean;
+}
+
+export interface Config {
+  api_host: string;
+  api_routes: {
+    track?: string;
+    engage?: string;
+    groups?: string;
+  };
+  api_method: string;
+  api_transport: string;
+  app_host: string;
+  api_payload_format: ApiPayloadFormat;
+  autotrack: boolean;
+  cdn: string;
+  cookie_domain: string;
+  cross_site_cookie: boolean;
+  cross_subdomain_cookie: boolean;
+  persistence: Persistence;
+  persistence_name: string;
+  cookie_name: string;
+  loaded: (mixpanel: Mixpanel) => void;
+  store_google: boolean;
+  stop_utm_persistence: boolean;
+  save_referrer: boolean;
+  test: boolean;
+  verbose: boolean;
+  img: boolean;
+  /**
+   * @default false
+   * @see https://github.com/mixpanel/mixpanel-js/blob/master/doc/readme.io/javascript-full-api-reference.md#mixpanelset_config
+   */
+  debug: boolean;
+  track_links_timeout: number;
+  track_pageview: TrackPageView;
+  autocapture: boolean | AutocaptureConfig;
+  skip_first_touch_marketing: boolean;
+  cookie_expiration: number;
+  upgrade: boolean;
+  disable_persistence: boolean;
+  disable_cookie: boolean;
+  disable_notifications: boolean;
+  secure_cookie: boolean;
+  ip: boolean;
+  property_blacklist: string[];
+  xhr_headers: XhrHeadersDef;
+  opt_out_tracking_by_default: boolean;
+  opt_out_persistence_by_default: boolean;
+  opt_out_tracking_persistence_type: Persistence;
+  opt_out_tracking_cookie_prefix: string;
+  inapp_protocol: string;
+  inapp_link_new_window: boolean;
+  ignore_dnt: boolean;
+  batch_requests: boolean;
+  batch_size: number;
+  batch_flush_interval_ms: number;
+  batch_request_timeout_ms: number;
+  record_block_class: string;
+  record_block_selector: string;
+  record_collect_fonts: boolean;
+  record_idle_timeout_ms: number;
+  record_inline_images: boolean;
+  record_mask_text_class: string;
+  record_mask_text_selector: string;
+  record_max_ms: number;
+  record_sessions_percent: number;
+  record_canvas: boolean;
+}
+
+export type VerboseResponse =
+  | {
+      status: 1;
+      error: null;
+    }
+  | {
+      status: 0;
+      error: string;
+    };
+
+export type NormalResponse = 1 | 0;
+
+export type Response = VerboseResponse | NormalResponse;
+
+export type Callback = (response: Response) => void;
+
+export interface People {
+  set(prop: string, to: any, callback?: Callback): void;
+  set(prop: Dict, callback?: Callback): void;
+  set_once(prop: string, to: any, callback?: Callback): void;
+  set_once(prop: Dict, callback?: Callback): void;
+  unset(prop: string[] | string, callback?: Callback): void;
+  increment(prop: string | Dict, callback?: Callback): void;
+  increment(prop: string, by: number, callback?: Callback): void;
+  remove(prop: string, value: any, callback?: Callback): void;
+  remove(prop: Dict, callback?: Callback): void;
+  append(prop: string, value: any, callback?: Callback): void;
+  append(prop: Dict, callback?: Callback): void;
+  union(prop: string, value: any, callback?: Callback): void;
+  union(prop: Dict, callback?: Callback): void;
+  track_charge(
+    amount: number,
+    propertiesOrCallback?: Dict | Callback,
+    callback?: Callback
+  ): void;
+  clear_charges(callback?: Callback): void;
+  delete_user(): void;
+}
+
+export interface Group {
+  remove(list_name: string, value: string, callback?: Callback): Group;
+  set<Prop extends string | Dict>(
+    prop: Prop,
+    to?: Prop extends string ? string : undefined,
+    callback?: Callback
+  ): Group;
+  set_once<Prop extends string | Dict>(
+    prop: Prop,
+    to?: Prop extends string ? string : undefined,
+    callback?: Callback
+  ): Group;
+  union(
+    list_name: string,
+    values: Array<string | number>,
+    callback?: Callback
+  ): Group;
+  unset(prop: string, callback?: Callback): void;
+}
+
+export interface Mixpanel {
+  add_group(group_key: string, group_id: string, callback?: Callback): void;
+  alias(alias: string, original?: string): void;
+  clear_opt_in_out_tracking(options?: Partial<ClearOptOutInOutOptions>): void;
+  disable(events?: string[]): void;
+  get_config(prop_name?: string): any;
+  get_distinct_id(): any;
+  get_group(group_key: string, group_id: string): Group;
+  get_property(property_name: string): any;
+  has_opted_in_tracking(options?: Partial<HasOptedInOutOptions>): boolean;
+  has_opted_out_tracking(options?: Partial<HasOptedInOutOptions>): boolean;
+  identify(unique_id?: string): any;
+  init(token: string, config: Partial<Config>, name: string): Mixpanel;
+  opt_in_tracking(options?: Partial<InTrackingOptions>): void;
+  opt_out_tracking(options?: Partial<OutTrackingOptions>): void;
+  push(item: PushItem): void;
+  register(
+    props: Dict,
+    days_or_options?: number | Partial<RegisterOptions>
+  ): void;
+  register_once(
+    props: Dict,
+    default_value?: any,
+    days_or_options?: number | Partial<RegisterOptions>
+  ): void;
+  remove_group(
+    group_key: string,
+    group_ids: string | string[] | number | number[],
+    callback?: Callback
+  ): void;
+  reset(): void;
+  set_config(config: Partial<Config>): void;
+  set_group(
+    group_key: string,
+    group_ids: string | string[] | number | number[],
+    callback?: Callback
+  ): void;
+  time_event(event_name: string): void;
+  track(
+    event_name: string,
+    properties?: Dict,
+    optionsOrCallback?: RequestOptions | Callback,
+    callback?: Callback
+  ): void;
+  track_forms(
+    query: Query,
+    event_name: string,
+    properties?: Dict | (() => void)
+  ): void;
+  track_links(
+    query: Query,
+    event_name: string,
+    properties?: Dict | (() => void)
+  ): void;
+  track_pageview(
+    properties?: Dict,
+    options?: { event_name?: string | undefined }
+  ): void;
+  track_with_groups(
+    event_name: string,
+    properties: Dict,
+    groups: Dict,
+    callback?: Callback
+  ): void;
+  unregister(property: string, options?: Partial<RegisterOptions>): void;
+  people: People;
+  start_session_recording(): void;
+  stop_session_recording(): void;
+  get_session_recording_properties(): { $mp_replay_id?: string } | {};
+}
+
+export interface OverridedMixpanel extends Mixpanel {
+  init(token: string, config: Partial<Config>, name: string): Mixpanel;
+  init(token: string, config?: Partial<Config>): undefined;
+}
+
+export function add_group(
+  group_key: string,
+  group_id: string,
+  callback?: Callback
+): void;
+export function alias(alias: string, original?: string): void;
+export function clear_opt_in_out_tracking(
+  options?: Partial<ClearOptOutInOutOptions>
+): void;
+export function disable(events?: string[]): void;
+export function get_config(prop_name?: string): any;
+export function get_distinct_id(): any;
+export function get_group(group_key: string, group_id: string): Group;
+export function get_property(property_name: string): any;
+export function has_opted_in_tracking(
+  options?: Partial<HasOptedInOutOptions>
+): boolean;
+export function has_opted_out_tracking(
+  options?: Partial<HasOptedInOutOptions>
+): boolean;
+export function identify(unique_id?: string): any;
+export function init(
+  token: string,
+  config: Partial<Config>,
+  name: string
+): Mixpanel;
+export function init(token: string, config?: Partial<Config>): undefined;
+export function opt_in_tracking(options?: Partial<InTrackingOptions>): void;
+export function opt_out_tracking(options?: Partial<OutTrackingOptions>): void;
+export function push(item: PushItem): void;
+export function register(
+  props: Dict,
+  days_or_options?: number | Partial<RegisterOptions>
+): void;
+export function register_once(
+  props: Dict,
+  default_value?: any,
+  days_or_options?: number | Partial<RegisterOptions>
+): void;
+export function remove_group(
+  group_key: string,
+  group_ids: string | string[] | number | number[],
+  callback?: Callback
+): void;
+export function reset(): void;
+export function set_config(config: Partial<Config>): void;
+export function set_group(
+  group_key: string,
+  group_ids: string | string[] | number | number[],
+  callback?: Callback
+): void;
+export function time_event(event_name: string): void;
+export function track(
+  event_name: string,
+  properties?: Dict,
+  optionsOrCallback?: RequestOptions | Callback,
+  callback?: Callback
+): void;
+export function track_forms(
+  query: Query,
+  event_name: string,
+  properties?: Dict | (() => void)
+): void;
+export function track_links(
+  query: Query,
+  event_name: string,
+  properties?: Dict | (() => void)
+): void;
+export function track_with_groups(
+  event_name: string,
+  properties: Dict,
+  groups: Dict,
+  callback?: Callback
+): void;
+export function unregister(
+  property: string,
+  options?: Partial<RegisterOptions>
+): void;
+export const people: People;
+export function get_session_recording_properties():
+  | { $mp_replay_id?: string }
+  | {};
+
+declare const mixpanel: OverridedMixpanel;
+export default mixpanel;

package/src/mixpanel-core.js

@@ -99,6 +99,7 @@ var DEFAULT_API_ROUTES = {
  */
 var DEFAULT_CONFIG = {
     'api_host':                          'https://api-js.mixpanel.com',
+    'api_hosts':                         {},
     'api_routes':                        DEFAULT_API_ROUTES,
     'api_extra_query_params':            {},
     'api_method':                        'POST',
@@ -368,8 +369,11 @@ MixpanelLib.prototype._init = function(token, config, name) {
     }
 
     this.flags = new FeatureFlagManager({
+        getFullApiRoute: _.bind(function() {
+            return this.get_api_host('flags') + '/' + this.get_config('api_routes')['flags'];
+        }, this),
         getConfigFunc: _.bind(this.get_config, this),
-        getDistinctIdFunc: _.bind(this.get_distinct_id, this),
+        getPropertyFunc: _.bind(this.get_property, this),
         trackingFunc: _.bind(this.track, this)
     });
     this.flags.init();
@@ -484,20 +488,23 @@ MixpanelLib.prototype.start_session_recording = function () {
 
 MixpanelLib.prototype.stop_session_recording = function () {
     if (this._recorder) {
-        this._recorder['stopRecording']();
+        return this._recorder['stopRecording']();
     }
+    return Promise.resolve();
 };
 
 MixpanelLib.prototype.pause_session_recording = function () {
     if (this._recorder) {
-        this._recorder['pauseRecording']();
+        return this._recorder['pauseRecording']();
     }
+    return Promise.resolve();
 };
 
 MixpanelLib.prototype.resume_session_recording = function () {
     if (this._recorder) {
-        this._recorder['resumeRecording']();
+        return this._recorder['resumeRecording']();
     }
+    return Promise.resolve();
 };
 
 MixpanelLib.prototype.is_recording_heatmap_data = function () {
@@ -852,11 +859,10 @@ MixpanelLib.prototype.are_batchers_initialized = function() {
 
 MixpanelLib.prototype.get_batcher_configs = function() {
     var queue_prefix = '__mpq_' + this.get_config('token');
-    var api_routes = this.get_config('api_routes');
     this._batcher_configs = this._batcher_configs || {
-        events: {type: 'events', endpoint: '/' + api_routes['track'], queue_key: queue_prefix + '_ev'},
-        people: {type: 'people', endpoint: '/' + api_routes['engage'], queue_key: queue_prefix + '_pp'},
-        groups: {type: 'groups', endpoint: '/' + api_routes['groups'], queue_key: queue_prefix + '_gr'}
+        events: {type: 'events', api_name: 'track', queue_key: queue_prefix + '_ev'},
+        people: {type: 'people', api_name: 'engage', queue_key: queue_prefix + '_pp'},
+        groups: {type: 'groups', api_name: 'groups', queue_key: queue_prefix + '_gr'}
     };
     return this._batcher_configs;
 };
@@ -870,8 +876,9 @@ MixpanelLib.prototype.init_batchers = function() {
                     libConfig: this['config'],
                     errorReporter: this.get_config('error_reporter'),
                     sendRequestFunc: _.bind(function(data, options, cb) {
+                        var api_routes = this.get_config('api_routes');
                         this._send_request(
-                            this.get_config('api_host') + attrs.endpoint,
+                            this.get_api_host(attrs.api_name) + '/' + api_routes[attrs.api_name],
                             this._encode_data_for_request(data),
                             options,
                             this._prepare_callback(cb, data)
@@ -1097,7 +1104,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
     var ret = this._track_or_batch({
         type: 'events',
         data: data,
-        endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
+        endpoint: this.get_api_host('events') + '/' + this.get_config('api_routes')['track'],
         batcher: this.request_batchers.events,
         should_send_immediately: should_send_immediately,
         send_request_options: options
@@ -1599,6 +1606,7 @@ MixpanelLib.prototype.identify = function(
  * Useful for clearing data when a user logs out.
  */
 MixpanelLib.prototype.reset = function() {
+    this.stop_session_recording();
     this['persistence'].clear();
     this._flags.identify_called = false;
     var uuid = _.UUID();
@@ -1606,7 +1614,6 @@ MixpanelLib.prototype.reset = function() {
         'distinct_id': DEVICE_ID_PREFIX + uuid,
         '$device_id': uuid
     }, '');
-    this.stop_session_recording();
     this._check_and_start_session_recording();
 };
 
@@ -1918,6 +1925,16 @@ MixpanelLib.prototype.get_property = function(property_name) {
     return this['persistence'].load_prop([property_name]);
 };
 
+/**
+ * Get the API host for a specific endpoint type, falling back to the default api_host if not specified
+ *
+ * @param {String} endpoint_type The type of endpoint (e.g., "events", "people", "groups")
+ * @returns {String} The API host to use for this endpoint
+ */
+MixpanelLib.prototype.get_api_host = function(endpoint_type) {
+    return this.get_config('api_hosts')[endpoint_type] || this.get_config('api_host');
+};
+
 MixpanelLib.prototype.toString = function() {
     var name = this.get_config('name');
     if (name !== PRIMARY_INSTANCE_NAME) {
@@ -2213,6 +2230,7 @@ MixpanelLib.prototype['alias']                              = MixpanelLib.protot
 MixpanelLib.prototype['name_tag']                           = MixpanelLib.prototype.name_tag;
 MixpanelLib.prototype['set_config']                         = MixpanelLib.prototype.set_config;
 MixpanelLib.prototype['get_config']                         = MixpanelLib.prototype.get_config;
+MixpanelLib.prototype['get_api_host']                       = MixpanelLib.prototype.get_api_host;
 MixpanelLib.prototype['get_property']                       = MixpanelLib.prototype.get_property;
 MixpanelLib.prototype['get_distinct_id']                    = MixpanelLib.prototype.get_distinct_id;
 MixpanelLib.prototype['toString']                           = MixpanelLib.prototype.toString;

package/src/mixpanel-group.js

@@ -146,7 +146,7 @@ MixpanelGroup.prototype._send_request = function(data, callback) {
     return this._mixpanel._track_or_batch({
         type: 'groups',
         data: date_encoded_data,
-        endpoint: this._get_config('api_host') + '/' +  this._get_config('api_routes')['groups'],
+        endpoint: this._mixpanel.get_api_host('groups') + '/' +  this._get_config('api_routes')['groups'],
         batcher: this._mixpanel.request_batchers.groups
     }, callback);
 };

package/src/mixpanel-people.js

@@ -337,7 +337,7 @@ MixpanelPeople.prototype._send_request = function(data, callback) {
     return this._mixpanel._track_or_batch({
         type: 'people',
         data: date_encoded_data,
-        endpoint: this._get_config('api_host') + '/' +  this._get_config('api_routes')['engage'],
+        endpoint: this._mixpanel.get_api_host('people') + '/' +  this._get_config('api_routes')['engage'],
         batcher: this._mixpanel.request_batchers.people
     }, callback);
 };

package/src/recorder/recorder.js

@@ -27,6 +27,7 @@ var MixpanelRecorder = function(mixpanelInstance, rrwebRecord, sharedLockStorage
     this._flushInactivePromise = this.recordingRegistry.flushInactiveRecordings();
 
     this.activeRecording = null;
+    this.stopRecordingInProgress = false;
 };
 
 MixpanelRecorder.prototype.startRecording = function(options) {
@@ -75,19 +76,26 @@ MixpanelRecorder.prototype.startRecording = function(options) {
 };
 
 MixpanelRecorder.prototype.stopRecording = function() {
-    var stopPromise = this._stopCurrentRecording(false);
-    this.recordingRegistry.clearActiveRecording();
-    this.activeRecording = null;
-    return stopPromise;
+    // Prevents activeSerializedRecording from being reused when stopping the recording.
+    this.stopRecordingInProgress = true;
+    return this._stopCurrentRecording(false, true).then(function() {
+        return this.recordingRegistry.clearActiveRecording();
+    }.bind(this)).then(function() {
+        this.stopRecordingInProgress = false;
+    }.bind(this));
 };
 
 MixpanelRecorder.prototype.pauseRecording = function() {
     return this._stopCurrentRecording(false);
 };
 
-MixpanelRecorder.prototype._stopCurrentRecording = function(skipFlush) {
+MixpanelRecorder.prototype._stopCurrentRecording = function(skipFlush, disableActiveRecording) {
     if (this.activeRecording) {
-        return this.activeRecording.stopRecording(skipFlush);
+        var stopRecordingPromise = this.activeRecording.stopRecording(skipFlush);
+        if (disableActiveRecording) {
+            this.activeRecording = null;
+        }
+        return stopRecordingPromise;
     }
     return Promise.resolve();
 };
@@ -100,7 +108,7 @@ MixpanelRecorder.prototype.resumeRecording = function (startNewIfInactive) {
 
     return this.recordingRegistry.getActiveRecording()
         .then(function (activeSerializedRecording) {
-            if (activeSerializedRecording) {
+            if (activeSerializedRecording && !this.stopRecordingInProgress) {
                 return this.startRecording({activeSerializedRecording: activeSerializedRecording});
             } else if (startNewIfInactive) {
                 return this.startRecording({shouldStopBatcher: false});

package/src/recorder/session-recording.js

@@ -63,6 +63,13 @@ function isUserEvent(ev) {
  * @property {string} replayStartUrl
  */
 
+/**
+ * @typedef {Object} UserIdInfo
+ * @property {string} distinct_id
+ * @property {string} user_id
+ * @property {string} device_id
+ */
+
 
 /**
  * This class encapsulates a single session recording and its lifecycle.
@@ -118,6 +125,30 @@ var SessionRecording = function(options) {
     });
 };
 
+/**
+ * @returns {UserIdInfo}
+ */
+SessionRecording.prototype.getUserIdInfo = function () {
+    if (this.finalFlushUserIdInfo) {
+        return this.finalFlushUserIdInfo;
+    }
+
+    var userIdInfo = {
+        'distinct_id': String(this._mixpanel.get_distinct_id()),
+    };
+
+    // send ID management props if they exist
+    var deviceId = this._mixpanel.get_property('$device_id');
+    if (deviceId) {
+        userIdInfo['$device_id'] = deviceId;
+    }
+    var userId = this._mixpanel.get_property('$user_id');
+    if (userId) {
+        userIdInfo['$user_id'] = userId;
+    }
+    return userIdInfo;
+};
+
 SessionRecording.prototype.unloadPersistedData = function () {
     this.batcher.stop();
     return this.batcher.flush()
@@ -242,6 +273,9 @@ SessionRecording.prototype.startRecording = function (shouldStopBatcher) {
 };
 
 SessionRecording.prototype.stopRecording = function (skipFlush) {
+    // store the user ID info in case this is getting called in mixpanel.reset()
+    this.finalFlushUserIdInfo = this.getUserIdInfo();
+
     if (!this.isRrwebStopped()) {
         try {
             this._stopRecording();
@@ -352,8 +386,8 @@ SessionRecording.prototype._sendRequest = function(currentReplayId, reqParams, r
             retryAfter: response.headers.get('Retry-After')
         });
     }.bind(this);
-
-    window['fetch'](this.getConfig('api_host') + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
+    var apiHost = (this._mixpanel.get_api_host && this._mixpanel.get_api_host('record')) || this.getConfig('api_host');
+    window['fetch'](apiHost + '/' + this.getConfig('api_routes')['record'] + '?' + new URLSearchParams(reqParams), {
         'method': 'POST',
         'headers': {
             'Authorization': 'Basic ' + btoa(this.getConfig('token') + ':'),
@@ -407,7 +441,6 @@ SessionRecording.prototype._flushEvents = addOptOutCheckMixpanelLib(function (da
             '$current_url': this.batchStartUrl,
             '$lib_version': Config.LIB_VERSION,
             'batch_start_time': batchStartTime / 1000,
-            'distinct_id': String(this._mixpanel.get_distinct_id()),
             'mp_lib': 'web',
             'replay_id': replayId,
             'replay_length_ms': replayLengthMs,
@@ -416,16 +449,7 @@ SessionRecording.prototype._flushEvents = addOptOutCheckMixpanelLib(function (da
             'seq': this.seqNo
         };
         var eventsJson = JSON.stringify(data);
-
-        // send ID management props if they exist
-        var deviceId = this._mixpanel.get_property('$device_id');
-        if (deviceId) {
-            reqParams['$device_id'] = deviceId;
-        }
-        var userId = this._mixpanel.get_property('$user_id');
-        if (userId) {
-            reqParams['$user_id'] = userId;
-        }
+        Object.assign(reqParams, this.getUserIdInfo());
 
         if (CompressionStream) {
             var jsonStream = new Blob([eventsJson], {type: 'application/json'}).stream();