meshcore 2.2.25__tar.gz → 2.2.27__tar.gz

{meshcore-2.2.25 → meshcore-2.2.27}/PKG-INFO

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

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

{meshcore-2.2.25 → meshcore-2.2.27}/src/meshcore/commands/contact.py

@@ -182,3 +182,9 @@ class ContactCommands(CommandHandlerBase):
     async def get_autoadd_config(self) -> Event:
         data = b"\x3B"
         return await self.send(data, [EventType.AUTOADD_CONFIG, EventType.ERROR])
+
+    async def get_advert_path(self, key: DestinationType) -> Event:
+        key_bytes = _validate_destination(key, prefix_length=32)
+        logger.debug(f"getting advert path for: {key} {key_bytes.hex()}")
+        data = b"\x2a\0" + key_bytes
+        return await self.send(data, [EventType.ADVERT_PATH, EventType.ERROR])

{meshcore-2.2.25 → meshcore-2.2.27}/src/meshcore/events.py

@@ -23,6 +23,7 @@ class EventType(Enum):
     NEW_CONTACT = "new_contact"
     NEXT_CONTACT = "next_contact"
     AUTOADD_CONFIG = "autoadd_config"
+    ADVERT_PATH = "advert_path"
 
     # Push notifications
     ADVERTISEMENT = "advertisement"
@@ -63,6 +64,15 @@ class EventType(Enum):
     CONNECTED = "connected"
     DISCONNECTED = "disconnected"
 
+# a dict to associate a message to an error code
+ErrorMessages = {
+    1: "ERR_CODE_UNSUPPORTED_CMD",
+    2: "ERR_CODE_NOT_FOUND",
+    3: "ERR_CODE_TABLE_FULL",
+    4: "ERR_CODE_BAD_STATE",
+    5: "ERR_CODE_FILE_IO_ERROR",
+    6: "ERR_CODE_ILLEGAL_ARG",
+}
 
 @dataclass
 class Event:

{meshcore-2.2.25 → meshcore-2.2.27}/src/meshcore/packets.py

@@ -97,6 +97,8 @@ class PacketType(Enum):
     SIGN_START = 19
     SIGNATURE = 20
     CUSTOM_VARS = 21
+    ADVERT_PATH = 22
+    TUNING_PARAMS = 23
     STATS = 24
     AUTOADD_CONFIG = 25
     ALLOWED_REPEAT_FREQ = 26

{meshcore-2.2.25 → meshcore-2.2.27}/src/meshcore/reader.py

@@ -4,7 +4,7 @@ import struct
 import time
 import io
 from typing import Any, Dict
-from .events import Event, EventType, EventDispatcher
+from .events import Event, EventType, EventDispatcher, ErrorMessages
 from .packets import BinaryReqType, PacketType, ControlType
 from .parsing import lpp_parse, lpp_parse_mma, parse_acl, parse_status
 from cayennelpp import LppFrame, LppData
@@ -80,7 +80,10 @@ class MessageReader:
 
         elif packet_type_value == PacketType.ERROR.value:
             if len(data) > 1:
-                result = {"error_code": data[1]}
+                result = {
+                    "error_code": data[1],
+                    "code_string": ErrorMessages[data[1]],
+                }
             else:
                 result = {}
 
@@ -123,6 +126,20 @@ class MessageReader:
                 await self.dispatcher.dispatch(Event(EventType.NEXT_CONTACT, c))
                 self.contacts[c["public_key"]] = c
 
+        elif packet_type_value == PacketType.ADVERT_PATH.value :
+            r = {}
+            r["timestamp"] = int.from_bytes(dbuf.read(4), "little", signed=False)
+            plen = int.from_bytes(dbuf.read(1), "little", signed=False)
+            if plen == 255: # flood, should not happen
+                r["path_hash_mode"] = -1
+                r["path_len"] = -1
+            else:
+                r["path_hash_mode"] = plen >> 6 # 2 upper bytes
+                r["path_len"] = plen & 0x3F
+            r["path"] = dbuf.read().replace(b"\0", b"").hex()
+
+            await self.dispatcher.dispatch(Event(EventType.ADVERT_PATH, r))
+
         elif packet_type_value == PacketType.CONTACT_END.value:
             lastmod = int.from_bytes(dbuf.read(4), byteorder="little")
             attributes = {