feat: adding server timer and retry command compatibility

Author: humbertogontijo

roborock/api.py

@@ -35,6 +35,7 @@
     RoborockBase,
     RoomMapping,
     S7MaxVStatus,
+    ServerTimer,
     SmartWashParams,
     Status,
     UserData,
@@ -136,6 +137,13 @@ async def update_value(self, params):
         await self._async_value()
         return response
 
+    async def add_value(self, params):
+        if self.attribute.add_command is None:
+            raise RoborockException(f"{self.attribute.attribute} have no add command")
+        response = await self.api._send_command(self.attribute.add_command, params)
+        await self._async_value()
+        return response
+
     async def close_value(self):
         if self.attribute.close_command is None:
             raise RoborockException(f"{self.attribute.attribute} have no close command")
@@ -483,6 +491,15 @@ async def get_sound_volume(self) -> int | None:
         """Gets current volume level."""
         return await self.cache[CacheableAttribute.sound_volume].async_value()
 
+    async def get_server_timer(self) -> list[ServerTimer]:
+        """Gets current server timer."""
+        server_timers = await self.cache[CacheableAttribute.server_timer].async_value()
+        if server_timers:
+            if isinstance(server_timers[0], list):
+                return [ServerTimer(*server_timer) for server_timer in server_timers]
+            return [ServerTimer(*server_timers)]
+        return []
+
     def add_listener(self, listener: Callable):
         self._listeners.append(listener)
 

roborock/command_cache.py

@@ -38,6 +38,7 @@ class CacheableAttribute(str, Enum):
 class RoborockAttribute:
     attribute: str
     get_command: RoborockCommand
+    add_command: Optional[RoborockCommand] = None
     set_command: Optional[RoborockCommand] = None
     close_command: Optional[RoborockCommand] = None
 
@@ -126,7 +127,9 @@ def create_cache_map():
         CacheableAttribute.server_timer: RoborockAttribute(
             attribute="server_timer",
             get_command=RoborockCommand.GET_SERVER_TIMER,
-            set_command=RoborockCommand.SET_SERVER_TIMER,
+            add_command=RoborockCommand.SET_SERVER_TIMER,
+            set_command=RoborockCommand.UPD_SERVER_TIMER,
+            close_command=RoborockCommand.DEL_SERVER_TIMER,
         ),
         CacheableAttribute.smart_wash_params: RoborockAttribute(
             attribute="smart_wash_params",

roborock/containers.py

@@ -5,7 +5,7 @@
 import re
 from dataclasses import asdict, dataclass
 from enum import Enum
-from typing import Any, Optional, Type
+from typing import Any, NamedTuple, Optional, Type
 
 from dacite import Config, from_dict
 
@@ -513,3 +513,9 @@ class FlowLedStatus(RoborockBase):
 class BroadcastMessage(RoborockBase):
     duid: str
     ip: str
+
+
+class ServerTimer(NamedTuple):
+    id: str
+    status: str
+    dontknow: int

roborock/local_api.py

@@ -11,7 +11,7 @@
 from .api import COMMANDS_SECURED, QUEUE_TIMEOUT, RoborockClient
 from .exceptions import CommandVacuumError, RoborockConnectionException, RoborockException
 from .protocol import MessageParser
-from .roborock_message import RoborockMessage, RoborockMessageProtocol
+from .roborock_message import MessageRetry, RoborockMessage, RoborockMessageProtocol
 from .roborock_typing import RoborockCommand
 
 _LOGGER = logging.getLogger(__name__)
@@ -85,10 +85,11 @@ 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)
         request_protocol = RoborockMessageProtocol.GENERAL_REQUEST
+        message_retry: Optional[MessageRetry] = None
+        if method == RoborockCommand.RETRY_REQUEST and isinstance(params, dict):
+            message_retry = MessageRetry(method=params["method"], retry_id=params["retry_id"])
         return RoborockMessage(
-            timestamp=timestamp,
-            protocol=request_protocol,
-            payload=payload,
+            timestamp=timestamp, protocol=request_protocol, payload=payload, message_retry=message_retry
         )
 
     async def hello(self):
@@ -161,4 +162,9 @@ async def send_message(self, roborock_message: RoborockMessage):
             raise CommandVacuumError(method, err) from err
         if roborock_message.protocol == RoborockMessageProtocol.GENERAL_REQUEST:
             _LOGGER.debug(f"id={request_id} Response from method {roborock_message.get_method()}: {response}")
+        if response == "retry":
+            retry_id = roborock_message.get_retry_id()
+            return self.send_command(
+                RoborockCommand.RETRY_REQUEST, {"retry_id": retry_id, "retry_count": 8, "method": method}
+            )
         return response

roborock/roborock_message.py

@@ -55,6 +55,12 @@ class RoborockDataProtocol(RoborockEnum):
 ]
 
 
+@dataclass
+class MessageRetry:
+    method: str
+    retry_id: int
+
+
 @dataclass
 class RoborockMessage:
     protocol: RoborockMessageProtocol
@@ -63,6 +69,7 @@ class RoborockMessage:
     version: bytes = b"1.0"
     random: int = randint(10000, 99999)
     timestamp: int = math.floor(time.time())
+    message_retry: Optional[MessageRetry] = None
 
     def get_request_id(self) -> int | None:
         if self.payload:
@@ -73,7 +80,14 @@ def get_request_id(self) -> int | None:
                     return data_point_response.get("id")
         return None
 
+    def get_retry_id(self) -> int | None:
+        if self.message_retry:
+            return self.message_retry.retry_id
+        return self.get_request_id()
+
     def get_method(self) -> str | None:
+        if self.message_retry:
+            return self.message_retry.method
         protocol = self.protocol
         if self.payload and protocol in [4, 5, 101, 102]:
             payload = json.loads(self.payload.decode())

roborock/roborock_typing.py

@@ -125,6 +125,7 @@ class RoborockCommand(str, Enum):
     SWITCH_WATER_MARK = "switch_water_mark"
     TEST_SOUND_VOLUME = "test_sound_volume"
     UPD_SERVER_TIMER = "upd_server_timer"
+    DEL_SERVER_TIMER = "del_server_timer"
 
 
 @dataclass
@@ -274,7 +275,12 @@ class CommandInfo:
     RoborockCommand.SET_IDENTIFY_GROUND_MATERIAL_STATUS: CommandInfo(params={"status": 1}),
     RoborockCommand.SET_LED_STATUS: CommandInfo(params=[1]),
     RoborockCommand.SET_MOP_MODE: CommandInfo(params=None),
-    RoborockCommand.SET_SERVER_TIMER: CommandInfo(params=None),
+    RoborockCommand.SET_SERVER_TIMER: CommandInfo(
+        params={
+            "data": [["1687793948482", ["39 12 * * 0,1,2,3,4,5,6", ["start_clean", 106, "0", -1]]]],
+            "need_retry": 1,
+        }
+    ),
     RoborockCommand.SET_SMART_WASH_PARAMS: CommandInfo(params=None),
     RoborockCommand.SET_TIMEZONE: CommandInfo(params=["America/Sao_Paulo"]),
     RoborockCommand.SET_VALLEY_ELECTRICITY_TIMER: CommandInfo(params=[0, 0, 8, 0]),
@@ -286,7 +292,8 @@ class CommandInfo:
     RoborockCommand.STOP_CAMERA_PREVIEW: CommandInfo(params={"client_id": "443f8636"}),
     RoborockCommand.SWITCH_WATER_MARK: CommandInfo(params={"waterMark": "OFF"}),
     RoborockCommand.TEST_SOUND_VOLUME: CommandInfo(params=None),
-    RoborockCommand.UPD_SERVER_TIMER: CommandInfo(params=None),
+    RoborockCommand.UPD_SERVER_TIMER: CommandInfo(params=[["1687793948482", "off"]]),
+    RoborockCommand.DEL_SERVER_TIMER: CommandInfo(params=["1687793948482"]),
 }