🦎 q7: harden map command decode + cover RPC payload tests

Author: arduano

roborock/devices/rpc/b01_q7_channel.py

@@ -113,14 +113,23 @@ async def send_map_command(mqtt_channel: MqttChannel, request_message: Q7Request
 
     roborock_message = encode_mqtt_payload(request_message)
     future: asyncio.Future[bytes] = asyncio.get_running_loop().create_future()
+    publish_started = asyncio.Event()
 
     def find_response(response_message: RoborockMessage) -> None:
         if future.done():
             return
 
-        if response_message.protocol == RoborockMessageProtocol.MAP_RESPONSE and response_message.payload:
-            if not future.done():
-                future.set_result(response_message.payload)
+        # Avoid accepting queued/stale MAP_RESPONSE messages before we actually
+        # publish this request.
+        if not publish_started.is_set():
+            return
+
+        if (
+            response_message.protocol == RoborockMessageProtocol.MAP_RESPONSE
+            and response_message.payload
+            and response_message.version == roborock_message.version
+        ):
+            future.set_result(response_message.payload)
             return
 
         try:
@@ -145,13 +154,25 @@ def find_response(response_message: RoborockMessage) -> None:
             data = inner.get("data")
             if isinstance(data, dict) and isinstance(data.get("payload"), str):
                 try:
-                    if not future.done():
-                        future.set_result(bytes.fromhex(data["payload"]))
-                except ValueError:
-                    pass
+                    future.set_result(bytes.fromhex(data["payload"]))
+                except ValueError as ex:
+                    future.set_exception(
+                        RoborockException(
+                            f"Invalid hex payload in B01 map response: {data.get('payload')} ({request_message})"
+                        )
+                    )
+                    _LOGGER.debug(
+                        "Invalid hex payload in B01 map response (msgId=%s): %s (%s): %s",
+                        inner.get("msgId"),
+                        data.get("payload"),
+                        request_message,
+                        ex,
+                    )
+                return
 
     unsub = await mqtt_channel.subscribe(find_response)
     try:
+        publish_started.set()
         await mqtt_channel.publish(roborock_message)
         return await asyncio.wait_for(future, timeout=_TIMEOUT)
     except TimeoutError as ex:

tests/devices/traits/b01/q7/test_init.py

@@ -309,6 +309,32 @@ async def test_q7_api_get_current_map_payload(
     assert second_payload["dps"]["10000"]["params"] == {"map_id": 1772093512}
 
 
+async def test_q7_api_get_current_map_payload_rpc_wrapped_hex_payload(
+    q7_api: Q7PropertiesApi,
+    fake_channel: FakeChannel,
+    message_builder: B01MessageBuilder,
+):
+    """Fetch current map via RPC-wrapped hex payload response."""
+    fake_channel.response_queue.append(message_builder.build({"map_list": [{"id": 1772093512, "cur": True}]}))
+    fake_channel.response_queue.append(message_builder.build({"payload": "68656c6c6f"}))
+
+    raw_payload = await q7_api.get_current_map_payload()
+    assert raw_payload == b"hello"
+
+
+async def test_q7_api_get_current_map_payload_rpc_wrapped_invalid_hex_errors(
+    q7_api: Q7PropertiesApi,
+    fake_channel: FakeChannel,
+    message_builder: B01MessageBuilder,
+):
+    """Invalid hex payload should fail fast (not time out)."""
+    fake_channel.response_queue.append(message_builder.build({"map_list": [{"id": 1772093512, "cur": True}]}))
+    fake_channel.response_queue.append(message_builder.build({"payload": "not-hex"}))
+
+    with pytest.raises(RoborockException, match="Invalid hex payload"):
+        await q7_api.get_current_map_payload()
+
+
 async def test_q7_api_get_current_map_payload_falls_back_to_first_map(
     q7_api: Q7PropertiesApi,
     fake_channel: FakeChannel,