images/ha_xiaomi_home
2
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2025-10-31 17:32:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: ignore 'Event loop is closed' when unsub a closed event loop (#991)
Some checks failed
Tests / check-rule-format (push) Has been cancelled
Details
Validate / validate-hassfest (push) Has been cancelled
Details
Validate / validate-hacs (push) Has been cancelled
Details
Validate / validate-lint (push) Has been cancelled
Details
Validate / validate-setup (push) Has been cancelled
Details

Browse Source
This commit is contained in:
RangerCD
2025-04-24 17:55:15 +08:00
committed by GitHub
parent 2f619ff51d
commit 7a459de766
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
custom_components/xiaomi_home/miot/miot_client.py
View File

@@ -879,16 +879,7 @@ class MIoTClient:
sub_from = self._sub_source_list.pop(did, None) sub_from = self._sub_source_list.pop(did, None)
# Unsub # Unsub
if sub_from: if sub_from:
if sub_from == 'cloud': self.__unsub_from(sub_from, did)
self._mips_cloud.unsub_prop(did=did)
self._mips_cloud.unsub_event(did=did)
elif sub_from == 'lan':
self._miot_lan.unsub_prop(did=did)
self._miot_lan.unsub_event(did=did)
elif sub_from in self._mips_local:
mips = self._mips_local[sub_from]
mips.unsub_prop(did=did)
mips.unsub_event(did=did)
# Storage # Storage
await self._storage.save_async( await self._storage.save_async(
domain='miot_devices', domain='miot_devices',
@@ -936,6 +927,39 @@ class MIoTClient:
delay_sec, lambda: self._main_loop.create_task( delay_sec, lambda: self._main_loop.create_task(
self.refresh_user_cert_async())) self.refresh_user_cert_async()))
@final
def __unsub_from(self, sub_from: str, did: str) -> None:
mips: Any = None
if sub_from == 'cloud':
mips = self._mips_cloud
elif sub_from == 'lan':
mips = self._miot_lan
elif sub_from in self._mips_local:
mips = self._mips_local[sub_from]
if mips is not None:
try:
mips.unsub_prop(did=did)
mips.unsub_event(did=did)
except RuntimeError as e:
if 'Event loop is closed' in str(e):
# Ignore unsub exception when loop is closed
pass
else:
raise
@final
def __sub_from(self, sub_from: str, did: str) -> None:
mips = None
if sub_from == 'cloud':
mips = self._mips_cloud
elif sub_from == 'lan':
mips = self._miot_lan
elif sub_from in self._mips_local:
mips = self._mips_local[sub_from]
if mips is not None:
mips.sub_prop(did=did, handler=self.__on_prop_msg)
mips.sub_event(did=did, handler=self.__on_event_msg)
@final @final
def __update_device_msg_sub(self, did: str) -> None: def __update_device_msg_sub(self, did: str) -> None:
if did not in self._device_list_cache: if did not in self._device_list_cache:
@@ -967,27 +991,9 @@ class MIoTClient:
return return
# Unsub old # Unsub old
if from_old: if from_old:
if from_old == 'cloud': self.__unsub_from(from_old, did)
self._mips_cloud.unsub_prop(did=did)
self._mips_cloud.unsub_event(did=did)
elif from_old == 'lan':
self._miot_lan.unsub_prop(did=did)
self._miot_lan.unsub_event(did=did)
elif from_old in self._mips_local:
mips = self._mips_local[from_old]
mips.unsub_prop(did=did)
mips.unsub_event(did=did)
# Sub new # Sub new
if from_new == 'cloud': self.__sub_from(from_new, did)
self._mips_cloud.sub_prop(did=did, handler=self.__on_prop_msg)
self._mips_cloud.sub_event(did=did, handler=self.__on_event_msg)
elif from_new == 'lan':
self._miot_lan.sub_prop(did=did, handler=self.__on_prop_msg)
self._miot_lan.sub_event(did=did, handler=self.__on_event_msg)
elif from_new in self._mips_local:
mips = self._mips_local[from_new]
mips.sub_prop(did=did, handler=self.__on_prop_msg)
mips.sub_event(did=did, handler=self.__on_event_msg)
self._sub_source_list[did] = from_new self._sub_source_list[did] = from_new
_LOGGER.info( _LOGGER.info(
'device sub changed, %s, from %s to %s', did, from_old, from_new) 'device sub changed, %s, from %s to %s', did, from_old, from_new)