add stop call so when unloading integration it can be stopped properly, start tracking iotToken error, use cloud client token instead of self._iot_token

Author: mikey0000

pymammotion/mammotion/devices/mammotion.py

@@ -41,6 +41,13 @@ def __init__(self) -> None:
         self.devices: dict[str, MammotionMowerDeviceManager] = {}
         self.rtk_devices: dict[str, MammotionRTKDeviceManager] = {}
 
+    async def stop(self) -> None:
+        for mower in self.devices.values():
+            if cloud := mower.cloud:
+                cloud.stop()
+            if ble := mower.ble:
+                await ble.stop()
+
     def _should_disconnect_mqtt(self, device_for_removal: AbstractDeviceManager) -> bool:
         """Check if MQTT connection should be disconnected.
 
@@ -128,7 +135,7 @@ async def remove_device(self, name: str) -> None:
             if device_for_removal.cloud:
                 if self._should_disconnect_mqtt(device_for_removal):
                     await loop.run_in_executor(None, device_for_removal.cloud.mqtt.disconnect)
-                await device_for_removal.cloud.stop()
+                    device_for_removal.cloud.stop()
 
             if device_for_removal.ble:
                 await device_for_removal.ble.stop()
@@ -144,7 +151,7 @@ async def remove_rtk_device(self, name: str) -> None:
             if device_for_removal.cloud:
                 if self._should_disconnect_mqtt(device_for_removal):
                     await loop.run_in_executor(None, device_for_removal.cloud.mqtt.disconnect)
-                await device_for_removal.cloud.stop()
+                    device_for_removal.cloud.stop()
 
             if device_for_removal.ble:
                 await device_for_removal.ble.stop()
@@ -433,6 +440,12 @@ async def login(self, account: str, password: str) -> CloudIOTGateway:
         await self.connect_iot(cloud_client)
         return cloud_client
 
+    async def stop(self) -> None:
+        await self.device_manager.stop()
+        for mqtt in self.mqtt_list.values():
+            if mqtt.is_connected():
+                mqtt.disconnect()
+
     @staticmethod
     async def connect_iot(cloud_client: CloudIOTGateway) -> None:
         """Connect to aliyun cloud and fetch device info."""

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -126,6 +126,14 @@ async def _parse_mqtt_response(self, topic: str, payload: dict, iot_id: str) ->
             payload (dict): The payload data of the MQTT message.
 
         """
+        if topic.endswith("/app/down/account/bind_reply"):
+            code = payload.get("code", 0)
+            if code != 200:
+                _LOGGER.error("Failed to bind account: %s", payload)
+                # TODO send message to re login to aliyun mqtt
+                self._disconnect_error = payload
+                return
+
         if topic.endswith("/app/down/thing/events"):
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
@@ -233,9 +241,11 @@ async def on_disconnect(self) -> None:
     async def on_connect(self) -> None:
         """On connect callback"""
 
-    async def stop(self) -> None:
+    def stop(self) -> None:
         """Stop all tasks and disconnect."""
         # self._mqtt._mqtt_client.unsubscribe()
+        if self.mqtt.is_connected():
+            self._mqtt.disconnect()
         self.stopped = True
 
     async def start(self) -> None:

pymammotion/mqtt/aliyun_mqtt.py

@@ -49,7 +49,6 @@ def __init__(
         self._product_key = product_key
         self._device_name = device_name
         self._device_secret = device_secret
-        self._iot_token = iot_token
         self._mqtt_username = f"{device_name}&{product_key}"
         # linkkit provides the correct MQTT service for all of this and uses paho under the hood
         if client_id is None:
@@ -81,6 +80,12 @@ def __init__(
         self._linkkit_client.on_topic_message = self._thing_on_topic_message
         self._mqtt_host = f"{self._product_key}.iot-as-mqtt.{region_id}.aliyuncs.com"
 
+    @property
+    def iot_token(self) -> str:
+        if authcode_response := self._cloud_client.session_by_authcode_response.data:
+            return authcode_response.iotToken
+        return ""
+
     def connect_async(self) -> None:
         """Connect async to MQTT Server."""
         logger.info("Connecting...")
@@ -129,7 +134,7 @@ def _thing_on_thing_enable(self, user_data) -> None:
                     "id": "msgid1",
                     "version": "1.0",
                     "request": {"clientId": self._mqtt_username},
-                    "params": {"iotToken": self._iot_token},
+                    "params": {"iotToken": self.iot_token},
                 }
             ),
         )

pymammotion/mqtt/linkkit/linkkit.py

@@ -30,6 +30,7 @@
 import sys
 import threading
 import time
+from typing import Any
 import urllib.parse
 import urllib.request
 
@@ -1189,19 +1190,19 @@ def destruct(self) -> None:
     def destroy(self) -> None:
         self.destruct()
 
-    def check_state(self):
+    def check_state(self) -> LinkKitState:
         return self.__linkkit_state
 
     @staticmethod
-    def __generate_random_str(randomlength=16):
+    def __generate_random_str(randomlength: int = 16) -> str:
         """Generate radom string"""
         random_str = ""
         for i in range(randomlength):
             random_str += random.choice(string.digits + string.ascii_letters)
         return random_str
 
     # 基于HTTPS的一型一密预注册
-    def __dynamic_register_device(self):
+    def __dynamic_register_device(self) -> tuple[int, Any] | None:
         pk = self.__product_key
         ps = self.__product_secret
         dn = self.__device_name
@@ -1222,8 +1223,9 @@ def __dynamic_register_device(self):
                     return 0, reply_obj_data["deviceSecret"]
             else:
                 return 1, reply_obj["message"]
+        return None
 
-    def __config_mqtt_client_internal(self):
+    def __config_mqtt_client_internal(self) -> None:
         self.__link_log.info("start connect")
 
         timestamp = str(int(time.time()))