python-aidot 0.3.41__tar.gz → 0.3.43__tar.gz

{python_aidot-0.3.41 → python_aidot-0.3.43}/PKG-INFO

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

{python_aidot-0.3.41 → python_aidot-0.3.43}/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
@@ -102,8 +106,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",
@@ -206,6 +211,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:
@@ -235,6 +242,12 @@ class AidotClient:
             device_client.update_ip_address(ip)
         return device_client
 
+    async def remove_device_client(self, dev_id: str) -> None:
+        device_client: DeviceClient = self._device_clients.get(dev_id)
+        if device_client is not None:
+            await device_client.close()
+            del self._device_clients[dev_id]
+
     def start_discover(self) -> None:
         if self._discover is not None:
             return

{python_aidot-0.3.41 → python_aidot-0.3.43}/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.41 → python_aidot-0.3.43}/aidot/device_client.py

@@ -33,6 +33,8 @@ from .const import (
     CONF_PROPERTIES,
     CONF_RGBW,
     CONF_SERVICE_MODULES,
+    CONF_ACK,
+    CONF_CODE,
     Identity,
 )
 
@@ -102,10 +104,10 @@ class DeviceClient(object):
     _connect_and_login: bool = False
     _connecting: bool = False
     _simpleVersion: str = ""
-    _ip_address: str
+    _ip_address: str = None
     device_id: str
     _is_close: bool = False
-
+    _status_fresh_cb: Any = None
     @property
     def connect_and_login(self) -> bool:
         return self._connect_and_login
@@ -132,6 +134,7 @@ class DeviceClient(object):
         self._simpleVersion = device.get("simpleVersion")
 
     async def connect(self, ip_address) -> None:
+        _LOGGER.info(f"connect device : {ip_address}")
         self.reader = self.writer = None
         self._connecting = True
         try:
@@ -147,8 +150,12 @@ class DeviceClient(object):
             self._connecting = False
 
     def update_ip_address(self, ip: str) -> None:
+        if ip is None:
+            return
         self._ip_address = ip
-
+        if self._connecting is not True and self._connect_and_login is not True:
+            asyncio.get_running_loop().create_task(self.async_login())
+        
     async def async_login(self) -> None:
         if self._ip_address is None:
             return
@@ -198,57 +205,111 @@ 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
 
-        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
 
-        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
-        await self.send_action({}, "getDevAttrReq")
+        
 
+    async def reveive_data(self) -> None:
+        while True:
+            try:
+                data = await self.reader.read(1024)
+            except (BrokenPipeError, ConnectionResetError) as e:
+                _LOGGER.error(f"{self.device_id} read status error {e}")
+                await self.reset()
+                self.status.online = False
+                return
+            except Exception as e:
+                _LOGGER.error(f"recv data error {e}")
+                return
+            data_len = len(data)
+            if data_len <= 0:
+                _LOGGER.error("recv data error len, exit socket")
+                await self.reset()
+                self.status.online = False
+                return
+            try:
+                magic, msgtype, bodysize = struct.unpack(">HHI", data[:8])
+                decrypted_data = aes_decrypt(data[8:], self.aes_key)
+                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"]:
+                    self.ping_count = 0
+                    continue
+
+            payload = json_data.get(CONF_PAYLOAD)
+            if payload is not None:
+                self.ascNumber = payload.get(CONF_ASCNUMBER)
+                self.status.update(payload.get(CONF_ATTR))
+                # _LOGGER.info(f"recv status : {payload}")
+                if self._status_fresh_cb:
+                    self._status_fresh_cb(self.status)
+    def set_status_fresh_cb(self, callback) -> None:
+        self._status_fresh_cb = callback
     async def read_status(self) -> DeviceStatusData:
-        if self._connect_and_login is False:
-            await asyncio.sleep(2)
-            raise AidotNotLogin
-        try:
-            data = await self.reader.read(1024)
-        except (BrokenPipeError, ConnectionResetError) as e:
-            _LOGGER.error(f"{self.device_id} read status error {e}")
-            await self.reset()
-            self.status.online = False
-            return self.status
-        except Exception as e:
-            _LOGGER.error(f"recv data error {e}")
-            return self.status
-        data_len = len(data)
-        if data_len <= 0:
-            _LOGGER.error("recv data error len")
-            await self.reset()
-            self.status.online = False
-            return self.status
-        try:
-            magic, msgtype, bodysize = struct.unpack(">HHI", data[:8])
-            decrypted_data = aes_decrypt(data[8:], self.aes_key)
-            json_data = json.loads(decrypted_data)
-        except Exception as e:
-            _LOGGER.error(f"recv json error : {e}")
-            return await self.read_status()
-
-        if "service" in json_data:
-            if "test" == json_data["service"]:
-                self.ping_count = 0
-                return await self.read_status()
-        payload = json_data.get(CONF_PAYLOAD)
-        if payload is not None:
-            self.ascNumber = payload.get(CONF_ASCNUMBER)
-            self.status.update(payload.get(CONF_ATTR))
+        # if self._connect_and_login is False:
+        #     await asyncio.sleep(2)
+        #     raise AidotNotLogin
+        # try:
+        #     data = await self.reader.read(1024)
+        # except (BrokenPipeError, ConnectionResetError) as e:
+        #     _LOGGER.error(f"{self.device_id} read status error {e}")
+        #     await self.reset()
+        #     self.status.online = False
+        #     return self.status
+        # except Exception as e:
+        #     _LOGGER.error(f"recv data error {e}")
+        #     return self.status
+        # data_len = len(data)
+        # if data_len <= 0:
+        #     _LOGGER.error("recv data error len")
+        #     await self.reset()
+        #     self.status.online = False
+        #     return self.status
+        # try:
+        #     magic, msgtype, bodysize = struct.unpack(">HHI", data[:8])
+        #     decrypted_data = aes_decrypt(data[8:], self.aes_key)
+        #     json_data = json.loads(decrypted_data)
+        # except Exception as e:
+        #     _LOGGER.error(f"recv json error : {e}")
+        #     return await self.read_status()
+
+        # if "service" in json_data:
+        #     if "test" == json_data["service"]:
+        #         self.ping_count = 0
+        #         return await self.read_status()
+        # payload = json_data.get(CONF_PAYLOAD)
+        # if payload is not None:
+        #     self.ascNumber = payload.get(CONF_ASCNUMBER)
+        #     self.status.update(payload.get(CONF_ATTR))
         return self.status
 
     async def ping_task(self) -> None:
@@ -260,6 +321,8 @@ class DeviceClient(object):
             await asyncio.sleep(5)
 
     async def send_dev_attr(self, dev_attr) -> None:
+        if not self._connect_and_login:
+            raise ConnectionError('Device offline')
         await self.send_action(dev_attr, "setDevAttrReq")
 
     async def async_turn_off(self) -> None:

{python_aidot-0.3.41 → python_aidot-0.3.43}/python_aidot.egg-info/PKG-INFO

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

{python_aidot-0.3.41 → python_aidot-0.3.43}/setup.py

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