jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align esphome ble client notify behavior to match BlueZ (#81463)

Browse Source
This commit is contained in:
J. Nick Koston 2022-11-05 15:28:47 -05:00 committed by GitHub
parent 5f9f956023
commit 6495c65d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/esphome/bluetooth/client.py
View File

@ -137,6 +137,7 @@ class ESPHomeClient(BaseBleakClient):
was_connected = self._is_connected was_connected = self._is_connected
self.services = BleakGATTServiceCollection() # type: ignore[no-untyped-call] self.services = BleakGATTServiceCollection() # type: ignore[no-untyped-call]
self._is_connected = False self._is_connected = False
self._notify_cancels.clear()
if self._disconnected_event: if self._disconnected_event:
self._disconnected_event.set() self._disconnected_event.set()
self._disconnected_event = None self._disconnected_event = None
@ -463,12 +464,20 @@ class ESPHomeClient(BaseBleakClient):
UUID or directly by the BleakGATTCharacteristic object representing it. UUID or directly by the BleakGATTCharacteristic object representing it.
callback (function): The function to be called on notification. callback (function): The function to be called on notification.
""" """
ble_handle = characteristic.handle
if ble_handle in self._notify_cancels:
raise BleakError(
"Notifications are already enabled on "
f"service:{characteristic.service_uuid} "
f"characteristic:{characteristic.uuid} "
f"handle:{ble_handle}"
)
cancel_coro = await self._client.bluetooth_gatt_start_notify( cancel_coro = await self._client.bluetooth_gatt_start_notify(
self._address_as_int, self._address_as_int,
characteristic.handle, ble_handle,
lambda handle, data: callback(data), lambda handle, data: callback(data),
) )
self._notify_cancels[characteristic.handle] = cancel_coro self._notify_cancels[ble_handle] = cancel_coro
@api_error_as_bleak_error @api_error_as_bleak_error
async def stop_notify( async def stop_notify(
@ -483,5 +492,7 @@ class ESPHomeClient(BaseBleakClient):
directly by the BleakGATTCharacteristic object representing it. directly by the BleakGATTCharacteristic object representing it.
""" """
characteristic = self._resolve_characteristic(char_specifier) characteristic = self._resolve_characteristic(char_specifier)
coro = self._notify_cancels.pop(characteristic.handle) # Do not raise KeyError if notifications are not enabled on this characteristic
await coro() # to be consistent with the behavior of the BlueZ backend
if coro := self._notify_cancels.pop(characteristic.handle, None):
await coro()