meshcore-cli 1.1.35__tar.gz → 1.1.37__tar.gz

{meshcore_cli-1.1.35 → meshcore_cli-1.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.1.35
+Version: 1.1.37
 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
@@ -10,7 +10,7 @@ License-File: LICENSE
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: meshcore>=2.1.16
+Requires-Dist: meshcore>=2.1.17
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: requests>=2.28.0
 Description-Content-Type: text/markdown

{meshcore_cli-1.1.35 → meshcore_cli-1.1.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.1.35"
+version = "1.1.37"
 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.16", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
+dependencies = [ "meshcore >= 2.1.17", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-1.1.35 → meshcore_cli-1.1.37}/src/meshcore_cli/meshcore_cli.py

@@ -23,7 +23,7 @@ from prompt_toolkit.shortcuts import radiolist_dialog
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.1.35"
+VERSION = "v1.1.37"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -69,7 +69,7 @@ def escape_ansi(line):
     ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')
     return ansi_escape.sub('', line)
 
-def print_above(str):
+def print_one_line_above(str):
     """ prints a string above current line """
     width = os.get_terminal_size().columns
     stringlen = len(escape_ansi(str))-1
@@ -85,6 +85,11 @@ def print_above(str):
     print(str, end="")                          # Print output status msg
     print("\u001B[u", end="", flush=True)       # Jump back to saved cursor position
 
+def print_above(str):
+    lines = str.split('\n')
+    for l in lines:
+        print_one_line_above(l)
+
 async def process_event_message(mc, ev, json_output, end="\n", above=False):
     """ display incoming message """
     if ev is None :
@@ -350,6 +355,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "share_contact" : contact_list,
             "path": contact_list,
             "disc_path" : contact_list,
+            "trace" : None,
             "reset_path" : contact_list,
             "change_path" : contact_list,
             "change_flags" : contact_list,
@@ -779,28 +785,31 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
             # special treatment for setperm to support contact name as param
             elif contact["type"] > 1 and\
                 (line.startswith("setperm ") or line.startswith("set perm ")):
-                cmds = shlex.split(line)
-                off = 1 if line.startswith("set perm") else 0
-                name = cmds[1 + off]
-                perm_string = cmds[2 + off]
-                if (perm_string.startswith("0x")):
-                    perm = int(perm_string,0)
-                elif (perm_string.startswith("#")):
-                    perm = int(perm_string[1:])
-                else:
-                    perm = int(perm_string,16)
-                ct=mc.get_contact_by_name(name)
-                if ct is None:
-                    ct=mc.get_contact_by_key_prefix(name)
-                if ct is None:
-                    if name == "self" or mc.self_info["public_key"].startswith(name):
-                        key = mc.self_info["public_key"]
+                try:
+                    cmds = shlex.split(line)
+                    off = 1 if line.startswith("set perm") else 0
+                    name = cmds[1 + off]
+                    perm_string = cmds[2 + off]
+                    if (perm_string.startswith("0x")):
+                        perm = int(perm_string,0)
+                    elif (perm_string.startswith("#")):
+                        perm = int(perm_string[1:])
                     else:
-                        key = name
-                else:
-                    key=ct["public_key"]
-                newline=f"setperm {key} {perm}"
-                await process_cmds(mc, ["cmd", contact["adv_name"], newline])
+                        perm = int(perm_string,16)
+                    ct=mc.get_contact_by_name(name)
+                    if ct is None:
+                        ct=mc.get_contact_by_key_prefix(name)
+                    if ct is None:
+                        if name == "self" or mc.self_info["public_key"].startswith(name):
+                            key = mc.self_info["public_key"]
+                        else:
+                            key = name
+                    else:
+                        key=ct["public_key"]
+                    newline=f"setperm {key} {perm}"
+                    await process_cmds(mc, ["cmd", contact["adv_name"], newline])
+                except IndexError:
+                    print("Wrong number of parameters")
                 
             # same but for commands with a parameter
             elif contact["type"] > 0 and (line.startswith("cmd ") or\
@@ -1694,6 +1703,46 @@ async def next_cmd(mc, cmds, json_output=False):
                         print(res.payload)
                         print(json.dumps(res.payload, indent=4))
 
+            case "trace" :
+                argnum = 1
+                res = await mc.commands.send_trace(path=cmds[1])
+                if res and res.type != EventType.ERROR:
+                    tag= int.from_bytes(res.payload['expected_ack'], byteorder="little")
+                    timeout = res.payload["suggested_timeout"] / 1000 * 1.2
+                    ev = await mc.wait_for_event(EventType.TRACE_DATA, 
+                        attribute_filters={"tag": tag},
+                        timeout=timeout)
+                    if ev is None:
+                        if json_output:
+                            print(json.dumps({"error" : "timeout waiting trace"}))
+                        else :
+                            print("Timeout waiting trace")
+                    elif ev.type == EventType.ERROR:
+                        if json_output:
+                            print(json.dumps(ev.payload))
+                        else :
+                            print("Error waiting trace")
+                    else:
+                        if json_output:
+                            print(json.dumps(ev.payload, indent=2))
+                        else :
+                            print("]",end="")
+                            for t in ev.payload["path"]:
+                                print("→",end="")
+                                snr = t['snr']
+                                if snr >= 10 :
+                                    print(ANSI_GREEN, end="")
+                                elif snr <= 0:
+                                    print(ANSI_RED, end="")
+                                print(f"{snr:.2f}",end="")
+                                if snr >= 10 or snr <= 0:
+                                    print(ANSI_END, end="")
+                                print("→",end="")
+                                if "hash" in t:
+                                    print(f"[{t['hash']}]",end="")
+                                else:
+                                    print("[")
+
             case "login" | "l" :
                 argnum = 2
                 await mc.ensure_contacts()
@@ -2356,6 +2405,7 @@ def command_help():
     import_contact <URI>   : import a contact from its URI          ic
     remove_contact <ct>    : removes a contact from this node
     path <ct>              : diplays path for a contact
+    disc_path <ct>         : discover new path and display          dp
     reset_path <ct>        : resets path to a contact to flood      rp
     change_path <ct> <pth> : change the path to a contact           cp
     change_flags <ct> <f>  : change contact flags (tel_l|tel_a|star)cf
@@ -2364,13 +2414,14 @@ def command_help():
     req_acl <ct>           : requests access control list for sensor
     pending_contacts       : show pending contacts
     add_pending <key>      : manually add pending contact from key
-    flush_pending          : flush pending contact clist
+    flush_pending          : flush pending contact list
   Repeaters
     login <name> <pwd>     : log into a node (rep) with given pwd   l
     logout <name>          : log out of a repeater
     cmd <name> <cmd>       : sends a command to a repeater (no ack) c  [
     wmt8                   : wait for a msg (reply) with a timeout     ]
-    req_status <name>      : requests status from a node            rs""")
+    req_status <name>      : requests status from a node            rs
+    trace <path>           : run a trace, path is comma separated""")
 
 def usage () :
     """ Prints some help """
@@ -2528,7 +2579,16 @@ async def main(argv):
                 logger.info(f"Couldn't find device {address}")
                 return
 
-        mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
+        try :
+            mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
+        except ConnectionError :
+            logger.info("Error while connecting, retrying once ...")
+            try :
+                mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
+            except ConnectionError :
+                logger.error("Can't connect to node, exiting")
+                return
+
 
         # Store device address in configuration
         if os.path.isdir(MCCLI_CONFIG_DIR) :