fix: S6MaxVStatus and minor changes

Author: humbertogontijo

roborock/api.py

@@ -59,6 +59,7 @@
 QUEUE_TIMEOUT = 4
 COMMANDS_SECURED = [
     RoborockCommand.GET_MAP_V1,
+    RoborockCommand.GET_MULTI_MAP,
 ]
 
 
@@ -149,7 +150,7 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:
                                     queue.resolve((result, None))
                 elif data.payload and protocol == 301:
                     payload = data.payload[0:24]
-                    [endpoint, _, request_id, _] = struct.unpack("<15sBH6s", payload)
+                    [endpoint, _, request_id, _] = struct.unpack("<8s8sH6s", payload)
                     if endpoint.decode().startswith(self._endpoint):
                         decrypted = Utils.decrypt_cbc(data.payload[24:], self._nonce)
                         decompressed = Utils.decompress(decrypted)

roborock/code_mappings.py

@@ -131,11 +131,11 @@ class RoborockFanSpeedV3(RoborockFanPowerCode):
 
 
 class RoborockFanSpeedE2(RoborockFanPowerCode):
-    quiet = 101
-    balanced = 102
-    turbo = 103
-    max = 104
-    gentle = 105
+    gentle = 41
+    silent = 50
+    standard = 68
+    medium = 79
+    turbo = 100
 
 
 class RoborockFanSpeedS7(RoborockFanPowerCode):

roborock/containers.py

@@ -15,7 +15,6 @@
     RoborockDockWashTowelModeCode,
     RoborockErrorCode,
     RoborockFanPowerCode,
-    RoborockFanSpeedE2,
     RoborockFanSpeedQ7Max,
     RoborockFanSpeedS6Pure,
     RoborockFanSpeedS7,
@@ -284,8 +283,8 @@ class Q7MaxStatus(Status):
 
 @dataclass
 class S6MaxVStatus(Status):
-    fan_power: Optional[RoborockFanSpeedE2] = None
-    water_box_mode: Optional[RoborockMopIntensityV2] = None
+    fan_power: Optional[RoborockFanSpeedS7MaxV] = None
+    water_box_mode: Optional[RoborockMopIntensityS7] = None
 
 
 @dataclass

roborock/local_api.py

@@ -12,7 +12,7 @@
 from .exceptions import CommandVacuumError, RoborockConnectionException, RoborockException
 from .protocol import MessageParser
 from .roborock_message import RoborockMessage, RoborockMessageProtocol
-from .roborock_typing import CommandInfoMap, RoborockCommand
+from .roborock_typing import RoborockCommand
 from .util import get_running_loop_or_create_one
 
 _LOGGER = logging.getLogger(__name__)
@@ -87,12 +87,6 @@ def build_roborock_message(self, method: RoborockCommand, params: Optional[list
         secured = True if method in COMMANDS_SECURED else False
         request_id, timestamp, payload = self._get_payload(method, params, secured)
         _LOGGER.debug(f"id={request_id} Requesting method {method} with {params}")
-        command_info = CommandInfoMap.get(method)
-        if not command_info:
-            raise RoborockException(f"Request {method} have unknown prefix. Can't execute in offline mode")
-        command = CommandInfoMap.get(method)
-        if command is None:
-            raise RoborockException(f"No prefix found for {method}")
         request_protocol = 4
         return RoborockMessage(
             timestamp=timestamp,

roborock/roborock_message.py

@@ -28,8 +28,7 @@ class RoborockMessage:
     timestamp: int = math.floor(time.time())
 
     def get_request_id(self) -> int | None:
-        protocol = self.protocol
-        if self.payload and protocol in [4, 101, 102]:
+        if self.payload:
             payload = json.loads(self.payload.decode())
             for data_point_number, data_point in payload.get("dps").items():
                 if data_point_number in ["101", "102"]:

roborock/roborock_typing.py

@@ -127,6 +127,16 @@ class RoborockCommand(str, Enum):
     UPD_SERVER_TIMER = "upd_server_timer"
 
 
+CacheableCommands = [
+    attribute
+    for attribute in [
+        command.removeprefix("get_").removeprefix("set_").removeprefix("change_").upper() for command in RoborockCommand
+    ]
+    if "GET_" + attribute in RoborockCommand.__members__
+    and ("SET_" + attribute in RoborockCommand.__members__ or "CHANGE_" + attribute in RoborockCommand.__members__)
+]
+
+
 @dataclass
 class CommandInfo:
     params: Optional[list | dict] = None