feat: Share mqtt url parsing code with original client

Author: allenporter

roborock/cli.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+import asyncio
 import json
 import logging
 from pathlib import Path
 from typing import Any
-import asyncio
 
 import click
 from pyshark import FileCapture  # type: ignore
@@ -13,10 +13,9 @@
 
 from roborock import RoborockException
 from roborock.containers import DeviceData, HomeDataProduct, LoginData
+from roborock.mqtt.roborock_session import create_mqtt_session
 from roborock.protocol import MessageParser, create_mqtt_params
 from roborock.util import run_sync
-from roborock.mqtt.session import MqttParams, MqttSession
-from roborock.mqtt.roborock_session import create_mqtt_session
 from roborock.version_1_apis.roborock_local_client_v1 import RoborockLocalClientV1
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.web_api import RoborockApiClient
@@ -130,7 +129,6 @@ def on_message(bytes: bytes):
     await mqtt_session.close()
 
 
-
 async def _discover(ctx):
     context: RoborockContext = ctx.obj
     login_data = context.login_data()

roborock/cloud_api.py

@@ -6,14 +6,13 @@
 from abc import ABC
 from asyncio import Lock
 from typing import Any
-from urllib.parse import urlparse
 
 import paho.mqtt.client as mqtt
 
 from .api import KEEPALIVE, RoborockClient
 from .containers import DeviceData, UserData
 from .exceptions import RoborockException, VacuumError
-from .protocol import MessageParser, md5hex
+from .protocol import MessageParser, create_mqtt_params
 from .roborock_future import RoborockFuture
 
 _LOGGER = logging.getLogger(__name__)
@@ -53,25 +52,20 @@ def __init__(self, user_data: UserData, device_info: DeviceData) -> None:
         if rriot is None:
             raise RoborockException("Got no rriot data from user_data")
         RoborockClient.__init__(self, device_info)
+        mqtt_params = create_mqtt_params(rriot)
         self._mqtt_user = rriot.u
-        self._hashed_user = md5hex(self._mqtt_user + ":" + rriot.k)[2:10]
-        url = urlparse(rriot.r.m)
-        if not isinstance(url.hostname, str):
-            raise RoborockException("Url parsing returned an invalid hostname")
-        self._mqtt_host = str(url.hostname)
-        self._mqtt_port = url.port
-        self._mqtt_ssl = url.scheme == "ssl"
+        self._hashed_user = mqtt_params.username
+        self._mqtt_host = mqtt_params.host
+        self._mqtt_port = mqtt_params.port
 
         self._mqtt_client = _Mqtt()
         self._mqtt_client.on_connect = self._mqtt_on_connect
         self._mqtt_client.on_message = self._mqtt_on_message
         self._mqtt_client.on_disconnect = self._mqtt_on_disconnect
-        if self._mqtt_ssl:
+        if mqtt_params.tls:
             self._mqtt_client.tls_set()
 
-        self._mqtt_password = rriot.s
-        self._hashed_password = md5hex(self._mqtt_password + ":" + rriot.k)[16:]
-        self._mqtt_client.username_pw_set(self._hashed_user, self._hashed_password)
+        self._mqtt_client.username_pw_set(mqtt_params.username, mqtt_params.password)
         self._waiting_queue: dict[int, RoborockFuture] = {}
         self._mutex = Lock()
 

roborock/protocol.py

@@ -33,8 +33,8 @@
 
 from roborock.containers import BroadcastMessage, RRiot
 from roborock.exceptions import RoborockException
-from roborock.roborock_message import RoborockMessage
 from roborock.mqtt.session import MqttParams
+from roborock.roborock_message import RoborockMessage
 
 _LOGGER = logging.getLogger(__name__)
 SALT = b"TXdfu$jyZ#TZHsg4"
@@ -364,13 +364,14 @@ def build(
 BroadcastParser: _Parser = _Parser(_BroadcastMessage, False)
 
 
-
 def create_mqtt_params(rriot: RRiot) -> MqttParams:
     """Return the MQTT parameters for this user."""
     url = urlparse(rriot.r.m)
     if not isinstance(url.hostname, str):
-        raise RoborockException("Url parsing returned an invalid hostname")
-    hashed_user =  md5hex(rriot.u + ":" + rriot.k)[2:10]
+        raise RoborockException(f"Url parsing '{rriot.r.m}' returned an invalid hostname")
+    if not url.port:
+        raise RoborockException(f"Url parsing '{rriot.r.m}' returned an invalid port")
+    hashed_user = md5hex(rriot.u + ":" + rriot.k)[2:10]
     hashed_password = md5hex(rriot.s + ":" + rriot.k)[16:]
     return MqttParams(
         host=str(url.hostname),