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

Fix HomeKit reset accessory procedure (#81573)

Browse Source 
fixes https://github.com/home-assistant/core/issues/81571
This commit is contained in:
J. Nick Koston 2022-11-08 04:03:37 -06:00 committed by GitHub
parent 274049cc8e
commit 462e2a8ea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/homekit/__init__.py
View File

@ -10,8 +10,10 @@ import os
from typing import Any, cast from typing import Any, cast
from aiohttp import web from aiohttp import web
from pyhap.characteristic import Characteristic
from pyhap.const import STANDALONE_AID from pyhap.const import STANDALONE_AID
from pyhap.loader import get_loader from pyhap.loader import get_loader
from pyhap.service import Service
import voluptuous as vol import voluptuous as vol
from zeroconf.asyncio import AsyncZeroconf from zeroconf.asyncio import AsyncZeroconf
@ -139,7 +141,7 @@ STATUS_WAIT = 3
PORT_CLEANUP_CHECK_INTERVAL_SECS = 1 PORT_CLEANUP_CHECK_INTERVAL_SECS = 1
_HOMEKIT_CONFIG_UPDATE_TIME = ( _HOMEKIT_CONFIG_UPDATE_TIME = (
5 # number of seconds to wait for homekit to see the c# change 10 # number of seconds to wait for homekit to see the c# change
) )
@ -529,6 +531,7 @@ class HomeKit:
self.status = STATUS_READY self.status = STATUS_READY
self.driver: HomeDriver | None = None self.driver: HomeDriver | None = None
self.bridge: HomeBridge | None = None self.bridge: HomeBridge | None = None
self._reset_lock = asyncio.Lock()
def setup(self, async_zeroconf_instance: AsyncZeroconf, uuid: str) -> None: def setup(self, async_zeroconf_instance: AsyncZeroconf, uuid: str) -> None:
"""Set up bridge and accessory driver.""" """Set up bridge and accessory driver."""
@ -558,21 +561,24 @@ class HomeKit:
async def async_reset_accessories(self, entity_ids: Iterable[str]) -> None: async def async_reset_accessories(self, entity_ids: Iterable[str]) -> None:
"""Reset the accessory to load the latest configuration.""" """Reset the accessory to load the latest configuration."""
if not self.bridge: async with self._reset_lock:
await self.async_reset_accessories_in_accessory_mode(entity_ids) if not self.bridge:
return await self.async_reset_accessories_in_accessory_mode(entity_ids)
await self.async_reset_accessories_in_bridge_mode(entity_ids) return
await self.async_reset_accessories_in_bridge_mode(entity_ids)
async def _async_shutdown_accessory(self, accessory: HomeAccessory) -> None: async def _async_shutdown_accessory(self, accessory: HomeAccessory) -> None:
"""Shutdown an accessory.""" """Shutdown an accessory."""
assert self.driver is not None assert self.driver is not None
await accessory.stop() await accessory.stop()
# Deallocate the IIDs for the accessory # Deallocate the IIDs for the accessory
iid_manager = self.driver.iid_manager iid_manager = accessory.iid_manager
for service in accessory.services: services: list[Service] = accessory.services
iid_manager.remove_iid(iid_manager.remove_obj(service)) for service in services:
for char in service.characteristics: iid_manager.remove_obj(service)
iid_manager.remove_iid(iid_manager.remove_obj(char)) characteristics: list[Characteristic] = service.characteristics
for char in characteristics:
iid_manager.remove_obj(char)
async def async_reset_accessories_in_accessory_mode( async def async_reset_accessories_in_accessory_mode(
self, entity_ids: Iterable[str] self, entity_ids: Iterable[str]
@ -581,7 +587,6 @@ class HomeKit:
assert self.driver is not None assert self.driver is not None
acc = cast(HomeAccessory, self.driver.accessory) acc = cast(HomeAccessory, self.driver.accessory)
await self._async_shutdown_accessory(acc)
if acc.entity_id not in entity_ids: if acc.entity_id not in entity_ids:
return return
if not (state := self.hass.states.get(acc.entity_id)): if not (state := self.hass.states.get(acc.entity_id)):
@ -589,6 +594,7 @@ class HomeKit:
"The underlying entity %s disappeared during reset", acc.entity_id "The underlying entity %s disappeared during reset", acc.entity_id
) )
return return
await self._async_shutdown_accessory(acc)
if new_acc := self._async_create_single_accessory([state]): if new_acc := self._async_create_single_accessory([state]):
self.driver.accessory = new_acc self.driver.accessory = new_acc
self.hass.async_add_job(new_acc.run) self.hass.async_add_job(new_acc.run)