pymammotion 0.5.42__tar.gz → 0.5.43__tar.gz

{pymammotion-0.5.42 → pymammotion-0.5.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymammotion
-Version: 0.5.42
+Version: 0.5.43
 Author: jLynx
 Author-email: Michael Arthur <michael@jumblesoft.co.nz>
 License-Expression: GPL-3.0

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/data/model/enums.py

@@ -19,7 +19,7 @@ class PositionMode(Enum):
     UNKNOWN = 4
 
     @staticmethod
-    def from_value(value: int):
+    def from_value(value: int) -> "PositionMode":
         if value == 0:
             return PositionMode.FIX
         elif value == 1:
@@ -52,7 +52,7 @@ class RTKStatus(Enum):
     UNKNOWN = 6
 
     @staticmethod
-    def from_value(value: int):
+    def from_value(value: int) -> "RTKStatus":
         if value == 0:
             return RTKStatus.NONE
         elif value == 1 or value == 2:

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/data/model/hash_list.py

@@ -220,7 +220,7 @@ class HashList(DataClassORJSONMixin):
         self.svg = {hash_id: frames for hash_id, frames in self.svg.items() if hash_id in hashlist}
 
         area_hashes = list(self.area.keys())
-        for hash_id, plan_task in self.plan.items():
+        for hash_id, plan_task in self.plan.copy().items():
             for item in plan_task.zone_hashs:
                 if item not in area_hashes:
                     self.plan.pop(hash_id)

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/data/mqtt/event.py

@@ -1,10 +1,10 @@
 from base64 import b64decode
 from dataclasses import dataclass
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 from google.protobuf import json_format
 from mashumaro.mixins.orjson import DataClassORJSONMixin
-from mashumaro.types import SerializableType
+from mashumaro.types import Alias, SerializableType
 
 from pymammotion.proto import luba_msg_pb2
 
@@ -73,34 +73,35 @@ class DeviceBizReqEventValue(DataClassORJSONMixin):
 
 @dataclass
 class GeneralParams(DataClassORJSONMixin):
-    groupIdList: list[str]
-    groupId: str
-    categoryKey: Literal["LawnMower", "Tracker"]
-    batchId: str
-    gmtCreate: int
-    productKey: str
+    group_id_list: Annotated[list[str], Alias("groupIdList")]
+    group_id: Annotated[str, Alias("groupId")]
+    category_key: Annotated[Literal["LawnMower", "Tracker"], Alias("categoryKey")]
+    batch_id: Annotated[str, Alias("batchId")]
+    gmt_create: Annotated[int, Alias("gmtCreate")]
+    product_key: Annotated[str, Alias("productKey")]
     type: str
-    deviceName: str
-    iotId: str
-    checkLevel: int
+    device_name: Annotated[str, Alias("deviceName")]
+    iot_id: Annotated[str, Alias("iotId")]
+    check_level: Annotated[int, Alias("checkLevel")]
     namespace: str
-    tenantId: str
+    tenant_id: Annotated[str, Alias("tenantId")]
     name: str
-    thingType: Literal["DEVICE"]
+    thing_type: Annotated[Literal["DEVICE"], Alias("thingType")]
     time: int
-    tenantInstanceId: str
+    tenant_instance_id: Annotated[str, Alias("tenantInstanceId")]
     value: Any
 
+    # Optional fields
     identifier: str | None = None
-    checkFailedData: dict | None = None
-    _tenantId: str | None = None
-    generateTime: int | None = None
-    JMSXDeliveryCount: int | None = None
+    check_failed_data: Annotated[dict | None, Alias("checkFailedData")] = None
+    _tenant_id: Annotated[str | None, Alias("_tenantId")] = None
+    generate_time: Annotated[int | None, Alias("generateTime")] = None
+    jmsx_delivery_count: Annotated[int | None, Alias("JMSXDeliveryCount")] = None
     qos: int | None = None
-    requestId: str | None = None
-    _categoryKey: str | None = None
-    deviceType: str | None = None
-    _traceId: str | None = None
+    request_id: Annotated[str | None, Alias("requestId")] = None
+    _category_key: Annotated[str | None, Alias("_categoryKey")] = None
+    device_type: Annotated[str | None, Alias("deviceType")] = None
+    _trace_id: Annotated[str | None, Alias("_traceId")] = None
 
 
 @dataclass
@@ -196,3 +197,27 @@ class ThingEventMessage(DataClassORJSONMixin):
             raise ValueError(f"Unknown identifier: {identifier} {params_dict}")
 
         return cls(method=method, id=event_id, params=params_obj, version=version)
+
+
+@dataclass
+class MammotionProtoMsgParams(DataClassORJSONMixin, SerializableType):
+    value: DeviceProtobufMsgEventValue
+    iot_id: str = ""
+    product_key: str = ""
+    device_name: str = ""
+
+    @classmethod
+    def _deserialize(cls, d: dict[str, Any]) -> "MammotionProtoMsgParams":
+        """Override from_dict to allow dict manipulation before conversion."""
+        proto: str = d["content"]
+
+        return cls(value=DeviceProtobufMsgEventValue(content=proto))
+
+
+@dataclass
+class MammotionEventMessage(DataClassORJSONMixin):
+    id: str
+    version: str
+    sys: dict
+    params: MammotionProtoMsgParams
+    method: str

pymammotion-0.5.43/pymammotion/data/mqtt/mammotion_properties.py

@@ -0,0 +1,257 @@
+from dataclasses import dataclass
+from typing import Annotated
+
+from mashumaro.config import BaseConfig
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
+
+
+@dataclass
+class FirmwareInfo(DataClassORJSONMixin):
+    t: str
+    c: str
+    v: str
+
+
+@dataclass
+class DeviceVersionInfo(DataClassORJSONMixin):
+    dev_ver: Annotated[str, Alias("devVer")]
+    whole: int
+    fw_info: Annotated[list[FirmwareInfo], Alias("fwInfo")]
+
+
+@dataclass
+class Coordinate(DataClassORJSONMixin):
+    lon: float
+    lat: float
+
+
+@dataclass
+class InternalNavigation(DataClassORJSONMixin):
+    nav: Annotated[str, Alias("NAV")]
+    pau: Annotated[str, Alias("Pau")]
+    r_pau: Annotated[str, Alias("rPau")]
+    mcu: Annotated[str, Alias("MCU")]
+    app: Annotated[str, Alias("APP")]
+    w_slp: Annotated[str, Alias("wSlp")]
+    i_slp: Annotated[str, Alias("iSlp")]
+
+
+@dataclass
+class BandwidthTraffic(DataClassORJSONMixin):
+    iot: Annotated[str, Alias("IoT")]
+    roi: Annotated[str, Alias("RoI")]
+    fpv: Annotated[str, Alias("FPV")]
+    inav: InternalNavigation
+
+
+@dataclass
+class TrafficPeriod(DataClassORJSONMixin):
+    r: str
+    t: str
+    s: str
+
+
+@dataclass
+class TrafficData(DataClassORJSONMixin):
+    upt: str
+    hour: Annotated[dict[str, TrafficPeriod], Alias("Hour")]
+    day: Annotated[dict[str, TrafficPeriod], Alias("Day")]
+    mon: Annotated[dict[str, TrafficPeriod], Alias("Mon")]
+
+
+@dataclass
+class NetworkInfo(DataClassORJSONMixin):
+    ssid: str
+    ip: str
+    wifi_sta_mac: str
+    wifi_rssi: int
+    wifi_available: int
+    bt_mac: str
+    mnet_model: str
+    imei: str
+    fw_ver: str
+    sim: str
+    imsi: str
+    iccid: str
+    sim_source: str
+    mnet_rssi: int
+    signal: int
+    mnet_link: int
+    mnet_option: str
+    mnet_ip: str
+    mnet_reg: str
+    mnet_rsrp: str
+    mnet_snr: str
+    mnet_enable: int
+    apn_num: int
+    apn_info: str
+    apn_cid: int
+    used_net: int
+    hub_reset: int
+    mnet_dis: int
+    airplane_times: int
+    lsusb_num: int
+    b_tra: Annotated[BandwidthTraffic, Alias("bTra")]
+    bw_tra: Annotated[BandwidthTraffic, Alias("bwTra")]
+    mnet_rx: str
+    mnet_tx: str
+    m_tra: Annotated[TrafficData, Alias("mTra")]
+    mnet_uniot: int
+    mnet_un_getiot: int
+    ssh_flag: str
+    mileage: str
+    work_time: str
+    wt_sec: int
+    bat_cycles: str
+
+
+@dataclass
+class DeviceOtherInfo(DataClassORJSONMixin):
+    soc_up_time: Annotated[int, Alias("socUpTime")]
+    mcu_up_time: Annotated[int, Alias("mcuUpTime")]
+    soc_loads: Annotated[str, Alias("socLoads")]
+    soc_mem_free: Annotated[int, Alias("socMemFree")]
+    soc_mem_total: Annotated[int, Alias("socMemTotal")]
+    soc_mmc_life_time: Annotated[int, Alias("socMmcLifeTime")]
+    usb_dis_cnt: Annotated[int, Alias("usbDisCnt")]
+    soc_pstore: Annotated[int, Alias("socPstore")]
+    soc_coredump: Annotated[int, Alias("socCoredump")]
+    soc_tmp: Annotated[int, Alias("socTmp")]
+    mc_mcu: Annotated[str, Alias("mcMcu")]
+    tilt_degree: str
+    i_msg_free: Annotated[int, Alias("iMsgFree")]
+    i_msg_limit: Annotated[int, Alias("iMsgLimit")]
+    i_msg_raw: Annotated[int, Alias("iMsgRaw")]
+    i_msg_prop: Annotated[int, Alias("iMsgprop")]
+    i_msg_serv: Annotated[int, Alias("iMsgServ")]
+    i_msg_info: Annotated[int, Alias("iMsgInfo")]
+    i_msg_warn: Annotated[int, Alias("iMsgWarn")]
+    i_msg_fault: Annotated[int, Alias("iMsgFault")]
+    i_msg_ota_stage: Annotated[int, Alias("iMsgOtaStage")]
+    i_msg_protobuf: Annotated[int, Alias("iMsgProtobuf")]
+    i_msg_notify: Annotated[int, Alias("iMsgNotify")]
+    i_msg_log_prog: Annotated[int, Alias("iMsgLogProg")]
+    i_msg_biz_req: Annotated[int, Alias("iMsgBizReq")]
+    i_msg_cfg_req: Annotated[int, Alias("iMsgCfgReq")]
+    i_msg_voice: Annotated[int, Alias("iMsgVoice")]
+    i_msg_warn_code: Annotated[int, Alias("iMsgWarnCode")]
+    pb_net: Annotated[int, Alias("pbNet")]
+    pb_sys: Annotated[int, Alias("pbSys")]
+    pb_nav: Annotated[int, Alias("pbNav")]
+    pb_local: Annotated[int, Alias("pbLocal")]
+    pb_plan: Annotated[int, Alias("pbPlan")]
+    pb_e_drv: Annotated[int, Alias("pbEDrv")]
+    pb_e_sys: Annotated[int, Alias("pbESys")]
+    pb_midware: Annotated[int, Alias("pbMidware")]
+    pb_ota: Annotated[int, Alias("pbOta")]
+    pb_appl: Annotated[int, Alias("pbAppl")]
+    pb_mul: Annotated[int, Alias("pbMul")]
+    pb_other: Annotated[int, Alias("pbOther")]
+    lora_connect: Annotated[int, Alias("loraConnect")]
+    base_status: Annotated[int, Alias("Basestatus")]
+    mqtt_rtk_switch: int
+    mqtt_rtk_channel: int
+    mqtt_rtk_status: int
+    mqtt_rtcm_cnt: int
+    mqtt_conn_cnt: int
+    mqtt_disconn_cnt: int
+    mqtt_rtk_hb_flag: int
+    mqtt_rtk_hb_count: int
+    mqtt_start_cnt: int
+    mqtt_close_cnt: int
+    mqtt_rtk_ssl_fail: int
+    mqtt_rtk_wifi_config: int
+    nrtk_svc_prov: int
+    nrtk_svc_err: int
+    base_stn_id: int
+    rtk_status: int
+    charge_status: int
+    chassis_state: int
+    nav: str
+    ins_fusion: str
+    perception: str
+    vision_proxy: str
+    vslam_vio: str
+    iot_con_timeout: int
+    iot_con: int
+    iot_con_fail_max: str
+    iot_con_fail_min: Annotated[str, Alias("iot_con__fail_min")]
+    iot_url_count: int
+    iot_url_max: str
+    iot_url_min: str
+    iot_cn: int
+    iot_ap: int
+    iot_us: int
+    iot_eu: int
+    task_area: float
+    task_count: int
+    task_hash: str
+    systemio_boot_time: Annotated[str, Alias("systemioBootTime")]
+    dds_no_gdc: int
+
+
+@dataclass
+class CheckData(DataClassORJSONMixin):
+    result: str
+    error: Annotated[list[int], Alias("Error")]
+    warn: Annotated[list[int], Alias("Warn")]
+    ok: Annotated[list[int], Alias("OK")]
+
+
+@dataclass
+class DeviceProperties(DataClassORJSONMixin):
+    device_state: Annotated[int, Alias("deviceState")]
+    battery_percentage: Annotated[int, Alias("batteryPercentage")]
+    device_version: Annotated[str, Alias("deviceVersion")]
+    knife_height: Annotated[int, Alias("knifeHeight")]
+    lora_general_config: Annotated[str, Alias("loraGeneralConfig")]
+    ext_mod: Annotated[str, Alias("extMod")]
+    int_mod: Annotated[str, Alias("intMod")]
+    iot_state: Annotated[int, Alias("iotState")]
+    iot_msg_total: Annotated[int, Alias("iotMsgTotal")]
+    iot_msg_hz: Annotated[int, Alias("iotMsgHz")]
+    lt_mr_mod: Annotated[str, Alias("ltMrMod")]
+    rt_mr_mod: Annotated[str, Alias("rtMrMod")]
+    bms_hardware_version: Annotated[str, Alias("bmsHardwareVersion")]
+    stm32_h7_version: Annotated[str, Alias("stm32H7Version")]
+    left_motor_version: Annotated[str, Alias("leftMotorVersion")]
+    right_motor_version: Annotated[str, Alias("rightMotorVersion")]
+    rtk_version: Annotated[str, Alias("rtkVersion")]
+    bms_version: Annotated[str, Alias("bmsVersion")]
+    mc_boot_version: Annotated[str, Alias("mcBootVersion")]
+    left_motor_boot_version: Annotated[str, Alias("leftMotorBootVersion")]
+    right_motor_boot_version: Annotated[str, Alias("rightMotorBootVersion")]
+
+    # Nested JSON objects
+    device_version_info: Annotated[DeviceVersionInfo, Alias("deviceVersionInfo")]
+    coordinate: Coordinate
+    device_other_info: Annotated[DeviceOtherInfo, Alias("deviceOtherInfo")]
+    network_info: Annotated[NetworkInfo, Alias("networkInfo")]
+    check_data: Annotated[CheckData, Alias("checkData")]
+    iot_id: str = ""
+
+    class Config(BaseConfig):
+        # Custom deserializer for nested JSON strings
+        serialization_strategy = {
+            DeviceVersionInfo: {
+                "deserialize": lambda x: DeviceVersionInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            Coordinate: {
+                "deserialize": lambda x: Coordinate.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            DeviceOtherInfo: {
+                "deserialize": lambda x: DeviceOtherInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            NetworkInfo: {
+                "deserialize": lambda x: NetworkInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            CheckData: {
+                "deserialize": lambda x: CheckData.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+        }

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/data/mqtt/properties.py

@@ -1,16 +1,11 @@
 from dataclasses import dataclass
-from typing import Any, Generic, Literal, TypeVar, Union
+from typing import Annotated, Any, Generic, Literal, TypeVar, Union
 
 from mashumaro import DataClassDictMixin
 from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
 
-DataT = TypeVar("DataT")
-
-
-@dataclass
-class Item(DataClassDictMixin, Generic[DataT]):
-    time: int
-    value: DataT
+from pymammotion.data.mqtt.mammotion_properties import DeviceProperties
 
 
 @dataclass
@@ -163,29 +158,29 @@ class Items(DataClassDictMixin):
 
 @dataclass
 class Params(DataClassORJSONMixin):
-    deviceType: Literal["LawnMower", "Tracker"]
-    checkFailedData: dict
-    groupIdList: list[str]
-    _tenantId: str
-    groupId: str
-    categoryKey: Literal["LawnMower", "Tracker"]
-    batchId: str
-    gmtCreate: int
-    productKey: str
-    generateTime: int
-    deviceName: str
-    _traceId: str
-    iotId: str
-    JMSXDeliveryCount: int
-    checkLevel: int
+    device_type: Annotated[Literal["LawnMower", "Tracker"], Alias("deviceType")]
+    check_failed_data: Annotated[dict[str, Any], Alias("checkFailedData")]
+    group_id_list: Annotated[list[str], Alias("groupIdList")]
+    _tenant_id: Annotated[str, Alias("_tenantId")]
+    group_id: Annotated[str, Alias("groupId")]
+    category_key: Annotated[Literal["LawnMower", "Tracker"], Alias("categoryKey")]
+    batch_id: Annotated[str, Alias("batchId")]
+    gmt_create: Annotated[int, Alias("gmtCreate")]
+    product_key: Annotated[str, Alias("productKey")]
+    generate_time: Annotated[int, Alias("generateTime")]
+    device_name: Annotated[str, Alias("deviceName")]
+    _trace_id: Annotated[str, Alias("_traceId")]
+    iot_id: Annotated[str, Alias("iotId")]
+    jmsx_delivery_count: Annotated[int, Alias("JMSXDeliveryCount")]
+    check_level: Annotated[int, Alias("checkLevel")]
     qos: int
-    requestId: str
-    _categoryKey: str
+    request_id: Annotated[str, Alias("requestId")]
+    _category_key: Annotated[str, Alias("_categoryKey")]
     namespace: str
-    tenantId: str
-    thingType: Literal["DEVICE"]
-    items: Items
-    tenantInstanceId: str
+    tenant_id: Annotated[str, Alias("tenantId")]
+    thing_type: Annotated[Literal["DEVICE"], Alias("thingType")]
+    items: Annotated["Items", Alias("items")]
+    tenant_instance_id: Annotated[str, Alias("tenantInstanceId")]
 
 
 @dataclass
@@ -194,3 +189,11 @@ class ThingPropertiesMessage(DataClassORJSONMixin):
     id: str
     params: Params
     version: Literal["1.0"]
+
+
+@dataclass
+class MammotionPropertiesMessage(DataClassORJSONMixin):
+    id: str
+    version: str
+    sys: dict
+    params: DeviceProperties

pymammotion-0.5.43/pymammotion/data/mqtt/status.py

@@ -0,0 +1,53 @@
+from dataclasses import dataclass
+from enum import Enum
+from typing import Annotated, Literal
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
+
+
+@dataclass
+class GroupIdListItem(DataClassORJSONMixin):
+    groupId: str
+    groupType: Literal["ISOLATION", "ILOP_APP"]
+
+
+# are there other values?
+class StatusType(Enum):
+    CONNECTED = 1
+    DISCONNECTED = 3
+
+
+@dataclass
+class Status(DataClassORJSONMixin):
+    time: int
+    value: StatusType
+
+
+@dataclass
+class Params(DataClassORJSONMixin):
+    group_id_list: Annotated[list[GroupIdListItem], Alias("groupIdList")]
+    net_type: Annotated[Literal["NET_WIFI", "NET_MNET"], Alias("netType")]
+    active_time: Annotated[int, Alias("activeTime")]
+    ip: str
+    aliyun_commodity_code: Annotated[Literal["iothub_senior"], Alias("aliyunCommodityCode")]
+    category_key: Annotated[Literal["LawnMower", "Tracker"], Alias("categoryKey")]
+    node_type: Annotated[Literal["DEVICE"], Alias("nodeType")]
+    product_key: Annotated[str, Alias("productKey")]
+    status_last: Annotated[int, Alias("statusLast")]
+    device_name: Annotated[str, Alias("deviceName")]
+    iot_id: Annotated[str, Alias("iotId")]
+    namespace: str
+    tenant_id: Annotated[str, Alias("tenantId")]
+    thing_type: Annotated[Literal["DEVICE"], Alias("thingType")]
+    tenant_instance_id: Annotated[str, Alias("tenantInstanceId")]
+    category_id: Annotated[int, Alias("categoryId")]
+    status: Annotated[Status, Alias("status")]
+
+
+@dataclass
+class ThingStatusMessage(DataClassORJSONMixin):
+    method: Literal["thing.status"]
+    id: str
+    params: Params
+    version: Literal["1.0"]

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/http/http.py

@@ -370,7 +370,13 @@ class MammotionHTTP:
         async with ClientSession(self.jwt_info.iot) as session:
             async with session.post(
                 "/v1/mqtt/rpc/thing/service/invoke",
-                json={"args": {"content": content, "deviceName": device_name, "iotId": iot_id, "productKey": ""}},
+                json={
+                    "args": {"content": content},
+                    "deviceName": device_name,
+                    "identifier": "device_protobuf_sync_service",
+                    "iotId": iot_id,
+                    "productKey": "",
+                },
                 headers={
                     **self._headers,
                     "Authorization": f"Bearer {self.login_info.access_token}",

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/mammotion/devices/mammotion.py

@@ -289,8 +289,7 @@ class Mammotion:
         if len(mammotion_http.device_records.records) != 0:
             mammotion_cloud = MammotionCloud(
                 MammotionMQTT(
-                    product_key=cloud_client.aep_response.data.productKey,
-                    device_name=cloud_client.aep_response.data.deviceName,
+                    records=mammotion_http.device_records.records,
                     mammotion_http=mammotion_http,
                     mqtt_connection=mammotion_http.mqtt_credentials,
                 ),

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -15,8 +15,8 @@ from pymammotion import AliyunMQTT, CloudIOTGateway, MammotionMQTT
 from pymammotion.aliyun.cloud_gateway import DeviceOfflineException
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.mower_state_manager import MowerStateManager
-from pymammotion.data.mqtt.event import ThingEventMessage
-from pymammotion.data.mqtt.properties import ThingPropertiesMessage
+from pymammotion.data.mqtt.event import MammotionEventMessage, ThingEventMessage
+from pymammotion.data.mqtt.properties import MammotionPropertiesMessage, ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
@@ -112,10 +112,9 @@ class MammotionCloud:
         # _LOGGER.debug("MQTT message received on topic %s: %s, iot_id: %s", topic, payload, iot_id)
         json_str = payload.decode("utf-8")
         dict_payload = json.loads(json_str)
-        print(dict_payload)
-        await self._parse_mqtt_response(topic, dict_payload)
+        await self._parse_mqtt_response(topic, dict_payload, iot_id)
 
-    async def _parse_mqtt_response(self, topic: str, payload: dict) -> None:
+    async def _parse_mqtt_response(self, topic: str, payload: dict, iot_id: str) -> None:
         """Parse and handle MQTT responses based on the topic.
 
         This function processes different types of MQTT messages received from various
@@ -150,6 +149,17 @@ class MammotionCloud:
             property_event = ThingPropertiesMessage.from_dict(payload)
             await self.mqtt_properties_event.data_event(property_event)
 
+        if topic.endswith("/thing/event/device_protobuf_msg_event/post"):
+            _LOGGER.debug("Mammotion Thing event received")
+            mammotion_event = MammotionEventMessage.from_dict(payload)
+            mammotion_event.params.iot_id = iot_id
+            await self.mqtt_message_event.data_event(mammotion_event)
+        elif topic.endswith("/thing/event/property/post"):
+            _LOGGER.debug("Mammotion Property event received")
+            mammotion_property_event = MammotionPropertiesMessage.from_dict(payload)
+            mammotion_property_event.params.iot_id = iot_id
+            await self.mqtt_properties_event.data_event(mammotion_property_event)
+
     def _disconnect(self) -> None:
         """Disconnect the MQTT client."""
         self._mqtt_client.disconnect()
@@ -229,6 +239,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self.stopped = True
 
     async def start(self) -> None:
+        """Start the device connection."""
         self.stopped = False
         if not self.mqtt.is_connected():
             loop = asyncio.get_running_loop()
@@ -277,18 +288,18 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         return None
 
     async def _parse_message_properties_for_device(self, event: ThingPropertiesMessage) -> None:
-        if event.params.iotId != self.iot_id:
+        if event.params.iot_id != self.iot_id:
             return
         await self.state_manager.properties(event)
 
     async def _parse_message_status_for_device(self, status: ThingStatusMessage) -> None:
-        if status.params.iotId != self.iot_id:
+        if status.params.iot_id != self.iot_id:
             return
         await self.state_manager.status(status)
 
     async def _parse_device_event_for_device(self, status: ThingStatusMessage) -> None:
         """Process device event if it matches the device's IoT ID."""
-        if status.params.iotId != self.iot_id:
+        if status.params.iot_id != self.iot_id:
             return
         await self.state_manager.device_event(status)
 
@@ -307,7 +318,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         """
         params = event.params
         new_msg = LubaMsg()
-        if event.params.iotId != self.iot_id:
+        if event.params.iot_id != self.iot_id:
             return
         binary_data = base64.b64decode(params.value.content)
         try:
@@ -318,9 +329,9 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
         if (
             self._commands.get_device_product_key() == ""
-            and self._commands.get_device_name() == event.params.deviceName
+            and self._commands.get_device_name() == event.params.device_name
         ):
-            self._commands.set_device_product_key(event.params.productKey)
+            self._commands.set_device_product_key(event.params.product_key)
 
         res = betterproto2.which_one_of(new_msg, "LubaSubMsg")
         if res[0] == "net":

{pymammotion-0.5.42 → pymammotion-0.5.43}/pymammotion/mammotion/devices/rtk_cloud.py

@@ -96,14 +96,14 @@ class MammotionRTKCloudDevice(MammotionRTKDevice):
 
     async def _parse_message_properties_for_device(self, event: ThingPropertiesMessage) -> None:
         """Parse property messages for this RTK device."""
-        if event.params.iotId != self.iot_id:
+        if event.params.iot_id != self.iot_id:
             return
         # RTK devices have simpler properties - update as needed
         _LOGGER.debug("RTK properties update: %s", event)
 
     async def _parse_message_status_for_device(self, status: ThingStatusMessage) -> None:
         """Parse status messages for this RTK device."""
-        if status.params.iotId != self.iot_id:
+        if status.params.iot_id != self.iot_id:
             return
         # Update online status
         self._rtk_device.online = True