pymammotion 0.2.17__tar.gz → 0.2.19__tar.gz

{pymammotion-0.2.17 → pymammotion-0.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.17
+Version: 0.2.19
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/aliyun/cloud_gateway.py

@@ -11,6 +11,7 @@ import time
 import uuid
 from logging import getLogger, exception
 from datetime import datetime
+from urllib.parse import urlencode
 
 from aiohttp import ClientSession
 from alibabacloud_iot_api_gateway.client import Client
@@ -241,6 +242,7 @@ class CloudIOTGateway:
     async def connect(self):
         """Connect to the Aliyun Cloud IoT Gateway."""
         region_url = "sdk.openaccount.aliyun.com"
+        time_now = time.time()
         async with ClientSession() as session:
             headers = {
                 "host": region_url,
@@ -323,7 +325,7 @@ class CloudIOTGateway:
                 "x-ca-key": self._app_key,
                 "x-ca-signaturemethod": "HmacSHA256",
                 "accept": "application/json",
-                "content-type": "application/x-www-form-urlencoded",
+                "content-type": "application/x-www-form-urlencoded; charset=utf-8",
                 "user-agent": UtilClient.get_user_agent(None),
                 "vid": self._connect_response.data.vid,
             }
@@ -331,14 +333,16 @@ class CloudIOTGateway:
             _bodyParam = {
                 "country": country_code,
                 "authCode": auth_code,
-                "oauthPlateform": "23",
+                "oauthPlateform": 23,
                 "oauthAppKey": self._app_key,
-                "appAuthToken": self._device_sn,
                 "riskControlInfo": {
                     "appID": "com.agilexrobotics",
+                    "appAuthToken": "",
                     "signType": "RSA",
+                    "sdkVersion": "3.4.2",
                     "utdid": self._utdid,
                     "umidToken": self._utdid,
+                    "deviceId": self._connect_response.data.data.device.data.deviceId,
                     "USE_OA_PWD_ENCRYPT": "true",
                     "USE_H5_NC": "true",
                 },
@@ -354,12 +358,12 @@ class CloudIOTGateway:
             header = "".join(f"{k}:{dic[k]}\n" for k in keys).strip()
 
             headers["x-ca-signature-headers"] = sign_headers
-            string_to_sign = "POST\n{}\n\n{}\n{}\n{}\n/api/prd/loginbyoauth.json?loginByOauthRequest={}".format(
+            string_to_sign = "POST\n{}\n\n{}\n{}\n{}\n/api/prd/loginbyoauth.json?{}".format(
                 headers["accept"],
                 headers["content-type"],
                 headers["date"],
                 header,
-                json.dumps(_bodyParam, separators=(",", ":")),
+                f"loginByOauthRequest={json.dumps(_bodyParam, separators=(",", ":"))}",
             )
 
             hash_val = hmac.new(
@@ -369,12 +373,14 @@ class CloudIOTGateway:
             ).digest()
             signature = base64.b64encode(hash_val).decode("utf-8")
             headers["x-ca-signature"] = signature
-
             async with session.post(
                 f"https://{region_url}/api/prd/loginbyoauth.json",
                 headers=headers,
-                params={"loginByOauthRequest": json.dumps(_bodyParam, separators=(",", ":"))},
+                data={
+                    'loginByOauthRequest': json.dumps(_bodyParam, separators=(",", ":"))
+                }
             ) as resp:
+
                 data = await resp.json()
                 logger.debug(data)
                 if resp.status == 200:

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/aliyun/dataclass/login_by_oauth_response.py

@@ -53,8 +53,8 @@ class InnerData(DataClassORJSONMixin):
     data: InnerDataContent
     subCode: int
     message: str
-    deviceId: str
     successful: str
+    deviceId: Optional[str] = None
 
 
 @dataclass

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/const.py

@@ -2,8 +2,8 @@
 
 APP_KEY = "34231230"
 APP_SECRET = "1ba85698bb10e19c6437413b61ba3445"
-APP_VERSION = "1.11.1220"
+APP_VERSION = "1.11.130"
 ALIYUN_DOMAIN = "api.link.aliyun.com"
-MAMMOTION_DOMAIN = "https://domestic.mammotion.com"
+MAMMOTION_DOMAIN = "https://id.mammotion.com"
 MAMMOTION_CLIENT_ID = "MADKALUBAS"
 MAMMOTION_CLIENT_SECRET = "GshzGRZJjuMUgd2sYHM7"

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/data/mqtt/event.py

@@ -45,10 +45,15 @@ class DeviceWarningEventValue(DataClassORJSONMixin):
     # (see resources/res/values-en-rUS/strings.xml in APK)
     code: int
 
+@dataclass
+class DeviceConfigurationRequestValue(DataClassORJSONMixin):
+    code: int
+    bizId: str
+    params: str
+
 
 @dataclass
 class GeneralParams(DataClassORJSONMixin):
-    identifier: str
     groupIdList: list[str]
     groupId: str
     categoryKey: Literal["LawnMower"]
@@ -67,7 +72,7 @@ class GeneralParams(DataClassORJSONMixin):
     tenantInstanceId: str
     value: Any
 
-    # Campi opzionali
+    identifier: Optional[str] = None
     checkFailedData: Optional[dict] = None
     _tenantId: Optional[str] = None
     generateTime: Optional[int] = None
@@ -92,6 +97,11 @@ class DeviceWarningEventParams(GeneralParams):
     type: Literal["alert"]
     value: DeviceWarningEventValue
 
+@dataclass
+class DeviceConfigurationRequestEvent(GeneralParams):
+    type: Literal["info"]
+    value: DeviceConfigurationRequestValue
+
 
 @dataclass
 class ThingEventMessage(DataClassORJSONMixin):
@@ -102,7 +112,7 @@ class ThingEventMessage(DataClassORJSONMixin):
 
     @classmethod
     def from_dicts(cls, payload: dict) -> "ThingEventMessage":
-        """Deserializza il payload JSON in un'istanza di ThingEventMessage."""
+        """Deserialize payload JSON ThingEventMessage."""
         method = payload.get("method")
         event_id = payload.get("id")
         params_dict = payload.get("params", {})
@@ -110,14 +120,16 @@ class ThingEventMessage(DataClassORJSONMixin):
 
         # Determina quale classe usare per i parametri
         identifier = params_dict.get("identifier")
-        if identifier == "device_protobuf_msg_event":
+        if identifier is None:
+            """Request configuration event."""
+            params_obj = DeviceConfigurationRequestEvent(**params_dict)
+        elif identifier == "device_protobuf_msg_event":
             params_obj = DeviceProtobufMsgEventParams(**params_dict)
         elif identifier == "device_warning_event":
             params_obj = DeviceWarningEventParams(**params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", '')
         else:
-            raise ValueError(f"Unknown identifier: {identifier}")
+            raise ValueError(f"Unknown identifier: {identifier} {params_dict}")
 
-        # Crea e restituisce l'istanza di ThingEventMessage
         return cls(method=method, id=event_id, params=params_obj, version=version)

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/http/http.py

@@ -55,7 +55,7 @@ class MammotionHTTP:
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:
         async with session.post(
-            "/user-server/v1/user/oauth/token",
+            "/oauth/token",
             params=dict(
                 username=username,
                 password=password,

{pymammotion-0.2.17 → pymammotion-0.2.19}/pymammotion/mammotion/devices/mammotion.py

@@ -1071,6 +1071,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def _send_command_locked(self, key: str, command: bytes) -> bytes:
         """Send command to device and read response."""
+        if not self._mqtt_client.is_connected:
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self._mqtt_client.connect_async)
+
+            if not self._mqtt_client.is_connected:
+                raise Exception("MQTT not connected, couldn't recover")
         try:
             return await self._execute_command_locked(key, command)
         except DeviceOfflineException as ex:
@@ -1106,7 +1112,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         await self.loop.run_in_executor(None, self._mqtt_client.get_cloud_client().send_cloud_command, self.iot_id, command)
         future = MammotionFuture()
         self._waiting_queue.append(future)
-        timeout = 20
+        timeout = 5
         try:
             notify_msg = await future.async_get(timeout)
         except asyncio.TimeoutError:
@@ -1150,8 +1156,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
             params = event.params
-            if isinstance(params, str):
-                _LOGGER.debug("config event %s", str)
+            if params.identifier is None:
                 return
             if params.identifier == "device_protobuf_msg_event" and event.method == "thing.events":
                 _LOGGER.debug("Protobuf event")

{pymammotion-0.2.17 → pymammotion-0.2.19}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.17"
+version     = "0.2.19"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.17"
+version     = "0.2.19"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -53,7 +53,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.7.1"
 
 [tool.bumpver]
-current_version = "0.2.17"
+current_version = "0.2.19"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true