python-roborock 2.9.5__tar.gz → 2.9.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {python_roborock-2.9.5 → python_roborock-2.9.6}/PKG-INFO +1 -1
- {python_roborock-2.9.5 → python_roborock-2.9.6}/pyproject.toml +1 -1
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/api.py +3 -9
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/cloud_api.py +4 -4
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/local_api.py +4 -4
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_client_v1.py +0 -4
- {python_roborock-2.9.5 → python_roborock-2.9.6}/LICENSE +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/README.md +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/__init__.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/cli.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/code_mappings.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/command_cache.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/const.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/containers.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/exceptions.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/protocol.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/py.typed +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/roborock_future.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/roborock_message.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/roborock_typing.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/util.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/__init__.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_local_client_v1.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_mqtt_client_v1.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_a01_apis/__init__.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_a01_apis/roborock_client_a01.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_a01_apis/roborock_mqtt_client_a01.py +0 -0
- {python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/web_api.py +0 -0
|
@@ -47,12 +47,6 @@ class RoborockClient(ABC):
|
|
|
47
47
|
}
|
|
48
48
|
self.is_available: bool = True
|
|
49
49
|
|
|
50
|
-
def __del__(self) -> None:
|
|
51
|
-
self.release()
|
|
52
|
-
|
|
53
|
-
def release(self) -> None:
|
|
54
|
-
self.sync_disconnect()
|
|
55
|
-
|
|
56
50
|
async def async_release(self) -> None:
|
|
57
51
|
await self.async_disconnect()
|
|
58
52
|
|
|
@@ -65,12 +59,12 @@ class RoborockClient(ABC):
|
|
|
65
59
|
"""Connect to the Roborock device."""
|
|
66
60
|
|
|
67
61
|
@abstractmethod
|
|
68
|
-
def
|
|
62
|
+
async def async_disconnect(self) -> Any:
|
|
69
63
|
"""Disconnect from the Roborock device."""
|
|
70
64
|
|
|
71
65
|
@abstractmethod
|
|
72
|
-
|
|
73
|
-
"""
|
|
66
|
+
def is_connected(self) -> bool:
|
|
67
|
+
"""Return True if the client is connected to the device."""
|
|
74
68
|
|
|
75
69
|
@abstractmethod
|
|
76
70
|
def on_message_received(self, messages: list[RoborockMessage]) -> None:
|
|
@@ -121,7 +121,7 @@ class RoborockMqttClient(RoborockClient, ABC):
|
|
|
121
121
|
"""Check if the mqtt client is connected."""
|
|
122
122
|
return self._mqtt_client.is_connected()
|
|
123
123
|
|
|
124
|
-
def
|
|
124
|
+
def _sync_disconnect(self) -> Any:
|
|
125
125
|
if not self.is_connected():
|
|
126
126
|
return None
|
|
127
127
|
|
|
@@ -139,7 +139,7 @@ class RoborockMqttClient(RoborockClient, ABC):
|
|
|
139
139
|
|
|
140
140
|
return disconnected_future
|
|
141
141
|
|
|
142
|
-
def
|
|
142
|
+
def _sync_connect(self) -> Any:
|
|
143
143
|
if self.is_connected():
|
|
144
144
|
self._mqtt_client.maybe_restart_loop()
|
|
145
145
|
return None
|
|
@@ -155,14 +155,14 @@ class RoborockMqttClient(RoborockClient, ABC):
|
|
|
155
155
|
|
|
156
156
|
async def async_disconnect(self) -> None:
|
|
157
157
|
async with self._mutex:
|
|
158
|
-
if disconnected_future := self.
|
|
158
|
+
if disconnected_future := self._sync_disconnect():
|
|
159
159
|
# There are no errors set on this future
|
|
160
160
|
await disconnected_future
|
|
161
161
|
await self.event_loop.run_in_executor(None, self._mqtt_client.loop_stop)
|
|
162
162
|
|
|
163
163
|
async def async_connect(self) -> None:
|
|
164
164
|
async with self._mutex:
|
|
165
|
-
if connected_future := self.
|
|
165
|
+
if connected_future := self._sync_connect():
|
|
166
166
|
try:
|
|
167
167
|
await connected_future
|
|
168
168
|
except VacuumError as err:
|
|
@@ -61,7 +61,7 @@ class RoborockLocalClient(RoborockClient, ABC):
|
|
|
61
61
|
|
|
62
62
|
def _connection_lost(self, exc: Exception | None):
|
|
63
63
|
"""Called when the transport connection is lost."""
|
|
64
|
-
self.
|
|
64
|
+
self._sync_disconnect()
|
|
65
65
|
self.on_connection_lost(exc)
|
|
66
66
|
|
|
67
67
|
def is_connected(self):
|
|
@@ -79,7 +79,7 @@ class RoborockLocalClient(RoborockClient, ABC):
|
|
|
79
79
|
async with self._mutex:
|
|
80
80
|
try:
|
|
81
81
|
if not self.is_connected():
|
|
82
|
-
self.
|
|
82
|
+
self._sync_disconnect()
|
|
83
83
|
async with async_timeout.timeout(self.queue_timeout):
|
|
84
84
|
self._logger.debug(f"Connecting to {self.host}")
|
|
85
85
|
self.transport, _ = await self.event_loop.create_connection( # type: ignore
|
|
@@ -93,7 +93,7 @@ class RoborockLocalClient(RoborockClient, ABC):
|
|
|
93
93
|
await self.hello()
|
|
94
94
|
await self.keep_alive_func()
|
|
95
95
|
|
|
96
|
-
def
|
|
96
|
+
def _sync_disconnect(self) -> None:
|
|
97
97
|
if self.transport and self.event_loop.is_running():
|
|
98
98
|
self._logger.debug(f"Disconnecting from {self.host}")
|
|
99
99
|
self.transport.close()
|
|
@@ -102,7 +102,7 @@ class RoborockLocalClient(RoborockClient, ABC):
|
|
|
102
102
|
|
|
103
103
|
async def async_disconnect(self) -> None:
|
|
104
104
|
async with self._mutex:
|
|
105
|
-
self.
|
|
105
|
+
self._sync_disconnect()
|
|
106
106
|
|
|
107
107
|
async def hello(self):
|
|
108
108
|
request_id = 1
|
{python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_client_v1.py
RENAMED
|
@@ -164,10 +164,6 @@ class RoborockClientV1(RoborockClient, ABC):
|
|
|
164
164
|
self.listener_model = self._listeners[device_info.device.duid]
|
|
165
165
|
self._endpoint = endpoint
|
|
166
166
|
|
|
167
|
-
def release(self):
|
|
168
|
-
super().release()
|
|
169
|
-
[item.stop() for item in self.cache.values()]
|
|
170
|
-
|
|
171
167
|
async def async_release(self) -> None:
|
|
172
168
|
await super().async_release()
|
|
173
169
|
[item.stop() for item in self.cache.values()]
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_local_client_v1.py
RENAMED
|
File without changes
|
{python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_1_apis/roborock_mqtt_client_v1.py
RENAMED
|
File without changes
|
|
File without changes
|
{python_roborock-2.9.5 → python_roborock-2.9.6}/roborock/version_a01_apis/roborock_client_a01.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|