review: use static pre-encoded test data, fix CodeQL logging

Address review feedback from edenhaus on #1567:
- Replace runtime LZMA encoding in tests with pre-computed static
  base64 strings. Test inputs are now constants, not computed at
  test time.
- Remove mid/batid from debug log message to satisfy CodeQL
  "clear-text logging of sensitive information" alert.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Beennnn

deebot_client/messages/json/map/__init__.py

@@ -140,10 +140,7 @@ def _handle_body_data_dict(
             groups = _json.loads(decompressed)
         except Exception:
             _LOGGER.debug(
-                "Could not decompress/parse onMapTrace info field for mid=%s batid=%s "
-                "(probably truncated by upstream logger)",
-                data.get("mid"),
-                data.get("batid"),
+                "Could not decompress/parse onMapTrace info field"
             )
             return HandlingResult.analyse()
 

tests/messages/json/map/test_on_map_trace.py

@@ -2,10 +2,6 @@
 
 from __future__ import annotations
 
-import base64
-import json as _json
-import lzma
-
 import pytest
 
 from deebot_client.events import FirmwareEvent
@@ -14,31 +10,23 @@
 from deebot_client.messages.json.map import OnMapTrace
 from tests.messages.json import assert_message
 
+# Static pre-encoded payloads (LZMA1 with trimmed header, base64).
+# Generated from real GOAT A1600 RTK firmware 1.15.x encoding format.
 
-# ---------------------------------------------------------------------------
-# Helper: encode bytes the same way mower firmware does
-# ---------------------------------------------------------------------------
-#
-# Real GOAT A1600 RTK firmware 1.15.x emits an LZMA1 stream with a
-# *trimmed* 9-byte header (props + dict_size_le + size_le_4_bytes) instead
-# of the standard LZMA1 ALONE 13-byte header. The Rust helper
-# ``decompress_base64_data`` accommodates this by injecting four zero
-# bytes after position 7 to rebuild a valid 13-byte header. Reproduce
-# that on the encoding side here so the round-trip works.
+# '[["7","0;100,200;150,250;"]]' (28 bytes uncompressed)
+_SINGLE_GROUP = "XQAABAAcAAAAAC3ghG4jMKGNRtkww/d7MLX33z8usOwaHU2B7///wFIAAA=="
 
-_DICT_SIZE = 1 << 18  # 256 KB — matches what real firmware advertises
+# '[["5","0;-11850,-28849;-11800,-28899;","0;-12850,-23699;-12800,-23750;"],["6","0;-7899,-39700;-7950,-39649;"]]' (110 bytes)
+_MULTI_GROUP = "XQAABABuAAAAAC3ghGojMKGNRtiHVVsAoT/QJyYK0+w8iNNfkK1fJciMh2LrturUwS3TNs8H+7FN7dV1zViWeRKpxrkDUNNQG/4bayp4L33u+jJYgA=="
 
+# '[]' (2 bytes)
+_EMPTY_GROUPS = "XQAABAACAAAAAC2XXP/////wAAAA"
 
-def _ecovacs_encode(payload: bytes) -> str:
-    raw = lzma.compress(
-        payload,
-        format=lzma.FORMAT_RAW,
-        filters=[{"id": lzma.FILTER_LZMA1,
-                  "preset": lzma.PRESET_DEFAULT,
-                  "dict_size": _DICT_SIZE}],
-    )
-    header = bytes([0x5D]) + _DICT_SIZE.to_bytes(4, "little") + len(payload).to_bytes(4, "little")
-    return base64.b64encode(header + raw).decode("ascii")
+# '[["1","0;1,2;3,4;"]]' (20 bytes)
+_SERIAL_TEST = "XQAABAAUAAAAAC3ghGIjMKGNR5N7rKaBA7QSJbYEb82/P//2SwAA"
+
+# b'not json content' compressed — decompresses to non-JSON
+_NON_JSON = "XQAABAAQAAAAADcbyuolm7SQrGkrEp4K2Iwi8deA//3qYAA="
 
 
 def _envelope(info_b64: str, info_size: int, fw: str = "1.15.13") -> dict:
@@ -64,50 +52,28 @@ def _envelope(info_b64: str, info_size: int, fw: str = "1.15.13") -> dict:
     }
 
 
-# ---------------------------------------------------------------------------
-# Happy path
-# ---------------------------------------------------------------------------
-
-
 def test_OnMapTrace_decompresses_and_flattens_groups() -> None:
-    inner = '[["7","0;100,200;150,250;"]]'
-    data = inner.encode("utf-8")
-    info = _ecovacs_encode(data)
-
-    expected_trace = "100,200;150,250"
     assert_message(
         OnMapTrace,
-        _envelope(info, len(data)),
-        (FirmwareEvent("1.15.13"), MapTraceEvent(start=1, total=1, data=expected_trace)),
+        _envelope(_SINGLE_GROUP, 28),
+        (FirmwareEvent("1.15.13"), MapTraceEvent(start=1, total=1, data="100,200;150,250")),
         device_class="xmp9ds",
     )
 
 
 def test_OnMapTrace_concatenates_multiple_groups_and_segments() -> None:
-    inner = (
-        '[["5","0;-11850,-28849;-11800,-28899;","0;-12850,-23699;-12800,-23750;"],'
-        '["6","0;-7899,-39700;-7950,-39649;"]]'
-    )
-    data = inner.encode("utf-8")
-    info = _ecovacs_encode(data)
     expected_trace = (
         "-11850,-28849;-11800,-28899;-12850,-23699;-12800,-23750;-7899,-39700;-7950,-39649"
     )
     assert_message(
         OnMapTrace,
-        _envelope(info, len(data)),
+        _envelope(_MULTI_GROUP, 110),
         (FirmwareEvent("1.15.13"), MapTraceEvent(start=1, total=1, data=expected_trace)),
         device_class="xmp9ds",
     )
 
 
-# ---------------------------------------------------------------------------
-# Edge cases
-# ---------------------------------------------------------------------------
-
-
 def test_OnMapTrace_no_info_field_returns_analyse() -> None:
-    """Without ``info``, defer to the legacy GetMapTrace handler — analyse, no event."""
     envelope = _envelope("", 0)
     envelope["body"]["data"].pop("info")
     envelope["body"]["data"].pop("infoSize")
@@ -121,13 +87,9 @@ def test_OnMapTrace_no_info_field_returns_analyse() -> None:
 
 
 def test_OnMapTrace_empty_groups_returns_analyse() -> None:
-    """A payload with no actual coordinates is unusable — analyse rather than emit empty event."""
-    inner = "[]"
-    data = inner.encode("utf-8")
-    info = _ecovacs_encode(data)
     assert_message(
         OnMapTrace,
-        _envelope(info, len(data)),
+        _envelope(_EMPTY_GROUPS, 2),
         FirmwareEvent("1.15.13"),
         device_class="xmp9ds",
         expected_state=HandlingState.ANALYSE_LOGGED,
@@ -137,15 +99,12 @@ def test_OnMapTrace_empty_groups_returns_analyse() -> None:
 @pytest.mark.parametrize(
     "broken_info",
     [
-        "@@@not-base64@@@",                    # invalid base64
-        base64.b64encode(b"too short").decode("ascii"),  # too short for LZMA header
-        _ecovacs_encode(b"not json content"),  # decompresses to non-JSON
+        "@@@not-base64@@@",
+        "AQIDBA==",  # too short for LZMA header
+        _NON_JSON,
     ],
 )
 def test_OnMapTrace_corrupt_info_returns_analyse(broken_info: str) -> None:
-    """Truncated/broken ``info`` (typical when upstream loggers truncate the payload)
-    should not raise — log at debug and return analyse so the message is dropped silently.
-    """
     assert_message(
         OnMapTrace,
         _envelope(broken_info, 0),
@@ -156,12 +115,7 @@ def test_OnMapTrace_corrupt_info_returns_analyse(broken_info: str) -> None:
 
 
 def test_OnMapTrace_uses_serial_as_event_start() -> None:
-    """``serial`` becomes the ``MapTraceEvent.start`` so the Map helper does not clear
-    on every push (it only clears when ``start == 0``)."""
-    inner = '[["1","0;1,2;3,4;"]]'
-    data = inner.encode("utf-8")
-    info = _ecovacs_encode(data)
-    envelope = _envelope(info, len(data))
+    envelope = _envelope(_SERIAL_TEST, 20)
     envelope["body"]["data"]["serial"] = "42"
 
     assert_message(