meshcore-cli 1.2.2__py3-none-any.whl → 1.2.3__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -26,13 +26,14 @@ 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.2"
+VERSION = "v1.2.3"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -54,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"
@@ -207,14 +209,22 @@ async def handle_log_rx(event):
 
     pkt = bytes().fromhex(event.payload["payload"])
 
-    if handle_log_rx.log_channels:
+    if handle_log_rx.channel_echoes:
         if pkt[0] == 0x15: 
             path_len = pkt[1]
             path = pkt[2:path_len+2].hex()
             chan_hash = pkt[path_len+2:path_len+3].hex()
-            cipher_mac = int.from_bytes(pkt[path_len+3:path_len+5], byteorder="little")
+            cipher_mac = pkt[path_len+3:path_len+5]
             msg = pkt[path_len+5:]
-            channel = await get_channel_by_hash(mc, chan_hash)
+            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 :
                 chan_name = chan_hash
                 message = msg.hex()
@@ -224,10 +234,18 @@ async def handle_log_rx(event):
                 cipher = AES.new(aes_key, AES.MODE_ECB)
                 message = cipher.decrypt(msg)[5:].decode("utf-8").strip("\x00")
             
-            print_above(f"{ANSI_LIGHT_GRAY}{chan_name:>10} {ANSI_GREEN}{message[0:25]:25} {ANSI_LIGHT_GRAY}({event.payload['snr']:6,.2f},{event.payload['rssi']:4}){ANSI_YELLOW} [{path}]{ANSI_END}")
+            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)
+            return
             
 handle_log_rx.json_log_rx = False
-handle_log_rx.log_channels = False
+handle_log_rx.channel_echoes = False
 handle_log_rx.mc = None
 
 async def handle_advert(event):
@@ -455,7 +473,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_name" : {"on":None, "off":None},
             "print_adverts" : {"on":None, "off":None},
             "json_log_rx" : {"on":None, "off":None},
-            "log_channels" : {"on":None, "off":None},
+            "channel_echoes" : {"on":None, "off":None},
             "print_new_contacts" : {"on": None, "off":None},
             "print_path_updates" : {"on":None,"off":None},
             "classic_prompt" : {"on" : None, "off":None},
@@ -484,7 +502,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_name":None,
             "print_adverts":None,
             "json_log_rx":None,
-            "log_channels":None,
+            "channel_echoes":None,
             "print_path_updates":None,
             "print_new_contacts":None,
             "classic_prompt":None,
@@ -777,8 +795,11 @@ 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]
@@ -795,7 +816,10 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                         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 :
-                            await process_cmds(mc, shlex.split(line[1:]))
+                            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]
@@ -874,8 +898,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
@@ -1205,16 +1232,6 @@ async def get_channel_by_name (mc, name):
 
     return None
 
-async def get_channel_by_hash (mc, hash):
-    if not hasattr(mc, 'channels') :
-        await_get_channels(mc)
-
-    for c in mc.channels:
-        if c['channel_hash'] == hash:
-            return c
-
-    return None
-
 async def get_contacts (mc, anim=False, lastomod=0, timeout=5) :
     if mc._contacts:
         return
@@ -1292,7 +1309,8 @@ async def get_channels (mc, anim=False) :
         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):
@@ -1502,8 +1520,8 @@ async def next_cmd(mc, cmds, json_output=False):
                         handle_log_rx.json_log_rx = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
-                    case "log_channels" :
-                        handle_log_rx.log_channels = (cmds[2] == "on")
+                    case "channel_echoes" :
+                        handle_log_rx.channel_echoes = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
                     case "print_adverts" :
@@ -1741,11 +1759,11 @@ async def next_cmd(mc, cmds, json_output=False):
                             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 "log_channels":
+                    case "channel_echoes":
                         if json_output :
-                            print(json.dumps({"log_channels" : handle_log_rx.log_channels}))
+                            print(json.dumps({"channel_echoes" : handle_log_rx.channel_echoes}))
                         else:
-                            print(f"{'on' if handle_log_rx.log_channels else 'off'}")
+                            print(f"{'on' if handle_log_rx.channel_echoes else 'off'}")
                     case "print_adverts":
                         if json_output :
                             print(json.dumps({"print_adverts" : handle_advert.print_adverts}))
@@ -2616,7 +2634,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
 
@@ -2709,8 +2727,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}")

{meshcore_cli-1.2.2.dist-info → meshcore_cli-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.2.2
+Version: 1.2.3
 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

meshcore_cli-1.2.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
+meshcore_cli/meshcore_cli.py,sha256=4vJusi30D_UBxw9lq4mTO5NqLp8y3zpTb09rCcF7064,126909
+meshcore_cli-1.2.3.dist-info/METADATA,sha256=Z727GJ6CD7OzRfEUGose_dAfACX6Oo2IbM3kzBWihtc,11657
+meshcore_cli-1.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore_cli-1.2.3.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.2.3.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.2.3.dist-info/RECORD,,

meshcore_cli-1.2.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
-meshcore_cli/meshcore_cli.py,sha256=1HmybWFe78tqsbD4zjxHq4aCzTrxd_s7MwtrlKTiQ6c,125901
-meshcore_cli-1.2.2.dist-info/METADATA,sha256=VZygAExPzIUa2rPpHksZQHGxkj1awTiyHuSjpnKOOXk,11657
-meshcore_cli-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore_cli-1.2.2.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.2.2.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.2.2.dist-info/RECORD,,