@amplitude/analytics-react-native 0.6.1 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amplitude/analytics-react-native",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Official React Native SDK",
   "keywords": [
     "analytics",
@@ -57,19 +57,19 @@
     "url": "https://github.com/amplitude/Amplitude-TypeScript/issues"
   },
   "dependencies": {
-    "@amplitude/analytics-client-common": "^0.4.1",
-    "@amplitude/analytics-core": "^0.10.1",
-    "@amplitude/analytics-types": "^0.13.0",
+    "@amplitude/analytics-client-common": "^0.5.1",
+    "@amplitude/analytics-core": "^0.11.1",
+    "@amplitude/analytics-types": "^0.14.0",
     "@amplitude/ua-parser-js": "^0.7.31",
-    "@react-native-async-storage/async-storage": "^1.17.7",
-    "tslib": "^2.3.1"
+    "@react-native-async-storage/async-storage": "^1.17.11",
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
-    "@types/react": "^16.9.19",
-    "@types/react-native": "0.62.13",
-    "react": "16.13.1",
-    "react-native": "0.63.4",
-    "react-native-builder-bob": "^0.17.1"
+    "@types/react": "^18.0.26",
+    "@types/react-native": "0.70.8",
+    "react": "18.2.0",
+    "react-native": "0.70.6",
+    "react-native-builder-bob": "^0.20.3"
   },
   "peerDependencies": {
     "react": "*",
@@ -89,5 +89,5 @@
       ]
     ]
   },
-  "gitHead": "87472a8ea343e4d177015a82c1f8b14e29d1c9f1"
+  "gitHead": "bb021b75fd1c48cbdb98d8f328eebb74f85c6fb4"
 }

package/src/config.ts

@@ -113,6 +113,7 @@ export class ReactNativeConfig extends Config implements IReactNativeConfig {
   }
 
   set sessionId(sessionId: number | undefined) {
+    this.loggerProvider?.log(`Set sessionId to ${sessionId ?? 'undefined'}`);
     this.sessionManager.setSessionId(sessionId);
   }
 
@@ -146,18 +147,29 @@ export const useReactNativeConfig = async (
   const queryParams = getQueryParams();
   const sessionManager = await new SessionManager(cookieStorage, apiKey).load();
 
-  return new ReactNativeConfig(apiKey, userId ?? cookies?.userId, {
+  const restoredSessionId = (await cookieStorage.get(cookieName))?.sessionId;
+  const optionsSessionId = options?.sessionId;
+
+  const config = new ReactNativeConfig(apiKey, userId ?? cookies?.userId, {
     ...options,
     cookieStorage,
     sessionManager,
     deviceId: createDeviceId(cookies?.deviceId, options?.deviceId, queryParams.deviceId),
     domain,
     optOut: options?.optOut ?? Boolean(cookies?.optOut),
-    sessionId: (await cookieStorage.get(cookieName))?.sessionId ?? options?.sessionId,
+    sessionId: restoredSessionId ?? optionsSessionId,
     storageProvider: await createEventsStorage(options),
     trackingOptions: { ...defaultConfig.trackingOptions, ...options?.trackingOptions },
     transportProvider: options?.transportProvider ?? new FetchTransport(),
   });
+
+  config.loggerProvider?.log(
+    `Init: storage=${cookieStorage.constructor.name} restoredSessionId = ${
+      restoredSessionId ?? 'undefined'
+    }, optionsSessionId = ${optionsSessionId ?? 'undefined'}`,
+  );
+
+  return config;
 };
 
 export const createCookieStorage = async (

package/src/plugins/context.ts

@@ -33,7 +33,6 @@ export class Context implements BeforePlugin {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   config: ReactNativeConfig;
-  eventId = 0;
   uaResult: UAParser.IResult;
   nativeModule: AmplitudeReactNative | undefined = NativeModules.AmplitudeReactNative as
     | AmplitudeReactNative
@@ -92,7 +91,6 @@ export class Context implements BeforePlugin {
         },
       }),
       ...context,
-      event_id: this.eventId++,
       library: this.library,
     };
     return event;

package/src/react-native-client.ts

@@ -1,4 +1,4 @@
-import { AppState, AppStateStatus } from 'react-native';
+import { AppState, AppStateStatus, NativeEventSubscription } from 'react-native';
 import {
   AmplitudeCore,
   Destination,
@@ -30,6 +30,7 @@ const END_SESSION_EVENT = 'session_end';
 
 export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
   appState: AppStateStatus = 'background';
+  private appStateChangeHandler: NativeEventSubscription | undefined;
   explicitSessionId: number | undefined;
 
   async init(apiKey = '', userId?: string, options?: ReactNativeOptions) {
@@ -74,7 +75,12 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
     // Step 4: Manage session
     this.appState = AppState.currentState;
     const isNewSession = this.startNewSessionIfNeeded();
-    AppState.addEventListener('change', this.handleAppStateChange);
+    this.config.loggerProvider?.log(
+      `Init: startNewSessionIfNeeded = ${isNewSession ? 'yes' : 'no'}, sessionId = ${
+        this.getSessionId() ?? 'undefined'
+      }`,
+    );
+    this.appStateChangeHandler = AppState.addEventListener('change', this.handleAppStateChange);
 
     this.initializing = false;
 
@@ -86,7 +92,7 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
   }
 
   shutdown() {
-    AppState.removeEventListener('change', this.handleAppStateChange);
+    this.appStateChangeHandler?.remove();
   }
 
   async runAttributionStrategy(attributionConfig?: AttributionOptions, isNewSession = false) {
@@ -181,6 +187,8 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
     this.config.sessionId = sessionId;
 
     if (this.config.trackingSessionEvents) {
+      this.config.loggerProvider?.log(`SESSION_END event: previousSessionId = ${previousSessionId ?? 'undefined'}`);
+
       if (previousSessionId !== undefined) {
         const sessionEndEvent: Event = {
           event_type: END_SESSION_EVENT,
@@ -190,6 +198,7 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
         void this.track(sessionEndEvent);
       }
 
+      this.config.loggerProvider?.log(`SESSION_START event: sessionId = ${sessionId}`);
       const sessionStartEvent: Event = {
         event_type: START_SESSION_EVENT,
         time: eventTime,
@@ -218,6 +227,12 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
       if (event.session_id == undefined) {
         event.session_id = this.getSessionId();
       }
+
+      if (event.event_id === undefined) {
+        const eventId = (this.config.sessionManager.getLastEventId() ?? -1) + 1;
+        event = { ...event, event_id: eventId };
+        this.config.sessionManager.setLastEventId(eventId);
+      }
     }
 
     return super.process(event);
@@ -256,6 +271,7 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
     const currentAppState = this.appState;
     this.appState = nextAppState;
     if (currentAppState !== nextAppState && nextAppState === 'active') {
+      this.config.loggerProvider?.log('App Activated');
       this.startNewSessionIfNeeded();
     }
   };

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '0.6.1';
+export const VERSION = '0.7.1';