pymammotion 0.4.52__py3-none-any.whl → 0.4.54__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -16,6 +16,7 @@ from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequ
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
 from Tea.exceptions import UnretryableException
+from orjson.orjson import JSONDecodeError
 
 from pymammotion.aliyun.client import Client
 from pymammotion.aliyun.model.aep_response import AepResponse
@@ -138,6 +139,14 @@ class CloudIOTGateway:
         hashed_uuid = hashlib.sha1(f"{uuid.getnode()}".encode()).hexdigest()
         return "".join(itertools.islice(itertools.cycle(hashed_uuid), length))
 
+    @staticmethod
+    def parse_json_response(response_body_str: str) -> dict:
+        try:
+            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 {}
+
     def sign(self, data):
         """Generate signature for the given data."""
         keys = ["appKey", "clientId", "deviceSn", "timestamp"]
@@ -207,7 +216,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in getting regions: " + response_body_dict["msg"])
@@ -264,7 +273,7 @@ class CloudIOTGateway:
 
         response_body_str = response.body.decode("utf-8")
 
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in getting mqtt credentials: " + response_body_dict["msg"])
@@ -464,7 +473,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         session_by_auth = SessionByAuthCodeResponse.from_dict(response_body_dict)
 
@@ -479,7 +488,7 @@ class CloudIOTGateway:
 
         return response.body
 
-    async def sign_out(self) -> None:
+    async def sign_out(self) -> dict:
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,
@@ -520,8 +529,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
-        logger.debug(response_body_dict)
+        response_body_dict = self.parse_json_response(response_body_str)
         return response_body_dict
 
     async def check_or_refresh_session(self):
@@ -567,7 +575,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(response_body_dict)
@@ -625,7 +633,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in creating session: " + response_body_dict["msg"])
@@ -666,7 +674,7 @@ class CloudIOTGateway:
         response_body_str = response.body.decode("utf-8")
 
         # Load the JSON string into a dictionary
-        response_body_dict = json.loads(response_body_str)
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error in creating session: " + response_body_dict["msg"])
@@ -731,8 +739,9 @@ class CloudIOTGateway:
         logger.debug(response.body)
         logger.debug(iot_id)
 
+
         response_body_str = response.body.decode("utf-8")
-        response_body_dict = json.loads(response_body_str) if response_body_str is not None else {}
+        response_body_dict = self.parse_json_response(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -133,7 +133,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         """Stop all tasks and disconnect."""
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
-        if self._client is not None:
+        if self._client is not None and self._client.is_connected:
             await self._client.disconnect()
 
     async def queue_command(self, key: str, **kwargs: Any) -> bytes | None:

{pymammotion-0.4.52.dist-info → pymammotion-0.4.54.dist-info}/METADATA

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

{pymammotion-0.4.52.dist-info → pymammotion-0.4.54.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=44YqBt0advxbYYXs25Jpq438lhEXrP6xaBWWMGBLdp4,9603
-pymammotion/aliyun/cloud_gateway.py,sha256=_qwntXZjj2VzX5x_9LSeq-lW0CRsBYdGO0Wn8e5kIHk,28328
+pymammotion/aliyun/cloud_gateway.py,sha256=DAawjvmlrdYrxzA-C4aXPN0hTx9FIXoIn5I4JSn2adw,28712
 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,7 +72,7 @@ pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3T
 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=SBisZ7zbLQmo8WpLQze5lI2gDawZpzLWZ9ANTkiLV8s,14451
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=sgfL4sz6WkIlr2bvYplzxsudmzATNE-z3UGe0K1Csng,18919
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=MWoaiHqNRh_bHlvjmVPRjYVauVNIVgDpOIsC-UDvYMc,18949
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=P352E-pcbG6wA-RXubI51EUJ3UUQcqJkxRDIqh3g-58,14217
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
@@ -123,7 +123,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.4.52.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.52.dist-info/METADATA,sha256=x_e3b_Q7aNFN5jnivYyy49BKm52a0Zm7WrqK3u8SExc,3878
-pymammotion-0.4.52.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.4.52.dist-info/RECORD,,
+pymammotion-0.4.54.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.54.dist-info/METADATA,sha256=jSP_SsEcwPL1U4Bl7JpJehngXz1LG6JRwon8scc3d8s,3878
+pymammotion-0.4.54.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.54.dist-info/RECORD,,