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

Fix HKC exceptions during BLE startup not being caught (#80882)

Browse Source
This commit is contained in:
J. Nick Koston 2022-10-24 09:29:13 -05:00 committed by GitHub
parent 9978296ae2
commit a7610909de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/homekit_controller/connection.py
View File

@ -35,6 +35,7 @@ from .const import (
IDENTIFIER_LEGACY_ACCESSORY_ID, IDENTIFIER_LEGACY_ACCESSORY_ID,
IDENTIFIER_LEGACY_SERIAL_NUMBER, IDENTIFIER_LEGACY_SERIAL_NUMBER,
IDENTIFIER_SERIAL_NUMBER, IDENTIFIER_SERIAL_NUMBER,
STARTUP_EXCEPTIONS,
) )
from .device_trigger import async_fire_triggers, async_setup_triggers_for_entry from .device_trigger import async_fire_triggers, async_setup_triggers_for_entry
@ -187,11 +188,12 @@ class HKDevice:
""" """
try: try:
await self.pairing.async_populate_accessories_state(force_update=True) await self.pairing.async_populate_accessories_state(force_update=True)
except (asyncio.TimeoutError, AccessoryNotFoundError): except STARTUP_EXCEPTIONS as ex:
_LOGGER.debug( _LOGGER.debug(
"Failed to populate BLE accessory state for %s, accessory may be sleeping" "Failed to populate BLE accessory state for %s, accessory may be sleeping"
" and will be retried the next time it advertises", " and will be retried the next time it advertises: %s",
self.config_entry.title, self.config_entry.title,
ex,
) )
async def async_setup(self) -> None: async def async_setup(self) -> None:
@ -220,7 +222,7 @@ class HKDevice:
# BLE devices may sleep and we can't force a connection # BLE devices may sleep and we can't force a connection
raise raise
entry.async_on_unload( entry.async_on_unload(
self.hass.bus.async_listen_once( self.hass.bus.async_listen(
EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STARTED,
self._async_retry_populate_ble_accessory_state, self._async_retry_populate_ble_accessory_state,
) )

13
homeassistant/components/homekit_controller/const.py
View File

@ -1,6 +1,12 @@
"""Constants for the homekit_controller component.""" """Constants for the homekit_controller component."""
import asyncio
from typing import Final from typing import Final
from aiohomekit.exceptions import (
AccessoryDisconnectedError,
AccessoryNotFoundError,
EncryptionError,
)
from aiohomekit.model.characteristics import CharacteristicsTypes from aiohomekit.model.characteristics import CharacteristicsTypes
from aiohomekit.model.services import ServicesTypes from aiohomekit.model.services import ServicesTypes
@ -94,3 +100,10 @@ CHARACTERISTIC_PLATFORMS = {
# Device classes # Device classes
DEVICE_CLASS_ECOBEE_MODE: Final = "homekit_controller__ecobee_mode" DEVICE_CLASS_ECOBEE_MODE: Final = "homekit_controller__ecobee_mode"
STARTUP_EXCEPTIONS = (
asyncio.TimeoutError,
AccessoryNotFoundError,
EncryptionError,
AccessoryDisconnectedError,
)