meshcore 2.3.1__tar.gz → 2.3.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.3.1
+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.1 → meshcore-2.3.2}/pyproject.toml

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

{meshcore-2.3.1 → 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.1 → 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_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