mixpanel-react-native 3.0.9 → 3.1.0

package/javascript/mixpanel-persistent.js

@@ -9,19 +9,21 @@ import {
   getAppHasOpenedBeforeKey,
 } from "./mixpanel-constants";
 
-import {AsyncStorageAdapter} from "./mixpanel-storage";
+import { AsyncStorageAdapter } from "./mixpanel-storage";
 import uuid from "uuid";
-import {MixpanelLogger} from "mixpanel-react-native/javascript/mixpanel-logger";
+import { MixpanelLogger } from "mixpanel-react-native/javascript/mixpanel-logger";
+import { randomUUID } from "expo-crypto";
 
 export class MixpanelPersistent {
   static instance;
 
-  static getInstance(storage) {
+  static getInstance(storage, token) {
     if (!MixpanelPersistent.instance) {
       MixpanelPersistent.instance = new MixpanelPersistent(
         new AsyncStorageAdapter(storage)
       );
-      MixpanelPersistent.initializationCompletePromise = MixpanelPersistent.instance.initializationCompletePromise();
+      MixpanelPersistent.initializationCompletePromise =
+        MixpanelPersistent.instance.initializationCompletePromise(token);
     }
     return MixpanelPersistent.instance;
   }
@@ -50,16 +52,26 @@ export class MixpanelPersistent {
   }
 
   async loadDeviceId(token) {
-    await this.storageAdapter
-      .getItem(getDeviceIdKey(token))
-      .then((deviceId) => {
-        if (!this._identity[token]) {
-          this._identity[token] = {};
-        }
-        this._identity[token].deviceId = deviceId;
-      });
+    if (!token) {
+      return;
+    }
+
+    const storageToken = await this.storageAdapter.getItem(
+      getDeviceIdKey(token)
+    );
+
+    if (!this._identity[token]) {
+      this._identity[token] = {};
+    }
+
+    this._identity[token].deviceId = storageToken;
+
     if (!this._identity[token].deviceId) {
-      this._identity[token].deviceId = uuid.v4();
+      try {
+        this._identity[token].deviceId = randomUUID();
+      } catch (e) {
+        this._identity[token].deviceId = uuid.v4();
+      }
       await this.storageAdapter.setItem(
         getDeviceIdKey(token),
         this._identity[token].deviceId
@@ -159,6 +171,10 @@ export class MixpanelPersistent {
     return this._identity[token].userId;
   }
 
+  isIdentified(token) {
+    return Boolean(this.getUserId(token));
+  }
+
   updateUserId(token, userId) {
     this._identity[token].userId = userId;
   }
@@ -189,7 +205,7 @@ export class MixpanelPersistent {
   updateSuperProperties(token, superProperties) {
     this._superProperties = {
       ...this._superProperties,
-      [token]: {...superProperties},
+      [token]: { ...superProperties },
     };
   }
 
@@ -217,7 +233,7 @@ export class MixpanelPersistent {
   }
 
   updateTimeEvents(token, timeEvents) {
-    this._timeEvents = {...this._timeEvents, [token]: {...timeEvents}};
+    this._timeEvents = { ...this._timeEvents, [token]: { ...timeEvents } };
   }
 
   async persistTimeEvents(token) {
@@ -242,7 +258,7 @@ export class MixpanelPersistent {
   }
 
   updateOptedOut(token, optOut) {
-    this._optedOut = {...this._optedOut, [token]: optOut};
+    this._optedOut = { ...this._optedOut, [token]: optOut };
   }
 
   async persistOptedOut(token) {

package/javascript/mixpanel-queue.js

@@ -1,4 +1,5 @@
-import {MixpanelPersistent} from "./mixpanel-persistent";
+import { MixpanelPersistent } from "./mixpanel-persistent";
+import { MixpanelType } from "./mixpanel-constants";
 
 export const MixpanelQueueManager = (() => {
   let _queues = {};
@@ -6,7 +7,7 @@ export const MixpanelQueueManager = (() => {
 
   const getPersistent = () => {
     if (!mixpanelPersistent) {
-        mixpanelPersistent = MixpanelPersistent.getInstance();
+      mixpanelPersistent = MixpanelPersistent.getInstance();
     }
     return mixpanelPersistent;
   };
@@ -40,9 +41,14 @@ export const MixpanelQueueManager = (() => {
   };
 
   const getQueue = (token, type) => {
-    if (!_queues[token] || !_queues[token][type]) {
+    if (
+      !_queues[token] ||
+      !_queues[token][type] ||
+      (type === MixpanelType.USER && !getPersistent().isIdentified(token))
+    ) {
       return [];
     }
+
     return [..._queues[token][type]];
   };
 
@@ -62,11 +68,49 @@ export const MixpanelQueueManager = (() => {
     await updateQueueInStorage(token, type);
   };
 
+  /**
+   * Ensures all USER queue records for the given token have the correct identity fields.
+   * Returns the updated queue (may be unchanged).
+   */
+  const identifyUserQueue = async (token) => {
+    const persistent = getPersistent();
+    const distinctId = persistent.getDistinctId(token);
+    const deviceId = persistent.getDeviceId(token);
+    const userId = persistent.getUserId(token);
+
+    const userQueue = _queues[token]?.[MixpanelType.USER];
+    if (!userQueue) return [];
+
+    let changed = false;
+    const updatedQueue = userQueue.map(record => {
+      let updated = record;
+      const updateDistinctId = distinctId != null && record.$distinct_id !== distinctId;
+      const updateDeviceId = deviceId != null && record.$device_id !== deviceId;
+      const updateUserId = userId != null && record.$user_id !== userId;
+      // Only update if there is a difference; minimize object copies
+      if (updateDistinctId || updateDeviceId || updateUserId) {
+        updated = { ...record }; // shallow copy only if needed
+        if (updateDistinctId) updated.$distinct_id = distinctId;
+        if (updateDeviceId) updated.$device_id = deviceId;
+        if (updateUserId) updated.$user_id = userId;
+        changed = true;
+      }
+      return updated;
+    });
+
+    if (changed) {
+      _queues[token][MixpanelType.USER] = updatedQueue;
+      await persistent.saveQueue(token, MixpanelType.USER, updatedQueue);
+    }
+    return updatedQueue;
+  };
+
   return {
     initialize,
     enqueue,
     getQueue,
     spliceQueue,
     clearQueue,
+    identifyUserQueue,
   };
 })();

package/javascript/mixpanel-storage.js

@@ -4,7 +4,12 @@ export class AsyncStorageAdapter {
   constructor(storage) {
     if (!storage) {
       try {
-        this.storage = require("@react-native-async-storage/async-storage");
+        const storageModule = require("@react-native-async-storage/async-storage");
+        if (storageModule.default) {
+          this.storage = storageModule.default
+        } else {
+          this.storage = storageModule
+        }
       } catch {
         console.error(
           "[@RNC/AsyncStorage]: NativeModule: AsyncStorage is null. Please run 'npm install @react-native-async-storage/async-storage' or follow the Mixpanel guide to set up your own Storage class."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixpanel-react-native",
-  "version": "3.0.9",
+  "version": "3.1.0",
   "description": "Official React Native Tracking Library for Mixpanel Analytics",
   "main": "index.js",
   "scripts": {
@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.21.0",
-    "uuid": "3.3.2"
+    "uuid": "3.3.2",
+    "expo-crypto": "~14.1.4"
   }
-}
+}