chickliu/ha_xiaomi_home
1
0
Fork 0
mirror of https://github.com/XiaoMi/ha_xiaomi_home.git synced 2026-01-16 23:00:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: refresh cloud devices retry

Browse Source
This commit is contained in:
LiShuzhen 2025-12-12 16:48:09 +08:00
parent 647adcc02e
commit 339a71e0bb
1 changed files with 18 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,11 +79,10 @@ from .miot_i18n import MIoTI18n
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
RECOVER_NETWORK_DELAY = 120
RECOVER_NETWORK_RETRY_DELAY = 600
REFRESH_PROPS_DELAY = 0.2 REFRESH_PROPS_DELAY = 0.2
REFRESH_PROPS_RETRY_DELAY = 3 REFRESH_PROPS_RETRY_DELAY = 3
REFRESH_CLOUD_DEVICES_DELAY = 6 REFRESH_CLOUD_DEVICES_DELAY = 6
REFRESH_CLOUD_DEVICES_RETRY_DELAY = 60
REFRESH_GATEWAY_DEVICES_DELAY = 3 REFRESH_GATEWAY_DEVICES_DELAY = 3
@dataclass @dataclass
@ -163,7 +162,6 @@ class MIoTClient:
_sub_device_state: dict[str, MipsDeviceState] _sub_device_state: dict[str, MipsDeviceState]
_mips_local_state_changed_timers: dict[str, asyncio.TimerHandle] _mips_local_state_changed_timers: dict[str, asyncio.TimerHandle]
_recover_network_timer: Optional[asyncio.TimerHandle]
_refresh_token_timer: Optional[asyncio.TimerHandle] _refresh_token_timer: Optional[asyncio.TimerHandle]
_refresh_cert_timer: Optional[asyncio.TimerHandle] _refresh_cert_timer: Optional[asyncio.TimerHandle]
_refresh_cloud_devices_timer: Optional[asyncio.TimerHandle] _refresh_cloud_devices_timer: Optional[asyncio.TimerHandle]
@ -234,7 +232,6 @@ class MIoTClient:
self._sub_device_state = {} self._sub_device_state = {}
self._mips_local_state_changed_timers = {} self._mips_local_state_changed_timers = {}
self._recover_network_timer = None
self._refresh_token_timer = None self._refresh_token_timer = None
self._refresh_cert_timer = None self._refresh_cert_timer = None
self._refresh_cloud_devices_timer = None self._refresh_cloud_devices_timer = None
@ -415,10 +412,6 @@ class MIoTClient:
devices=list(self._device_list_cache.keys())) devices=list(self._device_list_cache.keys()))
await self._miot_lan.vote_for_lan_ctrl_async( await self._miot_lan.vote_for_lan_ctrl_async(
key=f'{self._uid}-{self._cloud_server}', vote=False) key=f'{self._uid}-{self._cloud_server}', vote=False)
# Cancel recover network
if self._recover_network_timer:
self._recover_network_timer.cancel()
self._recover_network_timer = None
# Cancel refresh auth info # Cancel refresh auth info
if self._refresh_token_timer: if self._refresh_token_timer:
self._refresh_token_timer.cancel() self._refresh_token_timer.cancel()
@ -1035,13 +1028,14 @@ class MIoTClient:
@final @final
async def __on_network_status_changed(self, status: bool) -> None: async def __on_network_status_changed(self, status: bool) -> None:
_LOGGER.info('network status changed, %s', status) _LOGGER.info('network status changed, %s', status)
if self._recover_network_timer:
self._recover_network_timer.cancel()
self._recover_network_timer = None
if status: if status:
self._recover_network_timer = self._main_loop.call_later( # Check auth_info
RECOVER_NETWORK_DELAY, lambda: self._main_loop.create_task( if await self.refresh_oauth_info_async():
self.__recover_network_async())) # Connect to mips cloud
self._mips_cloud.connect()
# Update device list
self.__request_refresh_cloud_devices()
await self.refresh_user_cert_async()
else: else:
self.__request_show_devices_changed_notify(delay_sec=30) self.__request_show_devices_changed_notify(delay_sec=30)
# Cancel refresh cloud devices # Cancel refresh cloud devices
@ -1051,25 +1045,6 @@ class MIoTClient:
# Disconnect cloud mips # Disconnect cloud mips
self._mips_cloud.disconnect() self._mips_cloud.disconnect()
@final
async def __recover_network_async(self) -> None:
_LOGGER.info('recover network connection')
if self._recover_network_timer:
self._recover_network_timer.cancel()
self._recover_network_timer = None
# Check auth_info
if await self.refresh_oauth_info_async():
# Connect to mips cloud
self._mips_cloud.connect()
# Update device list
self.__request_refresh_cloud_devices()
else:
self._recover_network_timer = self._main_loop.call_later(
RECOVER_NETWORK_RETRY_DELAY,
lambda: self._main_loop.create_task(
self.__recover_network_async()))
await self.refresh_user_cert_async()
@final @final
async def __on_mips_service_state_change( async def __on_mips_service_state_change(
self, group_id: str, state: MipsServiceState, data: dict self, group_id: str, state: MipsServiceState, data: dict
@ -1464,12 +1439,18 @@ class MIoTClient:
async def __refresh_cloud_devices_async(self) -> None: async def __refresh_cloud_devices_async(self) -> None:
_LOGGER.debug( _LOGGER.debug(
'refresh cloud devices, %s, %s', self._uid, self._cloud_server) 'refresh cloud devices, %s, %s', self._uid, self._cloud_server)
self._refresh_cloud_devices_timer = None if self._refresh_cloud_devices_timer:
self._refresh_cloud_devices_timer.cancel()
self._refresh_cloud_devices_timer = None
try: try:
result = await self._http.get_devices_async( result = await self._http.get_devices_async(
home_ids=list(self._entry_data.get('home_selected', {}).keys())) home_ids=list(self._entry_data.get('home_selected', {}).keys()))
except Exception as err: # pylint: disable=broad-exception-caught except Exception as err: # pylint: disable=broad-exception-caught
_LOGGER.error('refresh cloud devices failed, %s', err) _LOGGER.error('refresh cloud devices failed, %s', err)
self._refresh_cloud_devices_timer = self._main_loop.call_later(
REFRESH_CLOUD_DEVICES_RETRY_DELAY,
lambda: self._main_loop.create_task(
self.__refresh_cloud_devices_async()))
return return
if not result and 'devices' not in result: if not result and 'devices' not in result:
self.__show_client_error_notify( self.__show_client_error_notify(
@ -1516,17 +1497,11 @@ class MIoTClient:
_LOGGER.debug( _LOGGER.debug(
'request refresh cloud devices, %s, %s', 'request refresh cloud devices, %s, %s',
self._uid, self._cloud_server) self._uid, self._cloud_server)
if immediately: delay_sec : int = 0 if immediately else REFRESH_CLOUD_DEVICES_DELAY
if self._refresh_cloud_devices_timer:
self._refresh_cloud_devices_timer.cancel()
self._refresh_cloud_devices_timer = self._main_loop.call_later(
0, lambda: self._main_loop.create_task(
self.__refresh_cloud_devices_async()))
return
if self._refresh_cloud_devices_timer: if self._refresh_cloud_devices_timer:
return self._refresh_cloud_devices_timer.cancel()
self._refresh_cloud_devices_timer = self._main_loop.call_later( self._refresh_cloud_devices_timer = self._main_loop.call_later(
REFRESH_CLOUD_DEVICES_DELAY, lambda: self._main_loop.create_task( delay_sec, lambda: self._main_loop.create_task(
self.__refresh_cloud_devices_async())) self.__refresh_cloud_devices_async()))
@final @final