feat: disconnect for ios central and android peripheral

Signed-off-by: Berend Sliedrecht <[email protected]>

android/src/main/java/com/reactnativebledidcomm/BleDidcommModule.kt

@@ -1,7 +1,11 @@
 package com.reactnativebledidcomm
 
 import androidx.annotation.RequiresPermission
-import com.facebook.react.bridge.*
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
 import com.reactnativebledidcomm.central.CentralManager
 import com.reactnativebledidcomm.central.CentralManagerException
 import com.reactnativebledidcomm.peripheral.PeripheralManager
@@ -20,7 +24,6 @@ class BleDidcommModule(private val context: ReactApplicationContext) :
     @ReactMethod
     fun startCentral(
         @Suppress("UNUSED_PARAMETER") options: ReadableMap,
-        promise: Promise,
     ) {
         try {
             this.centralManager = CentralManager(context)

android/src/main/java/com/reactnativebledidcomm/central/CentralManager.kt

@@ -145,18 +145,18 @@ class CentralManager(private val context: ReactContext) {
                 }
                 Log.d(
                     Constants.TAG,
-                    "[CENTRAL]: Sending chunked message of ${chunkedMessage.size} bytes."
+                    "[CENTRAL]: Sending chunked message of ${chunkedMessage.size} bytes.",
                 )
                 val didSend = connectedPeripheral.writeCharacteristic(characteristic)
                 if (didSend) {
                     Log.d(
                         Constants.TAG,
-                        "[CENTRAL]: Send the message"
+                        "[CENTRAL]: Send the message",
                     )
                 } else {
                     Log.d(
                         Constants.TAG,
-                        "[CENTRAL]: Did not send the message"
+                        "[CENTRAL]: Did not send the message",
                     )
                 }
                 isPeripheralReady = false
@@ -179,7 +179,7 @@ class CentralManager(private val context: ReactContext) {
         override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
             Log.d(
                 Constants.TAG,
-                "[CENTRAL]: Connection state has been changed to $newState with status $status"
+                "[CENTRAL]: Connection state has been changed to $newState with status $status",
             )
 
             if (status == BluetoothGatt.GATT_SUCCESS) {
@@ -231,7 +231,7 @@ class CentralManager(private val context: ReactContext) {
                     ?: run {
                         Log.d(
                             Constants.TAG,
-                            "[CENTRAL]: Indication Descriptor not found. Make sure CCC is set on the descriptor. Task of the peripheral"
+                            "[CENTRAL]: Indication Descriptor not found. Make sure CCC is set on the descriptor. Task of the peripheral",
                         )
                         gatt.disconnect()
                         return
@@ -260,7 +260,7 @@ class CentralManager(private val context: ReactContext) {
         ) {
             Log.d(
                 Constants.TAG,
-                "[CENTRAL]: Received an indication of ${characteristic.value.size} bytes."
+                "[CENTRAL]: Received an indication of ${characteristic.value.size} bytes.",
             )
 
             if (characteristic.uuid == characteristicIndicationUUID) {
@@ -282,7 +282,7 @@ class CentralManager(private val context: ReactContext) {
         override fun onDescriptorWrite(
             gatt: BluetoothGatt,
             descriptor: BluetoothGattDescriptor,
-            status: Int
+            status: Int,
         ) {
             super.onDescriptorWrite(gatt, descriptor, status)
             Log.d(Constants.TAG, "[CENTRAL]: Descriptor write. Connection is ready")
@@ -317,40 +317,3 @@ class CentralManager(private val context: ReactContext) {
         }
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

android/src/main/java/com/reactnativebledidcomm/peripheral/PeripheralManager.kt

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.reactnativebledidcomm.BleDidcommEvent
 import com.reactnativebledidcomm.Constants
+import java.util.Arrays
 import java.util.UUID
 
 class PeripheralManager(private val context: ReactContext) {
@@ -81,7 +82,7 @@ class PeripheralManager(private val context: ReactContext) {
         )
         val descriptor = BluetoothGattDescriptor(
             UUID.fromString(Constants.CCC_DESCRIPTOR_UUID),
-            BluetoothGattDescriptor.PERMISSION_WRITE or BluetoothGattCharacteristic.PERMISSION_READ
+            BluetoothGattDescriptor.PERMISSION_WRITE or BluetoothGattCharacteristic.PERMISSION_READ,
         )
         indicationCharacteristic?.addDescriptor(descriptor)
         service =
@@ -136,7 +137,7 @@ class PeripheralManager(private val context: ReactContext) {
             isSending = true
             val chunkSize = Integer.min(
                 connectedMtu - Constants.NUMBER_OF_BYTES_FOR_DATA_HEADER,
-                message.count()
+                message.count(),
             )
             for (chunkIndexStart in 0..message.count() step chunkSize) {
                 val chunkIndexEnd = Integer.min(chunkIndexStart + chunkSize, message.count()) - 1
@@ -147,7 +148,7 @@ class PeripheralManager(private val context: ReactContext) {
                 indicationCharacteristic.value = chunkedMessage
                 Log.d(
                     Constants.TAG,
-                    "[PERIPHERAL]: Sending chunked message of ${chunkedMessage.size} bytes."
+                    "[PERIPHERAL]: Sending chunked message of ${chunkedMessage.size} bytes.",
                 )
                 isConnectedClientReady = gattServer.notifyCharacteristicChanged(
                     connectedClient,
@@ -173,7 +174,7 @@ class PeripheralManager(private val context: ReactContext) {
         override fun onConnectionStateChange(device: BluetoothDevice, status: Int, newState: Int) {
             Log.d(
                 Constants.TAG,
-                "[PERIPHERAL]: Connection state has changed to $newState with status $status"
+                "[PERIPHERAL]: Connection state has changed to $newState with status $status",
             )
 
             if (newState == BluetoothProfile.STATE_CONNECTED) {
@@ -244,7 +245,7 @@ class PeripheralManager(private val context: ReactContext) {
             device: BluetoothDevice,
             requestId: Int,
             offset: Int,
-            descriptor: BluetoothGattDescriptor
+            descriptor: BluetoothGattDescriptor,
         ) {
             if (descriptor.uuid == UUID.fromString(Constants.CCC_DESCRIPTOR_UUID)) {
                 Log.d(Constants.TAG, "[PERIPHERAL]: Setting descriptor to enable indications")
@@ -253,12 +254,12 @@ class PeripheralManager(private val context: ReactContext) {
                     requestId,
                     BluetoothGatt.GATT_SUCCESS,
                     0,
-                    BluetoothGattDescriptor.ENABLE_INDICATION_VALUE
+                    BluetoothGattDescriptor.ENABLE_INDICATION_VALUE,
                 )
             } else {
                 Log.d(
                     Constants.TAG,
-                    "[PERIPHERAL]: Tried to read descriptor which is not the indication descriptor"
+                    "[PERIPHERAL]: Tried to read descriptor which is not the indication descriptor",
                 )
                 gattServer.sendResponse(device, requestId, BluetoothGatt.GATT_FAILURE, 0, null)
             }
@@ -277,25 +278,37 @@ class PeripheralManager(private val context: ReactContext) {
             if (descriptor.uuid == UUID.fromString(Constants.CCC_DESCRIPTOR_UUID)) {
                 Log.d(
                     Constants.TAG,
-                    "[PERIPHERAL]: Received a descriptor write request. Client likely wants to receive notifications."
+                    "[PERIPHERAL]: Received a descriptor write request. Client likely wants to receive notifications or disconnect from us",
                 )
                 if (responseNeeded) {
                     gattServer.sendResponse(device, requestId, BluetoothGatt.GATT_SUCCESS, 0, null)
                 }
             } else {
                 Log.d(
                     Constants.TAG,
-                    "[PERIPHERAL]: Received a descriptor write request for unsupported descriptor."
+                    "[PERIPHERAL]: Received a descriptor write request for unsupported descriptor.",
                 )
                 if (responseNeeded) {
                     gattServer.sendResponse(device, requestId, BluetoothGatt.GATT_FAILURE, 0, null)
                 }
             }
 
-            val params = Arguments.createMap().apply {
-                putString("identifier", device.address)
+            if (descriptor.uuid == UUID.fromString(Constants.CCC_DESCRIPTOR_UUID)) {
+                Log.e(Constants.TAG, "Eyo $value")
+                if (Arrays.equals(value, BluetoothGattDescriptor.ENABLE_INDICATION_VALUE)) {
+                    Log.e(Constants.TAG, "Equal enable")
+                    val params = Arguments.createMap().apply {
+                        putString("identifier", device.address)
+                    }
+                    sendEvent(BleDidcommEvent.OnConnectedCentral, params)
+                } else if (Arrays.equals(value, BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE)) {
+                    Log.e(Constants.TAG, "Equal disable")
+                    val params = Arguments.createMap().apply {
+                        putString("identifier", device.address)
+                    }
+                    sendEvent(BleDidcommEvent.OnDisconnectedPeripheral, params)
+                }
             }
-            sendEvent(BleDidcommEvent.OnConnectedCentral, params)
         }
 
         @SuppressLint("MissingPermission")
@@ -323,6 +336,6 @@ class PeripheralManager(private val context: ReactContext) {
     private var gattServer: BluetoothGattServer =
         bluetoothManager.openGattServer(
             context,
-            gattServerCallback
+            gattServerCallback,
         )
 }

example/metro.config.js

@@ -13,8 +13,6 @@ module.exports = {
   projectRoot: __dirname,
   watchFolders: [root],
 
-  // We need to make sure that only one version is loaded for peerDependencies
-  // So we block them at the root, and alias them to the versions in example's node_modules
   resolver: {
     blacklistRE: exclusionList(
       modules.map(

example/src/App.tsx

@@ -48,6 +48,18 @@ export default function App() {
         </>
       )}
       <Spacer />
+      {(isCentral || isPeripheral) && (
+        <>
+          <Button
+            title="Back"
+            onPress={() => {
+              setIsCentral(false)
+              setIsPeripheral(false)
+            }}
+          />
+          <Spacer />
+        </>
+      )}
       {!isCentral && !isPeripheral && (
         <>
           <Button title="Central" onPress={asCentral} />

example/src/Central.tsx

@@ -2,6 +2,7 @@ import React, { PropsWithChildren, useEffect, useMemo, useState } from 'react'
 import { Button } from 'react-native'
 import {
   Central as BleCentral,
+  CentralProvider,
   DEFAULT_DIDCOMM_SERVICE_UUID,
   DEFAULT_DIDCOMM_MESSAGE_CHARACTERISTIC_UUID,
   DEFAULT_DIDCOMM_INDICATE_CHARACTERISTIC_UUID,
@@ -16,10 +17,14 @@ import { Spacer } from './App'
 
 const msg = 'Hello from Central!'
 
-export const Central: React.FC<PropsWithChildren> = ({ children }) => {
+export const Central: React.FC = () => {
   const central = useMemo(() => new BleCentral(), [])
 
-  return <CentralProvider value={central}>{children}</CentralProvider>
+  return (
+    <CentralProvider central={central}>
+      <CentralChildren />
+    </CentralProvider>
+  )
 }
 
 const CentralChildren = () => {
@@ -46,6 +51,8 @@ const CentralChildren = () => {
 
   useCentralOnDisconnected((identifier: string) => {
     console.log(`[CENTRAL]: Disconnected from ${identifier}`)
+    setPeripheralId(undefined)
+    setIsConnected(false)
   })
 
   const start = central.start

example/src/Peripheral.tsx

@@ -8,22 +8,29 @@ import {
   PeripheralProvider,
   usePeripheralOnConnected,
   usePeripheralOnDisconnected,
-  usePeripheralOnReceiveMessage,
+  usePeripheralOnReceivedMessage,
   usePeripheralShutdownOnUnmount,
+  usePeripheral,
 } from '@animo-id/react-native-ble-didcomm'
 import { Spacer } from './App'
 
 const msg = 'Hello from peripheral!'
 
-export const Peripheral: React.FC<PropsWithChildren> = ({ children }) => {
-  const peripeheral = useMemo(() => new BlePeripheral(), [])
+export const Peripheral: React.FC = () => {
+  const peripheral = useMemo(() => new BlePeripheral(), [])
 
-  return <PeripheralProvider value={peripheral}>{children}</PeripheralProvider>
+  return (
+    <PeripheralProvider peripheral={peripheral}>
+      <PeripheralChildren />
+    </PeripheralProvider>
+  )
 }
 
 const PeripheralChildren = () => {
   usePeripheralShutdownOnUnmount()
 
+  const { peripheral } = usePeripheral()
+
   const [isConnected, setIsConnected] = useState(false)
 
   usePeripheralOnConnected((identifier: string) => {
@@ -32,11 +39,11 @@ const PeripheralChildren = () => {
   })
 
   usePeripheralOnDisconnected((identifier: string) => {
-    console.log(`[PERIPHERAL]: Connected to ${identifier}`)
-    setIsConnected(true)
+    console.log(`[PERIPHERAL]: Disconnected to ${identifier}`)
+    setIsConnected(false)
   })
 
-  usePeripheralOnReceiveMessage((message: string) => {
+  usePeripheralOnReceivedMessage((message: string) => {
     console.log(`[PERIPHERAL]: Received message: ${message}`)
   })
 

example/tsconfig.json

@@ -1,6 +1,9 @@
 {
   "extends": "@tsconfig/react-native/tsconfig.json",
   "compilerOptions": {
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "paths": {
+      "@animo-id/react-native-ble-didcomm": ["../"]
+    }
   }
 }

ios/BleDidcomm.swift

@@ -150,7 +150,7 @@ class BleDidcomm: React.RCTEventEmitter {
     do {
       try centralManager.scan()
       resolve(nil)
-    } catch CentralManager.CentralManagerError.NoDefinedService {
+    } catch CentralManager.CentralManagerError.noDefinedService {
       reject("error", "Set the service before calling the scan function", nil)
     } catch {
         reject("error", "unexpected error", nil)
@@ -170,7 +170,7 @@ class BleDidcomm: React.RCTEventEmitter {
     do {
       try centralManager.connect(peripheralId: peripheralId)
       resolve(nil)
-    } catch CentralManager.CentralManagerError.PeripheralNotFound(let peripheralId) {
+    } catch CentralManager.CentralManagerError.peripheralNotFound(let peripheralId) {
       reject("error", "Peripheral not found with id: \(peripheralId)", nil)
     } catch {
       reject("error", "unexpected error", nil)
@@ -195,9 +195,9 @@ class BleDidcomm: React.RCTEventEmitter {
     do {
       try centralManager.write(message: data)
       resolve(nil)
-    } catch CentralManager.CentralManagerError.NotConnectedToPeripheral {
+    } catch CentralManager.CentralManagerError.notConnectedToPeripheral {
       reject("error", "Not connected to any peripheral", nil)
-    } catch CentralManager.CentralManagerError.NoWriteableCharacteristicFound {
+    } catch CentralManager.CentralManagerError.noWriteableCharacteristicFound {
       reject("error", "No writeable characteristic found", nil)
     } catch {
       reject("error", "unexpected error", nil)