fix: adding method parse_datetime_to_roborock_datetime

Author: humbertogontijo

roborock/api.py

@@ -54,7 +54,7 @@
 )
 from .protocol import Utils
 from .roborock_future import RoborockFuture
-from .roborock_message import RoborockMessage
+from .roborock_message import RoborockDataProtocol, RoborockMessage
 from .roborock_typing import DeviceProp, DockSummary, RoborockCommand
 from .util import fallback_cache, unpack_list
 
@@ -169,6 +169,8 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:
                             if isinstance(decompressed, list):
                                 decompressed = decompressed[0]
                             queue.resolve((decompressed, None))
+                elif data.payload and protocol in RoborockDataProtocol:
+                    _LOGGER.debug(f"Got device update for {RoborockDataProtocol(protocol).name}: {data.payload!r}")
                 else:
                     queue = self._waiting_queue.get(data.seq)
                     if queue:

roborock/cloud_api.py

@@ -119,14 +119,14 @@ def sync_disconnect(self) -> bool:
         return rc == mqtt.MQTT_ERR_SUCCESS
 
     def sync_connect(self) -> bool:
-        self.sync_start_loop()
-        if not self.is_connected():
+        should_connect = not self.is_connected()
+        if should_connect:
             if self._mqtt_port is None or self._mqtt_host is None:
                 raise RoborockException("Mqtt information was not entered. Cannot connect.")
             _LOGGER.info("Connecting to mqtt")
             super().connect(host=self._mqtt_host, port=self._mqtt_port, keepalive=KEEPALIVE)
-            return True
-        return False
+        self.sync_start_loop()
+        return should_connect
 
     async def async_disconnect(self) -> None:
         async with self._mutex:
@@ -154,7 +154,7 @@ async def send_command(
         method: RoborockCommand,
         params: Optional[list | dict] = None,
         return_type: Optional[Type[RT]] = None,
-    ):
+    ) -> RT:
         await self.validate_connection()
         request_id, timestamp, payload = super()._get_payload(method, params, True)
         _LOGGER.debug(f"id={request_id} Requesting method {method} with {params}")

roborock/roborock_message.py

@@ -18,6 +18,25 @@ class RoborockMessageProtocol(RoborockEnum):
     GENERAL_RESPONSE = 5
 
 
+class RoborockDataProtocol(RoborockEnum):
+    RPC_REQUEST = 101
+    RPC_RESPONSE = 102
+    ERROR_CODE = 120
+    STATE = 121
+    BATTERY = 122
+    FAN_POWER = 123
+    WATER_BOX_MODE = 124
+    MAIN_BRUSH_LIFE = 125
+    SIDE_BRUSH_LIFE = 126
+    FILTER_LIFE = 127
+    ADDITIONAL_PROPS = 128
+    TASK_COMPLETE = 130
+    TASK_CANCEL_LOW_POWER = 131
+    TASK_CANCEL_IN_MOTION = 132
+    CHARGE_STATUS = 133
+    DRYING_STATUS = 134
+
+
 @dataclass
 class RoborockMessage:
     protocol: int

roborock/util.py

@@ -23,6 +23,25 @@ def get_running_loop_or_create_one() -> AbstractEventLoop:
     return loop
 
 
+def parse_datetime_to_roborock_datetime(
+    start_datetime: datetime.datetime, end_datetime: datetime.datetime
+) -> Tuple[datetime.datetime, datetime.datetime]:
+    now = datetime.datetime.now(DEFAULT_TIME_ZONE)
+    start_datetime = start_datetime.replace(
+        year=now.year, month=now.month, day=now.day, second=0, microsecond=0, tzinfo=DEFAULT_TIME_ZONE
+    )
+    end_datetime = end_datetime.replace(
+        year=now.year, month=now.month, day=now.day, second=0, microsecond=0, tzinfo=DEFAULT_TIME_ZONE
+    )
+    if start_datetime > end_datetime:
+        end_datetime += datetime.timedelta(days=1)
+    elif end_datetime < now:
+        start_datetime += datetime.timedelta(days=1)
+        end_datetime += datetime.timedelta(days=1)
+
+    return start_datetime, end_datetime
+
+
 def parse_time_to_datetime(
     start_time: datetime.time, end_time: datetime.time
 ) -> Tuple[datetime.datetime, datetime.datetime]:
@@ -34,13 +53,7 @@ def parse_time_to_datetime(
         hour=end_time.hour, minute=end_time.minute, second=0, microsecond=0
     )
 
-    if start_datetime > end_datetime:
-        end_datetime += datetime.timedelta(days=1)
-    elif end_datetime < datetime.datetime.now(DEFAULT_TIME_ZONE):
-        start_datetime += datetime.timedelta(days=1)
-        end_datetime += datetime.timedelta(days=1)
-
-    return start_datetime, end_datetime
+    return parse_datetime_to_roborock_datetime(start_datetime, end_datetime)
 
 
 def run_sync():