meshcore 2.1.16__tar.gz → 2.1.21__tar.gz

{meshcore-2.1.16 → meshcore-2.1.21}/PKG-INFO

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

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

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/ble_cx.py

@@ -18,7 +18,6 @@ UART_SERVICE_UUID = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
 UART_RX_CHAR_UUID = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"
 UART_TX_CHAR_UUID = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
 
-
 class BLEConnection:
     def __init__(self, address=None, device=None, client=None, pin=None):
         """
@@ -113,7 +112,14 @@ class BLEConnection:
         except TimeoutError:
             return None
 
-        await self.client.start_notify(UART_TX_CHAR_UUID, self.handle_rx)
+        try:
+            await self.client.start_notify(UART_TX_CHAR_UUID, self.handle_rx)
+        except AttributeError :
+            if self.client :
+                await self.client.disconnect()
+            logger.info("Connection is not established, need to restart it")
+            logger.debug("in ble_cx.connect()")
+            return None
 
         nus = self.client.services.get_service(UART_SERVICE_UUID)
         if nus is None:

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/commands/__init__.py

@@ -7,10 +7,15 @@ from .binary import BinaryCommandHandler
 from .contact import ContactCommands
 from .device import DeviceCommands
 from .messaging import MessagingCommands
+from .control_data import ControlDataCommandHandler
 
 
 class CommandHandler(
-    DeviceCommands, ContactCommands, MessagingCommands, BinaryCommandHandler
+    DeviceCommands,
+    ContactCommands,
+    MessagingCommands,
+    BinaryCommandHandler,
+    ControlDataCommandHandler
 ):
     pass
 

meshcore-2.1.21/src/meshcore/commands/control_data.py

@@ -0,0 +1,45 @@
+import logging
+import random
+
+from .base import CommandHandlerBase
+from ..events import EventType, Event
+from ..packets import ControlType, PacketType
+
+logger = logging.getLogger("meshcore")
+
+class ControlDataCommandHandler(CommandHandlerBase):
+    """Helper functions to handle binary requests through binary commands"""
+
+    async def send_control_data (self, control_type: ControlType, payload: bytes) -> Event:
+        data = bytearray([PacketType.SEND_CONTROL_DATA.value]) 
+        data.extend(control_type.value.to_bytes(1, "little", signed = False)) 
+        data.extend(payload)
+
+        result = await self.send(data, [EventType.OK, EventType.ERROR])
+        return result
+
+    async def send_node_discover_req (
+        self,
+        filter: int,
+        tag: int=None,
+        since: int=None
+    ) -> Event:
+
+        if tag is None:
+            tag = random.randint(1, 0xFFFFFFFF)
+
+        data = bytearray()
+        data.extend(filter.to_bytes(1, "little", signed=False))
+        data.extend(tag.to_bytes(4, "little"))
+        if not since is None:
+            data.extend(since.to_bytes(4, "little", signed=False))
+
+        logger.debug(f"sending node discover req {data.hex()}")
+
+        res = await self.send_control_data(ControlType.NODE_DISCOVER_REQ, data)
+
+        if res is None:
+            return None
+        else:
+            res.payload["tag"] = tag
+            return res

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/commands/device.py

@@ -87,14 +87,18 @@ class DeviceCommands(CommandHandlerBase):
             [EventType.OK, EventType.ERROR],
         )
 
+    # the old set_other_params function has been replaced in
+    # favour of set_other_params_from_infos to be more generic
+    # stays here for backward compatibility but does not support
+    # multi_acks for instance
     async def set_other_params(
-        self,
-        manual_add_contacts: bool,
-        telemetry_mode_base: int,
-        telemetry_mode_loc: int,
-        telemetry_mode_env: int,
-        advert_loc_policy: int,
-    ) -> Event:
+            self,
+            manual_add_contacts: bool,
+            telemetry_mode_base: int,
+            telemetry_mode_loc: int,
+            telemetry_mode_env: int,
+            advert_loc_policy: int,
+        ) -> Event:
         telemetry_mode = (
             (telemetry_mode_base & 0b11)
             | ((telemetry_mode_loc & 0b11) << 2)
@@ -108,55 +112,50 @@ class DeviceCommands(CommandHandlerBase):
         )
         return await self.send(data, [EventType.OK, EventType.ERROR])
 
+    async def set_other_params_from_infos(self, infos) -> Event:
+        telemetry_mode = (
+            (infos["telemetry_mode_base"] & 0b11)
+            | ((infos["telemetry_mode_loc"] & 0b11) << 2)
+            | ((infos["telemetry_mode_env"] & 0b11) << 4)
+        )
+        data = (
+            b"\x26"
+            + infos["manual_add_contacts"].to_bytes(1)
+            + telemetry_mode.to_bytes(1)
+            + infos["adv_loc_policy"].to_bytes(1)
+            + infos["multi_acks"].to_bytes(1)
+        )
+        return await self.send(data, [EventType.OK, EventType.ERROR])
+
     async def set_telemetry_mode_base(self, telemetry_mode_base: int) -> Event:
         infos = (await self.send_appstart()).payload
-        return await self.set_other_params(
-            infos["manual_add_contacts"],
-            telemetry_mode_base,
-            infos["telemetry_mode_loc"],
-            infos["telemetry_mode_env"],
-            infos["adv_loc_policy"],
-        )
+        infos["telemetry_mode_base"] = telemetry_mode_base
+        return await self.set_other_params_from_infos(infos)
 
     async def set_telemetry_mode_loc(self, telemetry_mode_loc: int) -> Event:
         infos = (await self.send_appstart()).payload
-        return await self.set_other_params(
-            infos["manual_add_contacts"],
-            infos["telemetry_mode_base"],
-            telemetry_mode_loc,
-            infos["telemetry_mode_env"],
-            infos["adv_loc_policy"],
-        )
+        infos["telemetry_mode_loc"] = telemetry_mode_loc
+        return await self.set_other_params_from_infos(infos)
 
     async def set_telemetry_mode_env(self, telemetry_mode_env: int) -> Event:
         infos = (await self.send_appstart()).payload
-        return await self.set_other_params(
-            infos["manual_add_contacts"],
-            infos["telemetry_mode_base"],
-            infos["telemetry_mode_loc"],
-            telemetry_mode_env,
-            infos["adv_loc_policy"],
-        )
+        infos["telemetry_mode_env"] = telemetry_mode_env
+        return await self.set_other_params_from_infos(infos)
 
     async def set_manual_add_contacts(self, manual_add_contacts: bool) -> Event:
         infos = (await self.send_appstart()).payload
-        return await self.set_other_params(
-            manual_add_contacts,
-            infos["telemetry_mode_base"],
-            infos["telemetry_mode_loc"],
-            infos["telemetry_mode_env"],
-            infos["adv_loc_policy"],
-        )
+        infos["manual_add_contacts"] = manual_add_contacts
+        return await self.set_other_params_from_infos(infos)
 
     async def set_advert_loc_policy(self, advert_loc_policy: int) -> Event:
         infos = (await self.send_appstart()).payload
-        return await self.set_other_params(
-            infos["manual_add_contacts"],
-            infos["telemetry_mode_base"],
-            infos["telemetry_mode_loc"],
-            infos["telemetry_mode_env"],
-            advert_loc_policy,
-        )
+        infos["adv_loc_policy"] = advert_loc_policy
+        return await self.set_other_params_from_infos(infos)
+
+    async def set_multi_acks(self, multi_acks: int) -> Event:
+        infos = (await self.send_appstart()).payload
+        infos["multi_acks"] = multi_acks
+        return await self.set_other_params_from_infos(infos)
 
     async def set_devicepin(self, pin: int) -> Event:
         logger.debug(f"Setting device PIN to: {pin}")

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/commands/messaging.py

@@ -1,8 +1,10 @@
 import logging
 import random
 from typing import Optional, Union
+from hashlib import sha256
 
 from ..events import Event, EventType
+from ..packets import PacketType
 from .base import CommandHandlerBase, DestinationType, _validate_destination
 
 logger = logging.getLogger("meshcore")
@@ -209,3 +211,20 @@ class MessagingCommands(CommandHandlerBase):
                 return Event(EventType.ERROR, {"reason": "unsupported_path_type"})
 
         return await self.send(cmd_data, [EventType.MSG_SENT, EventType.ERROR])
+
+    async def set_flood_scope(self, scope):
+        if scope.startswith("#"): # an hash
+            logger.debug(f"Setting scope from hash {scope}")
+            scope_key = sha256(scope.encode("utf-8")).digest()[0:16]
+        elif scope == "0" or scope == "None" or scope == "*" or scope == "": # disable
+            scope_key = b"\0"*16
+        else: # assume the key has been sent directly
+            scope_key = scope.encode("utf-8")
+
+        logger.debug(f"Setting scope to {scope_key.hex()}")
+
+        cmd_data = bytearray([PacketType.SET_FLOOD_SCOPE.value])
+        cmd_data.extend(b"\0")
+        cmd_data.extend(scope_key)
+
+        return await self.send(cmd_data, [EventType.OK, EventType.ERROR])

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/events.py

@@ -44,6 +44,8 @@ class EventType(Enum):
     PATH_RESPONSE = "path_response"
     PRIVATE_KEY = "private_key"
     DISABLED = "disabled"
+    CONTROL_DATA = "control_data"
+    DISCOVER_RESPONSE = "discover_response"
 
     # Command response types
     OK = "command_ok"

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/meshcore.py

@@ -165,6 +165,7 @@ class MeshCore:
         await self.dispatcher.start()
         result = await self.connection_manager.connect()
         if result is None:
+            await self.dispatcher.stop()
             raise ConnectionError("Failed to connect to device")
         return await self.commands.send_appstart()
 

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/packets.py

@@ -7,6 +7,10 @@ class BinaryReqType(Enum):
     MMA = 0x04
     ACL = 0x05
 
+class ControlType(Enum):
+    NODE_DISCOVER_REQ = 0x80
+    NODE_DISCOVER_RESP = 0x90
+
 # Packet prefixes for the protocol
 class PacketType(Enum):
     OK = 0
@@ -33,6 +37,9 @@ class PacketType(Enum):
     CUSTOM_VARS = 21
     BINARY_REQ = 50
     FACTORY_RESET = 51
+    PATH_DISCOVERY = 52
+    SET_FLOOD_SCOPE = 54
+    SEND_CONTROL_DATA = 55
 
     # Push notifications
     ADVERTISEMENT = 0x80
@@ -49,3 +56,4 @@ class PacketType(Enum):
     TELEMETRY_RESPONSE = 0x8B
     BINARY_RESPONSE = 0x8C
     PATH_DISCOVERY_RESPONSE = 0x8D
+    CONTROL_DATA = 0x8E

{meshcore-2.1.16 → meshcore-2.1.21}/src/meshcore/reader.py

@@ -1,9 +1,10 @@
 import logging
 import json
 import time
+import io
 from typing import Any, Dict
 from .events import Event, EventType, EventDispatcher
-from .packets import BinaryReqType, PacketType
+from .packets import BinaryReqType, PacketType, ControlType
 from .parsing import lpp_parse, lpp_parse_mma, parse_acl, parse_status
 from cayennelpp import LppFrame, LppData
 from meshcore.lpp_json_encoder import lpp_json_encoder
@@ -18,7 +19,7 @@ class MessageReader:
         # before events are dispatched
         self.contacts = {}  # Temporary storage during contact list building
         self.contact_nb = 0  # Used for contact processing
-        
+
         # Track pending binary requests by tag for proper response parsing
         self.pending_binary_requests: Dict[str, Dict[str, Any]] = {}  # tag -> {request_type, expires_at}
 
@@ -26,7 +27,7 @@ class MessageReader:
         """Register a pending binary request for proper response parsing"""
         # Clean up expired requests before adding new one
         self.cleanup_expired_requests()
-        
+
         expires_at = time.time() + timeout_seconds
         self.pending_binary_requests[tag] = {
             "request_type": request_type,
@@ -42,13 +43,14 @@ class MessageReader:
             tag for tag, info in self.pending_binary_requests.items()
             if current_time > info["expires_at"]
         ]
-        
+
         for tag in expired_tags:
             logger.debug(f"Cleaning up expired binary request: tag={tag}")
             del self.pending_binary_requests[tag]
-    
+
     async def handle_rx(self, data: bytearray):
-        packet_type_value = data[0]
+        dbuf = io.BytesIO(data)
+        packet_type_value = dbuf.read(1)[0]
         logger.debug(f"Received data: {data.hex()}")
 
         # Handle command responses
@@ -78,23 +80,24 @@ class MessageReader:
             or packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value
         ):
             c = {}
-            c["public_key"] = data[1:33].hex()
-            c["type"] = data[33]
-            c["flags"] = data[34]
-            c["out_path_len"] = int.from_bytes(data[35:36], signed=True, byteorder="little")
-            plen = int.from_bytes(data[35:36], signed=True, byteorder="little")
+            c["public_key"] = dbuf.read(32).hex()
+            c["type"] = dbuf.read(1)[0]
+            c["flags"] = dbuf.read(1)[0]
+            plen = int.from_bytes(dbuf.read(1), signed=True, byteorder="little")
+            c["out_path_len"] = plen
             if plen == -1:
                 plen = 0
-            c["out_path"] = data[36 : 36 + plen].hex()
-            c["adv_name"] = data[100:132].decode("utf-8", "ignore").replace("\0", "")
-            c["last_advert"] = int.from_bytes(data[132:136], byteorder="little")
+            path = dbuf.read(64)
+            c["out_path"] = path[0:plen].hex()
+            c["adv_name"] = dbuf.read(32).decode("utf-8", "ignore").replace("\0", "")
+            c["last_advert"] = int.from_bytes(dbuf.read(4), byteorder="little")
             c["adv_lat"] = (
-                int.from_bytes(data[136:140], byteorder="little", signed=True) / 1e6
+                int.from_bytes(dbuf.read(4), byteorder="little", signed=True) / 1e6
             )
             c["adv_lon"] = (
-                int.from_bytes(data[140:144], byteorder="little", signed=True) / 1e6
+                int.from_bytes(dbuf.read(4), byteorder="little", signed=True) / 1e6
             )
-            c["lastmod"] = int.from_bytes(data[144:148], byteorder="little")
+            c["lastmod"] = int.from_bytes(dbuf.read(4), byteorder="little")
 
             if packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value:
                 await self.dispatcher.dispatch(Event(EventType.NEW_CONTACT, c))
@@ -103,7 +106,7 @@ class MessageReader:
                 self.contacts[c["public_key"]] = c
 
         elif packet_type_value == PacketType.CONTACT_END.value:
-            lastmod = int.from_bytes(data[1:5], byteorder="little")
+            lastmod = int.from_bytes(dbuf.read(4), byteorder="little")
             attributes = {
                 "lastmod": lastmod,
             }
@@ -113,37 +116,39 @@ class MessageReader:
 
         elif packet_type_value == PacketType.SELF_INFO.value:
             self_info = {}
-            self_info["adv_type"] = data[1]
-            self_info["tx_power"] = data[2]
-            self_info["max_tx_power"] = data[3]
-            self_info["public_key"] = data[4:36].hex()
+            self_info["adv_type"] = dbuf.read(1)[0]
+            self_info["tx_power"] = dbuf.read(1)[0]
+            self_info["max_tx_power"] = dbuf.read(1)[0]
+            self_info["public_key"] = dbuf.read(32).hex()
             self_info["adv_lat"] = (
-                int.from_bytes(data[36:40], byteorder="little", signed=True) / 1e6
+                int.from_bytes(dbuf.read(4), byteorder="little", signed=True) / 1e6
             )
             self_info["adv_lon"] = (
-                int.from_bytes(data[40:44], byteorder="little", signed=True) / 1e6
+                int.from_bytes(dbuf.read(4), byteorder="little", signed=True) / 1e6
             )
-            self_info["adv_loc_policy"] = data[45]
-            self_info["telemetry_mode_env"] = (data[46] >> 4) & 0b11
-            self_info["telemetry_mode_loc"] = (data[46] >> 2) & 0b11
-            self_info["telemetry_mode_base"] = (data[46]) & 0b11
-            self_info["manual_add_contacts"] = data[47] > 0
+            self_info["multi_acks"] = dbuf.read(1)[0]
+            self_info["adv_loc_policy"] = dbuf.read(1)[0]
+            telemetry_mode = dbuf.read(1)[0]
+            self_info["telemetry_mode_env"] = (telemetry_mode >> 4) & 0b11
+            self_info["telemetry_mode_loc"] = (telemetry_mode >> 2) & 0b11
+            self_info["telemetry_mode_base"] = (telemetry_mode) & 0b11
+            self_info["manual_add_contacts"] = dbuf.read(1)[0] > 0
             self_info["radio_freq"] = (
-                int.from_bytes(data[48:52], byteorder="little") / 1000
+                int.from_bytes(dbuf.read(4), byteorder="little") / 1000
             )
             self_info["radio_bw"] = (
-                int.from_bytes(data[52:56], byteorder="little") / 1000
+                int.from_bytes(dbuf.read(4), byteorder="little") / 1000
             )
-            self_info["radio_sf"] = data[56]
-            self_info["radio_cr"] = data[57]
-            self_info["name"] = data[58:].decode("utf-8", "ignore")
+            self_info["radio_sf"] = dbuf.read(1)[0]
+            self_info["radio_cr"] = dbuf.read(1)[0]
+            self_info["name"] = dbuf.read().decode("utf-8", "ignore")
             await self.dispatcher.dispatch(Event(EventType.SELF_INFO, self_info))
 
         elif packet_type_value == PacketType.MSG_SENT.value:
             res = {}
-            res["type"] = data[1]
-            res["expected_ack"] = bytes(data[2:6])
-            res["suggested_timeout"] = int.from_bytes(data[6:10], byteorder="little")
+            res["type"] = dbuf.read(1)[0]
+            res["expected_ack"] = dbuf.read(4)
+            res["suggested_timeout"] = int.from_bytes(dbuf.read(4), byteorder="little")
 
             attributes = {
                 "type": res["type"],
@@ -155,15 +160,14 @@ class MessageReader:
         elif packet_type_value == PacketType.CONTACT_MSG_RECV.value:
             res = {}
             res["type"] = "PRIV"
-            res["pubkey_prefix"] = data[1:7].hex()
-            res["path_len"] = data[7]
-            res["txt_type"] = data[8]
-            res["sender_timestamp"] = int.from_bytes(data[9:13], byteorder="little")
-            if data[8] == 2:
-                res["signature"] = data[13:17].hex()
-                res["text"] = data[17:].decode("utf-8", "ignore")
-            else:
-                res["text"] = data[13:].decode("utf-8", "ignore")
+            res["pubkey_prefix"] = dbuf.read(6).hex()
+            res["path_len"] = dbuf.read(1)[0]
+            txt_type = dbuf.read(1)[0]
+            res["txt_type"] = txt_type
+            res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little")
+            if txt_type == 2:
+                res["signature"] = dbuf.read(4).hex()
+            res["text"] = dbuf.read().decode("utf-8", "ignore")
 
             attributes = {
                 "pubkey_prefix": res["pubkey_prefix"],
@@ -177,16 +181,16 @@ class MessageReader:
         elif packet_type_value == 16:  # A reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
             res = {}
             res["type"] = "PRIV"
-            res["SNR"] = int.from_bytes(data[1:2], byteorder="little", signed=True) / 4
-            res["pubkey_prefix"] = data[4:10].hex()
-            res["path_len"] = data[10]
-            res["txt_type"] = data[11]
-            res["sender_timestamp"] = int.from_bytes(data[12:16], byteorder="little")
-            if data[11] == 2:
-                res["signature"] = data[16:20].hex()
-                res["text"] = data[20:].decode("utf-8", "ignore")
-            else:
-                res["text"] = data[16:].decode("utf-8", "ignore")
+            res["SNR"] = int.from_bytes(dbuf.read(2), byteorder="little", signed=True) / 4
+            dbuf.read(1) # reserved
+            res["pubkey_prefix"] = dbuf.read(6).hex()
+            res["path_len"] = dbuf.read(1)[0]
+            txt_type = dbuf.read(1)[0]
+            res["txt_type"] = txt_type
+            res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little")
+            if txt_type == 2:
+                res["signature"] = dbuf.read(4).hex()
+            res["text"] = dbuf.read().decode("utf-8", "ignore")
 
             attributes = {
                 "pubkey_prefix": res["pubkey_prefix"],
@@ -200,11 +204,11 @@ class MessageReader:
         elif packet_type_value == PacketType.CHANNEL_MSG_RECV.value:
             res = {}
             res["type"] = "CHAN"
-            res["channel_idx"] = data[1]
-            res["path_len"] = data[2]
-            res["txt_type"] = data[3]
-            res["sender_timestamp"] = int.from_bytes(data[4:8], byteorder="little")
-            res["text"] = data[8:].decode("utf-8", "ignore")
+            res["channel_idx"] = dbuf.read(1)[0]
+            res["path_len"] = dbuf.read(1)[0]
+            res["txt_type"] = dbuf.read(1)[0]
+            res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little")
+            res["text"] = dbuf.read().decode("utf-8", "ignore")
 
             attributes = {
                 "channel_idx": res["channel_idx"],
@@ -218,12 +222,13 @@ class MessageReader:
         elif packet_type_value == 17:  # A reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
             res = {}
             res["type"] = "CHAN"
-            res["SNR"] = int.from_bytes(data[1:2], byteorder="little", signed=True) / 4
-            res["channel_idx"] = data[4]
-            res["path_len"] = data[5]
-            res["txt_type"] = data[6]
-            res["sender_timestamp"] = int.from_bytes(data[7:11], byteorder="little")
-            res["text"] = data[11:].decode("utf-8", "ignore")
+            res["SNR"] = int.from_bytes(dbuf.read(2), byteorder="little", signed=True) / 4
+            dbuf.read(1) # reserved
+            res["channel_idx"] = dbuf.read(1)[0]
+            res["path_len"] = dbuf.read(1)[0]
+            res["txt_type"] = dbuf.read(1)[0]
+            res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little")
+            res["text"] = dbuf.read().decode("utf-8", "ignore")
 
             attributes = {
                 "channel_idx": res["channel_idx"],
@@ -235,7 +240,7 @@ class MessageReader:
             )
 
         elif packet_type_value == PacketType.CURRENT_TIME.value:
-            time_value = int.from_bytes(data[1:5], byteorder="little")
+            time_value = int.from_bytes(dbuf.read(4), byteorder="little")
             result = {"time": time_value}
             await self.dispatcher.dispatch(Event(EventType.CURRENT_TIME, result))
 
@@ -244,34 +249,34 @@ class MessageReader:
             await self.dispatcher.dispatch(Event(EventType.NO_MORE_MSGS, result))
 
         elif packet_type_value == PacketType.CONTACT_URI.value:
-            contact_uri = "meshcore://" + data[1:].hex()
+            contact_uri = "meshcore://" + dbuf.read().hex()
             result = {"uri": contact_uri}
             await self.dispatcher.dispatch(Event(EventType.CONTACT_URI, result))
 
         elif packet_type_value == PacketType.BATTERY.value:
-            battery_level = int.from_bytes(data[1:3], byteorder="little")
+            battery_level = int.from_bytes(dbuf.read(2), byteorder="little")
             result = {"level": battery_level}
             if len(data) > 3:  # has storage info as well
-                result["used_kb"] = int.from_bytes(data[3:7], byteorder="little")
-                result["total_kb"] = int.from_bytes(data[7:11], byteorder="little")
+                result["used_kb"] = int.from_bytes(dbuf.read(4), byteorder="little")
+                result["total_kb"] = int.from_bytes(dbuf.read(4), byteorder="little")
             await self.dispatcher.dispatch(Event(EventType.BATTERY, result))
 
         elif packet_type_value == PacketType.DEVICE_INFO.value:
             res = {}
-            res["fw ver"] = data[1]
+            res["fw ver"] = dbuf.read(1)[0]
             if data[1] >= 3:
-                res["max_contacts"] = data[2] * 2
-                res["max_channels"] = data[3]
-                res["ble_pin"] = int.from_bytes(data[4:8], byteorder="little")
-                res["fw_build"] = data[8:20].decode("utf-8", "ignore").replace("\0", "")
-                res["model"] = data[20:60].decode("utf-8", "ignore").replace("\0", "")
-                res["ver"] = data[60:80].decode("utf-8", "ignore").replace("\0", "")
+                res["max_contacts"] = dbuf.read(1)[0] * 2
+                res["max_channels"] = dbuf.read(1)[0]
+                res["ble_pin"] = int.from_bytes(dbuf.read(4), byteorder="little")
+                res["fw_build"] = dbuf.read(12).decode("utf-8", "ignore").replace("\0", "")
+                res["model"] = dbuf.read(40).decode("utf-8", "ignore").replace("\0", "")
+                res["ver"] = dbuf.read(20).decode("utf-8", "ignore").replace("\0", "")
             await self.dispatcher.dispatch(Event(EventType.DEVICE_INFO, res))
 
         elif packet_type_value == PacketType.CUSTOM_VARS.value:
             logger.debug(f"received custom vars response: {data.hex()}")
             res = {}
-            rawdata = data[1:].decode("utf-8", "ignore")
+            rawdata = dbuf.read().decode("utf-8", "ignore")
             if not rawdata == "":
                 pairs = rawdata.split(",")
                 for p in pairs:
@@ -283,30 +288,30 @@ class MessageReader:
         elif packet_type_value == PacketType.CHANNEL_INFO.value:
             logger.debug(f"received channel info response: {data.hex()}")
             res = {}
-            res["channel_idx"] = data[1]
+            res["channel_idx"] = dbuf.read(1)[0]
 
             # Channel name is null-terminated, so find the first null byte
-            name_bytes = data[2:34]
+            name_bytes = dbuf.read(32)
             null_pos = name_bytes.find(0)
             if null_pos >= 0:
                 res["channel_name"] = name_bytes[:null_pos].decode("utf-8", "ignore")
             else:
                 res["channel_name"] = name_bytes.decode("utf-8", "ignore")
 
-            res["channel_secret"] = data[34:50]
+            res["channel_secret"] = dbuf.read(16)
             await self.dispatcher.dispatch(Event(EventType.CHANNEL_INFO, res, res))
 
         # Push notifications
         elif packet_type_value == PacketType.ADVERTISEMENT.value:
             logger.debug("Advertisement received")
             res = {}
-            res["public_key"] = data[1:33].hex()
+            res["public_key"] = dbuf.read(32).hex()
             await self.dispatcher.dispatch(Event(EventType.ADVERTISEMENT, res, res))
 
         elif packet_type_value == PacketType.PATH_UPDATE.value:
             logger.debug("Code path update")
             res = {}
-            res["public_key"] = data[1:33].hex()
+            res["public_key"] = dbuf.read(32).hex()
             await self.dispatcher.dispatch(Event(EventType.PATH_UPDATE, res, res))
 
         elif packet_type_value == PacketType.ACK.value:
@@ -314,7 +319,7 @@ class MessageReader:
             ack_data = {}
 
             if len(data) >= 5:
-                ack_data["code"] = bytes(data[1:5]).hex()
+                ack_data["code"] = dbuf.read(4).hex()
 
             attributes = {"code": ack_data.get("code", "")}
 
@@ -326,23 +331,24 @@ class MessageReader:
 
         elif packet_type_value == PacketType.RAW_DATA.value:
             res = {}
-            res["SNR"] = data[1] / 4
-            res["RSSI"] = data[2]
-            res["payload"] = data[4:].hex()
+            res["SNR"] = int.from_bytes(dbuf.read(1), byteorder="little", signed=True) / 4
+            res["RSSI"] = int.from_bytes(dbuf.read(1), byteorder="little", signed=True)
+            res["payload"] = dbuf.read(4).hex()
             logger.debug("Received raw data")
             print(res)
             await self.dispatcher.dispatch(Event(EventType.RAW_DATA, res))
 
         elif packet_type_value == PacketType.LOGIN_SUCCESS.value:
             res = {}
+            attributes = {}
             if len(data) > 1:
-                res["permissions"] = data[1]
-                res["is_admin"] = (data[1] & 1) == 1  # Check if admin bit is set
+                perms = dbuf.read(1)[0]
+                res["permissions"] = perms
+                res["is_admin"] = (perms & 1) == 1  # Check if admin bit is set
 
-            if len(data) > 7:
-                res["pubkey_prefix"] = data[2:8].hex()
+                res["pubkey_prefix"] = dbuf.read(6).hex()
 
-            attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
+                attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
 
             await self.dispatcher.dispatch(
                 Event(EventType.LOGIN_SUCCESS, res, attributes)
@@ -350,11 +356,14 @@ class MessageReader:
 
         elif packet_type_value == PacketType.LOGIN_FAILED.value:
             res = {}
+            attributes = {}
+
+            pbuf.read(1)
 
             if len(data) > 7:
-                res["pubkey_prefix"] = data[2:8].hex()
+                res["pubkey_prefix"] = pbuf.read(6).hex()
 
-            attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
+                attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
 
             await self.dispatcher.dispatch(
                 Event(EventType.LOGIN_FAILED, res, attributes)
@@ -368,12 +377,7 @@ class MessageReader:
             attributes = {
                 "pubkey_prefix": res["pubkey_pre"],
             }
-            data_hex = data[8:].hex()
-            logger.debug(f"Status response: {data_hex}")
 
-            attributes = {
-                "pubkey_prefix": res["pubkey_pre"],
-            }
             await self.dispatcher.dispatch(
                 Event(EventType.STATUS_RESPONSE, res, attributes)
             )
@@ -386,22 +390,23 @@ class MessageReader:
 
             # First byte is SNR (signed byte, multiplied by 4)
             if len(data) > 1:
-                snr_byte = data[1]
+                snr_byte = dbuf.read(1)[0]
                 # Convert to signed value
                 snr = (snr_byte if snr_byte < 128 else snr_byte - 256) / 4.0
                 log_data["snr"] = snr
 
             # Second byte is RSSI (signed byte)
             if len(data) > 2:
-                rssi_byte = data[2]
+                rssi_byte = dbuf.read(1)[0]
                 # Convert to signed value
                 rssi = rssi_byte if rssi_byte < 128 else rssi_byte - 256
                 log_data["rssi"] = rssi
 
             # Remaining bytes are the raw data payload
             if len(data) > 3:
-                log_data["payload"] = data[3:].hex()
-                log_data["payload_length"] = len(data) - 3
+                payload=dbuf.read()
+                log_data["payload"] = payload.hex()
+                log_data["payload_length"] = len(payload)
 
             attributes = {
                 "pubkey_prefix": log_data["raw_hex"],
@@ -470,8 +475,10 @@ class MessageReader:
             logger.debug(f"Received telemetry data: {data.hex()}")
             res = {}
 
-            res["pubkey_pre"] = data[2:8].hex()
-            buf = data[8:]
+            dbuf.read(1)
+
+            res["pubkey_pre"] = dbuf.read(6).hex()
+            buf = dbuf.read()
 
             """Parse a given byte string and return as a LppFrame object."""
             i = 0
@@ -498,29 +505,30 @@ class MessageReader:
 
         elif packet_type_value == PacketType.BINARY_RESPONSE.value:
             logger.debug(f"Received binary data: {data.hex()}")
-            tag = data[2:6].hex()
-            response_data = data[6:]
-            
+            dbuf.read(1)
+            tag = dbuf.read(4).hex()
+            response_data = dbuf.read()
+
             # Always dispatch generic BINARY_RESPONSE
             binary_res = {"tag": tag, "data": response_data.hex()}
             await self.dispatcher.dispatch(
                 Event(EventType.BINARY_RESPONSE, binary_res, {"tag": tag})
             )
-            
+
             # Check for tracked request type and dispatch specific response
             if tag in self.pending_binary_requests:
                 request_type = self.pending_binary_requests[tag]["request_type"]
                 pubkey_prefix = self.pending_binary_requests[tag]["pubkey_prefix"]
                 del self.pending_binary_requests[tag]
                 logger.debug(f"Processing binary response for tag {tag}, type {request_type}, pubkey_prefix {pubkey_prefix}")
-                
+
                 if request_type == BinaryReqType.STATUS and len(response_data) >= 52:
                     res = {}
                     res = parse_status(response_data, pubkey_prefix=pubkey_prefix)
                     await self.dispatcher.dispatch(
                         Event(EventType.STATUS_RESPONSE, res, {"pubkey_prefix": res["pubkey_pre"], "tag": tag})
                     )
-                
+
                 elif request_type == BinaryReqType.TELEMETRY:
                     try:
                         lpp = lpp_parse(response_data)
@@ -530,7 +538,7 @@ class MessageReader:
                         )
                     except Exception as e:
                         logger.error(f"Error parsing binary telemetry response: {e}")
-                
+
                 elif request_type == BinaryReqType.MMA:
                     try:
                         mma_result = lpp_parse_mma(response_data[4:])  # Skip 4-byte header
@@ -540,7 +548,7 @@ class MessageReader:
                         )
                     except Exception as e:
                         logger.error(f"Error parsing binary MMA response: {e}")
-                
+
                 elif request_type == BinaryReqType.ACL:
                     try:
                         acl_result = parse_acl(response_data)
@@ -556,13 +564,14 @@ class MessageReader:
         elif packet_type_value == PacketType.PATH_DISCOVERY_RESPONSE.value:
             logger.debug(f"Received path discovery response: {data.hex()}")
             res = {}
-            res["pubkey_pre"] = data[2:8].hex()
-            opl = data[8]
+            dbuf.read(1)
+            res["pubkey_pre"] = dbuf.read(6).hex()
+            opl = dbuf.read(1)[0]
             res["out_path_len"] = opl
-            res["out_path"] = data[9 : 9 + opl].hex()
-            ipl = data[9 + opl]
+            res["out_path"] = dbuf.read(opl).hex()
+            ipl = dbuf.read(1)[0]
             res["in_path_len"] = ipl
-            res["in_path"] = data[10 + opl : 10 + opl + ipl].hex()
+            res["in_path"] = dbuf.read(ipl).hex()
 
             attributes = {"pubkey_pre": res["pubkey_pre"]}
 
@@ -573,7 +582,7 @@ class MessageReader:
         elif packet_type_value == PacketType.PRIVATE_KEY.value:
             logger.debug(f"Received private key response: {data.hex()}")
             if len(data) >= 65:  # 1 byte response code + 64 bytes private key
-                private_key = data[1:65]  # Extract 64-byte private key
+                private_key = dbuf.read(64)  # Extract 64-byte private key
                 res = {"private_key": private_key}
                 await self.dispatcher.dispatch(Event(EventType.PRIVATE_KEY, res))
             else:
@@ -584,6 +593,43 @@ class MessageReader:
             res = {"reason": "private_key_export_disabled"}
             await self.dispatcher.dispatch(Event(EventType.DISABLED, res))
 
+        elif packet_type_value == PacketType.CONTROL_DATA.value:
+            logger.debug("Received control data packet")
+            res={}
+            res["SNR"] = int.from_bytes(dbuf.read(1), byteorder="little", signed=True) / 4
+            res["RSSI"] = int.from_bytes(dbuf.read(1), byteorder="little", signed=True)
+            res["path_len"] = dbuf.read(1)[0]
+            payload = dbuf.read()
+            payload_type = payload[0]
+            res["payload_type"] = payload_type
+            res["payload"] = payload
+
+            attributes = {"payload_type": payload_type}
+            await self.dispatcher.dispatch(
+                Event(EventType.CONTROL_DATA, res, attributes)
+            )
+
+            # decode NODE_DISCOVER_RESP
+            if payload_type & 0xF0 == ControlType.NODE_DISCOVER_RESP.value:
+                pbuf = io.BytesIO(payload[1:])
+                ndr = dict(res)
+                del ndr["payload_type"]
+                del ndr["payload"]
+                ndr["node_type"] = payload_type & 0x0F
+                ndr["SNR_in"] = int.from_bytes(pbuf.read(1), byteorder="little", signed=True)/4
+                ndr["tag"] = pbuf.read(4).hex()
+                ndr["pubkey"] = pbuf.read(32).hex()
+
+                attributes = {
+                    "node_type" : ndr["node_type"],
+                    "tag" : ndr["tag"],
+                    "pubkey" : ndr["pubkey"],
+                }
+
+                await self.dispatcher.dispatch(
+                    Event(EventType.DISCOVER_RESPONSE, ndr, attributes)
+                )
+
         else:
             logger.debug(f"Unhandled data received {data}")
             logger.debug(f"Unhandled packet type: {packet_type_value}")