@dashx/react-native 1.1.1 → 1.1.3

package/ios/DashXEventEmitter.swift

@@ -1,6 +1,6 @@
 class DashXEventEmitter {
     static let instance = DashXEventEmitter()
-    private static var eventEmitter: DashXReactNative!
+    private static var eventEmitter: DashXReactNative?
 
     private init() {}
 
@@ -9,6 +9,7 @@ class DashXEventEmitter {
     }
 
     func dispatch(name: String, body: Any?) {
-        DashXEventEmitter.eventEmitter.sendEvent(withName: name, body: body)
+        guard let emitter = DashXEventEmitter.eventEmitter else { return }
+        emitter.sendEvent(withName: name, body: body)
     }
 }

package/ios/DashXRCTAppDelegate.swift

@@ -1,90 +1,108 @@
-import FirebaseCore
-import FirebaseMessaging
 import Foundation
 import UIKit
 import DashX
+#if canImport(FirebaseCore)
+import FirebaseCore
+#endif
+#if canImport(FirebaseMessaging)
+import FirebaseMessaging
+#endif
 
 @objc(DashXRCTAppDelegate)
-open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotificationCenterDelegate {
-    // MARK: Getters
-    private var app: UIApplication = .shared
-
-    // MARK: Init
+open class DashXRCTAppDelegate: RCTDefaultReactNativeFactoryDelegate, UIApplicationDelegate, UNUserNotificationCenterDelegate {
 
-    public override init() {
-        super.init()
+    public var window: UIWindow?
+    private var reactNativeFactory: RCTReactNativeFactory?
 
-        UNUserNotificationCenter.current().delegate = self
-
-        // Register to ensure device token can be fetched
-        app.registerForRemoteNotifications()
-    }
+    /// The React Native module name. Defaults to "main". Override to match your app's registered component name.
+    open var moduleName: String { "main" }
 
-    // MARK: MessagingDelegate
+    // MARK: - UIApplicationDelegate
 
-    open override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    open func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        #if canImport(FirebaseCore)
         FirebaseApp.configure()
+        #endif
+        #if canImport(FirebaseMessaging)
         Messaging.messaging().delegate = self
+        #endif
+
+        UNUserNotificationCenter.current().delegate = self
 
-        // Requesting Push Notifications Permission
         DashX.requestNotificationPermission { authorizationStatus in
             switch authorizationStatus {
             case .authorized:
                 DashXLog.d(tag: #function, "permission authorized to receive push notifications")
+                DispatchQueue.main.async {
+                    application.registerForRemoteNotifications()
+                }
             default:
                 DashXLog.d(tag: #function, "permission denied to receive push notifications")
             }
         }
 
-        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+        let factory = RCTReactNativeFactory(delegate: self)
+        reactNativeFactory = factory
+
+        window = UIWindow(frame: UIScreen.main.bounds)
+        factory.startReactNative(withModuleName: moduleName, in: window, launchOptions: launchOptions)
+
+        return true
     }
 
     // MARK: - APNS Token Management
 
-    public override func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+    open func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
         DashXLog.d(tag: #function, "Unable to register for remote notifications: \(error.localizedDescription)")
     }
 
-    public override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    open func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+        #if canImport(FirebaseMessaging)
         Messaging.messaging().setAPNSToken(deviceToken, type: .unknown)
-    }
-
-    public func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
-        guard let token = fcmToken else {
-            DashXLog.d(tag: #function, "FCM Token is empty")
-            return
+        Messaging.messaging().token { token, error in
+            if let token = token {
+                DashX.setFCMToken(to: token)
+            }
         }
+        #endif
+    }
 
-        DashXLog.d(tag: #function, "FCM Token: \(token)")
+    // MARK: - Universal Links
 
-        DashX.setFCMToken(to: token)
+    open func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        DashX.handleUserActivity(userActivity: userActivity)
+        return true
     }
 
     // MARK: - Push Notifications
 
-    public func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
+    open func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         let message = notification.request.content.userInfo
 
-        // Pass notification reciept information to Firebase
+        #if canImport(FirebaseMessaging)
         Messaging.messaging().appDidReceiveMessage(message)
+        #endif
 
-        DashX.trackNotification(message: message, event: .delivered)
+        DashX.trackMessage(message: message, event: .delivered)
 
-        let presentationOptions = notificationDeliveredInForeground(message: message)
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: bridgeSafePayload(from: message))
 
-        completionHandler(presentationOptions)
+        completionHandler(notificationDeliveredInForeground(message: message))
     }
 
-    public func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
+    open func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
         let message = response.notification.request.content.userInfo
 
-        // Pass notification reciept information to Firebase
+        #if canImport(FirebaseMessaging)
         Messaging.messaging().appDidReceiveMessage(message)
+        #endif
+
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: bridgeSafePayload(from: message))
 
         if response.actionIdentifier == UNNotificationDismissActionIdentifier {
-            DashX.trackNotification(message: message, event: .dismissed)
+            DashX.trackMessage(message: message, event: .dismissed)
         } else {
-            DashX.trackNotification(message: message, event: .clicked)
+            DashX.trackMessage(message: message, event: .clicked)
 
             if let url = message.dashxNotificationUrl() {
                 handleLink(url: url)
@@ -96,9 +114,12 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
         completionHandler()
     }
 
-    public override func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
-        // Pass notification reciept information to Firebase
+    open func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+        #if canImport(FirebaseMessaging)
         Messaging.messaging().appDidReceiveMessage(userInfo)
+        #endif
+
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: bridgeSafePayload(from: userInfo))
 
         guard let dashxData = userInfo.dashxNotificationData() else {
             DashXLog.d(tag: #function, "Unable to parse DashX notification data")
@@ -147,13 +168,46 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
         completionHandler(.newData)
     }
 
-    // MARK: - Push Notifications handlers
+    // MARK: - Override points
 
-    open func notificationDeliveredInForeground(message: [AnyHashable: Any]) -> UNNotificationPresentationOptions { return [] }
+    open func notificationDeliveredInForeground(message: [AnyHashable: Any]) -> UNNotificationPresentationOptions { return [.banner, .sound] }
 
     open func notificationClicked(message: [AnyHashable: Any], actionIdentifier: String) {}
 
     open func handleLink(url: URL) {}
+
+    // MARK: - Helpers
+
+    private func bridgeSafePayload(from userInfo: [AnyHashable: Any]) -> [String: Any] {
+        userInfo.reduce(into: [String: Any]()) { result, pair in
+            let key = String(describing: pair.key)
+            let value = pair.value
+            if let str = value as? String {
+                result[key] = str
+            } else if let num = value as? NSNumber {
+                result[key] = num
+            } else if let dict = value as? [AnyHashable: Any] {
+                result[key] = bridgeSafePayload(from: dict)
+            } else if let arr = value as? [Any] {
+                result[key] = arr.map { item -> Any in
+                    if let str = item as? String { return str }
+                    if let num = item as? NSNumber { return num }
+                    if let d = item as? [AnyHashable: Any] { return bridgeSafePayload(from: d) }
+                    if let a = item as? [Any] {
+                        return a.map { sub -> Any in
+                            if let s = sub as? String { return s }
+                            if let n = sub as? NSNumber { return n }
+                            if let sd = sub as? [AnyHashable: Any] { return bridgeSafePayload(from: sd) }
+                            return "\(sub)"
+                        }
+                    }
+                    return "\(item)"
+                }
+            } else {
+                result[key] = "\(value)"
+            }
+        }
+    }
 }
 
 extension DashXRCTAppDelegate {
@@ -178,16 +232,13 @@ extension DashXRCTAppDelegate {
                 return
             }
 
-            // Create a temporary file URL to save the downloaded image
             let tmpDirectoryURL = FileManager.default.temporaryDirectory
             let uuid = UUID().uuidString
             let tmpFileURL = tmpDirectoryURL.appendingPathComponent(uuid + ".png")
 
             do {
-                // Move the downloaded file to the temporary file URL
                 try FileManager.default.moveItem(at: location, to: tmpFileURL)
 
-                // Create the notification attachment from the temporary file URL
                 let attachment = try UNNotificationAttachment(identifier: "\(id)-attachment", url: tmpFileURL, options: nil)
                 content.attachments = [attachment]
                 self.createNotification(id: id, content: content)
@@ -198,3 +249,18 @@ extension DashXRCTAppDelegate {
         task.resume()
     }
 }
+
+#if canImport(FirebaseMessaging)
+extension DashXRCTAppDelegate: MessagingDelegate {
+    open func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+        guard let token = fcmToken else {
+            DashXLog.d(tag: #function, "FCM Token is empty")
+            return
+        }
+
+        DashXLog.d(tag: #function, "FCM Token: \(token)")
+
+        DashX.setFCMToken(to: token)
+    }
+}
+#endif

package/ios/DashXReactNative-Bridging-Header.h

@@ -1,3 +1,5 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTViewManager.h>
+#import <React_RCTAppDelegate/RCTDefaultReactNativeFactoryDelegate.h>
+#import <React_RCTAppDelegate/RCTReactNativeFactory.h>

package/ios/DashXReactNative.h

@@ -0,0 +1 @@
+#import "DashXRCTAppDelegate.h"

package/ios/DashXReactNative.mm

@@ -13,6 +13,10 @@ RCT_EXTERN_METHOD(track:(NSString *)event data:(NSDictionary * _Nullable)data);
 
 RCT_EXTERN_METHOD(screen:(NSString *)screenName data:(NSDictionary * _Nullable)data);
 
+RCT_EXTERN_METHOD(fetchRecord:(NSString *)urn options:(NSDictionary * _Nullable)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(searchRecords:(NSString *)resource options:(NSDictionary * _Nullable)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
 RCT_EXTERN_METHOD(fetchStoredPreferences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
 
 RCT_EXTERN_METHOD(saveStoredPreferences:(NSDictionary *)preferenceData resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
@@ -25,4 +29,16 @@ RCT_EXTERN_METHOD(unsubscribe);
 
 RCT_EXTERN_METHOD(setLogLevel:(int *)level);
 
+RCT_EXTERN_METHOD(uploadAsset:(NSString *)filePath resource:(NSString *)resource attribute:(NSString *)attribute resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(fetchAsset:(NSString *)assetId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(enableLifecycleTracking);
+
+RCT_EXTERN_METHOD(enableAdTracking);
+
+RCT_EXTERN_METHOD(requestNotificationPermission:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(getNotificationPermissionStatus:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+
 @end

package/ios/DashXReactNative.swift

@@ -1,13 +1,14 @@
 import Foundation
 import DashX
 
-typealias CBU = CallbackUtils
-
 @objc(DashXReactNative)
 class DashXReactNative: RCTEventEmitter {
     override init() {
         super.init()
         DashXEventEmitter.instance.registerEventEmitter(eventEmitter: self)
+        DashX.linkHandler = { url in
+            DashXEventEmitter.instance.dispatch(name: "linkReceived", body: url.absoluteString)
+        }
     }
 
     override static func requiresMainQueueSetup() -> Bool {
@@ -15,14 +16,16 @@ class DashXReactNative: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String] {
-        return ["messageReceived"]
+        return ["messageReceived", "linkReceived"]
     }
 
     @objc(configure:)
     func configure(_ options: NSDictionary) {
-        let publicKey = options["publicKey"] as! String,
-            baseURI = options["baseURI"] as? String,
-            targetEnvironment = options["targetEnvironment"] as? String
+        guard let publicKey = options["publicKey"] as? String, !publicKey.isEmpty else {
+            return
+        }
+        let baseURI = options["baseURI"] as? String
+        let targetEnvironment = options["targetEnvironment"] as? String
 
         DashX.configure(
             withPublicKey: publicKey,
@@ -33,7 +36,8 @@ class DashXReactNative: RCTEventEmitter {
 
     @objc(identify:)
     func identify(_ options: NSDictionary) {
-        try? DashX.identify(withOptions: options)
+        let stringOptions = (options as? [String: Any])?.compactMapValues { ($0 as? CustomStringConvertible)?.description } ?? [:]
+        try? DashX.identify(options: stringOptions)
     }
 
     @objc(setIdentity:token:)
@@ -48,29 +52,74 @@ class DashXReactNative: RCTEventEmitter {
 
     @objc(track:data:)
     func track(_ event: String, _ data: NSDictionary?) {
-        DashX.track(event, withData: data)
+        DashX.track(event, withData: data as? [String: Any])
     }
 
     @objc(screen:data:)
     func screen(_ screenName: String, _ data: NSDictionary?) {
-        DashX.screen(screenName, withData: data)
+        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) {
+        DashXClient.instance.fetchRecord(
+            urn: urn,
+            preview: options?["preview"] as? Bool,
+            language: options?["language"] as? String,
+            fields: options?["fields"] as? [[String: Any]],
+            include: options?["include"] as? [[String: Any]],
+            exclude: options?["exclude"] as? [[String: Any]]
+        ) { result in
+            switch result {
+            case .success(let record): resolve(record)
+            case .failure(let error): reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
+        }
+    }
+
+    @objc(searchRecords:options:resolver:rejecter:)
+    func searchRecords(_ resource: String, options: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DashXClient.instance.searchRecords(
+            resource: resource,
+            filter: options?["filter"] as? [String: Any],
+            order: options?["order"] as? [[String: Any]],
+            limit: options?["limit"] as? Int,
+            page: options?["page"] as? Int,
+            preview: options?["preview"] as? Bool,
+            language: options?["language"] as? String,
+            fields: options?["fields"] as? [[String: Any]],
+            include: options?["include"] as? [[String: Any]],
+            exclude: options?["exclude"] as? [[String: Any]]
+        ) { result in
+            switch result {
+            case .success(let records): resolve(records)
+            case .failure(let error): reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
+        }
     }
 
     @objc(fetchStoredPreferences:rejecter:)
     func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        DashX.fetchStoredPreferences(
-            successCallback: CBU.resolveToSuccessCallback(resolve),
-            failureCallback: CBU.rejectToFailureCallback(reject)
-        )
+        DashXClient.instance.fetchStoredPreferences { result in
+            switch result {
+            case .success(let prefs): resolve(prefs)
+            case .failure(let error): reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
+        }
     }
 
-    @objc(saveStoredPreferences:resolve:rejecter:)
-    func saveStoredPreferences(_ preferenceData: NSDictionary, _ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        DashX.saveStoredPreferences(
-            preferenceData: preferenceData,
-            successCallback: CBU.resolveToSuccessCallback(resolve),
-            failureCallback: CBU.rejectToFailureCallback(reject)
-        )
+    @objc(saveStoredPreferences:resolver:rejecter:)
+    func saveStoredPreferences(_ preferenceData: NSDictionary, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let dict = preferenceData as? [String: Any] else {
+            reject("EINVAL", "preferenceData must be a plain object", nil)
+            return
+        }
+        DashXClient.instance.saveStoredPreferences(preferenceData: dict) { result in
+            switch result {
+            case .success(let success): resolve(success)
+            case .failure(let error): reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
+        }
     }
 
     @objc
@@ -88,18 +137,59 @@ class DashXReactNative: RCTEventEmitter {
         let logLevel = DashXLog.LogLevel(rawValue: level) ?? DashXLog.LogLevel.off
         DashXLog.setLogLevel(to: logLevel)
     }
-}
 
-class CallbackUtils {
-    static func resolveToSuccessCallback(_ resolve: @escaping RCTPromiseResolveBlock) -> SuccessCallback {
-        return resolve
+    @objc(uploadAsset:resource:attribute:resolver:rejecter:)
+    func uploadAsset(_ filePath: String, resource: String, attribute: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        let fileURL = URL(fileURLWithPath: filePath)
+        DashXClient.instance.uploadAsset(fileURL: fileURL, resource: resource, attribute: attribute) { result in
+            switch result {
+            case .success(let assetResponse):
+                if let data = try? JSONEncoder().encode(assetResponse),
+                   let dict = try? JSONSerialization.jsonObject(with: data) as? NSDictionary {
+                    resolve(dict)
+                } else {
+                    resolve(nil)
+                }
+            case .failure(let error):
+                reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
+        }
     }
 
-    static func rejectToFailureCallback(_ reject: @escaping RCTPromiseRejectBlock) -> FailureCallback {
-        let result: FailureCallback = { (error) in
-            reject("\((error as NSError).code)", error.localizedDescription, error)
+    @objc(fetchAsset:resolver:rejecter:)
+    func fetchAsset(_ assetId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DashXClient.instance.fetchAsset(assetId: assetId) { result in
+            switch result {
+            case .success(let assetResponse):
+                if let data = try? JSONEncoder().encode(assetResponse),
+                   let dict = try? JSONSerialization.jsonObject(with: data) as? NSDictionary {
+                    resolve(dict)
+                } else {
+                    resolve(nil)
+                }
+            case .failure(let error):
+                reject("EUNSPECIFIED", error.localizedDescription, error)
+            }
         }
+    }
+
+    @objc
+    func enableLifecycleTracking() {
+        DispatchQueue.main.async { DashX.enableLifecycleTracking() }
+    }
+
+    @objc
+    func enableAdTracking() {
+        DashX.enableAdTracking()
+    }
+
+    @objc(requestNotificationPermission:rejecter:)
+    func requestNotificationPermission(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DashX.requestNotificationPermission { status in resolve(status.rawValue) }
+    }
 
-        return result
+    @objc(getNotificationPermissionStatus:rejecter:)
+    func getNotificationPermissionStatus(_ resolve: @escaping RCTPromiseResolveBlock, rejecter 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.1",
+  "version": "1.1.3",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "types": "index.d.ts",
@@ -25,7 +25,8 @@
     "README.md"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest",
+    "lint": "eslint index.js"
   },
   "repository": {
     "type": "git",
@@ -37,7 +38,7 @@
     "android"
   ],
   "author": {
-    "name": "DashXDev",
+    "name": "Team DashX",
     "email": "dev@dashx.com"
   },
   "license": "MIT",
@@ -47,8 +48,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
+    "react": ">=17.0.0",
+    "react-native": ">=0.71.0"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
@@ -74,6 +75,9 @@
       "@react-native",
       "prettier"
     ],
+    "plugins": [
+      "prettier"
+    ],
     "rules": {
       "prettier/prettier": [
         "error",
@@ -95,5 +99,14 @@
     "quoteProps": "consistent",
     "singleQuote": true,
     "trailingComma": "es5"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "transform": {
+      "^.+\\.js$": "babel-jest"
+    },
+    "transformIgnorePatterns": [
+      "node_modules/(?!react-native)"
+    ]
   }
 }