kard-network-ble-mesh 1.0.0 → 1.1.0

package/android/build.gradle

@@ -66,12 +66,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "1.8"
+    jvmTarget = "17"
   }
 
   sourceSets {

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

@@ -481,7 +481,9 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
                 BluetoothProfile.STATE_CONNECTED -> {
                     Log.d(TAG, "Connected to GATT server: $address")
                     gattConnections[address] = gatt
-                    gatt.discoverServices()
+                    // Request larger MTU for bigger packets (512 bytes)
+                    Log.d(TAG, "Requesting MTU 512 for $address")
+                    gatt.requestMtu(512)
                 }
                 BluetoothProfile.STATE_DISCONNECTED -> {
                     Log.d(TAG, "Disconnected from GATT server: $address")
@@ -500,9 +502,12 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
 
         @SuppressLint("MissingPermission")
         override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+            Log.d(TAG, "onServicesDiscovered: status=$status for ${gatt.device.address}")
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 val service = gatt.getService(serviceUUID)
+                Log.d(TAG, "Found service: ${service != null}, UUID: $serviceUUID")
                 val characteristic = service?.getCharacteristic(characteristicUUID)
+                Log.d(TAG, "Found characteristic: ${characteristic != null}")
 
                 if (characteristic != null) {
                     gatt.setCharacteristicNotification(characteristic, true)
@@ -510,21 +515,40 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
                     val descriptor = characteristic.getDescriptor(
                         UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
                     )
+                    Log.d(TAG, "Found descriptor: ${descriptor != null}")
                     descriptor?.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
                     gatt.writeDescriptor(descriptor)
 
                     // Send announce
+                    Log.d(TAG, "Sending announce after services discovered")
                     sendAnnounce()
+                } else {
+                    Log.e(TAG, "Characteristic not found on remote device!")
                 }
+            } else {
+                Log.e(TAG, "Service discovery failed with status: $status")
             }
         }
 
         override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
             val data = characteristic.value
+            Log.d(TAG, "onCharacteristicChanged: received ${data?.size ?: 0} bytes from ${gatt.device.address}")
             if (data != null) {
                 handleReceivedPacket(data, gatt.device.address)
             }
         }
+
+        @SuppressLint("MissingPermission")
+        override fun onMtuChanged(gatt: BluetoothGatt, mtu: Int, status: Int) {
+            Log.d(TAG, "MTU changed to $mtu for ${gatt.device.address}, status: $status")
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                // Now discover services after MTU is set
+                gatt.discoverServices()
+            } else {
+                Log.e(TAG, "MTU negotiation failed, discovering services anyway")
+                gatt.discoverServices()
+            }
+        }
     }
 
     private val gattServerCallback = object : BluetoothGattServerCallback() {
@@ -553,8 +577,12 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
             offset: Int,
             value: ByteArray
         ) {
+            Log.d(TAG, "onCharacteristicWriteRequest: ${value.size} bytes from ${device.address}, uuid=${characteristic.uuid}")
             if (characteristic.uuid == characteristicUUID) {
+                Log.d(TAG, "Characteristic matches, handling packet")
                 handleReceivedPacket(value, device.address)
+            } else {
+                Log.d(TAG, "Characteristic UUID mismatch: expected $characteristicUUID")
             }
             if (responseNeeded) {
                 gattServer?.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, 0, null)
@@ -579,26 +607,41 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
     // MARK: - Packet Handling
 
     private fun handleReceivedPacket(data: ByteArray, fromAddress: String) {
-        val packet = BitchatPacket.decode(data) ?: return
+        Log.d(TAG, "handleReceivedPacket: ${data.size} bytes from $fromAddress")
+        val packet = BitchatPacket.decode(data)
+        if (packet == null) {
+            Log.e(TAG, "Failed to decode packet!")
+            return
+        }
 
         val senderId = packet.senderId.joinToString("") { "%02x".format(it) }
+        Log.d(TAG, "Packet from sender: $senderId, type: ${packet.type}, myPeerId: $myPeerId")
 
         // Skip our own packets
-        if (senderId == myPeerId) return
+        if (senderId == myPeerId) {
+            Log.d(TAG, "Skipping own packet")
+            return
+        }
 
         // Deduplication
         val messageId = "$senderId-${packet.timestamp}-${packet.type}"
-        if (processedMessages.contains(messageId)) return
+        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")
+
         // Handle by type
-        when (MessageType.fromValue(packet.type)) {
+        when (messageType) {
             MessageType.ANNOUNCE -> handleAnnounce(packet, senderId)
             MessageType.MESSAGE -> handleMessage(packet, senderId)
             MessageType.NOISE_HANDSHAKE -> handleNoiseHandshake(packet, senderId)
             MessageType.NOISE_ENCRYPTED -> handleNoiseEncrypted(packet, senderId)
             MessageType.LEAVE -> handleLeave(senderId)
-            else -> {}
+            else -> Log.d(TAG, "Unknown message type: ${packet.type}")
         }
 
         // Relay if TTL > 0
@@ -633,6 +676,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
     }
 
     private fun handleAnnounce(packet: BitchatPacket, senderId: String) {
+        Log.d(TAG, "handleAnnounce from $senderId, payload size: ${packet.payload.size}")
         // Parse TLV payload
         var nickname = senderId
         var noisePublicKey: ByteArray? = null
@@ -656,6 +700,8 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
             }
         }
 
+        Log.d(TAG, "Parsed announce: nickname=$nickname from peer $senderId")
+
         peers[senderId] = PeerInfo(
             peerId = senderId,
             nickname = nickname,
@@ -665,6 +711,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
             isVerified = false
         )
 
+        Log.d(TAG, "Peer added, total peers: ${peers.size}")
         notifyPeerListUpdated()
     }
 
@@ -1041,7 +1088,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
         REQUEST_SYNC(0x08);
 
         companion object {
-            fun fromValue(value: Byte): MessageType? = entries.find { it.value == value }
+            fun fromValue(value: Byte): MessageType? = values().find { it.value == value }
         }
     }
 
@@ -1054,7 +1101,7 @@ class BleMeshModule(reactContext: ReactApplicationContext) : ReactContextBaseJav
         VERIFY_RESPONSE(0x06);
 
         companion object {
-            fun fromValue(value: Byte): NoisePayloadType? = entries.find { it.value == value }
+            fun fromValue(value: Byte): NoisePayloadType? = values().find { it.value == value }
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kard-network-ble-mesh",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Kard Network BLE Mesh networking library for React Native with seamless permissions",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",