pymammotion 0.5.31__tar.gz → 0.5.33__tar.gz

{pymammotion-0.5.31 → pymammotion-0.5.33}/PKG-INFO

@@ -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 → pymammotion-0.5.33}/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-0.5.31 → pymammotion-0.5.33}/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-0.5.31 → pymammotion-0.5.33}/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-0.5.31 → pymammotion-0.5.33}/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 → pymammotion-0.5.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.31"
+version     = "0.5.33"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -67,7 +67,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.31"
+current_version = "0.5.33"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true