perf: update token and cert refresh logic

hchyhchyxh · Dec 11, 2024 · e8b681b · e8b681b
1 parent 051271a
commit e8b681b
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/custom_components/xiaomi_home/miot/miot_client.py b/custom_components/xiaomi_home/miot/miot_client.py
@@ -61,6 +61,7 @@ def load(mode: str) -> 'CtrlMode':
 class MIoTClient:
     """MIoT client instance."""
     # pylint: disable=unused-argument
+    # pylint: disable=broad-exception-caught
     _main_loop: asyncio.AbstractEventLoop
 
     _uid: str
@@ -418,7 +419,8 @@ async def refresh_oauth_info_async(self) -> bool:
             ):
                 raise MIoTClientError('invalid auth info')
             # Determine whether to update token
-            if (auth_info['expires_ts']-60) <= int(time.time()):
+            refresh_time = int(auth_info['expires_ts'] - time.time())
+            if refresh_time <= 60:
                 valid_auth_info = await self._oauth.refresh_access_token_async(
                     refresh_token=auth_info['refresh_token'])
                 auth_info = valid_auth_info
@@ -436,18 +438,17 @@ async def refresh_oauth_info_async(self) -> bool:
                 _LOGGER.info(
                     'refresh oauth info, get new access_token, %s',
                     auth_info)
-
-            refresh_time = int(auth_info['expires_ts'] - time.time())
-            if refresh_time <= 0:
-                raise MIoTClientError('invalid expires time')
+                refresh_time = int(auth_info['expires_ts'] - time.time())
+                if refresh_time <= 0:
+                    raise MIoTClientError('invalid expires time')
             self.__show_client_error_notify(None, 'oauth_info')
             self.__request_refresh_auth_info(refresh_time)
 
             _LOGGER.debug(
                 'refresh oauth info (%s, %s) after %ds',
                 self._uid, self._cloud_server, refresh_time)
             return True
-        except Exception as err:  # pylint: disable=broad-exception-caught
+        except Exception as err:
             self.__show_client_error_notify(
                 message=self._i18n.translate('miot.client.invalid_oauth_info'),
                 notify_key='oauth_info')
@@ -462,12 +463,12 @@ async def refresh_user_cert_async(self) -> bool:
                 return True
             if not await self._cert.verify_ca_cert_async():
                 raise MIoTClientError('ca cert is not ready')
-            if (
-                await self._cert.user_cert_remaining_time_async() <
-                    MIHOME_CERT_EXPIRE_MARGIN
-            ):
+            refresh_time = (
+                await self._cert.user_cert_remaining_time_async() -
+                MIHOME_CERT_EXPIRE_MARGIN)
+            if refresh_time <= 60:
                 user_key = await self._cert.load_user_key_async()
-                if user_key is None:
+                if not user_key:
                     user_key = self._cert.gen_user_key()
                     if not await self._cert.update_user_key_async(key=user_key):
                         raise MIoTClientError('update_user_key_async failed')
@@ -477,13 +478,12 @@ async def refresh_user_cert_async(self) -> bool:
                 if not await self._cert.update_user_cert_async(cert=crt_str):
                     raise MIoTClientError('update user cert error')
                 _LOGGER.info('update_user_cert_async, %s', crt_str)
-
-            # Create cert update task
-            refresh_time = (
-                await self._cert.user_cert_remaining_time_async() -
-                MIHOME_CERT_EXPIRE_MARGIN)
-            if refresh_time <= 0:
-                raise MIoTClientError('invalid refresh time')
+                # Create cert update task
+                refresh_time = (
+                    await self._cert.user_cert_remaining_time_async() -
+                    MIHOME_CERT_EXPIRE_MARGIN)
+                if refresh_time <= 0:
+                    raise MIoTClientError('invalid refresh time')
             self.__show_client_error_notify(None, 'user_cert')
             self.__request_refresh_user_cert(refresh_time)