@amplitude/analytics-react-native 0.2.3 → 0.3.1

package/src/react-native-client.ts

@@ -1,10 +1,11 @@
-import { AmplitudeCore, Destination, returnWrapper, UUID } from '@amplitude/analytics-core';
+import { AmplitudeCore, Destination, UUID, returnWrapper } from '@amplitude/analytics-core';
 import {
   ReactNativeConfig,
   Campaign,
   ReactNativeOptions,
   AdditionalReactNativeOptions,
   AttributionReactNativeOptions,
+  ReactNativeClient,
 } from '@amplitude/analytics-types';
 import { Context } from './plugins/context';
 import { useReactNativeConfig, createFlexibleStorage } from './config';
@@ -16,6 +17,12 @@ import { getAnalyticsConnector } from './utils/analytics-connector';
 
 export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
   async init(apiKey: string, userId?: string, options?: ReactNativeOptions & AdditionalReactNativeOptions) {
+    // Step 0: Block concurrent initialization
+    if (this.initializing) {
+      return;
+    }
+    this.initializing = true;
+
     // Step 1: Read cookies stored by old SDK
     const oldCookies = await parseOldCookies(apiKey, options);
 
@@ -60,6 +67,8 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
     await this.add(new IdentityEventSender());
     await this.add(new Destination());
 
+    this.initializing = false;
+
     // Step 5: Set timeline ready for processing events
     // Send existing events, which might be collected by track before init
     this.timeline.isReady = true;
@@ -143,210 +152,28 @@ export class AmplitudeReactNative extends AmplitudeCore<ReactNativeConfig> {
   }
 }
 
-const client = new AmplitudeReactNative();
-
-/**
- * Initializes the Amplitude SDK with your apiKey, userId and optional configurations.
- * This method must be called before any other operations.
- *
- * ```typescript
- * await init(API_KEY, USER_ID, options).promise;
- * ```
- */
-export const init = returnWrapper(client.init.bind(client));
-
-/**
- * Adds a new plugin.
- *
- * ```typescript
- * const plugin = {...};
- * amplitude.add(plugin);
- * ```
- */
-export const add = returnWrapper(client.add.bind(client));
-
-/**
- * Removes a plugin.
- *
- * ```typescript
- * amplitude.remove('myPlugin');
- * ```
- */
-export const remove = returnWrapper(client.remove.bind(client));
-
-/**
- * Tracks user-defined event, with specified type, optional event properties and optional overwrites.
- *
- * ```typescript
- * // event tracking with event type only
- * track('Page Load');
- *
- * // event tracking with event type and additional event properties
- * track('Page Load', { loadTime: 1000 });
- *
- * // event tracking with event type, additional event properties, and overwritten event options
- * track('Page Load', { loadTime: 1000 }, { sessionId: -1 });
- *
- * // alternatively, this tracking method is awaitable
- * const result = await track('Page Load').promise;
- * console.log(result.event); // {...}
- * console.log(result.code); // 200
- * console.log(result.message); // "Event tracked successfully"
- * ```
- */
-export const track = returnWrapper(client.track.bind(client));
-
-/**
- * Alias for track()
- */
-export const logEvent = returnWrapper(client.logEvent.bind(client));
-
-/**
- * Sends an identify event containing user property operations
- *
- * ```typescript
- * const id = new Identify();
- * id.set('colors', ['rose', 'gold']);
- * identify(id);
- *
- * // alternatively, this tracking method is awaitable
- * const result = await identify(id).promise;
- * console.log(result.event); // {...}
- * console.log(result.code); // 200
- * console.log(result.message); // "Event tracked successfully"
- * ```
- */
-export const identify = returnWrapper(client.identify.bind(client));
-
-/**
- * Sends a group identify event containing group property operations.
- *
- * ```typescript
- * const id = new Identify();
- * id.set('skills', ['js', 'ts']);
- * const groupType = 'org';
- * const groupName = 'engineering';
- * groupIdentify(groupType, groupName, id);
- *
- * // alternatively, this tracking method is awaitable
- * const result = await groupIdentify(groupType, groupName, id).promise;
- * console.log(result.event); // {...}
- * console.log(result.code); // 200
- * console.log(result.message); // "Event tracked successfully"
- * ```
- */
-export const groupIdentify = returnWrapper(client.groupIdentify.bind(client));
-export const setGroup = returnWrapper(client.setGroup.bind(client));
-
-/**
- * Sends a revenue event containing revenue property operations.
- *
- * ```typescript
- * const rev = new Revenue();
- * rev.setRevenue(100);
- * revenue(rev);
- *
- * // alternatively, this tracking method is awaitable
- * const result = await revenue(rev).promise;
- * console.log(result.event); // {...}
- * console.log(result.code); // 200
- * console.log(result.message); // "Event tracked successfully"
- * ```
- */
-export const revenue = returnWrapper(client.revenue.bind(client));
-
-/**
- * Returns current user ID.
- *
- * ```typescript
- * const userId = getUserId();
- * ```
- */
-export const getUserId = client.getUserId.bind(client);
-
-/**
- * Sets a new user ID.
- *
- * ```typescript
- * setUserId('userId');
- * ```
- */
-export const setUserId = client.setUserId.bind(client);
-
-/**
- * Returns current device ID.
- *
- * ```typescript
- * const deviceId = getDeviceId();
- * ```
- */
-export const getDeviceId = client.getDeviceId.bind(client);
-
-/**
- * Sets a new device ID.
- * When setting a custom device ID, make sure the value is sufficiently unique.
- * A uuid is recommended.
- *
- * ```typescript
- * setDeviceId('deviceId');
- * ```
- */
-export const setDeviceId = client.setDeviceId.bind(client);
-
-/**
- * reset is a shortcut to anonymize users after they log out, by:
- *   - setting userId to `undefined`
- *   - regenerating a new random deviceId
- *
- * With an `undefined` userId and a completely new deviceId, the current user would appear as a brand new user in dashboard.
- *
- * ```typescript
- * reset();
- * ```
- */
-export const reset = client.reset.bind(client);
-
-/**
- * Returns current session ID.
- *
- * ```typescript
- * const sessionId = getSessionId();
- * ```
- */
-export const getSessionId = client.getSessionId.bind(client);
-
-/**
- * Sets a new session ID.
- * When settign a custom session ID, make sure the value is in milliseconds since epoch (Unix Timestamp).
- *
- * ```typescript
- * setSessionId(Date.now());
- * ```
- */
-export const setSessionId = client.setSessionId.bind(client);
-
-/**
- * Sets a new optOut config value. This toggles event tracking on/off.
- *
- *```typescript
- * // Stops tracking
- * setOptOut(true);
- *
- * // Starts/resumes tracking
- * setOptOut(false);
- * ```
- */
-export const setOptOut = client.setOptOut.bind(client);
-
-/**
- * Flush and send all the events which haven't been sent.
- *
- *```typescript
- * // Send all the unsent events
- * flush();
- *
- * // alternatively, this tracking method is awaitable
- * await flush().promise;
- * ```
- */
-export const flush = returnWrapper(client.flush.bind(client));
+export const createInstance = (): ReactNativeClient => {
+  const client = new AmplitudeReactNative();
+  return {
+    init: returnWrapper(client.init.bind(client)),
+    add: returnWrapper(client.add.bind(client)),
+    remove: returnWrapper(client.remove.bind(client)),
+    track: returnWrapper(client.track.bind(client)),
+    logEvent: returnWrapper(client.logEvent.bind(client)),
+    identify: returnWrapper(client.identify.bind(client)),
+    groupIdentify: returnWrapper(client.groupIdentify.bind(client)),
+    setGroup: returnWrapper(client.setGroup.bind(client)),
+    revenue: returnWrapper(client.revenue.bind(client)),
+    flush: returnWrapper(client.flush.bind(client)),
+    getUserId: client.getUserId.bind(client),
+    setUserId: client.setUserId.bind(client),
+    getDeviceId: client.getDeviceId.bind(client),
+    setDeviceId: client.setDeviceId.bind(client),
+    reset: client.reset.bind(client),
+    getSessionId: client.getSessionId.bind(client),
+    setSessionId: client.setSessionId.bind(client),
+    setOptOut: client.setOptOut.bind(client),
+  };
+};
+
+export default createInstance();

package/src/storage/cookie.ts

@@ -15,7 +15,7 @@ export class CookieStorage<T> implements Storage<T> {
     }
 
     const random = String(Date.now());
-    const testStrorage = new CookieStorage<string>();
+    const testStrorage = new CookieStorage<string>(this.options);
     const testKey = 'AMP_TEST';
     try {
       await testStrorage.set(testKey, random);

package/src/utils/query-params.ts

@@ -1,18 +1,26 @@
-import { isNative } from './platform';
-
 export const getQueryParams = (): Record<string, string | undefined> => {
   /* istanbul ignore if */
-  if (isNative() || typeof window === 'undefined') {
+  if (typeof window === 'undefined') {
     return {};
   }
   const pairs = window.location.search.substring(1).split('&').filter(Boolean);
   const params = pairs.reduce<Record<string, string | undefined>>((acc, curr) => {
-    const [key, value = ''] = curr.split('=', 2);
+    const query = curr.split('=', 2);
+    const key = tryDecodeURIComponent(query[0]);
+    const value = tryDecodeURIComponent(query[1]);
     if (!value) {
       return acc;
     }
-    acc[decodeURIComponent(key)] = decodeURIComponent(value);
+    acc[key] = value;
     return acc;
   }, {});
   return params;
 };
+
+export const tryDecodeURIComponent = (value = '') => {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return '';
+  }
+};

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '0.2.3';
+export const VERSION = '0.3.1';