@magicred-1/ble-mesh 1.3.4 → 1.3.6

package/android/src/main/java/com/blemesh/BleMeshModule.kt

@@ -1096,17 +1096,19 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
             return
         }
 
-        // Deduplication
-        val messageId = "$senderId-${packet.timestamp}-${packet.type}"
-        if (processedMessages.contains(messageId)) {
-            Log.d(TAG, "Duplicate packet, skipping")
-            return
-        }
-        processedMessages.add(messageId)
-
         val messageType = MessageType.fromValue(packet.type)
         Log.d(TAG, "Processing packet type: $messageType")
 
+        // Deduplication (but NOT for encrypted messages which may contain transactions)
+        if (messageType != MessageType.NOISE_ENCRYPTED) {
+            val messageId = "$senderId-${packet.timestamp}-${packet.type}"
+            if (processedMessages.contains(messageId)) {
+                Log.d(TAG, "Duplicate packet, skipping")
+                return
+            }
+            processedMessages.add(messageId)
+        }
+
         // Handle by type
         when (messageType) {
             MessageType.ANNOUNCE -> handleAnnounce(packet, senderId)
@@ -1213,23 +1215,10 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
         Log.d(TAG, "Received handshake from $senderId, payload size: ${packet.payload.size}")
         Log.d(TAG, "Payload hex (first 100 bytes): ${packet.payload.take(100).joinToString("") { "%02x".format(it) }}")
         
-        // Extract EC public key from payload (should be 65 bytes, but payload might include extra data)
-        val publicKeySize = 65
-        if (packet.payload.size < publicKeySize) {
-            Log.e(TAG, "Invalid handshake payload size: ${packet.payload.size}, expected at least $publicKeySize")
-            return
-        }
-        
-        val publicKeyBytes = packet.payload.copyOfRange(0, publicKeySize)
-        Log.d(TAG, "Extracted public key: ${publicKeyBytes.size} bytes")
-        
-        val publicKeyBytes = packet.payload.copyOfRange(0, publicKeySize)
-        Log.d(TAG, "Extracted public key: ${publicKeyBytes.size} bytes")
-
         try {
-            // Derive shared secret
+            // Parse X.509 encoded EC public key (entire payload is the key)
             val keyFactory = java.security.KeyFactory.getInstance("EC")
-            val keySpec = java.security.spec.X509EncodedKeySpec(publicKeyBytes)
+            val keySpec = java.security.spec.X509EncodedKeySpec(packet.payload)
             val peerPublicKey = keyFactory.generatePublic(keySpec)
 
             val keyAgreement = KeyAgreement.getInstance("ECDH")
@@ -1245,7 +1234,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
 
             // Update peer's noise public key
             peers[senderId]?.let { peer ->
-                peers[senderId] = peer.copy(noisePublicKey = publicKeyBytes)
+                peers[senderId] = peer.copy(noisePublicKey = packet.payload)
             }
 
             // Send response handshake

package/ios/BleMesh.swift

@@ -883,13 +883,17 @@ class BleMesh: RCTEventEmitter {
         // Skip our own packets
         if senderID == myPeerID { return }
 
-        // Deduplication
-        let messageID = "\(senderID)-\(packet.timestamp)-\(packet.type)"
-        if processedMessages.contains(messageID) { return }
-        processedMessages.insert(messageID)
+        let messageTypeEnum = MessageType(rawValue: packet.type)
+        
+        // Deduplication (but NOT for encrypted messages which may contain transactions)
+        if messageTypeEnum != .noiseEncrypted {
+            let messageID = "\(senderID)-\(packet.timestamp)-\(packet.type)"
+            if processedMessages.contains(messageID) { return }
+            processedMessages.insert(messageID)
+        }
 
         // Handle by type
-        switch MessageType(rawValue: packet.type) {
+        switch messageTypeEnum {
         case .announce:
             handleAnnounce(packet, from: senderID)
         case .message:
@@ -1000,14 +1004,20 @@ class BleMesh: RCTEventEmitter {
 
     private func handleNoiseHandshake(_ packet: BitchatPacket, from senderID: String) {
         NSLog("[BleMesh] Received handshake from \(senderID), payload size: \(packet.payload.count)")
+        NSLog("[BleMesh] Payload hex (first 100 bytes): \(packet.payload.prefix(100).map { String(format: "%02x", $0) }.joined())")
         
-        // Store peer's public key and derive shared secret
-        guard packet.payload.count == 32 else {
-            NSLog("[BleMesh] Invalid handshake payload size: \(packet.payload.count), expected 32")
+        // Extract Curve25519 public key from payload (should be 32 bytes, but payload might include extra data)
+        let publicKeySize = 32
+        guard packet.payload.count >= publicKeySize else {
+            NSLog("[BleMesh] Invalid handshake payload size: \(packet.payload.count), expected at least \(publicKeySize)")
             return
         }
         
-        guard let peerPublicKey = try? Curve25519.KeyAgreement.PublicKey(rawRepresentation: packet.payload),
+        let publicKeyBytes = packet.payload.prefix(publicKeySize)
+        NSLog("[BleMesh] Extracted public key: \(publicKeyBytes.count) bytes")
+        
+        // Store peer's public key and derive shared secret
+        guard let peerPublicKey = try? Curve25519.KeyAgreement.PublicKey(rawRepresentation: publicKeyBytes),
               let pk = privateKey else {
             NSLog("[BleMesh] Failed to parse peer public key or missing private key")
             return
@@ -1026,7 +1036,7 @@ class BleMesh: RCTEventEmitter {
 
             // Update peer's noise public key
             if var peer = peers[senderID] {
-                peer.noisePublicKey = packet.payload
+                peer.noisePublicKey = Data(publicKeyBytes)
                 peers[senderID] = peer
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicred-1/ble-mesh",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "BLE Mesh networking library for React Native with seamless permissions",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",