meshcore-cli 1.2.1__tar.gz → 1.2.5__tar.gz

{meshcore_cli-1.2.1 → meshcore_cli-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.2.1
+Version: 1.2.5
 Summary: Command line interface to meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore-cli
 Project-URL: Issues, https://github.com/fdlamotte/meshcore-cli/issues
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Requires-Dist: meshcore>=2.1.19
 Requires-Dist: prompt-toolkit>=3.0.50
+Requires-Dist: pycryptodome
 Requires-Dist: requests>=2.28.0
 Description-Content-Type: text/markdown
 

{meshcore_cli-1.2.1 → meshcore_cli-1.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.2.1"
+version = "1.2.5"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 2.1.19", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
+dependencies = [ "meshcore >= 2.1.19", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0", "pycryptodome" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-1.2.1 → meshcore_cli-1.2.5}/src/meshcore_cli/meshcore_cli.py

@@ -24,13 +24,16 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import radiolist_dialog
 from prompt_toolkit.completion.word_completer import WordCompleter
 from prompt_toolkit.document import Document
+from hashlib import sha256
+from Crypto.Cipher import AES
+from Crypto.Hash import HMAC, SHA256
 
 import re
 
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.2.1"
+VERSION = "v1.2.5"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -52,6 +55,7 @@ ANSI_INVERT = "\033[7m"
 ANSI_NORMAL = "\033[27m"
 ANSI_GREEN = "\033[0;32m"
 ANSI_BGREEN = "\033[1;32m"
+ANSI_DGREEN="\033[0;38;5;22m"
 ANSI_BLUE = "\033[0;34m"
 ANSI_BBLUE = "\033[1;34m"
 ANSI_RED = "\033[0;31m"
@@ -193,6 +197,60 @@ process_event_message.print_snr=False
 process_event_message.color=True
 process_event_message.last_node=None
 
+async def handle_log_rx(event):
+    mc = handle_log_rx.mc
+    if handle_log_rx.json_log_rx: # json mode ... raw dump
+        msg = json.dumps(event.payload)
+        if handle_message.above:
+            print_above(msg)
+        else :
+            print(msg)
+        return
+
+    pkt = bytes().fromhex(event.payload["payload"])
+
+    if handle_log_rx.channel_echoes:
+        if pkt[0] == 0x15: 
+            chan_name = ""
+            path_len = pkt[1]
+            path = pkt[2:path_len+2].hex()
+            chan_hash = pkt[path_len+2:path_len+3].hex()
+            cipher_mac = pkt[path_len+3:path_len+5]
+            msg = pkt[path_len+5:]
+            channel = None
+            for c in await get_channels(mc):
+                if c["channel_hash"] == chan_hash : # validate against MAC
+                    h = HMAC.new(bytes.fromhex(c["channel_secret"]), digestmod=SHA256)
+                    h.update(msg)
+                    if h.digest()[0:2] == cipher_mac:
+                        channel = c
+                        break
+
+            if channel is None :
+                if handle_log_rx.echo_unk_chans:
+                    chan_name = chan_hash
+                    message = msg.hex()
+            else:
+                chan_name = channel["channel_name"]
+                aes_key = bytes.fromhex(channel["channel_secret"])
+                cipher = AES.new(aes_key, AES.MODE_ECB)
+                message = cipher.decrypt(msg)[5:].decode("utf-8").strip("\x00")
+            
+            if chan_name != "" :
+                width = os.get_terminal_size().columns
+                cars = width - 13 - 2 * path_len - len(chan_name) - 1
+                dispmsg = message[0:cars]
+                txt = f"{ANSI_LIGHT_GRAY}{chan_name} {ANSI_DGREEN}{dispmsg+(cars-len(dispmsg))*' '} {ANSI_YELLOW}[{path}]{ANSI_LIGHT_GRAY}{event.payload['snr']:6,.2f}{event.payload['rssi']:4}{ANSI_END}"
+                if handle_message.above:
+                    print_above(txt)
+                else:
+                    print(txt)
+            
+handle_log_rx.json_log_rx = False
+handle_log_rx.channel_echoes = False
+handle_log_rx.mc = None
+handle_log_rx.echo_unk_chans=False
+
 async def handle_advert(event):
     if not handle_advert.print_adverts:
         return
@@ -320,7 +378,7 @@ class MyNestedCompleter(NestedCompleter):
                 opts = self.options.keys()
             completer = WordCompleter(
                 opts, ignore_case=self.ignore_case,
-                pattern=re.compile(r"([a-zA-Z0-9_\\/]+|[^a-zA-Z0-9_\s]+)"))
+                pattern=re.compile(r"([a-zA-Z0-9_\\/\#]+|[^a-zA-Z0-9_\s\#]+)"))
             yield from completer.get_completions(document, complete_event)
         else: # normal behavior for remainder
             yield from super().get_completions(document, complete_event)
@@ -341,6 +399,10 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
     for c in it :
         contact_list[c[1]['adv_name']] = None
 
+    pit = iter(pending.items())
+    for c in pit :
+        pending_list[c[1]['adv_name']] = None
+
     pit = iter(pending.items())
     for c in pit :
         pending_list[c[1]['public_key']] = None
@@ -417,6 +479,9 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "color" : {"on":None, "off":None},
             "print_name" : {"on":None, "off":None},
             "print_adverts" : {"on":None, "off":None},
+            "json_log_rx" : {"on":None, "off":None},
+            "channel_echoes" : {"on":None, "off":None},
+            "echo_unk_chans" : {"on":None, "off":None},
             "print_new_contacts" : {"on": None, "off":None},
             "print_path_updates" : {"on":None,"off":None},
             "classic_prompt" : {"on" : None, "off":None},
@@ -444,6 +509,9 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "color":None,
             "print_name":None,
             "print_adverts":None,
+            "json_log_rx":None,
+            "channel_echoes":None,
+            "echo_unk_chans":None,
             "print_path_updates":None,
             "print_new_contacts":None,
             "classic_prompt":None,
@@ -604,6 +672,14 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
 
     completion_list.update(slash_contacts_completion_list)
 
+    slash_chan_completion_list = {}
+    if not channels is None:
+        for c in channels :
+            if c["channel_name"] != "":
+                slash_chan_completion_list["/" + c["channel_name"]] = None
+
+    completion_list.update(slash_chan_completion_list)
+
     completion_list.update({
         "script" : None,
         "quit" : None
@@ -675,7 +751,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 if classic :
                     prompt = prompt + " > "
                 else :
-                    prompt = prompt + "🭨"
+                    prompt = prompt + f"{ANSI_NORMAL}🭬{ANSI_INVERT}"
 
             if not contact is None :
                 if not last_ack:
@@ -696,7 +772,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                     prompt = prompt + f"{ANSI_INVERT}"
 
                 if print_name and not classic :
-                    prompt = prompt + "🭬"
+                    prompt = prompt + f"{ANSI_NORMAL}🭨{ANSI_INVERT}"
 
                 prompt = prompt + f"{contact['adv_name']}"
                 if classic :
@@ -728,14 +804,31 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 
             # raw meshcli command as on command line
             elif line.startswith("$") :
-                args = shlex.split(line[1:])
-                await process_cmds(mc, args)
+                try :
+                    args = shlex.split(line[1:])
+                    await process_cmds(mc, args)
+                except ValueError:
+                    logger.error("Error parsing line {line[1:]}")
 
             elif line.startswith("/") :
                 path = line.split(" ", 1)[0]
                 if path.count("/") == 1:
-                    args = shlex.split(line[1:])
-                    await process_cmds(mc, args)
+                    args = line[1:].split(" ")
+                    tct = mc.get_contact_by_name(args[0])
+                    if len(args)>1 and not tct is None: # a contact, send a message
+                        if tct["type"] == 1 or tct["type"] == 3: # client or room
+                            last_ack = await msg_ack(mc, tct, line.split(" ", 1)[1])
+                        else:
+                            print("Can only send msg to chan, client or room")
+                    else :
+                        ch = await get_channel_by_name(mc, args[0])
+                        if len(args)>1 and not ch is None: # a channel, send message
+                            await send_chan_msg(mc, ch["channel_idx"], line.split(" ", 1)[1])
+                        else :
+                            try :
+                                await process_cmds(mc, shlex.split(line[1:]))
+                            except ValueError:
+                                logger.error(f"Error processing line{line[1:]}")
                 else:
                     cmdline = line[1:].split("/",1)[1]
                     contact_name = path[1:].split("/",1)[0]
@@ -744,10 +837,11 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                         print(f"{contact_name} is not a contact")
                     else:
                         if not await process_contact_chat_line(mc, tct, cmdline):
-                            if tct["type"] == 1:
-                                last_ack = await msg_ack(mc, tct, cmdline)
-                            else :
-                                await process_cmds(mc, ["cmd", tct["adv_name"], cmdline])
+                            if cmdline != "":
+                                if tct["type"] == 1:
+                                    last_ack = await msg_ack(mc, tct, cmdline)
+                                else :
+                                    await process_cmds(mc, ["cmd", tct["adv_name"], cmdline])
 
             elif line.startswith("to ") : # dest
                 dest = line[3:]
@@ -805,7 +899,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 if ln is None :
                     print("No received msg yet !")
                 elif ln["type"] == 0 :
-                    await process_cmds(mc, ["chan", str(contact["chan_nb"]), line]  )
+                    await send_chan_msg(mc, ln["chan_nb"], line[1:])
                 else :
                     last_ack = await msg_ack(mc, ln, line[1:])
                     if last_ack == False :
@@ -813,8 +907,11 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 
             # commands are passed through if at root
             elif contact is None or line.startswith(".") :
-                args = shlex.split(line)
-                await process_cmds(mc, args)
+                try:
+                    args = shlex.split(line)
+                    await process_cmds(mc, args)
+                except ValueError:
+                    logger.error(f"Error processing {line}")
 
             elif await process_contact_chat_line(mc, contact, line):
                 pass
@@ -837,7 +934,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 last_ack = await msg_ack(mc, contact, line)
 
             elif contact["type"] == 0 : # channel, send msg to channel
-                await process_cmds(mc, ["chan", str(contact["chan_nb"]), line]  )
+                await send_chan_msg(mc, contact["chan_nb"], line)
 
             elif contact["type"] == 1 : # chat, send to recipient and wait ack
                 last_ack = await msg_ack(mc, contact, line)
@@ -970,7 +1067,18 @@ async def process_contact_chat_line(mc, contact, line):
         password_file = ""
         password = ""
         if os.path.isdir(MCCLI_CONFIG_DIR) :
+            # if a password file exists with node name open it and destroy it
             password_file = MCCLI_CONFIG_DIR + contact['adv_name'] + ".pass"
+            if os.path.exists(password_file) :
+                with open(password_file, "r", encoding="utf-8") as f :
+                    password=f.readline().strip()
+                os.remove(password_file)
+                password_file = MCCLI_CONFIG_DIR + contact["public_key"] + ".pass"
+                with open(password_file, "w", encoding="utf-8") as f :
+                    f.write(password)
+
+            # this is the new correct password file, using pubkey
+            password_file = MCCLI_CONFIG_DIR + contact["public_key"] + ".pass"
             if os.path.exists(password_file) :
                 with open(password_file, "r", encoding="utf-8") as f :
                     password=f.readline().strip()
@@ -993,6 +1101,9 @@ async def process_contact_chat_line(mc, contact, line):
 
     if line.startswith("forget_password") or line.startswith("fp"):
         password_file = MCCLI_CONFIG_DIR + contact['adv_name'] + ".pass"
+        if os.path.exists(password_file):
+            os.remove(password_file)
+        password_file = MCCLI_CONFIG_DIR + contact['public_key'] + ".pass"
         if os.path.exists(password_file):
             os.remove(password_file)
         try:
@@ -1112,6 +1223,7 @@ async def set_channel (mc, chan, name, key=None):
         return None
 
     info = res.payload
+    info["channel_hash"] = sha256(info["channel_secret"]).digest()[0:1].hex()
     info["channel_secret"] = info["channel_secret"].hex()
 
     if hasattr(mc,'channels') :
@@ -1200,12 +1312,14 @@ async def get_channels (mc, anim=False) :
         if res.type == EventType.ERROR:
             break
         info = res.payload
+        info["channel_hash"] = sha256(info["channel_secret"]).digest()[0:1].hex()
         info["channel_secret"] = info["channel_secret"].hex()
         mc.channels.append(info)
         ch = ch + 1
         if anim:
             print(".", end="", flush=True)
-    print (" Done")
+    if anim:
+        print (" Done")
     return mc.channels
 
 async def print_trace_to (mc, contact):
@@ -1411,6 +1525,18 @@ async def next_cmd(mc, cmds, json_output=False):
                         process_event_message.print_snr = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
+                    case "json_log_rx" :
+                        handle_log_rx.json_log_rx = (cmds[2] == "on")
+                        if json_output :
+                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
+                    case "channel_echoes" :
+                        handle_log_rx.channel_echoes = (cmds[2] == "on")
+                        if json_output :
+                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
+                    case "echo_unk_chans" :
+                        handle_log_rx.echo_unk_chans = (cmds[2] == "on")
+                        if json_output :
+                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
                     case "print_adverts" :
                         handle_advert.print_adverts = (cmds[2] == "on")
                         if json_output :
@@ -1641,6 +1767,21 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"color" : process_event_message.color}))
                         else:
                             print(f"{'on' if process_event_message.color else 'off'}")
+                    case "json_log_rx":
+                        if json_output :
+                            print(json.dumps({"json_log_rx" : handle_log_rx.json_log_rx}))
+                        else:
+                            print(f"{'on' if handle_log_rx.json_log_rx else 'off'}")
+                    case "channel_echoes":
+                        if json_output :
+                            print(json.dumps({"channel_echoes" : handle_log_rx.channel_echoes}))
+                        else:
+                            print(f"{'on' if handle_log_rx.channel_echoes else 'off'}")
+                    case "echo_unk_chans":
+                        if json_output :
+                            print(json.dumps({"echo_unk_chans" : handle_log_rx.echo_unk_chans}))
+                        else:
+                            print(f"{'on' if handle_log_rx.echo_unk_chans else 'off'}")
                     case "print_adverts":
                         if json_output :
                             print(json.dumps({"print_adverts" : handle_advert.print_adverts}))
@@ -2232,6 +2373,13 @@ async def next_cmd(mc, cmds, json_output=False):
             case "add_pending":
                 argnum = 1
                 contact = mc.pop_pending_contact(cmds[1])
+                if contact is None: # try to find by name
+                    key = None
+                    for c in mc.pending_contacts.items():
+                        if c[1]['adv_name'] == cmds[1]:
+                            key = c[1]['public_key']
+                            contact = mc.pop_pending_contact(key)
+                            break
                 if contact is None:
                     if json_output:
                         print(json.dumps({"error":"Contact does not exist"}))
@@ -2511,7 +2659,7 @@ async def next_cmd(mc, cmds, json_output=False):
                     if json_output:
                         await ps.prompt_async()
                     else:
-                        await ps.prompt_async("Press Enter to continue ...")
+                        await ps.prompt_async("Press Enter to continue ...\n")
                 except (EOFError, KeyboardInterrupt, asyncio.CancelledError):
                     pass
 
@@ -2570,7 +2718,7 @@ async def next_cmd(mc, cmds, json_output=False):
                 await mc.ensure_contacts()
                 contact = mc.get_contact_by_name(cmds[0])
                 if contact is None:
-                    logger.error(f"Unknown command : {cmd}, will exit ...")
+                    logger.error(f"Unknown command : {cmd}. {cmds} not executed ...")
                     return None
 
                 await interactive_loop(mc, to=contact)
@@ -2579,7 +2727,7 @@ async def next_cmd(mc, cmds, json_output=False):
         return cmds[argnum+1:]
 
     except IndexError:
-        logger.error("Error in parameters, returning")
+        logger.error("Error in parameters")
         return None
     except EOFError:
         logger.error("Cancelled")
@@ -2604,8 +2752,11 @@ async def process_script(mc, file, json_output=False):
         line = line.strip()
         if not (line == "" or line[0] == "#"):
             logger.debug(f"processing {line}")
-            cmds = shlex.split(line)
-            await process_cmds(mc, cmds, json_output)
+            try :
+                cmds = shlex.split(line)
+                await process_cmds(mc, cmds, json_output)
+            except ValueError:
+                logger.error(f"Error processing {line}")
 
 def version():
     print (f"meshcore-cli: command line interface to MeshCore companion radios {VERSION}")
@@ -2661,7 +2812,7 @@ def command_help():
     req_mma <ct>           : requests min/max/avg for a sensor      rm
     req_acl <ct>           : requests access control list for sensor
     pending_contacts       : show pending contacts
-    add_pending <key>      : manually add pending contact from key
+    add_pending <pending>  : manually add pending contact
     flush_pending          : flush pending contact list
   Repeaters
     login <name> <pwd>     : log into a node (rep) with given pwd   l
@@ -2881,10 +3032,12 @@ async def main(argv):
     handle_message.mc = mc # connect meshcore to handle_message
     handle_advert.mc = mc
     handle_path_update.mc = mc
+    handle_log_rx.mc = mc
 
     mc.subscribe(EventType.ADVERTISEMENT, handle_advert)
     mc.subscribe(EventType.PATH_UPDATE, handle_path_update)
     mc.subscribe(EventType.NEW_CONTACT, handle_new_contact)
+    mc.subscribe(EventType.RX_LOG_DATA, handle_log_rx)
 
     mc.auto_update_contacts = True