fix: added empty object to shutdown method (#50)

Signed-off-by: Jan <[email protected]>
animo · Jun 30, 2023 · 95f5369 · 95f5369
1 parent 855ca45
commit 95f5369
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 14 deletions.
diff --git a/android/src/main/java/com/reactnativebledidcomm/BleDidcommModule.kt b/android/src/main/java/com/reactnativebledidcomm/BleDidcommModule.kt
@@ -54,6 +54,7 @@ class BleDidcommModule(private val context: ReactApplicationContext) :
 
     @ReactMethod
     fun shutdownCentral(
+        @Suppress("UNUSED_PARAMETER") options: ReadableMap,
         promise: Promise
     ) {
         try {
@@ -67,6 +68,7 @@ class BleDidcommModule(private val context: ReactApplicationContext) :
 
     @ReactMethod
     fun shutdownPeripheral(
+        @Suppress("UNUSED_PARAMETER") options: ReadableMap,
         promise: Promise
     ) {
         try {

diff --git a/android/src/main/java/com/reactnativebledidcomm/peripheral/PeripheralManager.kt b/android/src/main/java/com/reactnativebledidcomm/peripheral/PeripheralManager.kt
@@ -63,8 +63,11 @@ class PeripheralManager(
     }
 
     fun shutdownPeripheral() {
-        this.gattServer.connectedDevices.clear()
-        this.gattServer.close()
+        val connectedDevices = this.bluetoothManager.getConnectedDevices(BluetoothProfile.GATT)
+        for (device in connectedDevices) {
+            this.gattServer.cancelConnection(device)
+        }
+
         try {
             this.stopAdvertising()
         } catch (e: Exception) {
@@ -101,6 +104,7 @@ class PeripheralManager(
     fun stopAdvertising() {
         val advertiser = bluetoothAdapter.bluetoothLeAdvertiser
         advertiser.stopAdvertising(advertiseCallback)
+        this.gattServer.close()
         advertiseCallback = null
     }
 

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -466,4 +466,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 79b9603a04b5cd9c3421fcf11b93d98c75a337c5
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -31,14 +31,13 @@ const requestPermissions = async () => {
 }
 
 export default function App() {
+  const central = new Central()
+  const peripheral = new Peripheral()
+
   const [isCentral, setIsCentral] = React.useState<boolean>(false)
   const [isPeripheral, setIsPeripheral] = React.useState<boolean>(false)
   const [peripheralId, setPeripheralId] = React.useState<string>()
-  const [connected, setConnected] = React.useState<boolean>(false)
-  const [central, setCentral] = React.useState<Central>(new Central())
-  const [peripheral, setPeripheral] = React.useState<Peripheral>(
-    new Peripheral()
-  )
+  const [isConnected, setIsConnected] = React.useState<boolean>(false)
 
   React.useEffect(() => {
     const onDiscoverPeripheralListener = central.registerOnDiscoveredListener(
@@ -51,7 +50,7 @@ export default function App() {
     const onConnectedPeripheralListener = central.registerOnConnectedListener(
       ({ identifier }: { identifier: string }) => {
         console.log(`Connected to: ${identifier}`)
-        setConnected(true)
+        setIsConnected(true)
       }
     )
 
@@ -118,6 +117,15 @@ export default function App() {
       )}
       {isCentral && (
         <>
+          <Button
+            title="shutdown"
+            onPress={async () => {
+              await central.shutdown()
+              setIsConnected(false)
+              setIsCentral(false)
+              setPeripheralId(undefined)
+            }}
+          />
           <Button
             title="set services"
             onPress={async () => {
@@ -134,13 +142,14 @@ export default function App() {
               await central.scan()
             }}
           />
+
           {peripheralId && (
             <Button
               title="connect"
               onPress={async () => await central.connect(peripheralId)}
             />
           )}
-          {connected && (
+          {isConnected && (
             <Button
               title="write"
               onPress={async () => await central.sendMessage(msg)}
@@ -150,6 +159,14 @@ export default function App() {
       )}
       {isPeripheral && (
         <>
+          <Button
+            title="shutdown"
+            onPress={async () => {
+              await peripheral.shutdown()
+              setIsConnected(false)
+              setIsPeripheral(false)
+            }}
+          />
           <Button
             title="set services"
             onPress={async () => {

diff --git a/ios/BleDidcomm.m b/ios/BleDidcomm.m
@@ -11,6 +11,7 @@ @interface RCT_EXTERN_MODULE(BleDidcomm, RCTEventEmitter)
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(shutdownCentral
+                  :(NSDictionary *)options
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
@@ -20,6 +21,7 @@ @interface RCT_EXTERN_MODULE(BleDidcomm, RCTEventEmitter)
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(shutdownPeripheral
+                  :(NSDictionary *)options
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 

diff --git a/ios/BleDidcomm.swift b/ios/BleDidcomm.swift
@@ -18,6 +18,7 @@ class BleDidcomm: React.RCTEventEmitter {
   }
 
   @objc func shutdownPeripheral(
+    _: [String: String],
     resolve: RCTPromiseResolveBlock,
     reject _: RCTPromiseRejectBlock
   ) {
@@ -79,6 +80,7 @@ class BleDidcomm: React.RCTEventEmitter {
   }
 
   @objc func shutdownCentral(
+    _: [String: String],
     resolve: RCTPromiseResolveBlock,
     reject: RCTPromiseRejectBlock
   ) {

diff --git a/src/central.ts b/src/central.ts
@@ -45,7 +45,7 @@ export class Central implements Ble {
 
   public async shutdown() {
     try {
-      await sdk.shutdownCentral()
+      await sdk.shutdownCentral({})
     } catch (e) {
       throw new Error('Failed to shutdown central: ' + e)
     }

diff --git a/src/peripheral.ts b/src/peripheral.ts
@@ -45,7 +45,7 @@ export class Peripheral implements Ble {
 
   public async shutdown() {
     try {
-      await sdk.shutdownPeripheral()
+      await sdk.shutdownPeripheral({})
     } catch (e) {
       throw new Error('Failed to shutdown peripheral: ' + e)
     }

diff --git a/src/register.ts b/src/register.ts
@@ -18,6 +18,8 @@ const BleDidcomm = NativeModules.BleDidcomm
       }
     )
 
+// Functions without any params needs an empty object to work, might be fixable by tweaking the Objective-C interface
+// For now we just add an empty object to functions without any params.
 type Sdk = {
   startPeripheral({}: Record<string, never>): Promise<void>
   startCentral({}: Record<string, never>): Promise<void>
@@ -32,8 +34,8 @@ type Sdk = {
     characteristicUUID: string,
     notifyCharacteristicUUID: string
   ): Promise<void>
-  shutdownCentral(): Promise<void>
-  shutdownPeripheral(): Promise<void>
+  shutdownCentral({}: Record<string, never>): Promise<void>
+  shutdownPeripheral({}: Record<string, never>): Promise<void>
   scan({}: Record<never, never>): Promise<void>
   stopScan(): void
   advertise({}: Record<never, never>): Promise<void>