@dashx/react-native 1.1.5 → 1.2.0

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

@@ -0,0 +1,85 @@
+package com.dashx.rn.sdk
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+
+class DashXReactNativeModule(reactContext: ReactApplicationContext) :
+    NativeDashXReactNativeSpec(reactContext) {
+
+    private val impl = DashXReactNativeModuleImpl(reactContext)
+
+    override fun getName(): String = DashXReactNativeModuleImpl.NAME
+
+    override fun initialize() {
+        super.initialize()
+        impl.initialize()
+    }
+
+    override fun invalidate() {
+        impl.invalidate()
+        super.invalidate()
+    }
+
+    override fun configure(options: ReadableMap) = impl.configure(options)
+
+    override fun identify(options: ReadableMap?) = impl.identify(options)
+
+    override fun setIdentity(uid: String?, token: String?) = impl.setIdentity(uid, token)
+
+    override fun reset() = impl.reset()
+
+    override fun track(event: String, data: ReadableMap?) = impl.track(event, data)
+
+    override fun screen(screenName: String, data: ReadableMap?) = impl.screen(screenName, data)
+
+    override fun fetchRecord(urn: String, options: ReadableMap?, promise: Promise) =
+        impl.fetchRecord(urn, options, promise)
+
+    override fun searchRecords(resource: String, options: ReadableMap?, promise: Promise) =
+        impl.searchRecords(resource, options, promise)
+
+    override fun fetchStoredPreferences(promise: Promise) = impl.fetchStoredPreferences(promise)
+
+    override fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) =
+        impl.saveStoredPreferences(preferenceData, promise)
+
+    override fun subscribe() = impl.subscribe()
+
+    override fun unsubscribe() = impl.unsubscribe()
+
+    override fun setLogLevel(level: Double) = impl.setLogLevel(level)
+
+    override fun enableLifecycleTracking() = impl.enableLifecycleTracking()
+
+    override fun enableAdTracking() = impl.enableAdTracking()
+
+    override fun processURL(url: String, source: String?, forwardToLinkHandler: Boolean) =
+        impl.processURL(url, source, forwardToLinkHandler)
+
+    override fun trackNotificationNavigation(action: ReadableMap?, notificationId: String?) =
+        impl.trackNotificationNavigation(action, notificationId)
+
+    override fun uploadAsset(
+        filePath: String,
+        resource: String,
+        attribute: String,
+        promise: Promise
+    ) = impl.uploadAsset(filePath, resource, attribute, promise)
+
+    override fun fetchAsset(assetId: String, promise: Promise) = impl.fetchAsset(assetId, promise)
+
+    override fun requestNotificationPermission(promise: Promise) =
+        impl.requestNotificationPermission(promise)
+
+    override fun getNotificationPermissionStatus(promise: Promise) =
+        impl.getNotificationPermissionStatus(promise)
+
+    override fun addListener(eventName: String) {
+        // Required for RN built-in Event Emitter Calls
+    }
+
+    override fun removeListeners(count: Double) {
+        // Required for RN built-in Event Emitter Calls
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.dashx.rn.sdk
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class DashXReactNativePackage : BaseReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == DashXReactNativeModuleImpl.NAME) {
+            DashXReactNativeModule(reactContext)
+        } else {
+            null
+        }
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            mapOf(
+                DashXReactNativeModuleImpl.NAME to ReactModuleInfo(
+                    DashXReactNativeModuleImpl.NAME,
+                    DashXReactNativeModuleImpl.NAME,
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit
+                    false, // hasConstants
+                    false, // isCxxModule
+                    true   // isTurboModule
+                )
+            )
+        }
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.dashx.rn.sdk
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+
+class DashXReactNativeModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext) {
+
+    private val impl = DashXReactNativeModuleImpl(reactContext)
+
+    override fun getName(): String = DashXReactNativeModuleImpl.NAME
+
+    override fun initialize() {
+        super.initialize()
+        impl.initialize()
+    }
+
+    override fun invalidate() {
+        impl.invalidate()
+        super.invalidate()
+    }
+
+    @ReactMethod
+    fun configure(options: ReadableMap) = impl.configure(options)
+
+    @ReactMethod
+    fun identify(options: ReadableMap?) = impl.identify(options)
+
+    @ReactMethod
+    fun setIdentity(uid: String?, token: String?) = impl.setIdentity(uid, token)
+
+    @ReactMethod
+    fun reset() = impl.reset()
+
+    @ReactMethod
+    fun track(event: String, data: ReadableMap?) = impl.track(event, data)
+
+    @ReactMethod
+    fun screen(screenName: String, data: ReadableMap?) = impl.screen(screenName, data)
+
+    @ReactMethod
+    fun fetchRecord(urn: String, options: ReadableMap?, promise: Promise) =
+        impl.fetchRecord(urn, options, promise)
+
+    @ReactMethod
+    fun searchRecords(resource: String, options: ReadableMap?, promise: Promise) =
+        impl.searchRecords(resource, options, promise)
+
+    @ReactMethod
+    fun fetchStoredPreferences(promise: Promise) = impl.fetchStoredPreferences(promise)
+
+    @ReactMethod
+    fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) =
+        impl.saveStoredPreferences(preferenceData, promise)
+
+    @ReactMethod
+    fun subscribe() = impl.subscribe()
+
+    @ReactMethod
+    fun unsubscribe() = impl.unsubscribe()
+
+    @ReactMethod
+    fun setLogLevel(level: Double) = impl.setLogLevel(level)
+
+    @ReactMethod
+    fun enableLifecycleTracking() = impl.enableLifecycleTracking()
+
+    @ReactMethod
+    fun enableAdTracking() = impl.enableAdTracking()
+
+    @ReactMethod
+    fun processURL(url: String, source: String?, forwardToLinkHandler: Boolean) =
+        impl.processURL(url, source, forwardToLinkHandler)
+
+    @ReactMethod
+    fun trackNotificationNavigation(action: ReadableMap?, notificationId: String?) =
+        impl.trackNotificationNavigation(action, notificationId)
+
+    @ReactMethod
+    fun uploadAsset(filePath: String, resource: String, attribute: String, promise: Promise) =
+        impl.uploadAsset(filePath, resource, attribute, promise)
+
+    @ReactMethod
+    fun fetchAsset(assetId: String, promise: Promise) = impl.fetchAsset(assetId, promise)
+
+    @ReactMethod
+    fun requestNotificationPermission(promise: Promise) =
+        impl.requestNotificationPermission(promise)
+
+    @ReactMethod
+    fun getNotificationPermissionStatus(promise: Promise) =
+        impl.getNotificationPermissionStatus(promise)
+
+    @ReactMethod
+    fun addListener(eventName: String) {
+        // Required for RN built-in Event Emitter Calls
+    }
+
+    @ReactMethod
+    fun removeListeners(count: Double) {
+        // Required for RN built-in Event Emitter Calls
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.dashx.rn.sdk
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class DashXReactNativePackage : BaseReactPackage() {
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == DashXReactNativeModuleImpl.NAME) {
+            DashXReactNativeModule(reactContext)
+        } else {
+            null
+        }
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            mapOf(
+                DashXReactNativeModuleImpl.NAME to ReactModuleInfo(
+                    DashXReactNativeModuleImpl.NAME,
+                    DashXReactNativeModuleImpl.NAME,
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit
+                    false, // hasConstants
+                    false, // isCxxModule
+                    false  // isTurboModule
+                )
+            )
+        }
+    }
+}

package/index.d.ts

@@ -7,6 +7,8 @@ import { EmitterSubscription } from 'react-native';
 export enum DashXErrorCode {
   /** An unspecified error occurred. */
   EUNSPECIFIED = 'EUNSPECIFIED',
+  /** The operation is not supported on this platform. */
+  EUNSUPPORTED = 'EUNSUPPORTED',
 }
 
 export interface ConfigureOptions {
@@ -92,7 +94,7 @@ export interface DashXInstance {
   /**
    * Set user identity using a UID and authentication token.
    */
-  setIdentity(uid: string, token: string): void;
+  setIdentity(uid: string, token?: string | null): void;
 
   /**
    * Clear the current user identity and reset SDK state.

package/index.js

@@ -1,4 +1,5 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+import NativeDashXReactNative from './src/NativeDashXReactNative';
 
 function getLinkingError() {
   return (
@@ -12,8 +13,10 @@ function getLinkingError() {
 let _nativeDashX = null;
 function getNativeDashX() {
   if (!_nativeDashX) {
-    _nativeDashX = NativeModules.DashXReactNative
-      ? NativeModules.DashXReactNative
+    const nativeModule =
+      NativeDashXReactNative || NativeModules.DashXReactNative;
+    _nativeDashX = nativeModule
+      ? nativeModule
       : new Proxy(
           {},
           {
@@ -60,12 +63,7 @@ const DashX = {
         '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);
+    return getNativeDashX().setIdentity(uid, token || null);
   },
 
   reset() {

package/ios/DashXNotificationHandler.swift

@@ -0,0 +1,222 @@
+import Foundation
+import UIKit
+import UserNotifications
+import DashX
+#if canImport(FirebaseMessaging)
+import FirebaseMessaging
+#endif
+
+/// The result of handling a notification response.
+/// Consumers can use `url` to navigate and `actionIdentifier` for custom action handling.
+@objc(DashXNotificationResponseResult)
+public final class DashXNotificationResponseResult: NSObject {
+    @objc public let userInfo: [AnyHashable: Any]
+    @objc public let actionIdentifier: String
+    /// The DashX notification URL, if present in the payload.
+    @objc public let url: URL?
+
+    init(userInfo: [AnyHashable: Any], actionIdentifier: String, url: URL?) {
+        self.userInfo = userInfo
+        self.actionIdentifier = actionIdentifier
+        self.url = url
+    }
+}
+
+@objc(DashXNotificationHandler)
+public final class DashXNotificationHandler: NSObject {
+
+    @objc
+    public static func handleRemoteNotification(
+        userInfo: [AnyHashable: Any],
+        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 {
+            completionHandler(.noData)
+            return
+        }
+
+        DashX.trackMessage(message: userInfo, event: .delivered)
+
+        let content = UNMutableNotificationContent()
+        content.sound = UNNotificationSound.default
+        content.title = dashxData.title
+        content.body = dashxData.body
+        content.userInfo = userInfo
+        content.categoryIdentifier = Constants.DASHX_NOTIFICATION_CATEGORY_IDENTIFIER
+
+        var actions: [UNNotificationAction] = []
+        if let actionButtons = dashxData.actionButtons {
+            for button in actionButtons {
+                actions.append(
+                    UNNotificationAction(
+                        identifier: button.identifier,
+                        title: button.label,
+                        options: [.foreground]
+                    )
+                )
+            }
+        }
+
+        let category = UNNotificationCategory(
+            identifier: Constants.DASHX_NOTIFICATION_CATEGORY_IDENTIFIER,
+            actions: actions,
+            intentIdentifiers: [],
+            options: .customDismissAction
+        )
+        UNUserNotificationCenter.current().setNotificationCategories([category])
+
+        if let imagePath = dashxData.image, let imageURL = URL(string: imagePath) {
+            createNotificationWithImage(id: dashxData.id, imageURL: imageURL, content: content)
+        } else {
+            createNotification(id: dashxData.id, content: content)
+        }
+
+        completionHandler(.newData)
+    }
+
+    @objc
+    @discardableResult
+    public static func handleNotificationResponse(_ response: UNNotificationResponse) -> DashXNotificationResponseResult {
+        let userInfo = response.notification.request.content.userInfo
+
+        #if canImport(FirebaseMessaging)
+        Messaging.messaging().appDidReceiveMessage(userInfo)
+        #endif
+
+        DashXEventEmitter.instance.dispatch(
+            name: "messageReceived",
+            body: bridgeSafePayload(from: userInfo)
+        )
+
+        if response.actionIdentifier == UNNotificationDismissActionIdentifier {
+            DashX.trackMessage(message: userInfo, event: .dismissed)
+        } else {
+            DashX.trackMessage(message: userInfo, event: .clicked)
+        }
+
+        let notificationUrl = userInfo.dashxNotificationUrl()
+
+        return DashXNotificationResponseResult(
+            userInfo: userInfo,
+            actionIdentifier: response.actionIdentifier,
+            url: notificationUrl
+        )
+    }
+
+    // MARK: - Device Token
+
+    /// Bridges the APNS device token to Firebase Cloud Messaging and registers
+    /// the FCM token with DashX. Call this from
+    /// `application(_:didRegisterForRemoteNotificationsWithDeviceToken:)`.
+    @objc
+    public static func handleDeviceToken(_ deviceToken: Data) {
+        #if canImport(FirebaseMessaging)
+        Messaging.messaging().setAPNSToken(deviceToken, type: .unknown)
+        Messaging.messaging().token { token, error in
+            if let token = token {
+                DashX.setFCMToken(to: token)
+            }
+        }
+        #endif
+    }
+
+    // MARK: - Foreground Notification
+
+    /// Handles a notification that arrived while the app is in the foreground.
+    /// Tracks the delivery event, emits `messageReceived` to JS, forwards to
+    /// Firebase analytics, and presents the notification as a banner with sound.
+    /// Call this from `userNotificationCenter(_:willPresent:withCompletionHandler:)`.
+    @objc
+    public static func handleForegroundNotification(
+        _ notification: UNNotification,
+        completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+    ) {
+        let userInfo = notification.request.content.userInfo
+
+        #if canImport(FirebaseMessaging)
+        Messaging.messaging().appDidReceiveMessage(userInfo)
+        #endif
+
+        DashX.trackMessage(message: userInfo, event: .delivered)
+
+        DashXEventEmitter.instance.dispatch(
+            name: "messageReceived",
+            body: bridgeSafePayload(from: userInfo)
+        )
+
+        completionHandler([.banner, .sound])
+    }
+
+    // MARK: - Private Helpers
+
+    private static func createNotification(id: String, content: UNMutableNotificationContent) {
+        let request = UNNotificationRequest(identifier: id, content: content, trigger: nil)
+        UNUserNotificationCenter.current().add(request) { error in
+            if let error = error {
+                DashXLog.d(tag: #function, "Failed to schedule notification: \(error.localizedDescription)")
+            }
+        }
+    }
+
+    private static func createNotificationWithImage(
+        id: String,
+        imageURL: URL,
+        content: UNMutableNotificationContent
+    ) {
+        let task = URLSession.shared.downloadTask(with: imageURL) { location, _, error in
+            guard let location = location, error == nil else {
+                createNotification(id: id, content: content)
+                return
+            }
+
+            let tmpDir = FileManager.default.temporaryDirectory
+            let tmpFile = tmpDir.appendingPathComponent(UUID().uuidString + ".png")
+
+            do {
+                try FileManager.default.moveItem(at: location, to: tmpFile)
+                let attachment = try UNNotificationAttachment(
+                    identifier: "\(id)-attachment",
+                    url: tmpFile,
+                    options: nil
+                )
+                content.attachments = [attachment]
+                createNotification(id: id, content: content)
+            } catch {
+                createNotification(id: id, content: content)
+            }
+        }
+        task.resume()
+    }
+
+    private static 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) }
+                    return "\(item)"
+                }
+            } else {
+                result[key] = "\(value)"
+            }
+        }
+    }
+}

package/ios/DashXReactNative-Bridging-Header.h

@@ -1,5 +1,3 @@
 #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.mm

@@ -1,6 +1,10 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNDashXReactNativeSpec.h"
+#endif
+
 @interface RCT_EXTERN_MODULE(DashXReactNative, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(configure:(NSDictionary *)options);
@@ -13,13 +17,13 @@ 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(fetchRecord:(NSString *)urn options:(NSDictionary * _Nullable)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
-RCT_EXTERN_METHOD(searchRecords:(NSString *)resource options:(NSDictionary * _Nullable)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(searchRecords:(NSString *)resource options:(NSDictionary * _Nullable)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
-RCT_EXTERN_METHOD(fetchStoredPreferences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(fetchStoredPreferences:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
-RCT_EXTERN_METHOD(saveStoredPreferences:(NSDictionary *)preferenceData resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(saveStoredPreferences:(NSDictionary *)preferenceData resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
 RCT_EXTERN_METHOD(reset);
 
@@ -27,18 +31,37 @@ RCT_EXTERN_METHOD(subscribe);
 
 RCT_EXTERN_METHOD(unsubscribe);
 
-RCT_EXTERN_METHOD(setLogLevel:(int *)level);
+RCT_EXTERN_METHOD(setLogLevel:(double)level);
 
-RCT_EXTERN_METHOD(uploadAsset:(NSString *)filePath resource:(NSString *)resource attribute:(NSString *)attribute resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(uploadAsset:(NSString *)filePath resource:(NSString *)resource attribute:(NSString *)attribute resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
-RCT_EXTERN_METHOD(fetchAsset:(NSString *)assetId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(fetchAsset:(NSString *)assetId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
 
 RCT_EXTERN_METHOD(enableLifecycleTracking);
 
 RCT_EXTERN_METHOD(enableAdTracking);
 
-RCT_EXTERN_METHOD(requestNotificationPermission:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+RCT_EXTERN_METHOD(processURL:(NSString *)url source:(NSString * _Nullable)source forwardToLinkHandler:(BOOL)forwardToLinkHandler);
+
+RCT_EXTERN_METHOD(trackNotificationNavigation:(NSDictionary * _Nullable)action notificationId:(NSString * _Nullable)notificationId);
+
+RCT_EXTERN_METHOD(requestNotificationPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
+
+RCT_EXTERN_METHOD(getNotificationPermissionStatus:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject);
+
+@end
+
+#ifdef RCT_NEW_ARCH_ENABLED
+@interface DashXReactNative () <NativeDashXReactNativeSpec>
+@end
+
+@implementation DashXReactNative (TurboModule)
 
-RCT_EXTERN_METHOD(getNotificationPermissionStatus:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject);
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeDashXReactNativeSpecJSI>(params);
+}
 
 @end
+#endif