@dashx/react-native 1.1.1 → 1.1.2

package/README.md

@@ -161,16 +161,25 @@ import DashX from '@dashx/react-native';
 
 ### Configure
 
-Initialize the SDK as early as possible (e.g. in your root component or `App.js`):
+Initialize the SDK once at app startup. Call `configure` at the top level of your entry file (e.g. `App.js`) so it runs before any component mounts:
 
 ```js
+// App.js — call at module level, before the component
+import DashX from '@dashx/react-native';
+
 DashX.configure({
   publicKey: 'your-public-key',
   // baseURI: 'https://api.dashx.com',       // optional, custom API endpoint
   // targetEnvironment: 'production',         // optional
 });
+
+export default function App() {
+  // ...
+}
 ```
 
+Calling from `useEffect` in your root component also works, but module-level init is preferred so the SDK is ready as early as possible.
+
 | Option | Type | Required | Description |
 |--------|------|----------|-------------|
 | `publicKey` | `string` | Yes | Your DashX public key |
@@ -218,6 +227,51 @@ DashX.screen('HomeScreen', {
 });
 ```
 
+### Fetch a record
+
+Fetch a single record by URN (e.g. `"article/123"`) with optional options (matches [dashx-android](https://github.com/dashxhq/dashx-android) `fetchRecord`). **Android only**; on iOS the promise rejects until the native SDK supports it.
+
+```js
+const record = await DashX.fetchRecord('article/123', {
+  preview: false,
+  language: 'en',
+  // fields, include, exclude as arrays of objects if needed
+});
+```
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `preview` | `boolean` | Include draft/preview content |
+| `language` | `string` | Content language |
+| `fields` | `object[]` | Fields to return |
+| `include` | `object[]` | Related data to include |
+| `exclude` | `object[]` | Fields to exclude |
+
+### Search records
+
+Search records by resource with optional filter, order, limit, and other options (matches [dashx-android](https://github.com/dashxhq/dashx-android) `searchRecords`). **Android only**; on iOS the promise rejects until the native SDK supports it.
+
+```js
+const records = await DashX.searchRecords('article', {
+  filter: { status: 'published' },
+  order: [{ field: 'createdAt', direction: 'desc' }],
+  limit: 10,
+  preview: false,
+  language: 'en',
+});
+```
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `filter` | `object` | Filter criteria |
+| `order` | `object[]` | Sort order (e.g. `[{ field, direction }]`) |
+| `limit` | `number` | Max records to return |
+| `preview` | `boolean` | Preview/draft content |
+| `language` | `string` | Content language |
+| `fields` | `object[]` | Fields to return |
+| `include` | `object[]` | Related data to include |
+| `exclude` | `object[]` | Fields to exclude |
+
 ### Push notifications
 
 Subscribe the current device to push notifications:
@@ -280,16 +334,15 @@ Below is a full example of integrating DashX in a React Native Android app:
 
 ```js
 // App.js
-import React, { useEffect } from 'react';
+import React from 'react';
 import { View, Text, Button, StyleSheet } from 'react-native';
 import DashX from '@dashx/react-native';
 
-export default function App() {
-  useEffect(() => {
-    DashX.configure({ publicKey: 'your-public-key' });
-    DashX.subscribe();
-  }, []);
+// Initialize once at app load
+DashX.configure({ publicKey: 'your-public-key' });
+DashX.subscribe();
 
+export default function App() {
   const handleLogin = () => {
     DashX.setIdentity('user-123', 'auth-token');
     DashX.identify({
@@ -334,6 +387,8 @@ const styles = StyleSheet.create({
 | `reset` | `()` | `void` | Clear the current user identity |
 | `track` | `(event: string, data?: object)` | `void` | Track a named event with optional data |
 | `screen` | `(screenName: string, data?: object)` | `void` | Track a screen view with optional data |
+| `fetchRecord` | `(urn: string, options?: object)` | `Promise<object>` | Fetch a single record by URN (e.g. `"article/123"`). Options: preview, language, fields, include, exclude. Android only; iOS rejects until implemented. |
+| `searchRecords` | `(resource: string, options?: object)` | `Promise<object[]>` | Search records (filter, order, limit, preview, language, fields, include, exclude). Android only; iOS rejects until implemented. |
 | `subscribe` | `()` | `void` | Subscribe device for push notifications |
 | `unsubscribe` | `()` | `void` | Unsubscribe device from push notifications |
 | `fetchStoredPreferences` | `()` | `Promise<object>` | Fetch stored notification preferences |

package/android/.gitignore

@@ -0,0 +1,10 @@
+# Build outputs
+build/
+
+# Gradle
+.gradle/
+local.properties
+
+# IDE
+.idea/
+*.iml

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/processDebugManifest/aapt/AndroidManifest.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.dashx.rn.sdk" >
 
     <uses-sdk android:minSdkVersion="26" />
 
+    <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/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt

@@ -1,7 +1,33 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.dashx.rn.sdk" >
-4
-5    <uses-sdk android:minSdkVersion="26" />
-6
-7</manifest>
+3    xmlns:tools="http://schemas.android.com/tools"
+4    package="com.dashx.rn.sdk" >
+5
+6    <uses-sdk android:minSdkVersion="26" />
+7
+8    <application>
+8-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:3:5-15:19
+9
+10        <!-- Replace dashx-android's FCM service with our subclass that also emits to JS. -->
+11        <service
+11-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:5:9-7:35
+12            android:name="com.dashx.android.DashXFirebaseMessagingService"
+12-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:6:13-75
+13            tools:node="remove" />
+13-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:7:13-32
+14        <service
+14-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:8:9-14:19
+15            android:name="com.dashx.rn.sdk.DashXReactNativeFirebaseMessagingService"
+15-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:9:13-85
+16            android:exported="false" >
+16-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:10:13-37
+17            <intent-filter>
+17-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:11:13-13:29
+18                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+18-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:12:17-78
+18-->/Users/gulshan/Work/dashx-demo-rn/node_modules/@dashx/react-native/android/src/main/AndroidManifest.xml:12:25-75
+19            </intent-filter>
+20        </service>
+21    </application>
+22
+23</manifest>

package/android/build/intermediates/merged_manifest/debug/processDebugManifest/AndroidManifest.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.dashx.rn.sdk" >
 
     <uses-sdk android:minSdkVersion="26" />
 
+    <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/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.4"
 }

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/index.d.ts

@@ -16,6 +16,25 @@ 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;
+  preview?: boolean;
+  language?: string;
+  fields?: Record<string, unknown>[];
+  include?: Record<string, unknown>[];
+  exclude?: Record<string, unknown>[];
+}
+
 export interface NotificationMessage {
   [key: string]: unknown;
 }
@@ -52,6 +71,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.
    */

package/index.js

@@ -80,6 +80,26 @@ const DashX = {
     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();
   },

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

@@ -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,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "types": "index.d.ts",
@@ -47,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",