@magicred-1/ble-mesh 1.2.6 → 1.2.7

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

@@ -1210,7 +1210,12 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
     }
 
     private fun handleNoiseHandshake(packet: BitchatPacket, senderId: String) {
-        if (packet.payload.size != 65) return // EC public key size
+        Log.d(TAG, "Received handshake from $senderId, payload size: ${packet.payload.size}")
+        
+        if (packet.payload.size != 65) {
+            Log.e(TAG, "Invalid handshake payload size: ${packet.payload.size}, expected 65")
+            return
+        }
 
         try {
             // Derive shared secret
@@ -1227,6 +1232,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
             val symmetricKey = digest.digest(sharedSecret)
 
             sessions[senderId] = symmetricKey
+            Log.d(TAG, "✅ Encrypted session established with $senderId")
 
             // Update peer's noise public key
             peers[senderId]?.let { peer ->
@@ -1235,10 +1241,14 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
 
             // Send response handshake
             if (packet.recipientId == null || packet.recipientId.contentEquals(myPeerIdBytes)) {
+                Log.d(TAG, "Sending handshake response to $senderId")
                 initiateHandshakeInternal(senderId)
+            } else {
+                Log.d(TAG, "Handshake not for us, recipient: ${byteArrayToHexString(packet.recipientId ?: byteArrayOf())}")
             }
         } catch (e: Exception) {
             Log.e(TAG, "Handshake failed: ${e.message}")
+            e.printStackTrace()
             sendErrorEvent("HANDSHAKE_ERROR", e.message ?: "Unknown error")
         }
     }
@@ -1700,12 +1710,20 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
     }
 
     private fun initiateHandshakeInternal(peerId: String) {
-        val publicKey = privateKey?.public?.encoded ?: return
+        Log.d(TAG, "Initiating handshake with $peerId")
+        val publicKey = privateKey?.public?.encoded
+        if (publicKey == null) {
+            Log.e(TAG, "Cannot initiate handshake: no private key")
+            return
+        }
+        
+        Log.d(TAG, "Public key size: ${publicKey.size} bytes")
         val packet = createPacket(
             type = MessageType.NOISE_HANDSHAKE.value,
             payload = publicKey,
             recipientId = hexStringToByteArray(peerId)
         )
+        Log.d(TAG, "Broadcasting handshake packet to $peerId (${connectedDevices.size} devices, ${gattConnections.size} connections)")
         broadcastPacket(packet)
     }
 

package/ios/BleMesh.swift

@@ -817,13 +817,20 @@ class BleMesh: RCTEventEmitter {
     }
 
     private func initiateHandshakeInternal(with peerId: String) {
-        guard let publicKey = privateKey?.publicKey.rawRepresentation else { return }
-
+        NSLog("[BleMesh] Initiating handshake with \(peerId)")
+        
+        guard let publicKey = privateKey?.publicKey.rawRepresentation else {
+            NSLog("[BleMesh] Cannot initiate handshake: no private key")
+            return
+        }
+        
+        NSLog("[BleMesh] Public key size: \(publicKey.count) bytes")
         let packet = createPacket(
             type: MessageType.noiseHandshake.rawValue,
             payload: publicKey,
             recipientID: Data(hexString: peerId)
         )
+        NSLog("[BleMesh] Broadcasting handshake packet to \(peerId) (\(subscribedCentrals.count) centrals, \(peripherals.count) peripherals)")
         broadcastPacket(packet)
     }
 
@@ -992,10 +999,19 @@ class BleMesh: RCTEventEmitter {
     }
 
     private func handleNoiseHandshake(_ packet: BitchatPacket, from senderID: String) {
+        NSLog("[BleMesh] Received handshake from \(senderID), payload size: \(packet.payload.count)")
+        
         // Store peer's public key and derive shared secret
-        guard packet.payload.count == 32,
-              let peerPublicKey = try? Curve25519.KeyAgreement.PublicKey(rawRepresentation: packet.payload),
-              let pk = privateKey else { return }
+        guard packet.payload.count == 32 else {
+            NSLog("[BleMesh] Invalid handshake payload size: \(packet.payload.count), expected 32")
+            return
+        }
+        
+        guard let peerPublicKey = try? Curve25519.KeyAgreement.PublicKey(rawRepresentation: packet.payload),
+              let pk = privateKey else {
+            NSLog("[BleMesh] Failed to parse peer public key or missing private key")
+            return
+        }
 
         do {
             let sharedSecret = try pk.sharedSecretFromKeyAgreement(with: peerPublicKey)
@@ -1006,6 +1022,7 @@ class BleMesh: RCTEventEmitter {
                 outputByteCount: 32
             )
             sessions[senderID] = symmetricKey.withUnsafeBytes { Data($0) }
+            NSLog("[BleMesh] ✅ Encrypted session established with \(senderID)")
 
             // Update peer's noise public key
             if var peer = peers[senderID] {
@@ -1015,9 +1032,13 @@ class BleMesh: RCTEventEmitter {
 
             // Send response handshake if this is an incoming request
             if packet.recipientID == nil || packet.recipientID == myPeerIDData {
+                NSLog("[BleMesh] Sending handshake response to \(senderID)")
                 initiateHandshakeInternal(with: senderID)
+            } else {
+                NSLog("[BleMesh] Handshake not for us, recipient: \(packet.recipientID?.hexString ?? "none")")
             }
         } catch {
+            NSLog("[BleMesh] Handshake failed: \(error.localizedDescription)")
             sendEvent(withName: "onError", body: ["code": "HANDSHAKE_ERROR", "message": error.localizedDescription])
         }
     }

package/package.json

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