@magicred-1/react-native-lxmf 0.2.16 → 0.2.18

package/android/src/main/kotlin/expo/modules/lxmf/LxmfModule.kt

@@ -92,13 +92,13 @@ class LxmfModule : Module() {
     }
 
     // Messaging
-    AsyncFunction("send") { destHex: String, bodyBase64: String ->
-      nativeSend(destHex, bodyBase64).toDouble()
+    AsyncFunction("send") { destHex: String, bodyBase64: String, fieldsJson: String? ->
+      nativeSend(destHex, bodyBase64, fieldsJson).toDouble()
     }
 
-    AsyncFunction("broadcast") { destsHex: List<String>, bodyBase64: String ->
+    AsyncFunction("broadcast") { destsHex: List<String>, bodyBase64: String, fieldsJson: String? ->
       val destsJson = org.json.JSONArray(destsHex).toString()
-      nativeBroadcast(destsJson, bodyBase64).toDouble()
+      nativeBroadcast(destsJson, bodyBase64, fieldsJson).toDouble()
     }
 
     // Identity
@@ -202,8 +202,8 @@ class LxmfModule : Module() {
   private external fun nativeStop(): Int
   private external fun nativeIsRunning(): Boolean
   private external fun nativePollEvents(): String?
-  private external fun nativeSend(destHex: String, bodyBase64: String): Long
-  private external fun nativeBroadcast(destsJson: String, bodyBase64: String): Long
+  private external fun nativeSend(destHex: String, bodyBase64: String, fieldsJson: String?): Long
+  private external fun nativeBroadcast(destsJson: String, bodyBase64: String, fieldsJson: String?): Long
   private external fun nativeGetIdentityHex(): String?
   private external fun nativeGetStatus(): String?
   private external fun nativeGetBeacons(): String?

package/build/LxmfModule.d.ts

@@ -6,8 +6,8 @@ export type NativeModuleType = {
     }[], displayName: string, isBeacon: boolean): Promise<boolean>;
     stop(): Promise<boolean>;
     isRunning(): boolean;
-    send(destHex: string, bodyBase64: string): Promise<number>;
-    broadcast(destsHex: string[], bodyBase64: string): Promise<number>;
+    send(destHex: string, bodyBase64: string, fieldsJson?: string | null): Promise<number>;
+    broadcast(destsHex: string[], bodyBase64: string, fieldsJson?: string | null): Promise<number>;
     getIdentityHex(): string | null;
     getStatus(): string | null;
     getBeacons(): string | null;

package/build/index.d.ts

@@ -1,2 +1,2 @@
 export { LxmfModule, LxmfModuleNative, isLxmfNativeAvailable, NativeModuleType } from './LxmfModule';
-export { useLxmf, LxmfNodeMode, type UseLxmfOptions, type TcpInterface, type LxmfNodeStatus, type Beacon, type LxmfEvent } from './useLxmf';
+export { useLxmf, LxmfNodeMode, type UseLxmfOptions, type TcpInterface, type LxmfNodeStatus, type Beacon, type LxmfEvent, type LxmfMessageEvent, type LxmfMedia } from './useLxmf';

package/build/useLxmf.d.ts

@@ -18,6 +18,21 @@ export interface Beacon {
     lastAnnounce: number;
     reconnectAttempts: number;
 }
+export interface LxmfMessageEvent {
+    type: 'messageReceived';
+    source: string;
+    title: string;
+    body: string;
+    timestamp: number;
+    image?: {
+        mimeType: string;
+        data: string;
+    };
+    files?: {
+        name: string;
+        data: string;
+    }[];
+}
 export interface LxmfEvent {
     type: 'statusChanged' | 'packetReceived' | 'txReceived' | 'beaconDiscovered' | 'messageReceived' | 'announceReceived' | 'log' | 'error';
     [key: string]: any;
@@ -39,6 +54,22 @@ export interface TcpInterface {
     host: string;
     port: number;
 }
+/** Media attachments to include in an LXMF message.
+ *  Encoded as LXMF standard fields: FIELD_IMAGE (0x06) and FIELD_FILE_ATTACHMENTS (0x05).
+ *  Compatible with Sideband and other LXMF clients.
+ */
+export interface LxmfMedia {
+    /** Inline image: LXMF FIELD_IMAGE — rendered by receiving clients. */
+    image?: {
+        mimeType: string;
+        dataBase64: string;
+    };
+    /** File attachments: LXMF FIELD_FILE_ATTACHMENTS — list of named blobs. */
+    files?: {
+        name: string;
+        dataBase64: string;
+    }[];
+}
 export interface UseLxmfOptions {
     autoStart?: boolean;
     identityHex?: string;
@@ -74,8 +105,8 @@ export declare function useLxmf(options?: UseLxmfOptions): {
         isBeacon?: boolean;
     }) => Promise<boolean>;
     stop: () => Promise<void>;
-    send: (destHex: string, bodyBase64: string) => Promise<number>;
-    broadcast: (destsHex: string[], bodyBase64: string) => Promise<number>;
+    send: (destHex: string, bodyBase64: string, media?: LxmfMedia) => Promise<number>;
+    broadcast: (destsHex: string[], bodyBase64: string, media?: LxmfMedia) => Promise<number>;
     getStatus: () => LxmfNodeStatus | null;
     getBeacons: () => Beacon[];
     fetchMessages: (limit?: number) => any[];

package/build/useLxmf.js

@@ -177,18 +177,20 @@ function useLxmf(options = {}) {
             setError(e?.message ?? 'Failed to stop');
         }
     }, []);
-    const send = (0, react_1.useCallback)(async (destHex, bodyBase64) => {
+    const send = (0, react_1.useCallback)(async (destHex, bodyBase64, media) => {
         try {
-            return await LxmfModule_1.LxmfModule.send(destHex, bodyBase64);
+            const fieldsJson = media ? JSON.stringify(media) : null;
+            return await LxmfModule_1.LxmfModule.send(destHex, bodyBase64, fieldsJson);
         }
         catch (e) {
             setError(e.message);
             return -1;
         }
     }, []);
-    const broadcast = (0, react_1.useCallback)(async (destsHex, bodyBase64) => {
+    const broadcast = (0, react_1.useCallback)(async (destsHex, bodyBase64, media) => {
         try {
-            return await LxmfModule_1.LxmfModule.broadcast(destsHex, bodyBase64);
+            const fieldsJson = media ? JSON.stringify(media) : null;
+            return await LxmfModule_1.LxmfModule.broadcast(destsHex, bodyBase64, fieldsJson);
         }
         catch (e) {
             setError(e.message);

package/ios/LxmfModule.swift

@@ -27,7 +27,8 @@ func lxmf_is_running() -> Int32
 func lxmf_send(
     _ destPtr: UnsafePointer<UInt8>?,
     _ bodyPtr: UnsafePointer<UInt8>?,
-    _ bodyLen: Int
+    _ bodyLen: Int,
+    _ fieldsJson: UnsafePointer<CChar>?
 ) -> Int64
 
 @_silgen_name("lxmf_broadcast")
@@ -35,7 +36,8 @@ func lxmf_broadcast(
     _ destsPtr: UnsafePointer<UInt8>?,
     _ destCount: Int,
     _ bodyPtr: UnsafePointer<UInt8>?,
-    _ bodyLen: Int
+    _ bodyLen: Int,
+    _ fieldsJson: UnsafePointer<CChar>?
 ) -> Int64
 
 @_silgen_name("lxmf_poll_events")
@@ -230,22 +232,33 @@ public class LxmfModule: Module {
 
         // --- Messaging ---
 
-        AsyncFunction("send") { (destHex: String, bodyBase64: String) -> Double in
+        AsyncFunction("send") { (destHex: String, bodyBase64: String, fieldsJson: String?) -> Double in
             guard let destBytes = Self.hexToBytes(destHex),
                   destBytes.count == 16,
                   let bodyData = Data(base64Encoded: bodyBase64) else {
                 return -1
             }
 
-            let opId = destBytes.withUnsafeBufferPointer { destBuf in
-                [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
-                    lxmf_send(destBuf.baseAddress, bodyBuf.baseAddress, bodyData.count)
+            let opId: Int64
+            if let json = fieldsJson {
+                opId = destBytes.withUnsafeBufferPointer { destBuf in
+                    [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
+                        json.withCString { jsonPtr in
+                            lxmf_send(destBuf.baseAddress, bodyBuf.baseAddress, bodyData.count, jsonPtr)
+                        }
+                    }
+                }
+            } else {
+                opId = destBytes.withUnsafeBufferPointer { destBuf in
+                    [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
+                        lxmf_send(destBuf.baseAddress, bodyBuf.baseAddress, bodyData.count, nil)
+                    }
                 }
             }
             return Double(opId)
         }
 
-        AsyncFunction("broadcast") { (destsHex: [String], bodyBase64: String) -> Double in
+        AsyncFunction("broadcast") { (destsHex: [String], bodyBase64: String, fieldsJson: String?) -> Double in
             guard let bodyData = Data(base64Encoded: bodyBase64) else { return -1 }
 
             var flatDests = [UInt8]()
@@ -254,9 +267,20 @@ public class LxmfModule: Module {
                 flatDests.append(contentsOf: bytes)
             }
 
-            let opId = flatDests.withUnsafeBufferPointer { destBuf in
-                [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
-                    lxmf_broadcast(destBuf.baseAddress, destsHex.count, bodyBuf.baseAddress, bodyData.count)
+            let opId: Int64
+            if let json = fieldsJson {
+                opId = flatDests.withUnsafeBufferPointer { destBuf in
+                    [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
+                        json.withCString { jsonPtr in
+                            lxmf_broadcast(destBuf.baseAddress, destsHex.count, bodyBuf.baseAddress, bodyData.count, jsonPtr)
+                        }
+                    }
+                }
+            } else {
+                opId = flatDests.withUnsafeBufferPointer { destBuf in
+                    [UInt8](bodyData).withUnsafeBufferPointer { bodyBuf in
+                        lxmf_broadcast(destBuf.baseAddress, destsHex.count, bodyBuf.baseAddress, bodyData.count, nil)
+                    }
                 }
             }
             return Double(opId)

package/ios/RustCore/liblxmf_rn.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>liblxmf_rn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>liblxmf_rn.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>liblxmf_rn.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>liblxmf_rn.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicred-1/react-native-lxmf",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "LXMF Reticulum mesh networking for React Native + Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",