python-aidot 0.3.48__tar.gz → 0.3.50__tar.gz

{python_aidot-0.3.48 → python_aidot-0.3.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.48
+Version: 0.3.50
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.48 → python_aidot-0.3.50}/aidot/client.py

@@ -77,7 +77,7 @@ class AidotClient:
         password: str | None = None,
         token: dict | None = None,
     ) -> None:
-        _LOGGER.info(f"Aidot Client Version: v0.3.46")
+        _LOGGER.warning(f"Aidot Client Version: v0.3.50")
         self.session = session
         self.username = username
         self.password = password
@@ -106,19 +106,19 @@ class AidotClient:
     def update_password(self, password: str) -> None:
         self.password = password
     
-    def get_terminal_id(self) -> str:
+    async def get_terminal_id(self) -> str:
         file_path = Path.home() / ".aidot_terminal_id"
-        if file_path.exists():
-            raw_id = file_path.read_text().strip()
-        else:
+
+        def _read_or_create() -> str:
+            if file_path.exists():
+                return file_path.read_text().strip()
             node = uuid.getnode()
             is_random = (node >> 40) & 1
-            
-            if is_random:
-                raw_id = str(uuid.uuid4())
-            else:
-                raw_id = format(node, 'x')
+            raw_id = str(uuid.uuid4()) if is_random else format(node, "x")
             file_path.write_text(raw_id)
+            return raw_id
+
+        raw_id = await asyncio.to_thread(_read_or_create)
         return hashlib.md5(raw_id.encode()).hexdigest()
 
     async def async_post_login(self) -> dict[str, Any]:
@@ -126,7 +126,7 @@ class AidotClient:
         url = f"{self._base_url}/users/loginWithFreeVerification"
         headers = {CONF_APP_ID: APP_ID, CONF_TERMINAL: "app"}
         # f"{region}:{self.country_name.strip()}",
-        terminalId = self.get_terminal_id()
+        terminalId = await self.get_terminal_id()
         if terminalId is None:
             terminalId = "gvz3gjae10l4zii00t7y0"
         data = {

{python_aidot-0.3.48 → python_aidot-0.3.50}/aidot/device_client.py

@@ -152,9 +152,10 @@ class DeviceClient(object):
             sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
             self.seq_num = 1
             await self.login()
-            self._connect_and_login = True
+            self._connect_and_login = self.status.online
         except Exception as e:
             self._connect_and_login = False
+            _LOGGER.warning(f"{self._TAG}:connect device error: {e}")
         finally:
             self._connecting = False
 
@@ -257,8 +258,7 @@ class DeviceClient(object):
                 raise
             except (BrokenPipeError, ConnectionResetError, asyncio.IncompleteReadError) as e:
                 _LOGGER.error(f"{self._TAG}:read status error {e}")
-                # await self.reset()
-                syncio.get_running_loop().call_soon(
+                asyncio.get_running_loop().call_soon(
                     lambda: asyncio.create_task(self.reset())
                 )
                 return
@@ -365,7 +365,7 @@ class DeviceClient(object):
             "srcAddr": "x.xxxxxxx",
             CONF_PAYLOAD: {},
         }
-        # _LOGGER.info(f"{self.device_id} send_ping_action {ping}")
+        _LOGGER.info(f"{self.device_id} send_ping_action {ping}")
         try:
             if self.ping_count >= 3:
                 _LOGGER.error(
@@ -427,5 +427,5 @@ class DeviceClient(object):
         #     10,  # 10秒后重连
         #     lambda: asyncio.create_task(self.async_login())
         # )
-        self._reconnect_handle = loop.call_later(15, self._schedule_reconnect)
+        self._reconnect_handle = loop.call_later(60, self._schedule_reconnect)
         self._login_task = asyncio.create_task(self.async_login())

{python_aidot-0.3.48 → python_aidot-0.3.50}/python_aidot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot
-Version: 0.3.48
+Version: 0.3.50
 Summary: aidot control wifi lights
 Home-page: https://github.com/Aidot-Development-Team/python-aidot
 Author: aidotdev2024

{python_aidot-0.3.48 → python_aidot-0.3.50}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="python-aidot",
-    version="0.3.48",
+    version="0.3.50",
     author="aidotdev2024",
     url='https://github.com/Aidot-Development-Team/python-aidot',
     description="aidot control wifi lights",