pymammotion 0.5.31__py3-none-any.whl → 0.5.33__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -600,6 +600,10 @@ class CloudIOTGateway:
             await self.sign_out()
             raise CheckSessionException("Error check or refresh token: " + response_body_dict.__str__())
 
+        if response_body_dict.get("code") == 2401:
+            await self.sign_out()
+            raise CheckSessionException("Error check or refresh token: " + response_body_dict.__str__())
+
         session = SessionByAuthCodeResponse.from_dict(response_body_dict)
         session_data = session.data
 
@@ -803,6 +807,10 @@ class CloudIOTGateway:
             if response_body_dict.get("code") == 6205:
                 raise DeviceOfflineException(response_body_dict.get("code"), iot_id)
 
+            if response_body_dict.get("code") == 460:
+                logger.debug("iotToken expired, must re-login.")
+                raise CheckSessionException(response_body_dict.get("message"))
+
         if self.message_delay != 1:
             self.message_delay = 1
 

pymammotion/mammotion/devices/base.py

@@ -1,7 +1,6 @@
 from abc import abstractmethod
 import asyncio
 import logging
-import time
 from typing import Any
 
 import betterproto2
@@ -43,7 +42,6 @@ class MammotionBaseDevice:
         self._raw_mower_data: RawMowerData = RawMowerData()
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
-        self.command_sent_time: float = time.time()
 
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses for root level hashs."""

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -76,6 +76,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
     ) -> None:
         """Initialize MammotionBaseBLEDevice."""
         super().__init__(state_manager, cloud_device)
+        self.command_sent_time = 0
         self._disconnect_strategy = True
         self._ble_sync_task = None
         self._prev_notification = None

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -33,6 +33,7 @@ class MammotionCloud:
     def __init__(self, mqtt_client: MammotionMQTT, cloud_client: CloudIOTGateway) -> None:
         """Initialize MammotionCloud."""
         self.cloud_client = cloud_client
+        self.command_sent_time = 0
         self.loop = asyncio.get_event_loop()
         self.is_ready = False
         self.command_queue = asyncio.Queue()
@@ -212,6 +213,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         """Cleanup."""
         self._state_manager.cloud_queue_command_callback.remove_subscribers(self.queue_command)
 
+    @property
+    def command_sent_time(self) -> float:
+        return self._mqtt.command_sent_time
+
     def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
         self._state_manager.cloud_on_notification_callback.add_subscribers(func)
 

{pymammotion-0.5.31.dist-info → pymammotion-0.5.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.31
+Version: 0.5.33
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.5.31.dist-info → pymammotion-0.5.33.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pymammotion/__init__.py,sha256=H-U94bNLp0LPC6hkRopVEUlUsZSR97n7WfKGPjK1GMg,1638
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
 pymammotion/aliyun/client.py,sha256=gS15-fAYn3nViwFY3zMlS_2T9mZokFLUyuHADaXH-O8,9777
-pymammotion/aliyun/cloud_gateway.py,sha256=_4emfnKNye5CEn4fzfrWSTAlfYZupZrIBFBPx-OCkHE,32038
+pymammotion/aliyun/cloud_gateway.py,sha256=MFtKG1cefV3s5eU7r7o8887Y482ZWz_O3LOYMvatoqs,32428
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=P9yYy4Z2tLkJSqXA_5XGaCUliSSVa5ILl7VoMtL_tCA,977
@@ -75,10 +75,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=5D5Azt6Q63K-OeC2eSPmmrGg
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=BPuikWg69cUqmRnphqEcS1HU-sNLAOkMjyZE_u5mp08,12082
+pymammotion/mammotion/devices/base.py,sha256=GIkiSP_pNgM1HbciXXeOYEjFzx8OiimH9cL4rqshAsI,12018
 pymammotion/mammotion/devices/mammotion.py,sha256=b12tqRQOhnqaP6zcNsCHUnTCVPxD07GgXwqVDbABw9o,15837
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=lVqGice3fv-Xura10PuWUCMdtNXf84gtf3S1STw2hr4,19345
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=WGB3S4KW8DGZB3au-bTNE-FCu6LZYp2zFOktfHmix6A,16489
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=u-uZKXwfk61a24n7Z9tJw6Vm0LHa7EZqVQ7SoS_YJAQ,19380
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=mo7zPKm5HNoMTID2rdHQM222xt4s_8hK97NRgQCl0Fo,16625
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
@@ -130,7 +130,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.31.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.31.dist-info/METADATA,sha256=g6jfhpGz1AW-oRGXkvDnprGUYitz8DJ-Ibm310TmKGs,3912
-pymammotion-0.5.31.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.31.dist-info/RECORD,,
+pymammotion-0.5.33.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.33.dist-info/METADATA,sha256=AzduzVw-y6wPLTZUgSFtdIm3cckQeCuGVX45i7eM2-U,3912
+pymammotion-0.5.33.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.33.dist-info/RECORD,,