fix: move add_status_listener from cloud_api to base_api

Author: humbertogontijo

roborock/api.py

@@ -103,21 +103,25 @@ def __init__(self, endpoint: str, device_localkey: dict[str, str]) -> None:
         self._waiting_queue: dict[int, RoborockQueue] = {}
         self._status_listeners: list[Callable[[str, str], None]] = []
 
+    def add_status_listener(self, callback: Callable[[str, str], None]):
+        self._status_listeners.append(callback)
+
     def _decode_msg(self, msg: bytes, local_key: str) -> dict[str, Any]:
         if msg[4:7] == "1.0".encode():
             msg = msg[4:]
         elif msg[0:3] != "1.0".encode():
             raise RoborockException(f"Unknown protocol version {msg[0:3]}")
         if len(msg) == 17:
-            [version, _seq, _random, timestamp, protocol] = struct.unpack(
+            [version, request_id, _random, timestamp, protocol] = struct.unpack(
                 "!3sIIIH", msg[0:17]
             )
             return {
                 "version": version,
+                "request_id": request_id,
                 "timestamp": timestamp,
                 "protocol": protocol,
             }
-        [version, _seq, _random, timestamp, protocol, payload_len] = struct.unpack(
+        [version, request_id, _random, timestamp, protocol, payload_len] = struct.unpack(
             "!3sIIIHH", msg[0:19]
         )
         extra_len = len(msg) - 23 - payload_len
@@ -132,20 +136,21 @@ def _decode_msg(self, msg: bytes, local_key: str) -> dict[str, Any]:
         decrypted_payload = unpad(decipher.decrypt(payload), AES.block_size) if payload else extra
         return {
             "version": version,
+            "request_id": request_id,
             "timestamp": timestamp,
             "protocol": protocol,
             "payload": decrypted_payload
         }
 
-    def _encode_msg(self, device_id, protocol, timestamp, payload, prefix=None) -> bytes:
+    def _encode_msg(self, device_id, request_id, protocol, timestamp, payload, prefix=None) -> bytes:
         local_key = self.device_localkey[device_id]
         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))
         encrypted_len = len(encrypted)
         values = [
             "1.0".encode(),
-            self._seq,
+            request_id,
             self._random,
             timestamp,
             protocol,

roborock/cloud_api.py

@@ -118,9 +118,6 @@ async def _async_check_keepalive(self) -> None:
             if now - self._last_disconnection > self._keepalive ** 2 and now - self._last_device_msg_in > self._keepalive:
                 self._ping_t = self._last_device_msg_in
 
-    def add_status_listener(self, callback: Callable[[str, str], None]):
-        self._status_listeners.append(callback)
-
     def _check_keepalive(self) -> None:
         self._async_check_keepalive()
         super()._check_keepalive()

roborock/local_api.py

@@ -46,7 +46,7 @@ async def send_command(
             _LOGGER.debug(f"id={request_id} Requesting method {method} with {params}")
             prefix = secured_prefix if method in SPECIAL_COMMANDS else get_prefix
             protocol = 4
-            msg = self._encode_msg(device_id, protocol, timestamp, payload, prefix)
+            msg = self._encode_msg(device_id, request_id, protocol, timestamp, payload, prefix)
             # Send the command to the Roborock device
             listener = self.device_listener.get(device_id)
             await listener.send_message(msg)