python-roborock 2.9.3__tar.gz → 2.9.5__tar.gz

{python_roborock-2.9.3 → python_roborock-2.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-roborock
-Version: 2.9.3
+Version: 2.9.5
 Summary: A package to control Roborock vacuums.
 License: GPL-3.0-only
 Keywords: roborock,vacuum,homeassistant
@@ -21,7 +21,7 @@ Requires-Dist: aiohttp (>=3.8.2,<4.0.0)
 Requires-Dist: async-timeout
 Requires-Dist: click (>=8)
 Requires-Dist: construct (>=2.10.57,<3.0.0)
-Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
+Requires-Dist: paho-mqtt (>=1.6.1,<3.0.0)
 Requires-Dist: pycryptodome (>=3.18,<4.0)
 Requires-Dist: pycryptodomex (>=3.18,<4.0) ; sys_platform == "darwin"
 Requires-Dist: vacuum-map-parser-roborock

{python_roborock-2.9.3 → python_roborock-2.9.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.9.3"
+version = "2.9.5"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"
@@ -27,7 +27,7 @@ aiohttp = "^3.8.2"
 async-timeout = "*"
 pycryptodome = "^3.18"
 pycryptodomex = {version = "^3.18", markers = "sys_platform == 'darwin'"}
-paho-mqtt = "^1.6.1"
+paho-mqtt = ">=1.6.1,<3.0.0"
 construct = "^2.10.57"
 vacuum-map-parser-roborock = "*"
 
@@ -45,6 +45,8 @@ ruff = "*"
 codespell = "*"
 pyshark = "^0.6"
 aioresponses = "^0.7.7"
+freezegun = "^1.5.1"
+pytest-timeout = "^2.3.1"
 
 [tool.semantic_release]
 branch = "main"
@@ -70,3 +72,5 @@ select=["E", "F", "UP", "I"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+timeout = 20

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/api.py

@@ -31,8 +31,9 @@ class RoborockClient(ABC):
     """Roborock client base class."""
 
     _logger: logging.LoggerAdapter
+    queue_timeout: int
 
-    def __init__(self, device_info: DeviceData, queue_timeout: int = 4) -> None:
+    def __init__(self, device_info: DeviceData) -> None:
         """Initialize RoborockClient."""
         self.event_loop = get_running_loop_or_create_one()
         self.device_info = device_info
@@ -45,7 +46,6 @@ class RoborockClient(ABC):
             "misc_info": {"Nonce": base64.b64encode(self._nonce).decode("utf-8")}
         }
         self.is_available: bool = True
-        self.queue_timeout = queue_timeout
 
     def __del__(self) -> None:
         self.release()
@@ -91,6 +91,7 @@ class RoborockClient(ABC):
 
     async def validate_connection(self) -> None:
         if not self.should_keepalive():
+            self._logger.info("Resetting Roborock connection due to kepalive timeout")
             await self.async_disconnect()
         await self.async_connect()
 

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/cloud_api.py

@@ -46,12 +46,12 @@ class _Mqtt(mqtt.Client):
 class RoborockMqttClient(RoborockClient, ABC):
     """Roborock MQTT client base class."""
 
-    def __init__(self, user_data: UserData, device_info: DeviceData, queue_timeout: int = 10) -> None:
+    def __init__(self, user_data: UserData, device_info: DeviceData) -> None:
         """Initialize the Roborock MQTT client."""
         rriot = user_data.rriot
         if rriot is None:
             raise RoborockException("Got no rriot data from user_data")
-        RoborockClient.__init__(self, device_info, queue_timeout)
+        RoborockClient.__init__(self, device_info)
         self._mqtt_user = rriot.u
         self._hashed_user = md5hex(self._mqtt_user + ":" + rriot.k)[2:10]
         url = urlparse(rriot.r.m)
@@ -82,6 +82,8 @@ class RoborockMqttClient(RoborockClient, ABC):
             self._logger.error(message)
             if connection_queue:
                 connection_queue.set_exception(VacuumError(message))
+            else:
+                self._logger.debug("Failed to notify connect future, not in queue")
             return
         self._logger.info(f"Connected to mqtt {self._mqtt_host}:{self._mqtt_port}")
         topic = f"rr/m/o/{self._mqtt_user}/{self._hashed_user}/{self.device_info.device.duid}"
@@ -154,10 +156,9 @@ class RoborockMqttClient(RoborockClient, ABC):
     async def async_disconnect(self) -> None:
         async with self._mutex:
             if disconnected_future := self.sync_disconnect():
-                try:
-                    await disconnected_future
-                except VacuumError as err:
-                    raise RoborockException(err) from err
+                # There are no errors set on this future
+                await disconnected_future
+            await self.event_loop.run_in_executor(None, self._mqtt_client.loop_stop)
 
     async def async_connect(self) -> None:
         async with self._mutex:

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/local_api.py

@@ -37,7 +37,7 @@ class _LocalProtocol(asyncio.Protocol):
 class RoborockLocalClient(RoborockClient, ABC):
     """Roborock local client base class."""
 
-    def __init__(self, device_data: DeviceData, queue_timeout: int = 4):
+    def __init__(self, device_data: DeviceData):
         """Initialize the Roborock local client."""
         if device_data.host is None:
             raise RoborockException("Host is required")
@@ -48,7 +48,7 @@ class RoborockLocalClient(RoborockClient, ABC):
         self.transport: Transport | None = None
         self._mutex = Lock()
         self.keep_alive_task: TimerHandle | None = None
-        RoborockClient.__init__(self, device_data, queue_timeout)
+        RoborockClient.__init__(self, device_data)
         self._local_protocol = _LocalProtocol(self._data_received, self._connection_lost)
 
     def _data_received(self, message):

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/roborock_message.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 import math
 import time
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from roborock import RoborockEnum
 from roborock.util import get_next_int
@@ -155,10 +155,10 @@ class MessageRetry:
 class RoborockMessage:
     protocol: RoborockMessageProtocol
     payload: bytes | None = None
-    seq: int = get_next_int(100000, 999999)
+    seq: int = field(default_factory=lambda: get_next_int(100000, 999999))
     version: bytes = b"1.0"
-    random: int = get_next_int(10000, 99999)
-    timestamp: int = math.floor(time.time())
+    random: int = field(default_factory=lambda: get_next_int(10000, 99999))
+    timestamp: int = field(default_factory=lambda: math.floor(time.time()))
     message_retry: MessageRetry | None = None
 
     def get_request_id(self) -> int | None:

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/version_1_apis/roborock_local_client_v1.py

@@ -17,8 +17,9 @@ class RoborockLocalClientV1(RoborockLocalClient, RoborockClientV1):
 
     def __init__(self, device_data: DeviceData, queue_timeout: int = 4):
         """Initialize the Roborock local client."""
-        RoborockLocalClient.__init__(self, device_data, queue_timeout)
+        RoborockLocalClient.__init__(self, device_data)
         RoborockClientV1.__init__(self, device_data, "abc")
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_data.device.name, _LOGGER)
 
     def build_roborock_message(

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/version_1_apis/roborock_mqtt_client_v1.py

@@ -32,8 +32,9 @@ class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
             raise RoborockException("Got no rriot data from user_data")
         endpoint = base64.b64encode(Utils.md5(rriot.k.encode())[8:14]).decode()
 
-        RoborockMqttClient.__init__(self, user_data, device_info, queue_timeout)
+        RoborockMqttClient.__init__(self, user_data, device_info)
         RoborockClientV1.__init__(self, device_info, endpoint)
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_info.device.name, _LOGGER)
 
     async def send_message(self, roborock_message: RoborockMessage):

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/version_a01_apis/roborock_client_a01.py

@@ -108,9 +108,9 @@ zeo_data_protocol_entries = {
 class RoborockClientA01(RoborockClient, ABC):
     """Roborock client base class for A01 devices."""
 
-    def __init__(self, device_info: DeviceData, category: RoborockCategory, queue_timeout: int = 4):
+    def __init__(self, device_info: DeviceData, category: RoborockCategory):
         """Initialize the Roborock client."""
-        super().__init__(device_info, queue_timeout)
+        super().__init__(device_info)
         self.category = category
 
     def on_message_received(self, messages: list[RoborockMessage]) -> None:
@@ -128,8 +128,8 @@ class RoborockClientA01(RoborockClient, ABC):
                     continue
                 payload_json = json.loads(payload.decode())
                 for data_point_number, data_point in payload_json.get("dps").items():
-                    self._logger.debug("data point number=%s", data_point_number)
                     data_point_protocol: RoborockDyadDataProtocol | RoborockZeoProtocol
+                    self._logger.debug("received msg with dps, protocol: %s, %s", data_point_number, protocol)
                     entries: dict
                     if self.category == RoborockCategory.WET_DRY_VAC:
                         data_point_protocol = RoborockDyadDataProtocol(int(data_point_number))

{python_roborock-2.9.3 → python_roborock-2.9.5}/roborock/version_a01_apis/roborock_mqtt_client_a01.py

@@ -34,8 +34,9 @@ class RoborockMqttClientA01(RoborockMqttClient, RoborockClientA01):
         if rriot is None:
             raise RoborockException("Got no rriot data from user_data")
 
-        RoborockMqttClient.__init__(self, user_data, device_info, queue_timeout)
-        RoborockClientA01.__init__(self, device_info, category, queue_timeout)
+        RoborockMqttClient.__init__(self, user_data, device_info)
+        RoborockClientA01.__init__(self, device_info, category)
+        self.queue_timeout = queue_timeout
         self._logger = RoborockLoggerAdapter(device_info.device.name, _LOGGER)
 
     async def send_message(self, roborock_message: RoborockMessage):