fix: changing RoborockDeviceInfo to serializable

Author: humbertogontijo

roborock/api.py

@@ -35,14 +35,14 @@
     HomeData,
     MultiMapsList,
     SmartWashParameters,
+    RoborockDeviceInfo,
 
 )
 from .roborock_queue import RoborockQueue
 from .typing import (
     RoborockDeviceProp,
     RoborockCommand,
-    RoborockDockSummary,
-    RoborockDeviceInfo,
+    RoborockDockSummary
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -371,11 +371,14 @@ async def get_prop(self, device_id: str) -> RoborockDeviceProp:
             )
 
     async def get_multi_maps_list(self, device_id) -> MultiMapsList:
-        multi_maps_list = await self.send_command(
-            device_id, RoborockCommand.GET_MULTI_MAPS_LIST
-        )
-        if isinstance(multi_maps_list, dict):
-            return MultiMapsList(multi_maps_list)
+        try:
+            multi_maps_list = await self.send_command(
+                device_id, RoborockCommand.GET_MULTI_MAPS_LIST
+            )
+            if isinstance(multi_maps_list, dict):
+                return MultiMapsList(multi_maps_list)
+        except RoborockTimeout as e:
+            _LOGGER.error(e)
 
     async def get_map_v1(self, device_id):
         return await self.send_command(device_id, RoborockCommand.GET_MAP_V1)

roborock/cli.py

@@ -8,7 +8,7 @@
 from roborock import RoborockException
 from roborock.api import RoborockApiClient
 from roborock.cloud_api import RoborockMqttClient
-from roborock.containers import LoginData
+from roborock.containers import LoginData, RoborockDeviceInfo
 from roborock.util import run_sync
 
 _LOGGER = logging.getLogger(__name__)
@@ -116,9 +116,9 @@ async def command(ctx, cmd, params):
         await _discover(ctx)
         login_data = context.login_data()
     home_data = login_data.home_data
-    device_map: dict[str, str] = {}
+    device_map: dict[str, RoborockDeviceInfo] = {}
     for device in home_data.devices + home_data.received_devices:
-        device_map[device.duid] = device.local_key
+        device_map[device.duid] = RoborockDeviceInfo({"device": device})
     mqtt_client = RoborockMqttClient(login_data.user_data, device_map)
     await mqtt_client.send_command(home_data.devices[0].duid, cmd, params)
     mqtt_client.__del__()

roborock/cloud_api.py

@@ -9,20 +9,21 @@
 from urllib.parse import urlparse
 
 import paho.mqtt.client as mqtt
-from roborock.code_mappings import RoborockDockType
 
 from roborock.api import md5hex, md5bin, RoborockClient, SPECIAL_COMMANDS
+from roborock.code_mappings import RoborockDockType
 from roborock.exceptions import (
     RoborockException,
     CommandVacuumError,
     VacuumError,
 )
 from .containers import (
     UserData,
+    RoborockDeviceInfo,
 )
 from .roborock_queue import RoborockQueue
 from .typing import (
-    RoborockCommand, RoborockDeviceProp, RoborockDeviceInfo,
+    RoborockCommand, RoborockDeviceProp,
 )
 from .util import run_in_executor
 

roborock/containers.py

@@ -237,6 +237,15 @@ class NetworkInfoField(str, Enum):
     RSSI = "rssi"
 
 
+class RoborockDeviceInfoField(str, Enum):
+    DEVICE = "device"
+    PRODUCT = "product"
+
+
+class RoborockLocalDeviceInfoField(str, Enum):
+    NETWORK_INFO = "network_info"
+
+
 class RoborockBase(dict):
     def __init__(self, data: dict[str, any]) -> None:
         super().__init__()
@@ -248,8 +257,6 @@ def as_dict(self):
 
 
 class Reference(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def region(self) -> str:
@@ -269,8 +276,6 @@ def l_unknown(self) -> str:
 
 
 class RRiot(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def user(self) -> str:
@@ -294,8 +299,6 @@ def reference(self) -> Reference:
 
 
 class UserData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def uid(self) -> int:
@@ -343,8 +346,6 @@ def avatar_url(self) -> str:
 
 
 class LoginData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def user_data(self) -> UserData:
@@ -364,8 +365,6 @@ def email(self):
 
 
 class HomeDataProductSchema(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -397,8 +396,6 @@ def desc(self):
 
 
 class HomeDataProduct(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self) -> str:
@@ -438,8 +435,6 @@ def schema(self) -> list[HomeDataProductSchema]:
 
 
 class HomeDataDeviceStatus(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -479,8 +474,6 @@ def schema(self):
 
 
 class HomeDataDevice(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def duid(self) -> str:
@@ -584,8 +577,6 @@ def silent_ota_switch(self) -> bool:
 
 
 class HomeDataRoom(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self):
@@ -597,8 +588,6 @@ def name(self):
 
 
 class HomeData(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def id(self) -> int:
@@ -638,8 +627,6 @@ def rooms(self) -> list[HomeDataRoom]:
 
 
 class Status(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def msg_ver(self) -> int:
@@ -839,8 +826,6 @@ def unsave_map_flag(self) -> int:
 
 
 class DNDTimer(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def start_hour(self) -> int:
@@ -864,8 +849,6 @@ def enabled(self) -> int:
 
 
 class CleanSummary(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def clean_time(self) -> int:
@@ -889,8 +872,6 @@ def records(self) -> list[int]:
 
 
 class CleanRecord(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def begin(self) -> int:
@@ -946,8 +927,6 @@ def map_flag(self) -> int:
 
 
 class Consumable(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def main_brush_work_time(self) -> int:
@@ -983,8 +962,6 @@ def cleaning_brush_work_times(self) -> int:
 
 
 class MultiMapsListMapInfoBakMaps(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def mapflag(self):
@@ -996,8 +973,6 @@ def add_time(self):
 
 
 class MultiMapsListMapInfo(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def mapflag(self):
@@ -1021,8 +996,6 @@ def bak_maps(self):
 
 
 class MultiMapsList(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def max_multi_map(self) -> int:
@@ -1042,8 +1015,6 @@ def map_info(self) -> list[MultiMapsListMapInfo]:
 
 
 class SmartWashParameters(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
     @property
     def smart_wash(self) -> int:
@@ -1053,22 +1024,40 @@ def smart_wash(self) -> int:
     def wash_interval(self) -> int:
         return self.get(SmartWashField.WASH_INTERVAL)
 
-class NetworkInfo(RoborockBase):
-    def __init__(self, data: dict[str, any]) -> None:
-        super().__init__(data)
 
+class NetworkInfo(RoborockBase):
     @property
     def ssid(self) -> str:
         return self.get(NetworkInfoField.SSID)
+
     @property
     def ip(self) -> str:
         return self.get(NetworkInfoField.IP)
+
     @property
     def mac(self) -> str:
         return self.get(NetworkInfoField.MAC)
+
     @property
     def bssid(self) -> str:
         return self.get(NetworkInfoField.BSSID)
+
     @property
     def rssi(self) -> int:
         return self.get(NetworkInfoField.RSSI)
+
+
+class RoborockDeviceInfo(RoborockBase):
+    @property
+    def device(self) -> HomeDataDevice:
+        return HomeDataDevice(self.get(RoborockDeviceInfoField.DEVICE))
+
+    @property
+    def product(self) -> HomeDataProduct:
+        return HomeDataProduct(self.get(RoborockDeviceInfoField.PRODUCT))
+
+
+class RoborockLocalDeviceInfo(RoborockDeviceInfo):
+    @property
+    def network_info(self) -> NetworkInfo:
+        return NetworkInfo(self.get(RoborockLocalDeviceInfoField.NETWORK_INFO))

roborock/local_api.py

@@ -9,8 +9,9 @@
 import async_timeout
 
 from roborock.api import RoborockClient, SPECIAL_COMMANDS
+from roborock.containers import RoborockLocalDeviceInfo
 from roborock.exceptions import RoborockTimeout, CommandVacuumError
-from roborock.typing import RoborockCommand, RoborockLocalDeviceInfo
+from roborock.typing import RoborockCommand
 from roborock.util import get_running_loop_or_create_one
 
 secured_prefix = 199
@@ -72,13 +73,15 @@ async def send_command(
             _LOGGER.debug(f"id={request_id} Response from {method}: {response}")
             return response
 
+
 class RoborockSocket(socket.socket):
     _closed = None
 
     @property
     def is_closed(self):
         return self._closed
 
+
 class RoborockSocketListener:
     roborock_port = 58867
 

roborock/offline/offline.py

@@ -3,8 +3,8 @@
 
 from roborock.containers import HomeDataDevice, HomeDataDeviceField, HomeDataProduct, HomeDataProductField, NetworkInfo, \
     NetworkInfoField
+from roborock.containers import RoborockLocalDeviceInfo
 from roborock.local_api import RoborockLocalClient
-from roborock.typing import RoborockLocalDeviceInfo
 
 local_ip = "<local_ip>"
 local_key = "<local_key>"
@@ -16,17 +16,21 @@ async def main():
         "level": logging.DEBUG
     }
     logging.basicConfig(**logging_config)
-    client = RoborockLocalClient({
-        device_id: RoborockLocalDeviceInfo(HomeDataDevice({
+    localdevices_info = RoborockLocalDeviceInfo({
+        "device": HomeDataDevice({
             HomeDataDeviceField.NAME: "test_name",
             HomeDataDeviceField.DUID: device_id,
             HomeDataDeviceField.FV: "1",
             HomeDataDeviceField.LOCAL_KEY: local_key
-        }), HomeDataProduct({
+        }),
+        "product": HomeDataProduct({
             HomeDataProductField.MODEL: "test_model"
-        }), NetworkInfo({
+        }),
+        "network_info": NetworkInfo({
             NetworkInfoField.IP: local_ip
-        }))
+        })})
+    client = RoborockLocalClient({
+        device_id: localdevices_info
     })
     await client.async_connect()
     props = await client.get_prop(device_id)