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

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

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

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

@@ -15,7 +15,7 @@ import hashlib
 from .exceptions import AidotAuthFailed, AidotUserOrPassIncorrect
 from .device_client import DeviceClient
 from .discover import Discover
-from .login_const import APP_ID, PUBLIC_KEY_PEM, BASE_URL
+from .login_const import APP_ID, PUBLIC_KEY_PEM, API_URL_TEMPLATE, DEFAULT_REGION
 from .const import (
     CONF_ACCESS_TOKEN,
     CONF_APP_ID,
@@ -58,8 +58,8 @@ def rsa_password_encrypt(message: str) -> str:
 
 
 class AidotClient:
-    _base_url: str = BASE_URL
-    _region: str = "us"
+    _base_url: str = API_URL_TEMPLATE.format(region=DEFAULT_REGION)
+    _region: str = DEFAULT_REGION
     session: Optional[ClientSession] = None
     username: str = ""
     password: str = ""
@@ -77,7 +77,7 @@ class AidotClient:
         password: str | None = None,
         token: dict | None = None,
     ) -> None:
-        _LOGGER.warning(f"Aidot Client Version: v0.3.50")
+        _LOGGER.info("Client Version: v0.3.52")
         self.session = session
         self.username = username
         self.password = password
@@ -87,7 +87,7 @@ class AidotClient:
             if item["id"] == self.country_code:
                 self.country_name = item["name"]
                 self._region = item["region"].lower()
-                self._base_url = f"https://prod-{self._region}-api.arnoo.com/v17"
+                self._base_url = API_URL_TEMPLATE.format(region=self._region)
                 break
         if token is not None:
             self.login_info = token.copy()
@@ -95,7 +95,7 @@ class AidotClient:
             self.password = token[CONF_PASSWORD]
             self._region = token[CONF_REGION]
             self.country_name = token[CONF_COUNTRY]
-            self._base_url = f"https://prod-{self._region}-api.arnoo.com/v17"
+            self._base_url = API_URL_TEMPLATE.format(region=self._region)
         self.setup_discover()
     def set_token_fresh_cb(self, callback) -> None:
         self._token_fresh_cb = callback
@@ -110,13 +110,16 @@ class AidotClient:
         file_path = Path.home() / ".aidot_terminal_id"
 
         def _read_or_create() -> str:
-            if file_path.exists():
-                return file_path.read_text().strip()
-            node = uuid.getnode()
-            is_random = (node >> 40) & 1
-            raw_id = str(uuid.uuid4()) if is_random else format(node, "x")
-            file_path.write_text(raw_id)
-            return raw_id
+            try:
+                if file_path.exists():
+                    return file_path.read_text().strip()
+                node = uuid.getnode()
+                is_random = (node >> 40) & 1
+                raw_id = str(uuid.uuid4()) if is_random else format(node, "x")
+                file_path.write_text(raw_id)
+                return raw_id
+            except OSError:
+                return 'gvz3gjae10l4zii00t7y0'
 
         raw_id = await asyncio.to_thread(_read_or_create)
         return hashlib.md5(raw_id.encode()).hexdigest()
@@ -150,7 +153,7 @@ class AidotClient:
             self.setup_discover()
             return self.login_info
         except aiohttp.ClientError as e:
-            _LOGGER.info(f"async_post_login ClientError {e}")
+            _LOGGER.error(f"async_post_login ClientError: {e}")
             if response_data[CONF_CODE] == ServerErrorCode.USER_PWD_INCORRECT:
                 raise AidotUserOrPassIncorrect
             raise Exception
@@ -169,12 +172,12 @@ class AidotClient:
             self.login_info[CONF_ACCESS_TOKEN] = response_data[CONF_ACCESS_TOKEN]
             if response_data[CONF_REFRESH_TOKEN] is not None:
                 self.login_info[CONF_REFRESH_TOKEN] = response_data[CONF_REFRESH_TOKEN]
-            _LOGGER.info(f"refresh token {response_data}")
+            _LOGGER.debug(f"refresh token: {response_data}")
             if self._token_fresh_cb:
                 self._token_fresh_cb()
             return response_data
         except aiohttp.ClientError as e:
-            _LOGGER.info(f"async_refresh_token ClientError {e} {response_data}")
+            _LOGGER.error(f"async_refresh_token ClientError: {e} {response_data}")
             if response_data[CONF_CODE] == ServerErrorCode.LOGIN_INVALID:
                 raise AidotAuthFailed
             return None
@@ -199,7 +202,7 @@ class AidotClient:
             response.raise_for_status()
             return response_data
         except aiohttp.ClientError as e:
-            _LOGGER.info(f"async_get ClientError {e} {response_data}")
+            _LOGGER.error(f"async_get ClientError: {e} {response_data}")
             code = response_data.get(CONF_CODE)
             if code == ServerErrorCode.TOKEN_EXPIRED:
                 try:
@@ -297,5 +300,5 @@ class AidotClient:
 
     async def async_cleanup(self) -> None:
         """清理所有资源"""
-        _LOGGER.info(f"async_cleanup")
+        _LOGGER.debug("async_cleanup")
         await self.async_close()

{python_aidot-0.3.50 → python_aidot-0.3.52}/aidot/const.py

@@ -101,6 +101,7 @@ SUPPORTED_COUNTRYS = [
     {"_id": "16-4", "id": "PK", "name": "Pakistan", "ext": "", "region": "JP"},
     {"_id": "16-5", "id": "PS", "name": "Palestine", "ext": "", "region": "JP"},
     {"_id": "16-6", "id": "PH", "name": "Philippines", "ext": "", "region": "JP"},
+    {"_id": "16-7", "id": "PL", "name": "Poland", "ext": "", "region": "EU"},
     {"_id": "17-0", "id": "QA", "name": "Qatar", "ext": "", "region": "JP"},
     {"_id": "18-0", "id": "RO", "name": "Romania", "ext": "", "region": "EU"},
     {"_id": "18-1", "id": "RU", "name": "Russia", "ext": "", "region": "EU"},

{python_aidot-0.3.50 → python_aidot-0.3.52}/aidot/login_const.py

@@ -1,7 +1,10 @@
-"""Constants for the aidot integration."""
+"""Constants for the aidot login."""
 
 APP_ID = "1383974540041977857"
-BASE_URL = "https://prod-us-api.arnoo.com/v17"
+
+# API URL template - use .format(region="us") to construct
+API_URL_TEMPLATE = "https://prod-{region}-api.arnoo.com/v17"
+DEFAULT_REGION = "us"
 
 PUBLIC_KEY_PEM = b"""
 -----BEGIN PUBLIC KEY-----

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

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

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

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