@dashx/react-native 1.1.1 → 1.1.3

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-4
+9
 0

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,11 +1,33 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:2:1-4:12
-INJECTED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:2:1-4:12
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:1:1-16:12
+INJECTED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:1:1-16:12
 	package
 		INJECTED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml
+	xmlns:tools
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:2:5-51
 	xmlns:android
-		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:2:11-69
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:1:11-69
+application
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:3:5-15:19
+service#com.dashx.android.DashXFirebaseMessagingService
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:5:9-7:35
+	tools:node
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:7:13-32
+	android:name
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:6:13-75
+service#com.dashx.rn.sdk.DashXReactNativeFirebaseMessagingService
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:8:9-14:19
+	android:exported
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:10:13-37
+	android:name
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:9:13-85
+intent-filter#action:name:com.google.firebase.MESSAGING_EVENT
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:11:13-13:29
+action#com.google.firebase.MESSAGING_EVENT
+ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:12:17-78
+	android:name
+		ADDED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:12:25-75
 uses-sdk
 INJECTED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from /Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -52,5 +52,8 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
 
-    implementation "com.dashx:dashx-android:1.1.3"
+    // Ensure Firebase Messaging types are available for FCM service subclass
+    implementation 'com.google.firebase:firebase-messaging-ktx:23.1.2'
+
+    implementation "com.dashx:dashx-android:1.1.5"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,16 @@
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <!-- Replace dashx-android's FCM service with our subclass that also emits to JS. -->
+        <service
+            android:name="com.dashx.android.DashXFirebaseMessagingService"
+            tools:node="remove" />
+        <service
+            android:name="com.dashx.rn.sdk.DashXReactNativeFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
 </manifest>

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

@@ -0,0 +1,72 @@
+package com.dashx.rn.sdk
+
+import com.dashx.android.DashXFirebaseMessagingService
+import com.dashx.android.DashXLog
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.google.firebase.messaging.RemoteMessage
+
+/**
+ * Extends dashx-android's FCM service to also emit "messageReceived" to the React Native JS layer
+ * so that DashX.onMessageReceived() callbacks receive push notifications.
+ */
+class DashXReactNativeFirebaseMessagingService : DashXFirebaseMessagingService() {
+
+    private val tag = DashXReactNativeFirebaseMessagingService::class.java.simpleName
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        // Preserve dashx-android behavior (notification display + tracking)
+        super.onMessageReceived(remoteMessage)
+
+        val context = MessageReceivedEventHolder.reactContext ?: run {
+            DashXLog.d(tag, "React context not available, skipping JS emit")
+            return
+        }
+
+        if (!context.hasActiveReactInstance()) {
+            DashXLog.d(tag, "No active React instance, skipping JS emit")
+            return
+        }
+
+        val payload = remoteMessageToWritableMap(remoteMessage)
+        context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit("messageReceived", payload)
+    }
+
+    private fun remoteMessageToWritableMap(remoteMessage: RemoteMessage): WritableMap {
+        val map = Arguments.createMap()
+
+        // Data payload (always present as Map<String, String>)
+        remoteMessage.data.let { data ->
+            if (!data.isNullOrEmpty()) {
+                val dataMap = Arguments.createMap()
+                for ((key, value) in data) {
+                    dataMap.putString(key, value)
+                }
+                map.putMap("data", dataMap)
+            }
+        }
+
+        // Notification payload (if present)
+        remoteMessage.notification?.let { notification ->
+            val notifMap = Arguments.createMap()
+            notification.title?.let { notifMap.putString("title", it) }
+            notification.body?.let { notifMap.putString("body", it) }
+            notification.bodyLocalizationKey?.let { notifMap.putString("bodyLocalizationKey", it) }
+            notification.titleLocalizationKey?.let { notifMap.putString("titleLocalizationKey", it) }
+            notification.channelId?.let { notifMap.putString("channelId", it) }
+            notification.clickAction?.let { notifMap.putString("clickAction", it) }
+            notification.tag?.let { notifMap.putString("tag", it) }
+            notification.imageUrl?.toString()?.let { notifMap.putString("imageUrl", it) }
+            map.putMap("notification", notifMap)
+        }
+
+        remoteMessage.messageId?.let { map.putString("messageId", it) }
+        remoteMessage.senderId?.let { map.putString("senderId", it) }
+        remoteMessage.from?.let { map.putString("from", it) }
+
+        return map
+    }
+}

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

@@ -13,6 +13,16 @@ 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"
     }
@@ -77,11 +87,38 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     }
 
     @ReactMethod
-    fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
+    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,
-            options?.getBooleanIfPresent("preview"),
-            options?.getStringIfPresent("language"),
+            urn = urn,
+            preview = preview,
+            language = language,
+            fields = fields,
+            include = include,
+            exclude = exclude,
             onError = {
                 promise.reject("EUNSPECIFIED", it.message)
             },
@@ -92,30 +129,62 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     }
 
     @ReactMethod
-    fun searchContent(contentType: String, options: ReadableMap?, promise: Promise) {
+    fun searchRecords(resource: String, options: ReadableMap?, promise: Promise) {
         val jsonFilter = try {
-            convertMapToJson(options?.getMap("filter"))
+            convertMapToJson(options?.getMap("filter"))?.let { convertJsonToKJson(it) }
         } catch (e: Exception) {
             DashXLog.d(tag, e.message)
-            throw Exception("Encountered an error while parsing filter")
+            promise.reject("EUNSPECIFIED", "Error parsing filter: ${e.message}")
+            return
         }
-
-        val jsonOrder = try {
-            convertMapToJson(options?.getMap("order"))
+        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)
-            throw Exception("Encountered an error while parsing order")
+            promise.reject("EUNSPECIFIED", "Error parsing exclude: ${e.message}")
+            return
         }
 
         DashX.searchRecords(
-            contentType,
-            convertJsonToKJson(jsonFilter),
+            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 = { content ->
+            onSuccess = { records ->
                 val readableArray = Arguments.createArray()
-                content.forEach {
+                records.forEach {
                     readableArray.pushMap(convertJsonToMap(convertKJsonToJson(it)))
                 }
                 promise.resolve(readableArray)

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

@@ -0,0 +1,14 @@
+package com.dashx.rn.sdk
+
+import com.facebook.react.bridge.ReactApplicationContext
+
+/**
+ * Holds a reference to the React context so that [DashXReactNativeFirebaseMessagingService]
+ * can emit "messageReceived" events to JS when FCM messages arrive.
+ * Set by [DashXReactNativeModule], cleared when the module is invalidated.
+ */
+object MessageReceivedEventHolder {
+    @Volatile
+    var reactContext: ReactApplicationContext? = null
+        internal set
+}

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

@@ -26,6 +26,20 @@ fun convertJsonToKJson(jsonObject: JsonObject?): KJsonObject? {
     return Json.decodeFromString(jsonString)
 }
 
+/**
+ * Converts a ReadableArray of maps to a list of kotlinx JsonObjects for DashX.searchRecords options (order, fields, include, exclude).
+ */
+@Throws(JSONException::class)
+fun convertReadableArrayToKJsonList(readableArray: ReadableArray?): List<KJsonObject>? {
+    if (readableArray == null || readableArray.size() == 0) return null
+    return (0 until readableArray.size()).mapNotNull { i ->
+        when (readableArray.getType(i)) {
+            ReadableType.Map -> readableArray.getMap(i)?.let { convertMapToJson(it)?.let { gson -> convertJsonToKJson(gson) } }
+            else -> null
+        }
+    }.ifEmpty { null }
+}
+
 @Throws(JSONException::class)
 fun convertMapToJson(readableMap: ReadableMap?): JsonObject? {
     val iterator = readableMap?.keySetIterator() ?: return null

package/babel.config.js

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

package/index.d.ts

@@ -1,5 +1,14 @@
 import { EmitterSubscription } from 'react-native';
 
+/**
+ * Error codes returned by native SDKs in promise rejections.
+ * Consistent across iOS and Android.
+ */
+export enum DashXErrorCode {
+  /** An unspecified error occurred. */
+  EUNSPECIFIED = 'EUNSPECIFIED',
+}
+
 export interface ConfigureOptions {
   publicKey: string;
   baseURI?: string;
@@ -16,6 +25,43 @@ export interface IdentifyOptions {
 
 export type LogLevel = 0 | 1 | 2;
 
+export interface FetchRecordOptions {
+  preview?: boolean;
+  language?: string;
+  fields?: Record<string, unknown>[];
+  include?: Record<string, unknown>[];
+  exclude?: Record<string, unknown>[];
+}
+
+export interface SearchRecordsOptions {
+  filter?: Record<string, unknown>;
+  order?: Record<string, unknown>[];
+  limit?: number;
+  page?: number;
+  preview?: boolean;
+  language?: string;
+  fields?: Record<string, unknown>[];
+  include?: Record<string, unknown>[];
+  exclude?: Record<string, unknown>[];
+}
+
+export interface AssetData {
+  status?: string;
+  url?: string;
+  playbackIds?: { id?: string; policy?: string }[];
+}
+
+export interface AssetResponse {
+  status?: string;
+  data?: { asset?: AssetData };
+}
+
+/**
+ * Mirrors UNAuthorizationStatus integer values:
+ * 0 = notDetermined, 1 = denied, 2 = authorized, 3 = provisional, 4 = ephemeral
+ */
+export type NotificationPermissionStatus = 0 | 1 | 2 | 3 | 4;
+
 export interface NotificationMessage {
   [key: string]: unknown;
 }
@@ -52,6 +98,24 @@ export interface DashXInstance {
    */
   screen(screenName: string, data?: Record<string, unknown>): void;
 
+  /**
+   * Fetch a single record by URN (e.g. "article/123") with optional preview, language, fields, include, exclude.
+   * Returns a promise resolving to the record object.
+   */
+  fetchRecord(
+    urn: string,
+    options?: FetchRecordOptions
+  ): Promise<Record<string, unknown>>;
+
+  /**
+   * Search records by resource with optional filter, order, limit, preview, language, fields, include, exclude.
+   * Returns a promise resolving to an array of record objects.
+   */
+  searchRecords(
+    resource: string,
+    options?: SearchRecordsOptions
+  ): Promise<Record<string, unknown>[]>;
+
   /**
    * Subscribe the current device to push notifications.
    */
@@ -86,6 +150,49 @@ export interface DashXInstance {
   onMessageReceived(
     callback: (message: NotificationMessage) => void
   ): EmitterSubscription;
+
+  /**
+   * Upload a local file to DashX. Returns an AssetResponse with the asset status and URL.
+   * @param filePath Absolute path to the local file.
+   */
+  uploadAsset(
+    filePath: string,
+    resource: string,
+    attribute: string
+  ): Promise<AssetResponse>;
+
+  /**
+   * Fetch details of a previously uploaded asset by its ID.
+   */
+  fetchAsset(assetId: string): Promise<AssetResponse>;
+
+  /**
+   * Enable automatic app lifecycle event tracking (iOS only).
+   */
+  enableLifecycleTracking(): void;
+
+  /**
+   * Enable IDFA/ATT ad tracking and request the App Tracking Transparency permission (iOS only).
+   */
+  enableAdTracking(): void;
+
+  /**
+   * Request push notification permission from the user.
+   * Resolves with a NotificationPermissionStatus integer.
+   */
+  requestNotificationPermission(): Promise<NotificationPermissionStatus>;
+
+  /**
+   * Get the current push notification permission status without prompting.
+   * Resolves with a NotificationPermissionStatus integer.
+   */
+  getNotificationPermissionStatus(): Promise<NotificationPermissionStatus>;
+
+  /**
+   * Register a listener for deep link / universal link events dispatched by the SDK.
+   * Returns a subscription that can be removed via `.remove()`.
+   */
+  onLinkReceived(callback: (url: string) => void): EmitterSubscription;
 }
 
 declare const DashX: DashXInstance;

package/index.js

@@ -40,7 +40,9 @@ const DashX = {
       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');
+      throw new Error(
+        'DashX.configure: publicKey is required and must be a string'
+      );
     }
     return getNativeDashX().configure(options);
   },
@@ -54,10 +56,14 @@ const DashX = {
 
   setIdentity(uid, token) {
     if (!uid || typeof uid !== 'string') {
-      throw new Error('DashX.setIdentity: uid is required and must be a 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');
+      throw new Error(
+        'DashX.setIdentity: token is required and must be a string'
+      );
     }
     return getNativeDashX().setIdentity(uid, token);
   },
@@ -75,11 +81,37 @@ const DashX = {
 
   screen(screenName, data) {
     if (!screenName || typeof screenName !== 'string') {
-      throw new Error('DashX.screen: screenName is required and must be a string');
+      throw new Error(
+        'DashX.screen: screenName is required and must be a string'
+      );
     }
     return getNativeDashX().screen(screenName, data || null);
   },
 
+  fetchRecord(urn, options = {}) {
+    if (!urn || typeof urn !== 'string') {
+      throw new Error(
+        'DashX.fetchRecord: urn is required and must be a string (e.g. "article/123")'
+      );
+    }
+    if (options !== null && typeof options !== 'object') {
+      throw new Error('DashX.fetchRecord: options must be an object');
+    }
+    return getNativeDashX().fetchRecord(urn, options || null);
+  },
+
+  searchRecords(resource, options = {}) {
+    if (!resource || typeof resource !== 'string') {
+      throw new Error(
+        'DashX.searchRecords: resource is required and must be a string'
+      );
+    }
+    if (options !== null && typeof options !== 'object') {
+      throw new Error('DashX.searchRecords: options must be an object');
+    }
+    return getNativeDashX().searchRecords(resource, options || null);
+  },
+
   fetchStoredPreferences() {
     return getNativeDashX().fetchStoredPreferences();
   },
@@ -114,6 +146,51 @@ const DashX = {
     }
     return getEventEmitter().addListener('messageReceived', callback);
   },
+
+  uploadAsset(filePath, resource, attribute) {
+    if (!filePath || typeof filePath !== 'string') {
+      throw new Error('DashX.uploadAsset: filePath must be a string');
+    }
+    if (!resource || typeof resource !== 'string') {
+      throw new Error('DashX.uploadAsset: resource must be a string');
+    }
+    if (!attribute || typeof attribute !== 'string') {
+      throw new Error('DashX.uploadAsset: attribute must be a string');
+    }
+    return getNativeDashX().uploadAsset(filePath, resource, attribute);
+  },
+
+  fetchAsset(assetId) {
+    if (!assetId || typeof assetId !== 'string') {
+      throw new Error('DashX.fetchAsset: assetId must be a string');
+    }
+    return getNativeDashX().fetchAsset(assetId);
+  },
+
+  enableLifecycleTracking() {
+    if (Platform.OS !== 'ios') return;
+    return getNativeDashX().enableLifecycleTracking();
+  },
+
+  enableAdTracking() {
+    if (Platform.OS !== 'ios') return;
+    return getNativeDashX().enableAdTracking();
+  },
+
+  requestNotificationPermission() {
+    return getNativeDashX().requestNotificationPermission();
+  },
+
+  getNotificationPermissionStatus() {
+    return getNativeDashX().getNotificationPermissionStatus();
+  },
+
+  onLinkReceived(callback) {
+    if (typeof callback !== 'function') {
+      throw new Error('DashX.onLinkReceived: callback must be a function');
+    }
+    return getEventEmitter().addListener('linkReceived', callback);
+  },
 };
 
 export default DashX;