fix: code cleaning

Author: humbertogontijo

roborock/__init__.py

@@ -2,6 +2,7 @@
 
 from roborock.api import RoborockApiClient
 from roborock.cloud_api import RoborockMqttClient
+from roborock.local_api import RoborockLocalClient
 from roborock.containers import *
 from roborock.exceptions import *
 from roborock.typing import *

roborock/api.py

@@ -158,7 +158,7 @@ def _get_msg_raw(self, device_id, protocol, timestamp, payload, prefix='') -> by
     def _get_payload(
             self, method: RoborockCommand, params: list = None
     ):
-        timestamp = 1680196427
+        timestamp = math.floor(time.time())
         request_id = self._id_counter
         self._id_counter += 1
         inner = {
@@ -255,7 +255,7 @@ async def get_prop(self, device_id: str) -> RoborockDeviceProp:
                 device_id, clean_summary.records[0]
             )
         dock_summary = None
-        if status.dock_type != RoborockDockType.NO_DOCK:
+        if status and status.dock_type != RoborockDockType.NO_DOCK:
             dock_summary = await self.get_dock_summary(device_id, status.dock_type)
         if any([status, dnd_timer, clean_summary, consumable]):
             return RoborockDeviceProp(

roborock/local_api.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import logging
 import socket
 
@@ -8,16 +9,17 @@
 from roborock.api import RoborockClient
 from roborock.typing import RoborockCommand
 from roborock.util import get_running_loop_or_create_one
+from roborock.exceptions import RoborockTimeout
 
 secured_prefix = 199
 _LOGGER = logging.getLogger(__name__)
 
 
 class RoborockLocalClient(RoborockClient):
 
-    def __init__(self, endpoint: str, device_localkey: dict[str, str]):
+    def __init__(self, ip: str, endpoint: str, device_localkey: dict[str, str]):
         super().__init__(endpoint, device_localkey, True)
-        self.listener = RoborockSocketListener("192.168.1.232", super()._decode_msg)
+        self.listener = RoborockSocketListener(ip, super()._decode_msg)
 
     async def async_connect(self):
         await self.listener.connect()
@@ -54,9 +56,14 @@ async def connect(self):
 
     async def send_message(self, data: bytes, local_key: str):
         response = {}
-        async with async_timeout.timeout(self.timeout):
-            await self.loop.sock_sendall(self.socket, data)
-            while response.get('protocol') != 4:
-                message = await self.loop.sock_recv(self.socket, 4096)
-                response = self.on_message(message, local_key)
+        try:
+            async with async_timeout.timeout(self.timeout):
+                await self.loop.sock_sendall(self.socket, data)
+                while response.get('protocol') != 4:
+                    message = await self.loop.sock_recv(self.socket, 4096)
+                    response = self.on_message(message, local_key)
+        except (asyncio.TimeoutError, asyncio.CancelledError):
+            raise RoborockTimeout(
+                f"Timeout after {self.timeout} seconds waiting for response"
+            ) from None
         return response

roborock/offline/__init__.py

@@ -10,7 +10,7 @@
 
 async def main():
     device_id = "1r9W0cAmDZ2COuVekgRhKA"
-    client = RoborockLocalClient(endpoint, {
+    client = RoborockLocalClient(local_ip, endpoint, {
         "1r9W0cAmDZ2COuVekgRhKA": local_key
     })
     await client.async_connect()