@dashx/react-native 1.1.0 → 1.1.2

package/ios/DashXRCTAppDelegate.swift

@@ -70,6 +70,8 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
 
         DashX.trackNotification(message: message, event: .delivered)
 
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: bridgeSafePayload(from: message))
+
         let presentationOptions = notificationDeliveredInForeground(message: message)
 
         completionHandler(presentationOptions)
@@ -81,6 +83,8 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
         // Pass notification reciept information to Firebase
         Messaging.messaging().appDidReceiveMessage(message)
 
+        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: bridgeSafePayload(from: message))
+
         if response.actionIdentifier == UNNotificationDismissActionIdentifier {
             DashX.trackNotification(message: message, event: .dismissed)
         } else {
@@ -100,6 +104,8 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
         // Pass notification reciept information to Firebase
         Messaging.messaging().appDidReceiveMessage(userInfo)
 
+        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")
             completionHandler(.failed)
@@ -154,6 +160,38 @@ open class DashXRCTAppDelegate: RCTAppDelegate, MessagingDelegate, UNUserNotific
     open func notificationClicked(message: [AnyHashable: Any], actionIdentifier: String) {}
 
     open func handleLink(url: URL) {}
+
+    /// Converts notification userInfo to a dictionary safe for the React Native bridge (string keys, JSON-serializable values).
+    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 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 {

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);

package/ios/DashXReactNative.swift

@@ -20,9 +20,11 @@ class DashXReactNative: RCTEventEmitter {
 
     @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,
@@ -56,6 +58,16 @@ class DashXReactNative: RCTEventEmitter {
         DashX.screen(screenName, withData: data)
     }
 
+    @objc(fetchRecord:options:resolver:rejecter:)
+    func fetchRecord(_ urn: String, options: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        reject("EUNIMPLEMENTED", "fetchRecord is not yet implemented on iOS", nil)
+    }
+
+    @objc(searchRecords:options:resolver:rejecter:)
+    func searchRecords(_ resource: String, options: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        reject("EUNIMPLEMENTED", "searchRecords is not yet implemented on iOS", nil)
+    }
+
     @objc(fetchStoredPreferences:rejecter:)
     func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         DashX.fetchStoredPreferences(

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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"
@@ -49,8 +47,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",
@@ -64,15 +62,12 @@
     "prettier": "^2.0.5",
     "react": "18.3.1",
     "react-native": "0.77.3",
-    "react-native-builder-bob": "^0.21.3",
     "turbo": "^1.10.7"
   },
   "engines": {
     "node": ">= 16.0.0"
   },
-  "dependencies": {
-    "react-native-get-real-path": "github:Wraptime/react-native-get-real-path"
-  },
+  "dependencies": {},
   "eslintConfig": {
     "root": true,
     "extends": [