python-roborock 2.8.4__tar.gz → 2.8.5__tar.gz

{python_roborock-2.8.4 → python_roborock-2.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: python-roborock
-Version: 2.8.4
+Version: 2.8.5
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only

{python_roborock-2.8.4 → python_roborock-2.8.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.8.4"
+version = "2.8.5"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

{python_roborock-2.8.4 → python_roborock-2.8.5}/roborock/api.py

@@ -7,7 +7,7 @@ import base64
 import logging
 import secrets
 import time
-from collections.abc import Callable, Coroutine
+from collections.abc import Coroutine
 from typing import Any
 
 from .containers import (
@@ -36,8 +36,8 @@ class RoborockClient:
         self._endpoint = endpoint
         self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockFuture] = {}
-        self._last_device_msg_in = self.time_func()
-        self._last_disconnection = self.time_func()
+        self._last_device_msg_in = time.monotonic()
+        self._last_disconnection = time.monotonic()
         self.keep_alive = KEEPALIVE
         self._diagnostic_data: dict[str, dict[str, Any]] = {
             "misc_info": {"Nonce": base64.b64encode(self._nonce).decode("utf-8")}
@@ -59,15 +59,6 @@ class RoborockClient:
     def diagnostic_data(self) -> dict:
         return self._diagnostic_data
 
-    @property
-    def time_func(self) -> Callable[[], float]:
-        try:
-            # Use monotonic clock if available
-            time_func = time.monotonic
-        except AttributeError:
-            time_func = time.time
-        return time_func
-
     async def async_connect(self):
         raise NotImplementedError
 
@@ -81,13 +72,13 @@ class RoborockClient:
         raise NotImplementedError
 
     def on_connection_lost(self, exc: Exception | None) -> None:
-        self._last_disconnection = self.time_func()
+        self._last_disconnection = time.monotonic()
         self._logger.info("Roborock client disconnected")
         if exc is not None:
             self._logger.warning(exc)
 
     def should_keepalive(self) -> bool:
-        now = self.time_func()
+        now = time.monotonic()
         # noinspection PyUnresolvedReferences
         if now - self._last_disconnection > self.keep_alive**2 and now - self._last_device_msg_in > self.keep_alive:
             return False
@@ -116,8 +107,11 @@ class RoborockClient:
         if request_id in self._waiting_queue:
             new_id = get_next_int(10000, 32767)
             _LOGGER.warning(
-                f"Attempting to create a future with an existing request_id... New id is {new_id}. "
-                f"Code may not function properly."
+                "Attempting to create a future with an existing id %s (%s)... New id is %s. "
+                "Code may not function properly.",
+                request_id,
+                protocol_id,
+                new_id,
             )
             request_id = new_id
         self._waiting_queue[request_id] = queue

{python_roborock-2.8.4 → python_roborock-2.8.5}/roborock/version_1_apis/roborock_client_v1.py

@@ -361,7 +361,7 @@ class RoborockClientV1(RoborockClient):
 
     def on_message_received(self, messages: list[RoborockMessage]) -> None:
         try:
-            self._last_device_msg_in = self.time_func()
+            self._last_device_msg_in = time.monotonic()
             for data in messages:
                 protocol = data.protocol
                 if data.payload and protocol in [
@@ -391,6 +391,8 @@ class RoborockClientV1(RoborockClient):
                                     if isinstance(result, list) and len(result) == 1:
                                         result = result[0]
                                     queue.resolve((result, None))
+                            else:
+                                self._logger.debug("Received response for unknown request id %s", request_id)
                         else:
                             try:
                                 data_protocol = RoborockDataProtocol(int(data_point_number))
@@ -443,10 +445,14 @@ class RoborockClientV1(RoborockClient):
                             if isinstance(decompressed, list):
                                 decompressed = decompressed[0]
                             queue.resolve((decompressed, None))
+                        else:
+                            self._logger.debug("Received response for unknown request id %s", request_id)
                 else:
                     queue = self._waiting_queue.get(data.seq)
                     if queue:
                         queue.resolve((data.payload, None))
+                    else:
+                        self._logger.debug("Received response for unknown request id %s", data.seq)
         except Exception as ex:
             self._logger.exception(ex)
 

{python_roborock-2.8.4 → python_roborock-2.8.5}/roborock/version_1_apis/roborock_local_client_v1.py

@@ -18,6 +18,7 @@ class RoborockLocalClientV1(RoborockLocalClient, RoborockClientV1):
     ) -> RoborockMessage:
         secured = True if method in COMMANDS_SECURED else False
         request_id, timestamp, payload = self._get_payload(method, params, secured)
+        self._logger.debug("Building message id %s for method %s", request_id, method)
         request_protocol = RoborockMessageProtocol.GENERAL_REQUEST
         message_retry: MessageRetry | None = None
         if method == RoborockCommand.RETRY_REQUEST and isinstance(params, dict):

{python_roborock-2.8.4 → python_roborock-2.8.5}/roborock/version_1_apis/roborock_mqtt_client_v1.py

@@ -74,6 +74,7 @@ class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
             # When we have more custom commands do something more complicated here
             return await self._get_calibration_points()
         request_id, timestamp, payload = self._get_payload(method, params, True)
+        self._logger.debug("Building message id %s for method %s", request_id, method)
         request_protocol = RoborockMessageProtocol.RPC_REQUEST
         roborock_message = RoborockMessage(timestamp=timestamp, protocol=request_protocol, payload=payload)
         return await self.send_message(roborock_message)