fix: refactor roborock device info

Author: humbertogontijo

roborock/api.py

@@ -147,7 +147,7 @@ def _decode_msg(self, msg: bytes, local_key: str) -> dict[str, Any]:
         }
 
     def _encode_msg(self, device_id, request_id, protocol, timestamp, payload, prefix=None) -> bytes:
-        local_key = self.devices_info[device_id].device.local_key
+        local_key = self.devices_info[device_id].local_key
         aes_key = md5bin(encode_timestamp(timestamp) + local_key + self._salt)
         cipher = AES.new(aes_key, AES.MODE_ECB)
         encrypted = cipher.encrypt(pad(payload, AES.block_size))
@@ -173,7 +173,7 @@ def _encode_msg(self, device_id, request_id, protocol, timestamp, payload, prefi
 
     async def on_message(self, device_id, msg) -> bool:
         try:
-            data = self._decode_msg(msg, self.devices_info[device_id].device.local_key)
+            data = self._decode_msg(msg, self.devices_info[device_id].local_key)
             protocol = data.get("protocol")
             if protocol == 102 or protocol == 4:
                 payload = json.loads(data.get("payload").decode())

roborock/local_api.py

@@ -10,7 +10,7 @@
 
 from roborock.api import RoborockClient, SPECIAL_COMMANDS
 from roborock.exceptions import RoborockTimeout, CommandVacuumError
-from roborock.typing import RoborockCommand, RoborockDeviceInfo
+from roborock.typing import RoborockCommand, RoborockLocalDeviceInfo
 from roborock.util import get_running_loop_or_create_one
 
 secured_prefix = 199
@@ -35,11 +35,11 @@ def error_received(self, exc):
 
 class RoborockLocalClient(RoborockClient):
 
-    def __init__(self, devices_info: dict[str, RoborockDeviceInfo]):
+    def __init__(self, devices_info: dict[str, RoborockLocalDeviceInfo]):
         super().__init__("abc", devices_info)
         self.loop = get_running_loop_or_create_one()
         self.device_listener: dict[str, RoborockSocketListener] = {
-            device_id: RoborockSocketListener(device_info.network_info.ip, device_id, self.on_message)
+            device_id: RoborockSocketListener(device_info.ip, device_id, self.on_message)
             for device_id, device_info in devices_info.items()
         }
         self._mutex = Lock()

roborock/offline/offline.py

@@ -1,14 +1,12 @@
 import asyncio
 import logging
 
-from roborock.containers import HomeDataDevice, HomeDataDeviceField, HomeDataProduct, HomeDataProductField, NetworkInfo, \
-    NetworkInfoField
 from roborock.local_api import RoborockLocalClient
-from roborock.typing import RoborockDeviceInfo
+from roborock.typing import RoborockLocalDeviceInfo
 
-local_ip = "192.168.1.232"
-local_key = "nXTBj42ej5WxQopO"
-device_id = "1r9W0cAmDZ2COuVekgRhKA"
+local_ip = "<local_ip>"
+local_key = "<local_key>"
+device_id = "<device_id>"
 
 
 async def main():
@@ -17,14 +15,7 @@ async def main():
     }
     logging.basicConfig(**logging_config)
     client = RoborockLocalClient({
-        device_id: RoborockDeviceInfo(HomeDataDevice({
-            HomeDataDeviceField.DUID: device_id,
-            HomeDataDeviceField.LOCAL_KEY: local_key
-        }), HomeDataProduct({
-            HomeDataProductField.MODEL: "test"
-        }), NetworkInfo({
-            NetworkInfoField.IP: local_ip
-        }))
+        device_id: RoborockLocalDeviceInfo(local_key, "model_test", local_ip)
     })
     await client.async_connect()
     props = await client.get_prop(device_id)

roborock/typing.py

@@ -4,7 +4,7 @@
 
 from .code_mappings import RoborockDockDustCollectionType, RoborockDockWashingModeType
 from .containers import Status, CleanSummary, Consumable, \
-    DNDTimer, CleanRecord, SmartWashParameters, HomeDataDevice, HomeDataProduct, NetworkInfo
+    DNDTimer, CleanRecord, SmartWashParameters
 
 
 class RoborockDevicePropField(str, Enum):
@@ -89,10 +89,14 @@ class RoborockCommand(str, Enum):
     GET_NETWORK_INFO = "get_network_info"
 
 class RoborockDeviceInfo:
-    def __init__(self, device: HomeDataDevice, product: HomeDataProduct, network_info: NetworkInfo = None):
-        self.device = device
-        self.product = product
-        self.network_info: NetworkInfo | None = network_info
+    def __init__(self, local_key: str, model: str):
+        self.local_key = local_key
+        self.model = model
+
+class RoborockLocalDeviceInfo(RoborockDeviceInfo):
+    def __init__(self, local_key: str, model: str, ip: str):
+        super().__init__(local_key, model)
+        self.ip = ip
 
 class RoborockDockSummary:
     def __init__(self, dust_collection_mode: RoborockDockDustCollectionType,