meshcore 2.3.0__tar.gz → 2.3.2__tar.gz

{meshcore-2.3.0 → meshcore-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.3.0
+Version: 2.3.2
 Summary: Base classes for communicating with meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore_py
 Project-URL: Issues, https://github.com/fdlamotte/meshcore_py/issues

{meshcore-2.3.0 → meshcore-2.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore"
-version = "2.3.0"
+version = "2.3.2"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
   { name="Alex Wolden", email="awolden@gmail.com" },

{meshcore-2.3.0 → meshcore-2.3.2}/src/meshcore/reader.py

@@ -26,7 +26,6 @@ class MessageReader:
         self.pending_binary_requests: Dict[str, Dict[str, Any]] = {}  # tag -> {request_type, expires_at}
 
         self.packet_parser = MeshcorePacketParser()
-        self.decrypt_channels = True
 
     @property
     def decrypt_channels(self):
@@ -828,13 +827,13 @@ class MessageReader:
             res["pubkey_pre"] = dbuf.read(6).hex()
             opl = dbuf.read(1)[0]
             opl_hlen = ((opl & 0xc0) >> 6) + 1
-            opl = opl & 0xbf
+            opl = opl & 0x3f
             res["out_path_len"] = opl
             res["out_path_hash_len"] = opl_hlen
             res["out_path"] = dbuf.read(opl*opl_hlen).hex()
             ipl = dbuf.read(1)[0]
             ipl_hlen = ((ipl & 0xc0) >> 6) + 1
-            ipl = ipl & 0xbf
+            ipl = ipl & 0x3f
             res["in_path_len"] = ipl
             res["in_path_hash_len"] = ipl_hlen
             res["in_path"] = dbuf.read(ipl*ipl_hlen).hex()

{meshcore-2.3.0 → meshcore-2.3.2}/src/meshcore/serial_cx.py

@@ -79,6 +79,10 @@ class SerialConnection:
             idx = data.find(b"\x3e")
             if idx < 0: # no start of frame
                 return
+            # Discard any leading junk bytes before the actual frame marker.
+            # Some radios interleave console/debug text on the same UART, so
+            # valid companion frames may begin at an offset inside the chunk.
+            data = data[idx:]
             self.header = data[0:1]
             data = data[1:]
 

{meshcore-2.3.0 → meshcore-2.3.2}/src/meshcore/tcp_cx.py

@@ -73,6 +73,10 @@ class TCPConnection:
             idx = data.find(b"\x3e")
             if idx < 0: # no start of frame
                 return
+            # Discard any leading junk bytes before the actual frame marker.
+            # Some radios interleave console/debug text on the same UART, so
+            # valid companion frames may begin at an offset inside the chunk.
+            data = data[idx:]
             self.header = data[0:1]
             data = data[1:]
 

meshcore-2.3.2/tests/unit/test_path_discovery_response.py

@@ -0,0 +1,45 @@
+import pytest
+
+from meshcore.events import EventType
+from meshcore.reader import MessageReader
+
+pytestmark = pytest.mark.asyncio
+
+
+class MockDispatcher:
+    def __init__(self):
+        self.dispatched_events = []
+
+    async def dispatch(self, event):
+        self.dispatched_events.append(event)
+
+
+async def test_path_discovery_response_decodes_3byte_paths():
+    dispatcher = MockDispatcher()
+    reader = MessageReader(dispatcher)
+
+    packet = bytearray.fromhex(
+        "8d"  # PacketType.PATH_DISCOVERY_RESPONSE
+        "00"  # Reserved byte
+        "112233445566"  # 6-byte contact public-key prefix
+        "82"  # Outbound path descriptor: mode=2 (3-byte hops), hop_count=2
+        "a1a2a3b1b2b3"  # Outbound path bytes: 2 hops * 3 bytes each
+        "81"  # Inbound path descriptor: mode=2 (3-byte hops), hop_count=1
+        "c1c2c3"  # Inbound path bytes: 1 hop * 3 bytes
+    )
+
+    await reader.handle_rx(packet)
+
+    matching = [e for e in dispatcher.dispatched_events if e.type == EventType.PATH_RESPONSE]
+    assert len(matching) == 1
+
+    payload = matching[0].payload
+    assert payload["pubkey_pre"] == "112233445566"
+
+    assert payload["out_path_hash_len"] == 3
+    assert payload["out_path_len"] == 2
+    assert payload["out_path"] == "a1a2a3b1b2b3"
+
+    assert payload["in_path_hash_len"] == 3
+    assert payload["in_path_len"] == 1
+    assert payload["in_path"] == "c1c2c3"

meshcore-2.3.2/tests/unit/test_serial_connection.py

@@ -0,0 +1,31 @@
+import asyncio
+
+import pytest
+
+from meshcore.serial_cx import SerialConnection
+
+
+class RecordingReader:
+    def __init__(self):
+        self.frames = []
+
+    async def handle_rx(self, data):
+        self.frames.append(bytes(data))
+
+
+@pytest.mark.asyncio
+async def test_handle_rx_discards_leading_junk_before_frame_start():
+    conn = SerialConnection("/dev/null", 115200)
+    reader = RecordingReader()
+    conn.set_reader(reader)
+
+    payload = b"\x00\x01\x02\x53"
+    frame = b"\x3e" + len(payload).to_bytes(2, "little") + payload
+
+    conn.handle_rx(b"junk bytes\r\n" + frame)
+    await asyncio.sleep(0)
+
+    assert reader.frames == [payload]
+    assert conn.header == b""
+    assert conn.inframe == b""
+    assert conn.frame_expected_size == 0