@dashx/react-native 1.1.4 → 1.2.0

package/ios/DashXReactNative.swift

@@ -60,8 +60,8 @@ class DashXReactNative: RCTEventEmitter {
         DashX.screen(screenName, withData: data as? [String: Any])
     }
 
-    @objc(fetchRecord:options:resolver:rejecter:)
-    func fetchRecord(_ urn: String, options: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(fetchRecord:options:resolve:reject:)
+    func fetchRecord(_ urn: String, options: NSDictionary?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashXClient.instance.fetchRecord(
             urn: urn,
             preview: options?["preview"] as? Bool,
@@ -77,8 +77,8 @@ class DashXReactNative: RCTEventEmitter {
         }
     }
 
-    @objc(searchRecords:options:resolver:rejecter:)
-    func searchRecords(_ resource: String, options: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(searchRecords:options:resolve:reject:)
+    func searchRecords(_ resource: String, options: NSDictionary?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashXClient.instance.searchRecords(
             resource: resource,
             filter: options?["filter"] as? [String: Any],
@@ -98,8 +98,8 @@ class DashXReactNative: RCTEventEmitter {
         }
     }
 
-    @objc(fetchStoredPreferences:rejecter:)
-    func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(fetchStoredPreferences:reject:)
+    func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashXClient.instance.fetchStoredPreferences { result in
             switch result {
             case .success(let prefs): resolve(prefs)
@@ -108,8 +108,8 @@ class DashXReactNative: RCTEventEmitter {
         }
     }
 
-    @objc(saveStoredPreferences:resolver:rejecter:)
-    func saveStoredPreferences(_ preferenceData: NSDictionary, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(saveStoredPreferences:resolve:reject:)
+    func saveStoredPreferences(_ preferenceData: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let dict = preferenceData as? [String: Any] else {
             reject("EINVAL", "preferenceData must be a plain object", nil)
             return
@@ -133,13 +133,21 @@ class DashXReactNative: RCTEventEmitter {
     }
 
     @objc(setLogLevel:)
-    func setLogLevel(_ level: Int) {
-        let logLevel = DashXLog.LogLevel(rawValue: level) ?? DashXLog.LogLevel.off
+    func setLogLevel(_ level: Double) {
+        // JS contract: 0 = off, 1 = errors, 2 = debug
+        // Native SDK:  off = -1, error = 0, info = 1, debug = 2
+        let logLevel: DashXLog.LogLevel
+        switch Int(level) {
+        case 0: logLevel = .off
+        case 1: logLevel = .error
+        case 2: logLevel = .debug
+        default: logLevel = .off
+        }
         DashXLog.setLogLevel(to: logLevel)
     }
 
-    @objc(uploadAsset:resource:attribute:resolver:rejecter:)
-    func uploadAsset(_ filePath: String, resource: String, attribute: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(uploadAsset:resource:attribute:resolve:reject:)
+    func uploadAsset(_ filePath: String, resource: String, attribute: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         let fileURL = URL(fileURLWithPath: filePath)
         DashXClient.instance.uploadAsset(fileURL: fileURL, resource: resource, attribute: attribute) { result in
             switch result {
@@ -156,8 +164,8 @@ class DashXReactNative: RCTEventEmitter {
         }
     }
 
-    @objc(fetchAsset:resolver:rejecter:)
-    func fetchAsset(_ assetId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(fetchAsset:resolve:reject:)
+    func fetchAsset(_ assetId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashXClient.instance.fetchAsset(assetId: assetId) { result in
             switch result {
             case .success(let assetResponse):
@@ -183,13 +191,47 @@ class DashXReactNative: RCTEventEmitter {
         DashX.enableAdTracking()
     }
 
-    @objc(requestNotificationPermission:rejecter:)
-    func requestNotificationPermission(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(processURL:source:forwardToLinkHandler:)
+    func processURL(_ url: String, source: NSString?, forwardToLinkHandler: Bool) {
+        guard let parsedURL = URL(string: url) else { return }
+        DashX.processURL(parsedURL, source: source as String?, forwardToLinkHandler: forwardToLinkHandler)
+    }
+
+    @objc(trackNotificationNavigation:notificationId:)
+    func trackNotificationNavigation(_ action: NSDictionary?, notificationId: NSString?) {
+        var navigationAction: NavigationAction? = nil
+        if let action = action, let type = action["type"] as? String {
+            switch type {
+            case "deepLink":
+                if let urlString = action["url"] as? String, let url = URL(string: urlString) {
+                    navigationAction = .deepLink(url: url)
+                }
+            case "screen":
+                if let name = action["name"] as? String {
+                    navigationAction = .screen(name: name, data: action["data"] as? [String: String])
+                }
+            case "richLanding":
+                if let urlString = action["url"] as? String, let url = URL(string: urlString) {
+                    navigationAction = .richLanding(url: url)
+                }
+            case "clickAction":
+                if let actionStr = action["action"] as? String {
+                    navigationAction = .clickAction(action: actionStr)
+                }
+            default:
+                break
+            }
+        }
+        DashX.trackNotificationNavigation(navigationAction, notificationId: notificationId as String?)
+    }
+
+    @objc(requestNotificationPermission:reject:)
+    func requestNotificationPermission(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashX.requestNotificationPermission { status in resolve(status.rawValue) }
     }
 
-    @objc(getNotificationPermissionStatus:rejecter:)
-    func getNotificationPermissionStatus(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    @objc(getNotificationPermissionStatus:reject:)
+    func getNotificationPermissionStatus(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         DashX.getNotificationPermissionStatus { status in resolve(status.rawValue) }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "types": "index.d.ts",
@@ -22,8 +22,17 @@
     "index.js",
     "index.d.ts",
     "ios",
+    "src",
     "README.md"
   ],
+  "codegenConfig": {
+    "name": "RNDashXReactNativeSpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.dashx.rn.sdk"
+    }
+  },
   "scripts": {
     "test": "jest",
     "lint": "eslint index.js"
@@ -49,7 +58,7 @@
   },
   "peerDependencies": {
     "react": ">=17.0.0",
-    "react-native": ">=0.71.0"
+    "react-native": ">=0.74.0"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",

package/src/NativeDashXReactNative.ts

@@ -0,0 +1,42 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  configure(options: Object): void;
+  identify(options: Object | null): void;
+  setIdentity(uid: string | null, token: string | null): void;
+  reset(): void;
+  track(event: string, data: Object | null): void;
+  screen(screenName: string, data: Object | null): void;
+  fetchRecord(urn: string, options: Object | null): Promise<Object>;
+  searchRecords(resource: string, options: Object | null): Promise<Object[]>;
+  fetchStoredPreferences(): Promise<Object>;
+  saveStoredPreferences(preferenceData: Object): Promise<Object>;
+  subscribe(): void;
+  unsubscribe(): void;
+  setLogLevel(level: number): void;
+  uploadAsset(
+    filePath: string,
+    resource: string,
+    attribute: string
+  ): Promise<Object>;
+  fetchAsset(assetId: string): Promise<Object>;
+  enableLifecycleTracking(): void;
+  enableAdTracking(): void;
+  processURL(
+    url: string,
+    source: string | null,
+    forwardToLinkHandler: boolean
+  ): void;
+  trackNotificationNavigation(
+    action: Object | null,
+    notificationId: string | null
+  ): void;
+  requestNotificationPermission(): Promise<number>;
+  getNotificationPermissionStatus(): Promise<number>;
+
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default TurboModuleRegistry.get<Spec>('DashXReactNative');

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

@@ -1,231 +0,0 @@
-package com.dashx.rn.sdk
-
-import com.dashx.rn.sdk.util.*
-import com.dashx.android.DashX
-import com.dashx.android.DashXLog
-import com.dashx.android.DashXLog.LogLevel
-import com.facebook.react.bridge.*
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-
-class DashXReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-    private val tag = DashXReactNativeModule::class.java.simpleName
-
-    override fun initialize() {
-        super.initialize()
-        MessageReceivedEventHolder.reactContext = reactContext
-    }
-
-    override fun invalidate() {
-        MessageReceivedEventHolder.reactContext = null
-        super.invalidate()
-    }
-
-    override fun getName(): String {
-        return "DashXReactNative"
-    }
-
-    @ReactMethod
-    fun setLogLevel(level: Int) {
-        val logLevel = LogLevel.values().firstOrNull { it.code == level } ?: LogLevel.OFF
-        DashXLog.setLogLevel(logLevel)
-    }
-
-    @ReactMethod
-    fun configure(options: ReadableMap) {
-        DashX.configure(
-            reactContext,
-            options.getString("publicKey")!!,
-            options.getStringIfPresent("baseURI"),
-            options.getStringIfPresent("targetEnvironment")
-        )
-    }
-
-    @ReactMethod
-    fun identify(options: ReadableMap?) {
-        val optionsHashMap = options?.toHashMap()
-            ?.filterValues { it != null }
-            ?.mapValues { it.value.toString() }
-        DashX.identify(optionsHashMap?.let { HashMap(it) })
-    }
-
-    @ReactMethod
-    fun setIdentity(uid: String?, token: String?) {
-        DashX.setIdentity(uid, token)
-    }
-
-    @ReactMethod
-    fun reset() {
-        DashX.reset()
-    }
-
-    @ReactMethod
-    fun track(event: String, data: ReadableMap?) {
-        val jsonData = try {
-            data?.toHashMap()
-                ?.filterValues { it != null }
-                ?.mapValues { it.value.toString() }
-                ?.let { HashMap(it) }
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            return
-        }
-
-        DashX.track(event, jsonData)
-    }
-
-    @ReactMethod
-    fun screen(screenName: String, data: ReadableMap?) {
-        val screenData = data?.toHashMap()
-            ?.filterValues { it != null }
-            ?.mapValues { it.value.toString() }
-            ?.let { HashMap(it) }
-            ?: HashMap()
-        DashX.screen(screenName, screenData)
-    }
-
-    @ReactMethod
-    fun fetchRecord(urn: String, options: ReadableMap?, promise: Promise) {
-        val preview = options?.getBooleanIfPresent("preview")
-        val language = options?.getStringIfPresent("language")
-        val fields = try {
-            convertReadableArrayToKJsonList(options?.getArray("fields"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing fields: ${e.message}")
-            return
-        }
-        val include = try {
-            convertReadableArrayToKJsonList(options?.getArray("include"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing include: ${e.message}")
-            return
-        }
-        val exclude = try {
-            convertReadableArrayToKJsonList(options?.getArray("exclude"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing exclude: ${e.message}")
-            return
-        }
-
-        DashX.fetchRecord(
-            urn = urn,
-            preview = preview,
-            language = language,
-            fields = fields,
-            include = include,
-            exclude = exclude,
-            onError = {
-                promise.reject("EUNSPECIFIED", it.message)
-            },
-            onSuccess = {
-                promise.resolve(convertJsonToMap(convertKJsonToJson(it)))
-            }
-        )
-    }
-
-    @ReactMethod
-    fun searchRecords(resource: String, options: ReadableMap?, promise: Promise) {
-        val jsonFilter = try {
-            convertMapToJson(options?.getMap("filter"))?.let { convertJsonToKJson(it) }
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing filter: ${e.message}")
-            return
-        }
-        val order = try {
-            convertReadableArrayToKJsonList(options?.getArray("order"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing order: ${e.message}")
-            return
-        }
-        val limit = options?.getIntIfPresent("limit")
-        val preview = options?.getBooleanIfPresent("preview")
-        val language = options?.getStringIfPresent("language")
-        val fields = try {
-            convertReadableArrayToKJsonList(options?.getArray("fields"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing fields: ${e.message}")
-            return
-        }
-        val include = try {
-            convertReadableArrayToKJsonList(options?.getArray("include"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing include: ${e.message}")
-            return
-        }
-        val exclude = try {
-            convertReadableArrayToKJsonList(options?.getArray("exclude"))
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            promise.reject("EUNSPECIFIED", "Error parsing exclude: ${e.message}")
-            return
-        }
-
-        DashX.searchRecords(
-            resource = resource,
-            filter = jsonFilter,
-            order = order,
-            limit = limit,
-            preview = preview,
-            language = language,
-            fields = fields,
-            include = include,
-            exclude = exclude,
-            onError = {
-                promise.reject("EUNSPECIFIED", it.message)
-            },
-            onSuccess = { records ->
-                val readableArray = Arguments.createArray()
-                records.forEach {
-                    readableArray.pushMap(convertJsonToMap(convertKJsonToJson(it)))
-                }
-                promise.resolve(readableArray)
-            }
-        )
-    }
-
-    @ReactMethod
-    fun fetchStoredPreferences(promise: Promise) {
-        DashX.fetchStoredPreferences(
-            onError = {
-                promise.reject("EUNSPECIFIED", it.message)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
-    @ReactMethod
-    fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) {
-        val preferencesString = MapUtil.toJSONElement(preferenceData).toString()
-
-        DashX.saveStoredPreferences(
-            Json.decodeFromString<JsonObject>(preferencesString),
-            onError = {
-                promise.reject("EUNSPECIFIED", it.message)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
-    @ReactMethod
-    fun subscribe() {
-        DashX.subscribe()
-    }
-
-    @ReactMethod
-    fun unsubscribe() {
-        DashX.unsubscribe()
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.dashx.rn.sdk
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JavaScriptModule
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-import java.util.Arrays
-
-class DashXPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return Arrays.asList<NativeModule>(DashXReactNativeModule(reactContext))
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return emptyList()
-    }
-}

package/ios/DashXRCTAppDelegate.h

@@ -1,3 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React_RCTAppDelegate/RCTAppDelegate.h>