Merge pull request hbldh#541 from dlech/mac-fixes

Mac fixes

CHANGELOG.rst

@@ -38,6 +38,7 @@ Fixed
 * Minor fix for disconnection event handling in BlueZ backend. Fixes #491.
 * Corrections for the Philips Hue lamp example. Merged #505
 * Fixed BleakClientBlueZDBus.pair() method always returning True. Fixes #503.
+* Fixed waiting for notification start/stop to complete in CoreBluetooth backend.
 * Fixed write without response on BlueZ < 5.51.
 
 

bleak/backends/corebluetooth/PeripheralDelegate.py

@@ -17,6 +17,7 @@
     CBService,
     CBCharacteristic,
     CBDescriptor,
+    NSArray,
     NSData,
     NSError,
 )
@@ -78,9 +79,9 @@ def initWithPeripheral_(self, peripheral: CBPeripheral):
 
         return self
 
-    async def discoverServices(self, use_cached=True) -> [CBService]:
+    async def discoverServices(self, use_cached=True) -> NSArray:
         event = self._services_discovered_event
-        if event.is_set() and (use_cached is True):
+        if event.is_set() and use_cached:
             return self.peripheral.services()
 
         event.clear()
@@ -92,8 +93,8 @@ async def discoverServices(self, use_cached=True) -> [CBService]:
 
     async def discoverCharacteristics_(
         self, service: CBService, use_cached=True
-    ) -> [CBCharacteristic]:
-        if service.characteristics() is not None and use_cached is True:
+    ) -> NSArray:
+        if service.characteristics() is not None and use_cached:
             return service.characteristics()
 
         sUUID = service.UUID().UUIDString()
@@ -105,8 +106,8 @@ async def discoverCharacteristics_(
 
     async def discoverDescriptors_(
         self, characteristic: CBCharacteristic, use_cached=True
-    ) -> [CBDescriptor]:
-        if characteristic.descriptors() is not None and use_cached is True:
+    ) -> NSArray:
+        if characteristic.descriptors() is not None and use_cached:
             return characteristic.descriptors()
 
         cUUID = characteristic.UUID().UUIDString()
@@ -119,7 +120,7 @@ async def discoverDescriptors_(
     async def readCharacteristic_(
         self, characteristic: CBCharacteristic, use_cached=True
     ) -> NSData:
-        if characteristic.value() is not None and use_cached is True:
+        if characteristic.value() is not None and use_cached:
             return characteristic.value()
 
         cUUID = characteristic.UUID().UUIDString()
@@ -145,7 +146,7 @@ def getMtuSize(self) -> int:
     async def readDescriptor_(
         self, descriptor: CBDescriptor, use_cached=True
     ) -> NSData:
-        if descriptor.value() is not None and use_cached is True:
+        if descriptor.value() is not None and use_cached:
             return descriptor.value()
 
         dUUID = descriptor.UUID().UUIDString()
@@ -196,7 +197,7 @@ async def startNotify_cb_(
         event = self._characteristic_notify_change_events.get_cleared(c_handle)
         self.peripheral.setNotifyValue_forCharacteristic_(True, characteristic)
         # wait for peripheral_didUpdateNotificationStateForCharacteristic_error_ to set event
-        # await event.wait()
+        await event.wait()
 
         return True
 
@@ -208,7 +209,7 @@ async def stopNotify_(self, characteristic: CBCharacteristic) -> bool:
         event = self._characteristic_notify_change_events.get_cleared(c_handle)
         self.peripheral.setNotifyValue_forCharacteristic_(False, characteristic)
         # wait for peripheral_didUpdateNotificationStateForCharacteristic_error_ to set event
-        # await event.wait()
+        await event.wait()
 
         self._characteristic_notify_callbacks.pop(c_handle)