fix: fix cloud_api

Author: humbertogontijo

roborock/api.py

@@ -87,7 +87,6 @@ class RoborockClient:
 
     def __init__(self, endpoint: str, devices_info: dict[str, RoborockDeviceInfo]) -> None:
         self.devices_info = devices_info
-        self._salt = "TXdfu$jyZ#TZHsg4"
         self._endpoint = endpoint
         self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockQueue] = {}

roborock/cli.py

@@ -26,10 +26,10 @@ def reload(self):
             with open(self.roborock_file, 'r') as f:
                 data = json.load(f)
                 if data:
-                    self._login_data = LoginData(data)
+                    self._login_data = LoginData.from_dict(data)
 
     def update(self, login_data: LoginData):
-        data = json.dumps(login_data, default=vars)
+        data = json.dumps(login_data.as_dict(), default=vars)
         with open(self.roborock_file, 'w') as f:
             f.write(data)
         self.reload()

roborock/cloud_api.py

@@ -2,8 +2,8 @@
 
 import base64
 import logging
-import secrets
 import threading
+import uuid
 from asyncio import Lock
 from typing import Any
 from urllib.parse import urlparse
@@ -49,16 +49,12 @@ def __init__(self, user_data: UserData, devices_info: dict[str, RoborockDeviceIn
         self._mqtt_password = rriot.s
         self._hashed_password = md5hex(self._mqtt_password + ":" + rriot.k)[16:]
         super().username_pw_set(self._hashed_user, self._hashed_password)
-        self._seq = 1
-        self._random = 4711
-        self._id_counter = 2
-        self._salt = "TXdfu$jyZ#TZHsg4"
         self._endpoint = base64.b64encode(md5bin(rriot.k)[8:14]).decode()
-        self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockQueue] = {}
         self._mutex = Lock()
         self._last_device_msg_in = mqtt.time_func()
         self._last_disconnection = mqtt.time_func()
+        self.update_client_id()
 
     def __del__(self) -> None:
         self.sync_disconnect()
@@ -102,6 +98,8 @@ async def on_disconnect(self, _client: mqtt.Client, _, rc, __=None) -> None:
         try:
             self._last_disconnection = mqtt.time_func()
             message = f"Roborock mqtt client disconnected (rc: {rc})"
+            if rc == mqtt.MQTT_ERR_PROTOCOL:
+                self.update_client_id()
             _LOGGER.warning(message)
             connection_queue = self._waiting_queue.get(1)
             if connection_queue:
@@ -111,6 +109,9 @@ async def on_disconnect(self, _client: mqtt.Client, _, rc, __=None) -> None:
         except Exception as ex:
             _LOGGER.exception(ex)
 
+    def update_client_id(self):
+        self._client_id = mqtt.base62(uuid.uuid4().int, padding=22)
+
     @run_in_executor()
     async def _async_check_keepalive(self) -> None:
         async with self._mutex: