react-native-test-adx 0.1.2 → 0.1.3

package/README.md

@@ -36,8 +36,6 @@ import { AdaxonProvider, useAdaxon } from 'react-native-test-adx';
 
 Both packages expose the same API. Only the npm name differs.
 
-`expo-secure-store` is **not** required. The SDK does not depend on it.
-
 ## Quick start (React Native)
 
 Wrap the app in `AdaxonProvider`. Screens use `useAdaxon()`.
@@ -52,7 +50,7 @@ The SDK owns the tracker host and API paths (`/event/tracking`, `/api/mts/recomm
 |---|---|---|
 | `appId` | **Yes** | None. MTS app id (`adx_…`). |
 | `sdkKey` | **Yes** | None. Sent as the `x-sdk-key` header. |
-| `storage` | No | In-memory. Queue and anonymous id are lost on app restart. |
+| `storage` | No | In-memory event queue and anonymous id. Offline events and the generated id are lost on app restart. |
 | `timeoutMs` | No | `10000` |
 | `testMode` | No | `false` (`sdk_version` gets a `-test` suffix when true) |
 | `externalUserId` | No | Unset |
@@ -146,40 +144,20 @@ function HomeScreen() {
 
 Do **not** pass device or app fields. The SDK attaches `device` and `app` automatically on every event.
 
+### Anonymous id
+
+`user.anonymous_id` is generated by the SDK. It reads a unique id from React Native `NativeModules` when the host exposes one, otherwise it generates a UUID. The value is cached for the process and written to the configured `storage` adapter so the same id is reused across app launches. No third-party device-info package is required.
+
 ### Storage
 
-`storage` is optional. You do not have to install `expo-secure-store` (or any other store) for the SDK to run. Only `appId` and `sdkKey` are required.
+`storage` is optional. It persists the **event queue** (offline / pending events) and the **anonymous id**. Only `appId` and `sdkKey` are required.
 
 | What you pass | What happens |
 |---|---|
-| No `storage` | SDK uses built-in in-memory storage. Tracking works. Anonymous id and queued events are lost when the app closes. |
-| A storage adapter | Anonymous id and queued events survive restart. |
-
-The adapter is only `getItem` / `setItem` / `removeItem`. You do not implement the queue. Any store works: Expo SecureStore, AsyncStorage, MMKV, or your own.
-
-Optional SecureStore helper (not required):
-
-```sh
-npx expo install expo-secure-store
-```
-
-```tsx
-import * as SecureStore from 'expo-secure-store';
-
-<AdaxonProvider
-  configuration={{
-    appId: 'adx_your_app_id',
-    sdkKey: 'your_sdk_key',
-    storage: {
-      getItem: (key) => SecureStore.getItemAsync(key),
-      setItem: (key, value) => SecureStore.setItemAsync(key, value),
-      removeItem: (key) => SecureStore.deleteItemAsync(key),
-    },
-  }}
->
-```
+| No `storage` | The queue and anonymous id stay in memory. Tracking still works. Both are lost if the app closes. |
+| A storage adapter | Queued events and the anonymous id survive restart. |
 
-SecureStore has a small per-key size limit. For a large event queue, prefer AsyncStorage (or similar) and keep SecureStore for the anonymous id if you want.
+The adapter is only `getItem` / `setItem` / `removeItem`. You do not implement the queue.
 
 ### Non-component boot
 
@@ -289,7 +267,7 @@ Values come from React Native `Platform` (`src/platform/reactNative.ts`). They a
   "app": {
     "package_name": "com.example.app",
     "app_version": "2.4.1",
-    "sdk_version": "0.1.2"
+    "sdk_version": "0.1.3"
   }
 }
 ```
@@ -325,7 +303,7 @@ MTS tracker
 | `src/platform/` | Android/iOS fields. **Only `react-native` import** |
 | `src/config/` | Tracker host, API paths, timeouts, storage key rules |
 | `src/validation/` | Event name, property, and batch-size rules |
-| `src/storage/` | Anonymous user id and persistent event queue |
+| `src/storage/` | Persistent event queue |
 | `example/src/` | Demo app: `App.tsx`, `screens/`, `components/` |
 
 Screens belong in the **host app**, not in the SDK.

package/lib/module/config/ApiConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 
-export const SDK_VERSION = '0.1.2';
+export const SDK_VERSION = '0.1.3';
 export const MEDIATION_PROVIDER = 'mts';
 export const BASE_URL = 'http://localhost:3002';
 export const EVENT_TRACKING_PATH = '/event/tracking';

package/lib/module/config/StorageKeys.js

@@ -4,7 +4,7 @@ export const ANONYMOUS_ID_KEY_PREFIX = 'adaxon_sdk.anonymous_id.';
 export const EVENT_QUEUE_META_KEY_PREFIX = 'adaxon_sdk.event_queue.meta.';
 export const EVENT_QUEUE_ITEM_KEY_PREFIX = 'adaxon_sdk.event_queue.item.';
 
-// Expo SecureStore and Keychain-backed adapters only accept alphanumerics
+// Queue adapters (and Keychain-backed stores) only accept alphanumerics
 // plus `.`, `-` and `_`, so app ids are sanitized before use as a key.
 const UNSAFE_STORAGE_KEY_CHARS = /[^A-Za-z0-9._-]/g;
 export function sanitizeStorageId(appId) {

package/lib/module/core/AdaxonClient.js

@@ -11,7 +11,6 @@ import { EventService } from "../services/event/EventService.js";
 import { ApiClient } from "../services/network/ApiClient.js";
 import { NetworkInfoService } from "../services/network/NetworkInfoService.js";
 import { NetworkService } from "../services/network/NetworkService.js";
-import { AnonymousIdService } from "../storage/AnonymousIdService.js";
 import { EventQueueStorage } from "../storage/EventQueueStorage.js";
 import { EventValidator } from "../validation/EventValidator.js";
 export class AdaxonClient {
@@ -27,10 +26,9 @@ export class AdaxonClient {
     const networkInfo = new NetworkInfoService(config.networkInfoReader);
     this.builder = new EventBuilder({
       appId: auth.appId,
-      deviceInfo: new DeviceInfoService(config.platform ?? 'web', config.deviceInfoReader),
+      deviceInfo: new DeviceInfoService(config.platform ?? 'web', config.deviceInfoReader, config.storage, auth.appId),
       appInfo: new AppInfoService(Boolean(config.testMode), config.appInfoReader),
       networkInfo,
-      anonymousId: new AnonymousIdService(auth.appId, config.storage),
       validator: this.validator,
       externalUserId: config.externalUserId
     });

package/lib/module/platform/reactNative.js

@@ -7,6 +7,28 @@ import { appFieldsFromNative } from "./app.js";
 import { deviceFieldsFromAndroid } from "./android.js";
 import { deviceFieldsFromIos } from "./ios.js";
 import { connectionTypeFromNativeState, ipAddressFromNativeState, isOnlineFromNativeState, usableIpAddress } from "./network.js";
+function nativeModule(name) {
+  return (NativeModules ?? {})[name];
+}
+async function callNative(method, arg) {
+  if (typeof method !== 'function') {
+    return undefined;
+  }
+  try {
+    return await method(arg);
+  } catch {
+    return undefined;
+  }
+}
+function safeUnsubscribe(remove) {
+  return () => {
+    try {
+      remove?.();
+    } catch {
+      // Native unsubscribe can throw after the module is torn down.
+    }
+  };
+}
 export function detectReactNativePlatform() {
   return Platform.OS === 'ios' || Platform.OS === 'android' ? Platform.OS : 'web';
 }
@@ -27,45 +49,21 @@ function collectFromReactNative(platform) {
   Object.assign(device, readLocaleFields());
   return device;
 }
-export const reactNativeDeviceReader = {
-  readDeviceInfo: collectFromReactNative
-};
-export const reactNativeAppInfoReader = {
-  readAppInfo: () => appFieldsFromNative(readNativeAppConstants())
-};
-export const reactNativeNetworkInfoReader = {
-  readNetworkInfo: collectFromNativeNetwork
-};
-export const reactNativeNetworkStatusReader = {
-  getIsOnline: readIsOnlineFromNative,
-  subscribe: subscribeNativeNetworkStatus
-};
-export const reactNativeUrlOpener = Linking;
+async function readUniqueIdFromNative() {
+  const deviceInfo = nativeModule('RNDeviceInfo');
+  return nonEmptyString(await callNative(deviceInfo?.getUniqueId)) ?? '';
+}
 function readNativeAppConstants() {
-  const modules = NativeModules ?? {};
-  const expoApp = modules.ExpoApplication;
-  const expoConstants = modules.ExponentConstants;
-  const deviceInfo = modules.RNDeviceInfo;
   return {
-    ...deviceInfo,
-    ...expoConstants,
-    ...expoApp
+    ...nativeModule('RNDeviceInfo'),
+    ...nativeModule('ExponentConstants'),
+    ...nativeModule('ExpoApplication')
   };
 }
 function nativeNetworkModules() {
-  const modules = NativeModules ?? {};
   return {
-    netInfo: modules.RNCNetInfo,
-    expoNetwork: modules.ExpoNetwork
-  };
-}
-function safeUnsubscribe(remove) {
-  return () => {
-    try {
-      remove?.();
-    } catch {
-      // Native unsubscribe can throw after the module is torn down.
-    }
+    netInfo: nativeModule('RNCNetInfo'),
+    expoNetwork: nativeModule('ExpoNetwork')
   };
 }
 async function readIsOnlineFromNative() {
@@ -73,18 +71,11 @@ async function readIsOnlineFromNative() {
     netInfo,
     expoNetwork
   } = nativeNetworkModules();
-  const getCurrentState = netInfo?.getCurrentState;
-  if (typeof getCurrentState === 'function') {
-    const online = isOnlineFromNativeState(await readOptionalNative(() => getCurrentState(null)));
-    if (online !== null) {
-      return online;
-    }
+  const fromNetInfo = isOnlineFromNativeState(await callNative(netInfo?.getCurrentState, null));
+  if (fromNetInfo !== null) {
+    return fromNetInfo;
   }
-  const getNetworkState = expoNetwork?.getNetworkStateAsync;
-  if (typeof getNetworkState === 'function') {
-    return isOnlineFromNativeState(await readOptionalNative(getNetworkState));
-  }
-  return null;
+  return isOnlineFromNativeState(await callNative(expoNetwork?.getNetworkStateAsync));
 }
 function subscribeNativeNetworkStatus(listener) {
   const {
@@ -99,9 +90,8 @@ function subscribeNativeNetworkStatus(listener) {
       const subscription = new NativeEventEmitter(NativeModules.RNCNetInfo).addListener('netInfo.networkStatusDidChange', onState);
       return safeUnsubscribe(() => subscription.remove());
     }
-    const addListener = expoNetwork?.addListener;
-    if (typeof addListener === 'function') {
-      const subscription = addListener.call(expoNetwork, 'onNetworkStateChanged', onState);
+    if (expoNetwork && typeof expoNetwork.addListener === 'function') {
+      const subscription = expoNetwork.addListener('onNetworkStateChanged', onState);
       return safeUnsubscribe(() => subscription?.remove?.());
     }
   } catch (error) {
@@ -109,32 +99,35 @@ function subscribeNativeNetworkStatus(listener) {
   }
   return () => undefined;
 }
-async function readOptionalNative(read) {
-  try {
-    return await read();
-  } catch {
-    return undefined;
-  }
-}
 async function collectFromNativeNetwork() {
   const network = {};
   const {
     netInfo,
     expoNetwork
   } = nativeNetworkModules();
-  const getCurrentState = netInfo?.getCurrentState;
-  if (typeof getCurrentState === 'function') {
-    const state = await readOptionalNative(() => getCurrentState(null));
-    setIfPresent(network, 'connection_type', connectionTypeFromNativeState(state));
-    setIfPresent(network, 'ip_address', ipAddressFromNativeState(state));
-  }
-  const getNetworkState = expoNetwork?.getNetworkStateAsync;
-  if (!network.connection_type && typeof getNetworkState === 'function') {
-    setIfPresent(network, 'connection_type', connectionTypeFromNativeState(await readOptionalNative(getNetworkState)));
+  const state = await callNative(netInfo?.getCurrentState, null);
+  setIfPresent(network, 'connection_type', connectionTypeFromNativeState(state));
+  setIfPresent(network, 'ip_address', ipAddressFromNativeState(state));
+  if (!network.connection_type) {
+    setIfPresent(network, 'connection_type', connectionTypeFromNativeState(await callNative(expoNetwork?.getNetworkStateAsync)));
   }
-  const getIpAddress = expoNetwork?.getIpAddressAsync;
-  if (!network.ip_address && typeof getIpAddress === 'function') {
-    setIfPresent(network, 'ip_address', usableIpAddress(nonEmptyString(await readOptionalNative(getIpAddress))));
+  if (!network.ip_address) {
+    setIfPresent(network, 'ip_address', usableIpAddress(nonEmptyString(await callNative(expoNetwork?.getIpAddressAsync))));
   }
   return network;
-}
+}
+export const reactNativeDeviceReader = {
+  readDeviceInfo: collectFromReactNative,
+  getUniqueId: readUniqueIdFromNative
+};
+export const reactNativeAppInfoReader = {
+  readAppInfo: () => appFieldsFromNative(readNativeAppConstants())
+};
+export const reactNativeNetworkInfoReader = {
+  readNetworkInfo: collectFromNativeNetwork
+};
+export const reactNativeNetworkStatusReader = {
+  getIsOnline: readIsOnlineFromNative,
+  subscribe: subscribeNativeNetworkStatus
+};
+export const reactNativeUrlOpener = Linking;

package/lib/module/services/device/DeviceInfoService.js

@@ -1,22 +1,71 @@
 "use strict";
 
+import { ANONYMOUS_ID_KEY_PREFIX, sanitizeStorageId } from "../../config/StorageKeys.js";
+import { nonEmptyString } from "../../utils/strings.js";
+import { createUuid } from "../../utils/uuid.js";
 export class DeviceInfoService {
-  constructor(platform, reader) {
+  constructor(platform, reader, storage, appId) {
     this.platform = platform;
     this.reader = reader;
+    this.storage = storage;
+    this.anonymousIdKey = storage && appId ? `${ANONYMOUS_ID_KEY_PREFIX}${sanitizeStorageId(appId)}` : undefined;
   }
   getDeviceInfo() {
     if (!this.cached) {
-      try {
-        this.cached = this.reader?.readDeviceInfo(this.platform) ?? {
-          platform: this.platform
-        };
-      } catch {
-        this.cached = {
-          platform: this.platform
-        };
-      }
+      this.cached = this.readDeviceInfo();
     }
     return this.cached;
   }
+  getUniqueId() {
+    if (!this.uniqueIdPromise) {
+      this.uniqueIdPromise = this.resolveUniqueId();
+    }
+    return this.uniqueIdPromise;
+  }
+  readDeviceInfo() {
+    const fallback = {
+      platform: this.platform
+    };
+    try {
+      return this.reader?.readDeviceInfo(this.platform) ?? fallback;
+    } catch {
+      return fallback;
+    }
+  }
+  async resolveUniqueId() {
+    const stored = await this.readStoredId();
+    if (stored) {
+      return stored;
+    }
+    const uniqueId = (await this.readNativeId()) ?? createUuid();
+    await this.writeStoredId(uniqueId);
+    return uniqueId;
+  }
+  async readNativeId() {
+    try {
+      return nonEmptyString(await this.reader?.getUniqueId?.());
+    } catch {
+      return undefined;
+    }
+  }
+  async readStoredId() {
+    if (!this.storage || !this.anonymousIdKey) {
+      return undefined;
+    }
+    try {
+      return nonEmptyString(await this.storage.getItem(this.anonymousIdKey));
+    } catch {
+      return undefined;
+    }
+  }
+  async writeStoredId(uniqueId) {
+    if (!this.storage || !this.anonymousIdKey) {
+      return;
+    }
+    try {
+      await this.storage.setItem(this.anonymousIdKey, uniqueId);
+    } catch {
+      // Persistence must not block tracking.
+    }
+  }
 }

package/lib/module/services/event/EventBuilder.js

@@ -15,14 +15,13 @@ export class EventBuilder {
     const {
       validator,
       appId,
-      anonymousId,
       deviceInfo,
       appInfo,
       networkInfo
     } = this.config;
     validator.validateTrackInput(input);
     const user = {
-      anonymous_id: await anonymousId.getAnonymousId()
+      anonymous_id: await deviceInfo.getUniqueId()
     };
     setIfPresent(user, 'external_user_id', nonEmptyString(this.externalUserId));
     return {

package/lib/typescript/src/config/ApiConstants.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "0.1.2";
+export declare const SDK_VERSION = "0.1.3";
 export declare const MEDIATION_PROVIDER = "mts";
 export declare const BASE_URL = "http://localhost:3002";
 export declare const EVENT_TRACKING_PATH = "/event/tracking";

package/lib/typescript/src/platform/types.d.ts

@@ -1,6 +1,7 @@
 import type { AdaxonAppContext, AdaxonDeviceContext, AdaxonNetworkContext, AdaxonPlatform } from '../types/EventTypes.js';
 export interface DeviceInfoReader {
     readDeviceInfo(platform: AdaxonPlatform): AdaxonDeviceContext;
+    getUniqueId?(): Promise<string>;
 }
 export interface AppInfoReader {
     readAppInfo(): AdaxonAppContext;

package/lib/typescript/src/services/device/DeviceInfoService.d.ts

@@ -1,10 +1,20 @@
 import type { DeviceInfoReader } from '../../platform/types.js';
+import type { AdaxonStorageAdapter } from '../../types/AdaxonConfig.js';
 import type { AdaxonDeviceContext, AdaxonPlatform } from '../../types/EventTypes.js';
 export declare class DeviceInfoService {
     private readonly platform;
     private readonly reader?;
+    private readonly storage?;
     private cached?;
-    constructor(platform: AdaxonPlatform, reader?: DeviceInfoReader | undefined);
+    private uniqueIdPromise?;
+    private readonly anonymousIdKey?;
+    constructor(platform: AdaxonPlatform, reader?: DeviceInfoReader | undefined, storage?: AdaxonStorageAdapter | undefined, appId?: string);
     getDeviceInfo(): AdaxonDeviceContext;
+    getUniqueId(): Promise<string>;
+    private readDeviceInfo;
+    private resolveUniqueId;
+    private readNativeId;
+    private readStoredId;
+    private writeStoredId;
 }
 //# sourceMappingURL=DeviceInfoService.d.ts.map

package/lib/typescript/src/services/event/EventBuilder.d.ts

@@ -1,7 +1,6 @@
 import type { AppInfoService } from '../app/AppInfoService.js';
 import type { DeviceInfoService } from '../device/DeviceInfoService.js';
 import type { NetworkInfoService } from '../network/NetworkInfoService.js';
-import type { AnonymousIdService } from '../../storage/AnonymousIdService.js';
 import type { EventPayload, TrackEventInput } from '../../types/EventTypes.js';
 import type { EventValidator } from '../../validation/EventValidator.js';
 interface EventBuilderConfig {
@@ -9,7 +8,6 @@ interface EventBuilderConfig {
     deviceInfo: DeviceInfoService;
     appInfo: AppInfoService;
     networkInfo: NetworkInfoService;
-    anonymousId: AnonymousIdService;
     validator: EventValidator;
     externalUserId?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-test-adx",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Adaxon React Native / Expo SDK for event tracking and offer recommendations.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/lib/module/storage/AnonymousIdService.js

@@ -1,31 +0,0 @@
-"use strict";
-
-import { ANONYMOUS_ID_KEY_PREFIX, sanitizeStorageId } from "../config/StorageKeys.js";
-import { createUuid } from "../utils/uuid.js";
-export class AnonymousIdService {
-  constructor(appId, storage) {
-    this.appId = appId;
-    this.storage = storage;
-  }
-  getAnonymousId() {
-    if (!this.anonymousIdPromise) {
-      this.anonymousIdPromise = this.loadOrCreate().catch(error => {
-        this.anonymousIdPromise = undefined;
-        throw error;
-      });
-    }
-    return this.anonymousIdPromise;
-  }
-  get storageKey() {
-    return `${ANONYMOUS_ID_KEY_PREFIX}${sanitizeStorageId(this.appId)}`;
-  }
-  async loadOrCreate() {
-    const stored = await this.storage?.getItem(this.storageKey);
-    if (stored) {
-      return stored;
-    }
-    const anonymousId = createUuid();
-    await this.storage?.setItem(this.storageKey, anonymousId);
-    return anonymousId;
-  }
-}

package/lib/typescript/src/storage/AnonymousIdService.d.ts

@@ -1,11 +0,0 @@
-import type { AdaxonStorageAdapter } from '../types/AdaxonConfig.js';
-export declare class AnonymousIdService {
-    private readonly appId;
-    private readonly storage?;
-    private anonymousIdPromise?;
-    constructor(appId: string, storage?: AdaxonStorageAdapter | undefined);
-    getAnonymousId(): Promise<string>;
-    private get storageKey();
-    private loadOrCreate;
-}
-//# sourceMappingURL=AnonymousIdService.d.ts.map