@dashx/react-native 1.0.8 → 1.1.1

package/android/src/main/java/com/dashx/rn/sdk/DashXReactNativeModule.kt

@@ -1,15 +1,10 @@
 package com.dashx.rn.sdk
 
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager.NameNotFoundException
-import android.net.Uri
 import com.dashx.rn.sdk.util.*
-import com.dashx.sdk.DashXClient as DashX
-import com.dashx.sdk.DashXLog
-import com.dashx.sdk.DashXLog.LogLevel
-import com.dashx.sdk.data.LibraryInfo
+import com.dashx.android.DashX
+import com.dashx.android.DashXLog
+import com.dashx.android.DashXLog.LogLevel
 import com.facebook.react.bridge.*
-import java.io.File
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -17,7 +12,6 @@ import kotlinx.serialization.json.JsonObject
 
 class DashXReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     private val tag = DashXReactNativeModule::class.java.simpleName
-    private var dashXClient: DashX? = null
 
     override fun getName(): String {
         return "DashXReactNative"
@@ -31,59 +25,65 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun configure(options: ReadableMap) {
-        dashXClient = DashX.configure(
+        DashX.configure(
             reactContext,
             options.getString("publicKey")!!,
             options.getStringIfPresent("baseURI"),
-            options.getStringIfPresent("targetEnvironment"),
-            LibraryInfo("dashx-react-native", BuildConfig.VERSION_NAME)
+            options.getStringIfPresent("targetEnvironment")
         )
     }
 
     @ReactMethod
     fun identify(options: ReadableMap?) {
         val optionsHashMap = options?.toHashMap()
-        dashXClient?.identify(optionsHashMap as HashMap<String, String>?)
+            ?.filterValues { it != null }
+            ?.mapValues { it.value.toString() }
+        DashX.identify(optionsHashMap?.let { HashMap(it) })
     }
 
     @ReactMethod
     fun setIdentity(uid: String?, token: String?) {
-        dashXClient?.setIdentity(uid, token)
+        DashX.setIdentity(uid, token)
     }
 
     @ReactMethod
     fun reset() {
-        dashXClient?.reset()
+        DashX.reset()
     }
 
     @ReactMethod
     fun track(event: String, data: ReadableMap?) {
         val jsonData = try {
-            data?.toHashMap() as HashMap<String, String>?
+            data?.toHashMap()
+                ?.filterValues { it != null }
+                ?.mapValues { it.value.toString() }
+                ?.let { HashMap(it) }
         } catch (e: Exception) {
             DashXLog.d(tag, e.message)
             return
         }
 
-        dashXClient?.track(event, jsonData)
+        DashX.track(event, jsonData)
     }
 
     @ReactMethod
     fun screen(screenName: String, data: ReadableMap?) {
-        dashXClient?.screen(screenName, data?.toHashMap() as HashMap<String, String>)
+        val screenData = data?.toHashMap()
+            ?.filterValues { it != null }
+            ?.mapValues { it.value.toString() }
+            ?.let { HashMap(it) }
+            ?: HashMap()
+        DashX.screen(screenName, screenData)
     }
 
     @ReactMethod
     fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
-        dashXClient?.fetchContent(
+        DashX.fetchRecord(
             urn,
             options?.getBooleanIfPresent("preview"),
             options?.getStringIfPresent("language"),
-            listOf(options?.getArray("fields")) as List<String>?,
-            listOf(options?.getArray("include")) as List<String>?,
-            listOf(options?.getArray("exclude")) as List<String>?,
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = {
                 promise.resolve(convertJsonToMap(convertKJsonToJson(it)))
@@ -107,19 +107,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
             throw Exception("Encountered an error while parsing order")
         }
 
-        dashXClient?.searchContent(
+        DashX.searchRecords(
             contentType,
-            options?.getString("returnType") ?: "all",
             convertJsonToKJson(jsonFilter),
-            convertJsonToKJson(jsonOrder),
-            options?.getIntIfPresent("limit"),
-            options?.getBooleanIfPresent("preview"),
-            options?.getStringIfPresent("language"),
-            listOf(options?.getArray("fields")) as List<String>?,
-            listOf(options?.getArray("include")) as List<String>?,
-            listOf(options?.getArray("exclude")) as List<String>?,
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 val readableArray = Arguments.createArray()
@@ -131,54 +123,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         )
     }
 
-    @ReactMethod
-    fun addItemToCart(
-        itemId: String,
-        pricingId: String,
-        quantity: String,
-        reset: Boolean? = false,
-        custom: ReadableMap? = null,
-        promise: Promise
-    ) {
-        val jsonCustom = try {
-            convertMapToJson(custom)
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            throw Exception("Encountered an error while parsing custom")
-        }
-
-        dashXClient?.addItemToCart(
-            itemId,
-            pricingId,
-            quantity,
-            reset ?: false,
-            convertJsonToKJson(jsonCustom),
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
-    @ReactMethod
-    fun fetchCart(promise: Promise) {
-        dashXClient?.fetchCart(
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
     @ReactMethod
     fun fetchStoredPreferences(promise: Promise) {
-        dashXClient?.fetchStoredPreferences(
+        DashX.fetchStoredPreferences(
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
@@ -190,10 +139,10 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) {
         val preferencesString = MapUtil.toJSONElement(preferenceData).toString()
 
-        dashXClient?.saveStoredPreferences(
+        DashX.saveStoredPreferences(
             Json.decodeFromString<JsonObject>(preferencesString),
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
@@ -203,27 +152,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun subscribe() {
-        dashXClient?.subscribe()
+        DashX.subscribe()
     }
 
     @ReactMethod
     fun unsubscribe() {
-        dashXClient?.unsubscribe()
-    }
-
-    //FIXME Amend the logic to work with React Native content URIs
-    fun getFilePathFromURIString(contentUriString: String): String {
-        val sanitizedURI = contentUriString.replace("\"", "")
-        val path = Uri.parse(sanitizedURI).path
-        val index = path?.indexOf(':')
-
-        if (index == null) {
-            return ""
-        }
-
-        // Remove unnecessary URI component
-        val filePath = path!!.substring(index!! + 1)
-
-        return filePath
+        DashX.unsubscribe()
     }
 }

package/android/src/main/java/com/dashx/rn/sdk/ReactNativeLibraryInfoProvider.kt

@@ -0,0 +1,8 @@
+package com.dashx.rn.sdk
+
+import com.dashx.android.DashXLibraryInfoProvider
+
+class ReactNativeLibraryInfoProvider : DashXLibraryInfoProvider {
+    override val name = "@dashx/react-native"
+    override val version: String = BuildConfig.VERSION_NAME
+}

package/android/src/main/resources/META-INF/services/com.dashx.android.DashXLibraryInfoProvider

@@ -0,0 +1 @@
+com.dashx.rn.sdk.ReactNativeLibraryInfoProvider

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+};

package/index.d.ts

@@ -0,0 +1,92 @@
+import { EmitterSubscription } from 'react-native';
+
+export interface ConfigureOptions {
+  publicKey: string;
+  baseURI?: string;
+  targetEnvironment?: string;
+}
+
+export interface IdentifyOptions {
+  firstName?: string;
+  lastName?: string;
+  email?: string;
+  phone?: string;
+  [key: string]: string | undefined;
+}
+
+export type LogLevel = 0 | 1 | 2;
+
+export interface NotificationMessage {
+  [key: string]: unknown;
+}
+
+export interface DashXInstance {
+  /**
+   * Initialize the SDK with your public key and optional configuration.
+   * Call this as early as possible, e.g. in your root component.
+   */
+  configure(options: ConfigureOptions): void;
+
+  /**
+   * Identify the current user with traits such as name and email.
+   */
+  identify(options: IdentifyOptions): void;
+
+  /**
+   * Set user identity using a UID and authentication token.
+   */
+  setIdentity(uid: string, token: string): void;
+
+  /**
+   * Clear the current user identity and reset SDK state.
+   */
+  reset(): void;
+
+  /**
+   * Track a named event with optional metadata.
+   */
+  track(event: string, data?: Record<string, unknown>): void;
+
+  /**
+   * Track a screen view with optional metadata.
+   */
+  screen(screenName: string, data?: Record<string, unknown>): void;
+
+  /**
+   * Subscribe the current device to push notifications.
+   */
+  subscribe(): void;
+
+  /**
+   * Unsubscribe the current device from push notifications.
+   */
+  unsubscribe(): void;
+
+  /**
+   * Fetch stored notification preferences for the current user.
+   */
+  fetchStoredPreferences(): Promise<Record<string, unknown>>;
+
+  /**
+   * Save notification preferences for the current user.
+   */
+  saveStoredPreferences(
+    data: Record<string, unknown>
+  ): Promise<Record<string, unknown>>;
+
+  /**
+   * Set SDK log verbosity. 0 = off, 1 = errors, 2 = debug.
+   */
+  setLogLevel(level: LogLevel): void;
+
+  /**
+   * Register a listener for incoming push notification messages.
+   * Returns a subscription that can be removed via `.remove()`.
+   */
+  onMessageReceived(
+    callback: (message: NotificationMessage) => void
+  ): EmitterSubscription;
+}
+
+declare const DashX: DashXInstance;
+export default DashX;

package/index.js

@@ -1,78 +1,119 @@
-import { NativeModules, Platform } from 'react-native';
-
-const LINKING_ERROR =
-  `The package 'dashx-react-native' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo Go\n';
-
-const DashX = NativeModules.DashXReactNative
-  ? NativeModules.DashXReactNative
-  : new Proxy(
-    {},
-    {
-      get() {
-        throw new Error(LINKING_ERROR);
-      },
-    }
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+
+function getLinkingError() {
+  return (
+    `The package 'dashx-react-native' doesn't seem to be linked. Make sure: \n\n` +
+    Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
+    '- You rebuilt the app after installing the package\n' +
+    '- You are not using Expo Go\n'
   );
+}
 
-const {
-  configure,
-  identify,
-  setIdentity,
-  reset,
-  track,
-  screen,
-  fetchStoredPreferences,
-  saveStoredPreferences,
-  subscribe,
-  unsubscribe,
-  setLogLevel,
-} = DashX;
-
-DashX.configure = (options) => {
-  return configure(options);
+let _nativeDashX = null;
+function getNativeDashX() {
+  if (!_nativeDashX) {
+    _nativeDashX = NativeModules.DashXReactNative
+      ? NativeModules.DashXReactNative
+      : new Proxy(
+          {},
+          {
+            get() {
+              throw new Error(getLinkingError());
+            },
+          }
+        );
+  }
+  return _nativeDashX;
 }
 
-DashX.identify = (options) => {
-  return identify(options);
-};
+let _eventEmitter = null;
+function getEventEmitter() {
+  if (!_eventEmitter) {
+    _eventEmitter = new NativeEventEmitter(getNativeDashX());
+  }
+  return _eventEmitter;
+}
 
-DashX.setIdentity = (uid, token) => {
-  return setIdentity(uid, token);
-};
+const DashX = {
+  configure(options) {
+    if (!options || typeof options !== 'object') {
+      throw new Error('DashX.configure: options must be an object');
+    }
+    if (!options.publicKey || typeof options.publicKey !== 'string') {
+      throw new Error('DashX.configure: publicKey is required and must be a string');
+    }
+    return getNativeDashX().configure(options);
+  },
 
-DashX.reset = () => {
-  return reset();
-}
+  identify(options) {
+    if (!options || typeof options !== 'object') {
+      throw new Error('DashX.identify: options must be an object');
+    }
+    return getNativeDashX().identify(options);
+  },
 
-DashX.track = (event, data) => {
-  return track(event, data || null);
-}
+  setIdentity(uid, token) {
+    if (!uid || typeof uid !== 'string') {
+      throw new Error('DashX.setIdentity: uid is required and must be a string');
+    }
+    if (!token || typeof token !== 'string') {
+      throw new Error('DashX.setIdentity: token is required and must be a string');
+    }
+    return getNativeDashX().setIdentity(uid, token);
+  },
 
-DashX.screen = (screenName, data) => {
-  return screen(screenName, data || null)
-}
+  reset() {
+    return getNativeDashX().reset();
+  },
 
-DashX.fetchStoredPreferences = () => {
-  return fetchStoredPreferences();
-};
+  track(event, data) {
+    if (!event || typeof event !== 'string') {
+      throw new Error('DashX.track: event is required and must be a string');
+    }
+    return getNativeDashX().track(event, data || null);
+  },
 
-DashX.saveStoredPreferences = (preferenceData) => {
-  return saveStoredPreferences(preferenceData);
-};
+  screen(screenName, data) {
+    if (!screenName || typeof screenName !== 'string') {
+      throw new Error('DashX.screen: screenName is required and must be a string');
+    }
+    return getNativeDashX().screen(screenName, data || null);
+  },
 
-DashX.subscribe = () => {
-  return subscribe();
-}
+  fetchStoredPreferences() {
+    return getNativeDashX().fetchStoredPreferences();
+  },
 
-DashX.unsubscribe = () => {
-  return unsubscribe();
-}
+  saveStoredPreferences(preferenceData) {
+    if (!preferenceData || typeof preferenceData !== 'object') {
+      throw new Error(
+        'DashX.saveStoredPreferences: preferenceData is required and must be an object'
+      );
+    }
+    return getNativeDashX().saveStoredPreferences(preferenceData);
+  },
 
-DashX.setLogLevel = (level) => {
-  return setLogLevel(level);
-}
+  subscribe() {
+    return getNativeDashX().subscribe();
+  },
+
+  unsubscribe() {
+    return getNativeDashX().unsubscribe();
+  },
+
+  setLogLevel(level) {
+    if (typeof level !== 'number') {
+      throw new Error('DashX.setLogLevel: level must be a number');
+    }
+    return getNativeDashX().setLogLevel(level);
+  },
+
+  onMessageReceived(callback) {
+    if (typeof callback !== 'function') {
+      throw new Error('DashX.onMessageReceived: callback must be a function');
+    }
+    return getEventEmitter().addListener('messageReceived', callback);
+  },
+};
 
 export default DashX;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "DashX SDK for React Native",
   "main": "index.js",
+  "types": "index.d.ts",
   "files": [
     "!**/__fixtures__",
     "!**/__mocks__",
@@ -15,16 +16,13 @@
     "!android/gradlew",
     "!android/local.properties",
     "!ios/build",
-    "!lib/typescript/example",
     "*.podspec",
     "android",
-    "ContentOptionsBuilder.js",
-    "cpp",
     "DashXReactNative.podspec",
     "index.js",
+    "index.d.ts",
     "ios",
-    "README.md",
-    "utils.js"
+    "README.md"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -54,7 +52,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
-    "@react-native/eslint-config": "^0.72.2",
+    "@react-native/eslint-config": "0.77.3",
     "del-cli": "^5.0.0",
     "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.5.0",
@@ -62,18 +60,14 @@
     "jest": "^28.1.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
-    "react": "18.2.0",
-    "react-native": "0.72.3",
-    "react-native-builder-bob": "^0.21.3",
+    "react": "18.3.1",
+    "react-native": "0.77.3",
     "turbo": "^1.10.7"
   },
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
-  "dependencies": {
-    "react-native-get-real-path": "github:Wraptime/react-native-get-real-path"
-  },
+  "dependencies": {},
   "eslintConfig": {
     "root": true,
     "extends": [