@magicred-1/ble-mesh 1.3.2 → 1.3.4

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

@@ -1211,16 +1211,25 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
 
     private fun handleNoiseHandshake(packet: BitchatPacket, senderId: String) {
         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) }}")
         
-        if (packet.payload.size != 65) {
-            Log.e(TAG, "Invalid handshake payload size: ${packet.payload.size}, expected 65")
+        // 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
             val keyFactory = java.security.KeyFactory.getInstance("EC")
-            val keySpec = java.security.spec.X509EncodedKeySpec(packet.payload)
+            val keySpec = java.security.spec.X509EncodedKeySpec(publicKeyBytes)
             val peerPublicKey = keyFactory.generatePublic(keySpec)
 
             val keyAgreement = KeyAgreement.getInstance("ECDH")
@@ -1236,7 +1245,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
 
             // Update peer's noise public key
             peers[senderId]?.let { peer ->
-                peers[senderId] = peer.copy(noisePublicKey = packet.payload)
+                peers[senderId] = peer.copy(noisePublicKey = publicKeyBytes)
             }
 
             // Send response handshake

package/package.json

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