python-aidot 0.3.42__tar.gz → 0.3.44__tar.gz

{python_aidot-0.3.42 → python_aidot-0.3.44}/PKG-INFO

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

{python_aidot-0.3.42 → python_aidot-0.3.44}/aidot/client.py

@@ -32,6 +32,8 @@ from .const import (
     CONF_USERNAME,
     DEFAULT_COUNTRY_NAME,
     SUPPORTED_COUNTRYS,
+    DEFAULT_COUNTRY_CODE,
+    CONF_IS_OWNER,
     ServerErrorCode,
 )
 
@@ -60,6 +62,7 @@ class AidotClient:
     username: str = ""
     password: str = ""
     country_name: str = DEFAULT_COUNTRY_NAME
+    country_code: str = DEFAULT_COUNTRY_CODE
     login_info: dict[str, Any] = {}
     _device_clients: dict[str, DeviceClient]
     _discover: Discover = None
@@ -67,18 +70,19 @@ class AidotClient:
     def __init__(
         self,
         session: Optional[ClientSession],
-        country_name: str | None = None,
+        country_code: str | None = None,
         username: str | None = None,
         password: str | None = None,
         token: dict | None = None,
     ) -> None:
         self.session = session
-        self.country_name = country_name
         self.username = username
         self.password = password
+        self.country_code = country_code
         self._device_clients = {}
         for item in SUPPORTED_COUNTRYS:
-            if item["name"] == self.country_name:
+            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"
                 break
@@ -88,6 +92,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"
 
     def set_token_fresh_cb(self, callback) -> None:
         self._token_fresh_cb = callback
@@ -102,8 +107,9 @@ class AidotClient:
         """Login the user input allows us to connect."""
         url = f"{self._base_url}/users/loginWithFreeVerification"
         headers = {CONF_APP_ID: APP_ID, CONF_TERMINAL: "app"}
+        # f"{region}:{self.country_name.strip()}",
         data = {
-            "countryKey": "region:UnitedStates",
+            "countryKey": f"region:{self.country_name.strip()}",
             "username": self.username,
             "password": rsa_password_encrypt(self.password),
             "terminalId": "gvz3gjae10l4zii00t7y0",
@@ -146,7 +152,7 @@ class AidotClient:
                 self._token_fresh_cb()
             return response_data
         except aiohttp.ClientError as e:
-            _LOGGER.info(f"async_refresh_token ClientError {e}")
+            _LOGGER.info(f"async_refresh_token ClientError {e} {response_data}")
             if response_data[CONF_CODE] == ServerErrorCode.LOGIN_INVALID:
                 raise AidotAuthFailed
             return None
@@ -171,7 +177,7 @@ class AidotClient:
             response.raise_for_status()
             return response_data
         except aiohttp.ClientError as e:
-            _LOGGER.info(f"async_get ClientError {e}")
+            _LOGGER.info(f"async_get ClientError {e} {response_data}")
             code = response_data.get(CONF_CODE)
             if code == ServerErrorCode.TOKEN_EXPIRED:
                 try:
@@ -206,6 +212,8 @@ class AidotClient:
         try:
             houses = await self.async_get_houses()
             for house in houses:
+                if house.get(CONF_IS_OWNER) is False:
+                    continue
                 # get device_list
                 device_list = await self.async_get_devices(house[CONF_ID])
                 if device_list:

{python_aidot-0.3.42 → python_aidot-0.3.44}/aidot/const.py

@@ -111,7 +111,7 @@ SUPPORTED_COUNTRYS = [
     {"_id": "19-4", "id": "SR", "name": "Suriname", "ext": "", "region": "US"},
     {"_id": "19-5", "id": "SE", "name": "Sweden", "ext": "", "region": "EU"},
     {"_id": "19-6", "id": "SK", "name": "Slovakia", "ext": "", "region": "EU"},
-    {"_id": "19-7", "id": "RS/ME", "name": "Serbia", "ext": "", "region": "EU"},
+    {"_id": "19-7", "id": "RS", "name": "Serbia", "ext": "", "region": "EU"},
     {
         "_id": "19-8",
         "id": "KN",
@@ -161,9 +161,10 @@ SUPPORTED_COUNTRYS = [
     {"_id": "22-2", "id": "VN", "name": "Vietnam", "ext": "", "region": "JP"},
     {"_id": "23-0", "id": "YE", "name": "Yemen", "ext": "", "region": "JP"},
 ]
-
+SUPPORTED_COUNTRY_CODES = [item["id"] for item in SUPPORTED_COUNTRYS]
 SUPPORTED_COUNTRY_NAMES = [item["name"] for item in SUPPORTED_COUNTRYS]
 DEFAULT_COUNTRY_NAME = "United States"
+DEFAULT_COUNTRY_CODE = "US"
 CONF_APP_ID = "Appid"
 CONF_TERMINAL = "Terminal"
 CONF_LOGIN_RESPONSE = "login_response"
@@ -203,6 +204,8 @@ CONF_ON_OFF = "OnOff"
 CONF_DIMMING = "Dimming"
 CONF_RGBW = "RGBW"
 CONF_CCT = "CCT"
+CONF_ACK = "ack"
+CONF_IS_OWNER = "isOwner"
 
 
 class Identity(StrEnum):

{python_aidot-0.3.42 → python_aidot-0.3.44}/aidot/device_client.py

@@ -33,6 +33,8 @@ from .const import (
     CONF_PROPERTIES,
     CONF_RGBW,
     CONF_SERVICE_MODULES,
+    CONF_ACK,
+    CONF_CODE,
     Identity,
 )
 
@@ -203,21 +205,34 @@ class DeviceClient(object):
         data_len = len(data)
         if data_len <= 0:
             return
+        
+        try:
+            magic, msgtype, bodysize = struct.unpack(">HHI", data[:8])
+            encrypted_data = data[8:]
+            if self.aes_key is not None:
+                decrypted_data = aes_decrypt(encrypted_data, self.aes_key)
+            else:
+                decrypted_data = encrypted_data
+
+            json_data = json.loads(decrypted_data)
+            code = json_data[CONF_ACK][CONF_CODE]
+            if code != 200:
+                # 登录失败
+                _LOGGER.error(f"{self.device_id} login error, code: {code}")
+                await self.reset()
+                return
 
-        magic, msgtype, bodysize = struct.unpack(">HHI", data[:8])
-        encrypted_data = data[8:]
-        if self.aes_key is not None:
-            decrypted_data = aes_decrypt(encrypted_data, self.aes_key)
-        else:
-            decrypted_data = encrypted_data
-
-        json_data = json.loads(decrypted_data)
+            self.ascNumber = json_data[CONF_PAYLOAD][CONF_ASCNUMBER]
+            self.ascNumber += 1
+            self.status.online = True
+            asyncio.get_running_loop().create_task(self.reveive_data())
+            _LOGGER.info(f"connect device success: {self._ip_address}")
+            await self.send_action({}, "getDevAttrReq")
+        except Exception as e:
+            _LOGGER.error(f"connect device error : {e}")
+            return
 
-        self.ascNumber = json_data[CONF_PAYLOAD][CONF_ASCNUMBER]
-        self.ascNumber += 1
-        self.status.online = True
-        asyncio.get_running_loop().create_task(self.reveive_data())
-        await self.send_action({}, "getDevAttrReq")
+        
 
     async def reveive_data(self) -> None:
         while True:
@@ -243,6 +258,7 @@ class DeviceClient(object):
                 json_data = json.loads(decrypted_data)
             except Exception as e:
                 _LOGGER.error(f"recv json error : {e}")
+                continue
 
             if "service" in json_data:
                 if "test" == json_data["service"]:

{python_aidot-0.3.42 → python_aidot-0.3.44}/python_aidot.egg-info/PKG-INFO

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

{python_aidot-0.3.42 → python_aidot-0.3.44}/setup.py

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