@magicred-1/react-native-lxmf 0.2.15 → 0.2.17

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

@@ -66,8 +66,9 @@ class LxmfModule : Module() {
 
     AsyncFunction("start") { identityHex: String, lxmfAddressHex: String, mode: Int,
                               announceIntervalMs: Double, bleMtuHint: Int,
-                              tcpInterfaces: List<Map<String, Any>>, displayName: String ->
-      Log.d(TAG, "start() mode=$mode interfaces=$tcpInterfaces name=$displayName")
+                              tcpInterfaces: List<Map<String, Any>>, displayName: String,
+                              isBeacon: Boolean ->
+      Log.d(TAG, "start() mode=$mode interfaces=$tcpInterfaces name=$displayName beacon=$isBeacon")
       val interfacesJson = org.json.JSONArray(tcpInterfaces.map { iface ->
         org.json.JSONObject().apply {
           put("host", iface["host"] ?: "")
@@ -75,7 +76,7 @@ class LxmfModule : Module() {
         }
       }).toString()
       val rc = nativeStart(identityHex, lxmfAddressHex, mode, announceIntervalMs.toLong(),
-                  bleMtuHint.toShort(), interfacesJson, displayName)
+                  bleMtuHint.toShort(), interfacesJson, displayName, isBeacon)
       if (rc != 0) throw RuntimeException("nativeStart returned $rc")
       true
     }
@@ -91,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
@@ -195,13 +196,14 @@ class LxmfModule : Module() {
     announceIntervalMs: Long,
     bleMtuHint: Short,
     tcpInterfacesJson: String,
-    displayName: String
+    displayName: String,
+    isBeacon: Boolean
   ): Int
   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

@@ -3,11 +3,11 @@ export type NativeModuleType = {
     start(identityHex: string, lxmfAddressHex: string, mode: number, announceIntervalMs: number, bleMtuHint: number, tcpInterfaces: {
         host: string;
         port: number;
-    }[], displayName: string): Promise<boolean>;
+    }[], 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 LxmfMedia } from './useLxmf';

package/build/useLxmf.d.ts

@@ -39,6 +39,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;
@@ -55,6 +71,8 @@ export interface UseLxmfOptions {
     bleMtuHint?: number;
     /** Display name broadcast in LXMF announces. Default: "lxmf-mobile" */
     displayName?: string;
+    /** Advertise this node as an anonmesh beacon (app_data = "anonmesh::beacon::v1\0<name>"). Default: false */
+    isBeacon?: boolean;
 }
 export declare function useLxmf(options?: UseLxmfOptions): {
     status: LxmfNodeStatus | null;
@@ -69,10 +87,11 @@ export declare function useLxmf(options?: UseLxmfOptions): {
         mode?: LxmfNodeMode;
         tcpInterfaces?: TcpInterface[];
         displayName?: string;
+        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

@@ -131,11 +131,12 @@ function useLxmf(options = {}) {
             const announceMs = options.announceIntervalMs ?? 5000;
             const bleMtu = options.bleMtuHint ?? 255;
             const displayName = overrides?.displayName ?? options.displayName ?? '';
+            const isBeacon = overrides?.isBeacon ?? options.isBeacon ?? false;
             if (mode !== LxmfNodeMode.BleOnly && tcpInterfaces.length === 0) {
                 setError(`Mode ${mode} requires at least one TCP interface.`);
                 return false;
             }
-            await LxmfModule_1.LxmfModule.start(resolvedIdentityHex, resolvedLxmfAddressHex, mode, announceMs, bleMtu, tcpInterfaces, displayName);
+            await LxmfModule_1.LxmfModule.start(resolvedIdentityHex, resolvedLxmfAddressHex, mode, announceMs, bleMtu, tcpInterfaces, displayName, isBeacon);
             setRunning(true);
             syncStatus();
             setError(null);
@@ -153,6 +154,7 @@ function useLxmf(options = {}) {
         options.announceIntervalMs,
         options.bleMtuHint,
         options.displayName,
+        options.isBeacon,
         syncStatus,
     ]);
     (0, react_1.useEffect)(() => {
@@ -175,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

@@ -13,7 +13,8 @@ func lxmf_start(
     _ announceIntervalMs: UInt64,
     _ bleMtuHint: UInt16,
     _ tcpInterfacesJson: UnsafePointer<CChar>?,
-    _ displayName: UnsafePointer<CChar>?
+    _ displayName: UnsafePointer<CChar>?,
+    _ isBeacon: UInt8
 ) -> Int32
 
 @_silgen_name("lxmf_stop")
@@ -26,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")
@@ -34,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")
@@ -182,7 +185,8 @@ public class LxmfModule: Module {
             announceIntervalMs: Double,
             bleMtuHint: Int,
             tcpInterfaces: [[String: Any]],
-            displayName: String
+            displayName: String,
+            isBeacon: Bool
         ) -> Bool in
             // Serialize TCP interfaces to JSON (matches Android pattern)
             let interfacesJson: String
@@ -200,7 +204,8 @@ public class LxmfModule: Module {
                             lxmf_start(
                                 idPtr, addrPtr,
                                 UInt32(mode), UInt64(announceIntervalMs),
-                                UInt16(bleMtuHint), ifacesPtr, namePtr
+                                UInt16(bleMtuHint), ifacesPtr, namePtr,
+                                isBeacon ? 1 : 0
                             )
                         }
                     }
@@ -227,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]()
@@ -251,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/package.json

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