pymammotion 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -5,6 +5,7 @@ import hashlib
 import hmac
 import itertools
 import json
+from json.decoder import JSONDecodeError
 from logging import getLogger
 import random
 import string
@@ -15,7 +16,6 @@ from aiohttp import ClientSession, ConnectionTimeoutError
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
-from orjson.orjson import JSONDecodeError
 from Tea.exceptions import UnretryableException
 
 from pymammotion.aliyun.client import Client
@@ -153,7 +153,7 @@ class CloudIOTGateway:
             return json.loads(response_body_str) if response_body_str is not None else {}
         except JSONDecodeError:
             logger.error("Couldn't decode message %s", response_body_str)
-            return {'code': 22000}
+            return {"code": 22000}
 
     def sign(self, data):
         """Generate signature for the given data."""
@@ -691,21 +691,21 @@ class CloudIOTGateway:
         return self._devices_by_account_response
 
     async def send_cloud_command(self, iot_id: str, command: bytes) -> str:
-
         """Sends a cloud command to a specified IoT device.
-        
+
         This function checks if the IoT token is expired and attempts to refresh it if
         possible. It then constructs a request using the provided command and sends it
         to the IoT device via an asynchronous HTTP POST request. The function handles
         various error codes and exceptions based on the response from the cloud
         service.
-        
+
         Args:
             iot_id (str): The unique identifier of the IoT device.
             command (bytes): The command to be sent to the IoT device in binary format.
-        
+
         Returns:
             str: A unique message ID for the sent command.
+
         """
         if command is None:
             raise Exception("Command is missing / None")

pymammotion/mammotion/devices/mammotion.py

@@ -273,7 +273,7 @@ class Mammotion:
     def get_or_create_device_by_name(self, device: Device, mqtt_client: MammotionCloud) -> MammotionMixedDeviceManager:
         if mow_device := self.device_manager.get_device(device.deviceName):
             return mow_device
-        return MammotionMixedDeviceManager(
+        mow_device = MammotionMixedDeviceManager(
             name=device.deviceName,
             iot_id=device.iotId,
             cloud_client=mqtt_client.cloud_client,
@@ -281,6 +281,8 @@ class Mammotion:
             cloud_device=device,
             ble_device=None,
         )
+        self.device_manager.add_device(mow_device)
+        return mow_device
 
     async def send_command(self, name: str, key: str):
         """Send a command to the device."""

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -61,7 +61,9 @@ class MammotionCloud:
         return self._mqtt_client.is_connected
 
     def disconnect(self) -> None:
-        self._mqtt_client.disconnect()
+        """Disconnect the MQTT client."""
+        if self.is_connected:
+            self._mqtt_client.disconnect()
 
     def connect_async(self) -> None:
         self._mqtt_client.connect_async()

pymammotion/mqtt/linkkit/linkkit.py

@@ -713,7 +713,7 @@ UxeCp6
         self.__on_ota_message_arrived = None
 
         if self.__just_for_pycharm_autocomplete:
-            self.__mqtt_client = mqtt.Client(CallbackAPIVersion.VERSION1)
+            self.__mqtt_client = mqtt.Client(CallbackAPIVersion.VERSION2)
 
         # device interface info
         self.__device_info_topic = "/sys/%s/%s/thing/deviceinfo/update" % (self.__product_key, self.__device_name)
@@ -1311,7 +1311,10 @@ UxeCp6
         elif self.__mqtt_protocol == "MQTTv31":
             mqtt_protocol_version = mqtt.MQTTv31
         self.__mqtt_client = mqtt.Client(
-            client_id=client_id, clean_session=self.__mqtt_clean_session, protocol=mqtt_protocol_version
+            callback_api_version=CallbackAPIVersion.VERSION2,
+            client_id=client_id,
+            clean_session=self.__mqtt_clean_session,
+            protocol=mqtt_protocol_version,
         )
 
         if self.__link_log.is_enabled():
@@ -1352,6 +1355,9 @@ UxeCp6
 
     def connect_async(self):
         self.__link_log.debug("connect_async")
+        if self.__linkkit_state == LinkKit.LinkKitState.CONNECTED:
+            self.__link_log.info("already connected, returning")
+            return
         if self.__linkkit_state not in (LinkKit.LinkKitState.INITIALIZED, LinkKit.LinkKitState.DISCONNECTED):
             raise LinkKit.StateError("not in INITIALIZED or DISCONNECTED state")
         self.__connect_async_req = True
@@ -1564,13 +1570,13 @@ UxeCp6
             else:
                 return 1, None
 
-    def __on_internal_connect_safe(self, client, user_data, session_flag, rc) -> None:
-        if rc == 0:
+    def __on_internal_connect_safe(self, client, userdata, flags, reason_code, properties) -> None:
+        if reason_code == 0:
             self.__reset_reconnect_wait()
             self.__force_reconnect = False
-        session_flag_internal = {"session present": session_flag}
+        session_flag_internal = {"session present": flags}
         self.__handler_task.post_message(
-            self.__handler_task_cmd_on_connect, (client, user_data, session_flag_internal, rc)
+            self.__handler_task_cmd_on_connect, (client, userdata, session_flag_internal, reason_code, properties)
         )
 
     def __loop_forever_internal(self):
@@ -1603,7 +1609,7 @@ UxeCp6
         except ssl.SSLError as e:
             self.__link_log.error("config mqtt raise exception:" + str(e))
             self.__linkkit_state = LinkKit.LinkKitState.INITIALIZED
-            self.__on_internal_connect_safe(None, None, 0, 6)
+            self.__on_internal_connect_safe(None, None, 0, 6, {})
             return
 
         try:
@@ -1613,7 +1619,7 @@ UxeCp6
         except Exception as e:
             self.__link_log.error("__loop_forever_internal connect raise exception:" + str(e))
             self.__linkkit_state = LinkKit.LinkKitState.INITIALIZED
-            self.__on_internal_connect_safe(None, None, 0, 7)
+            self.__on_internal_connect_safe(None, None, 0, 7, {})
             return
         while True:
             if self.__worker_loop_exit_req:
@@ -1636,7 +1642,7 @@ UxeCp6
                 #     return
                 if self.__linkkit_state == LinkKit.LinkKitState.CONNECTING:
                     self.__linkkit_state = LinkKit.LinkKitState.DISCONNECTED
-                self.__on_internal_connect_safe(None, None, 0, 9)
+                self.__on_internal_connect_safe(None, None, 0, 9, {})
                 if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTING:
                     self.__handler_task.stop()
                     self.__linkkit_state = LinkKit.LinkKitState.DESTRUCTED
@@ -1658,7 +1664,7 @@ UxeCp6
                     break
 
             if self.__linkkit_state == LinkKit.LinkKitState.CONNECTED:
-                self.__on_internal_disconnect(None, None, 1)
+                self.__on_internal_disconnect(None, None, 1, {})
             self.__link_log.info("loop return:%r" % rc)
 
             if self.__worker_loop_exit_req:
@@ -2533,23 +2539,25 @@ UxeCp6
         client, user_data, message = value
         self.__on_internal_async_message(message)
 
-    def __on_internal_connect(self, client, user_data, session_flag, rc) -> None:
+    def __on_internal_connect(self, client, userdata, flags, reason_code, properties) -> None:
         self.__link_log.info("__on_internal_connect")
-        if rc == 0:
+        if reason_code == 0:
             self.__reset_reconnect_wait()
             # self.__upload_device_interface_info()
-            self.__handler_task.post_message(self.__handler_task_cmd_on_connect, (client, user_data, session_flag, rc))
+            self.__handler_task.post_message(
+                self.__handler_task_cmd_on_connect, (client, userdata, flags, reason_code, properties)
+            )
 
     def __handler_task_on_connect_callback(self, value) -> None:
-        client, user_data, session_flag, rc = value
+        client, userdata, flags, reason_code = value
         self.__link_log.info("__on_internal_connect enter")
-        self.__link_log.debug("session:%d, return code:%d" % (session_flag["session present"], rc))
+        self.__link_log.debug("session:%d, return code:%d" % (flags["session present"], reason_code))
         if rc == 0:
             self.__linkkit_state = LinkKit.LinkKitState.CONNECTED
             # self.__worker_thread.start()
         if self.__on_connect is not None:
             try:
-                self.__on_connect(session_flag["session present"], rc, self.__user_data)
+                self.__on_connect(flags["session present"], reason_code, self.__user_data)
             except Exception as e:
                 self.__link_log.error("on_connect process raise exception:%r" % e)
         if self.__thing_setup_state:
@@ -2557,7 +2565,7 @@ UxeCp6
             if self.__on_thing_enable:
                 self.__on_thing_enable(self.__user_data)
 
-    def __on_internal_disconnect(self, client, user_data, rc) -> None:
+    def __on_internal_disconnect(self, client, userdata, flags, reason_code, properties) -> None:
         self.__link_log.info("__on_internal_disconnect enter")
         if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTING:
             self.__linkkit_state = LinkKit.LinkKitState.DESTRUCTED
@@ -2590,13 +2598,15 @@ UxeCp6
         self.__device_info_mid.clear()
         self.__thing_update_device_info_up_mid.clear()
         self.__thing_delete_device_info_up_mid.clear()
-        self.__handler_task.post_message(self.__handler_task_cmd_on_disconnect, (client, user_data, rc))
+        self.__handler_task.post_message(
+            self.__handler_task_cmd_on_disconnect, (client, userdata, reason_code, properties)
+        )
         if self.__linkkit_state == LinkKit.LinkKitState.DESTRUCTED:
             self.__handler_task.stop()
 
     def __handler_task_on_disconnect_callback(self, value) -> None:
         self.__link_log.info("__handler_task_on_disconnect_callback enter")
-        client, user_data, rc = value
+        client, userdata, reason_code = value
         if self.__thing_setup_state:
             if self.__thing_enable_state:
                 self.__thing_enable_state = False
@@ -2607,7 +2617,7 @@ UxeCp6
                         self.__link_log.error("on_thing_disable process raise exception:%r" % e)
         if self.__on_disconnect is not None:
             try:
-                self.__on_disconnect(rc, self.__user_data)
+                self.__on_disconnect(reason_code, self.__user_data)
             except Exception as e:
                 self.__link_log.error("on_disconnect process raise exception:%r" % e)
 

pymammotion/mqtt/mammotion_mqtt.py

@@ -175,18 +175,18 @@ class MammotionMQTT:
         )
         payload = json.loads(payload)
         iot_id = payload.get("params", {}).get("iotId", "")
-        if iot_id != "" and self.on_message:
+        if iot_id != "" and self.on_message is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_message(topic, payload, iot_id), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-    def _thing_on_connect(self, session_flag, rc, user_data) -> None:
+    def _thing_on_connect(self, userdata, flags, reason_code, properties) -> None:
         """Is called on thing connect."""
         self.is_connected = True
         if self.on_connected is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_connected(), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-        logger.debug("on_connect, session_flag:%d, rc:%d", session_flag, rc)
+        logger.debug("on_connect, session_flag:%d, rc:%d", flags, reason_code)
 
         # self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/#")
 

{pymammotion-0.5.2.dist-info → pymammotion-0.5.4.dist-info}/METADATA

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

{pymammotion-0.5.2.dist-info → pymammotion-0.5.4.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=GCpAnLOVWW_W0c8UvdRpWVzZH5oLto8JZnb82stJi-8,9662
-pymammotion/aliyun/cloud_gateway.py,sha256=dRsxFOm_ou1X0VjU-i5B5hee3ay3q6HK1bqEP0oK0EE,29717
+pymammotion/aliyun/cloud_gateway.py,sha256=tOnw4oh8CtAzVOgZc8yhnIIbM2Cv0rET5EyHD7JR4Po,29692
 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
@@ -72,15 +72,15 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
-pymammotion/mammotion/devices/mammotion.py,sha256=iXXV_jqv8w35ugaMRev3lEp_oKJTob54LZ6ZF659h-Y,15087
+pymammotion/mammotion/devices/mammotion.py,sha256=dvFNLJvYS_Fu3JFkrJE3ljhECzewNJYMIPGuTAeFYHY,15170
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=dSDw8xLUfAU2c9vKX65w87Rm2E78284WjJ72CKniPt4,19349
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=sj13Z08mhuinsAExSlZ1f_u8FWh8OH43Lt2hzzfvNdI,14828
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=Pd4aOIhcjVZznJfa0ANYTdG3QWO47maM2eB_qE8SR4U,14904
 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
-pymammotion/mqtt/linkkit/linkkit.py,sha256=NzFpdtfxNHQ6xNu-POyp45fTK7AWUAWV7RavFevX4m4,132772
+pymammotion/mqtt/linkkit/linkkit.py,sha256=joaubTgYYRILEkDMfCPiauOLuiKqY0eCpS8L5Ni8GkY,133217
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=NTuGoAKI4gYB5IV6aU2E19p__uTUmlz5KVslqy9Agbk,10171
+pymammotion/mqtt/mammotion_mqtt.py,sha256=4jNNV5tx6CCryjLSmAQA6u19bhRSuVkZem32JCpOakE,10198
 pymammotion/proto/__init__.py,sha256=vUF-eieR8e4VfduqaQ3KfeCRhsMD56NTX2Kk6sS38IE,73466
 pymammotion/proto/basestation.proto,sha256=YiSsDmT0DY_ep6DHay13SbhxGMhentYt0BmJrVQrwLQ,1198
 pymammotion/proto/basestation_pb2.py,sha256=suenbpMz9JZCXdGJGdiPaapppRz9Cf4IDzAXUfdIG3w,3083
@@ -124,7 +124,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.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.2.dist-info/METADATA,sha256=-Qj7lhgHAoIQzfB2NlfbFXOUpQkkVYqI6Q2D00dZleg,3870
-pymammotion-0.5.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.2.dist-info/RECORD,,
+pymammotion-0.5.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.4.dist-info/METADATA,sha256=8ATEs2lmbEZbpK5GZO31VxAYMdSEuAiaV-d4lSjSIzk,3870
+pymammotion-0.5.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.4.dist-info/RECORD,,