python-roborock 0.32.0__tar.gz → 0.32.2__tar.gz

{python_roborock-0.32.0 → python_roborock-0.32.2}/PKG-INFO

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

{python_roborock-0.32.0 → python_roborock-0.32.2}/pyproject.toml

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

{python_roborock-0.32.0 → python_roborock-0.32.2}/roborock/api.py

@@ -311,10 +311,8 @@ class RoborockClient:
             await self.async_disconnect()
         await self.async_connect()
 
-    async def _async_response(self, request_id: int, protocol_id: int = 0) -> tuple[Any, VacuumError | None]:
+    async def _wait_response(self, request_id: int, queue: RoborockFuture) -> tuple[Any, VacuumError | None]:
         try:
-            queue = RoborockFuture(protocol_id)
-            self._waiting_queue[request_id] = queue
             (response, err) = await queue.async_get(QUEUE_TIMEOUT)
             if response == "unknown_method":
                 raise UnknownMethodError("Unknown method")
@@ -324,6 +322,13 @@ class RoborockClient:
         finally:
             self._waiting_queue.pop(request_id, None)
 
+    def _async_response(
+        self, request_id: int, protocol_id: int = 0
+    ) -> Coroutine[Any, Any, tuple[Any, VacuumError | None]]:
+        queue = RoborockFuture(protocol_id)
+        self._waiting_queue[request_id] = queue
+        return self._wait_response(request_id, queue)
+
     def _get_payload(
         self,
         method: RoborockCommand,

{python_roborock-0.32.0 → python_roborock-0.32.2}/roborock/cloud_api.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import base64
 import logging
 import threading
@@ -132,7 +133,7 @@ class RoborockMqttClient(RoborockClient, mqtt.Client):
 
     async def async_disconnect(self) -> None:
         async with self._mutex:
-            async_response = self._async_response(DISCONNECT_REQUEST_ID)
+            async_response = asyncio.ensure_future(self._async_response(DISCONNECT_REQUEST_ID))
             disconnecting = self.sync_disconnect()
             if disconnecting:
                 (_, err) = await async_response
@@ -141,7 +142,7 @@ class RoborockMqttClient(RoborockClient, mqtt.Client):
 
     async def async_connect(self) -> None:
         async with self._mutex:
-            async_response = self._async_response(CONNECT_REQUEST_ID)
+            async_response = asyncio.ensure_future(self._async_response(CONNECT_REQUEST_ID))
             connecting = self.sync_connect()
             if connecting:
                 (_, err) = await async_response
@@ -167,7 +168,7 @@ class RoborockMqttClient(RoborockClient, mqtt.Client):
         local_key = self.device_info.device.local_key
         msg = MessageParser.build(roborock_message, local_key, False)
         self._logger.debug(f"id={request_id} Requesting method {method} with {params}")
-        async_response = self._async_response(request_id, response_protocol)
+        async_response = asyncio.ensure_future(self._async_response(request_id, response_protocol))
         self._send_msg_raw(msg)
         (response, err) = await async_response
         self._diagnostic_data[method if method is not None else "unknown"] = {

{python_roborock-0.32.0 → python_roborock-0.32.2}/roborock/local_api.py

@@ -153,7 +153,7 @@ class RoborockLocalClient(RoborockClient, asyncio.Protocol):
         if method:
             self._logger.debug(f"id={request_id} Requesting method {method} with {params}")
         # Send the command to the Roborock device
-        async_response = self._async_response(request_id, response_protocol)
+        async_response = asyncio.ensure_future(self._async_response(request_id, response_protocol))
         self._send_msg_raw(msg)
         (response, err) = await async_response
         self._diagnostic_data[method if method is not None else "unknown"] = {