meshcore-cli 1.2.12__py3-none-any.whl → 1.3.6__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.2.12"
+VERSION = "v1.3.6"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -40,6 +40,10 @@ MCCLI_ADDRESS = MCCLI_CONFIG_DIR + "default_address"
 MCCLI_HISTORY_FILE = MCCLI_CONFIG_DIR + "history"
 MCCLI_INIT_SCRIPT = MCCLI_CONFIG_DIR + "init"
 
+PAYLOAD_TYPENAMES = ["REQ", "RESPONSE", "TEXT_MSG", "ACK", "ADVERT", "GRP_TXT", "GRP_DATA", "ANON_REQ", "PATH", "TRACE", "MULTIPART", "CONTROL"]
+ROUTE_TYPENAMES = ["TC_FLOOD", "FLOOD", "DIRECT", "TC_DIRECT"]
+CONTACT_TYPENAMES = ["NONE","CLI","REP","ROOM","SENS"]
+
 # Fallback address if config file not found
 # if None or "" then a scan is performed
 ADDRESS = ""
@@ -76,13 +80,11 @@ ANSI_YELLOW = "\033[0;33m"
 ANSI_BYELLOW = "\033[1;33m"
 
 #Unicode chars
-# some possible symbols for prompts 🭬🬛🬗🭬🬛🬃🬗🭬🬛🬃🬗🬏🭀🭋🭨🮋
-ARROW_TAIL = "🭨"
-ARROW_HEAD = "🭬"
-
-if platform.system() == 'Windows' or platform.system() == 'Darwin':
-    ARROW_TAIL = ""                                                   
-    ARROW_HEAD = " "                                                   
+# some possible symbols for prompts 🭬🬛🬗🭬🬛🬃🬗🭬🬛🬃🬗🬏🭀🭋🭨🮋
+ARROW_HEAD = ""
+SLASH_END = ""
+SLASH_START = ""
+INVERT_SLASH = False
 
 def escape_ansi(line):
     ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')
@@ -207,27 +209,57 @@ 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"])
     pbuf = io.BytesIO(pkt)
     header = pbuf.read(1)[0]
+    route_type = header & 0x03
+    payload_type = (header & 0x3c) >> 2
+    payload_ver = (header & 0xc0) >> 6
+
+    transport_code = None
+    if route_type == 0x00 or route_type == 0x03: # has transport code
+        transport_code = pbuf.read(4)    # discard transport code
 
-    if header & ~1 == 0x14: # flood msg / channel
+    path_len = pbuf.read(1)[0]
+    path = pbuf.read(path_len).hex() # Beware of traces where pathes are mixed
+
+    try :
+        route_typename = ROUTE_TYPENAMES[route_type]
+    except IndexError:
+        logger.debug(f"Unknown route type {route_type}") 
+        route_typename = "UNK"
+
+    try :
+        payload_typename = PAYLOAD_TYPENAMES[payload_type]
+    except IndexError:
+        logger.debug(f"Unknown payload type {payload_type}")
+        payload_typename = "UNK"
+
+    pkt_payload = pbuf.read()
+
+    event.payload["header"] = header
+    event.payload["route_type"] = route_type
+    event.payload["route_typename"] = route_typename
+    event.payload["payload_type"] = payload_type
+    event.payload["payload_typename"]= payload_typename
+
+    event.payload["payload_ver"] = payload_ver
+
+    if not transport_code is None:
+        event.payload["transport_code"] = transport_code.hex()
+
+    event.payload["path_len"] = path_len 
+    event.payload["path"] = path
+
+    event.payload["pkt_payload"] = pkt_payload.hex()
+
+    if payload_type == 0x05: # flood msg / channel
         if handle_log_rx.channel_echoes:
-            if header & 1 == 0: # has transport code
-                pbuf.read(4)    # discard transport code
-            path_len = pbuf.read(1)[0]
-            path = pbuf.read(path_len).hex()
-            chan_hash = pbuf.read(1).hex()
-            cipher_mac = pbuf.read(2)
-            msg = pbuf.read() # until the end of buffer
+            pk_buf = io.BytesIO(pkt_payload)
+            chan_hash = pk_buf.read(1).hex()
+            cipher_mac = pk_buf.read(2)
+            msg = pk_buf.read() # until the end of buffer
 
             channel = None
             for c in await get_channels(mc):
@@ -253,13 +285,21 @@ async def handle_log_rx(event):
             if chan_name != "" :
                 width = os.get_terminal_size().columns
                 cars = width - 13 - 2 * path_len - len(chan_name) - 1
-                dispmsg = message[0:cars]
+                dispmsg = message.replace("\n","")[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)
 
+    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)
+
+
 handle_log_rx.json_log_rx = False
 handle_log_rx.channel_echoes = False
 handle_log_rx.mc = None
@@ -392,7 +432,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)
@@ -470,7 +510,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "login" : contact_list,
         "cmd" : contact_list,
         "req_status" : contact_list,
-        "req_bstatus" : contact_list,
+        "req_neighbours": contact_list,
         "logout" : contact_list,
         "req_telemetry" : contact_list,
         "req_binary" : contact_list,
@@ -495,7 +535,6 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_snr" : {"on":None, "off": None},
             "json_msgs" : {"on":None, "off": 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},
@@ -525,7 +564,6 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_snr":None,
             "json_msgs":None,
             "color":None,
-            "print_name":None,
             "print_adverts":None,
             "json_log_rx":None,
             "channel_echoes":None,
@@ -545,11 +583,24 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "flood_after":None,
             "custom":None,
         },
+        "?get":None,
+        "?set":None,
+        "?scope":None,
+        "?contact_info":None,
+        "?apply_to":None,
+        "?at":None,
+        "?node_discover":None,
+        "?nd":None,
+        "?pending_contacts":None,
+        "?add_pending":None,
+        "?flush_pending":None,
     }
 
     contact_completion_list = {
         "contact_info": None,
         "contact_name": None,
+        "contact_key": None,
+        "contact_type": None,
         "contact_lastmod": None,
         "export_contact" : None,
         "share_contact" : None,
@@ -577,7 +628,6 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "login" : None,
         "logout" : None,
         "req_status" : None,
-        "req_bstatus" : None,
         "req_neighbours": None,
         "cmd" : None,
         "ver" : None,
@@ -713,9 +763,10 @@ make_completion_dict.custom_vars = {}
 async def interactive_loop(mc, to=None) :
     print("""Interactive mode, most commands from terminal chat should work.
 Use \"to\" to select recipient, use Tab to complete name ...
-Line starting with \"$\" or \".\" will issue a meshcli command.
+Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
 \"quit\", \"q\", CTRL+D will end interactive mode""")
 
+
     contact = to
     prev_contact = None
 
@@ -724,16 +775,16 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 
     await get_contacts(mc, anim=True)
     await get_channels(mc, anim=True)
+
+    # Call sync_msg before going further so there is no issue when scrolling
+    # long list of msgs
+    await next_cmd(mc, ["sync_msgs"])
+
     await subscribe_to_msgs(mc, above=True)
 
     handle_new_contact.print_new_contacts = True
 
     try:
-        while True: # purge msgs
-            res = await mc.commands.get_msg()
-            if res.type == EventType.NO_MORE_MSGS:
-                break
-
         if os.path.isdir(MCCLI_CONFIG_DIR) :
             our_history = FileHistory(MCCLI_HISTORY_FILE)
         else:
@@ -765,26 +816,32 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 
             color = process_event_message.color
             classic = interactive_loop.classic or not color
-            print_name = interactive_loop.print_name
 
             if classic:
                 prompt = ""
             else:
                 prompt = f"{ANSI_INVERT}"
 
-            if print_name or contact is None :
-                if color:
-                    prompt = prompt + f"{ANSI_BGRAY}"
-                prompt = prompt + f"{mc.self_info['name']}"
-                if contact is None: # display scope
-                    if not scope is None:
-                        prompt = prompt + f"|{scope}"
+            prompt = prompt + f"{ANSI_BGRAY}"
+            prompt = prompt + f"{mc.self_info['name']}"
+            if contact is None: # display scope
+                if not scope is None:
+                    prompt = prompt + f"|{scope}"
+
+            if contact is None :
                 if classic :
-                    prompt = prompt + "> "
+                    prompt = prompt + ">"
                 else :
-                    prompt = prompt + f"{ANSI_NORMAL}{ARROW_HEAD}{ANSI_INVERT}"
-
-            if not contact is None :
+                    prompt = prompt + f"{ANSI_NORMAL}{ARROW_HEAD}"
+            else:
+                if classic :
+                    prompt = prompt + "/"
+                else :
+                    if INVERT_SLASH:
+                        prompt = prompt + f"{ANSI_INVERT}"
+                    else:
+                        prompt = prompt + f"{ANSI_NORMAL}"
+                    prompt = prompt + f"{SLASH_START}"
                 if not last_ack:
                     prompt = prompt + f"{ANSI_BRED}"
                     if classic :
@@ -800,11 +857,9 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 else :
                     prompt = prompt + f"{ANSI_BBLUE}"
                 if not classic:
+                    prompt = prompt + f"{SLASH_END}"
                     prompt = prompt + f"{ANSI_INVERT}"
 
-                if print_name and not classic :
-                    prompt = prompt + f"{ANSI_NORMAL}{ARROW_TAIL}{ANSI_INVERT}"
-
                 prompt = prompt + f"{contact['adv_name']}"
                 if contact["type"] == 0 or contact["out_path_len"]==-1:
                     if scope is None:
@@ -818,14 +873,15 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                         prompt = prompt + "|" + contact["out_path"]
 
                 if classic :
-                    prompt = prompt + f"{ANSI_NORMAL}> "
+                    prompt = prompt + f"{ANSI_NORMAL}>"
                 else:
                     prompt = prompt + f"{ANSI_NORMAL}{ARROW_HEAD}"
 
                 prompt = prompt + f"{ANSI_END}"
 
-                if not color :
-                    prompt=escape_ansi(prompt)
+            prompt = prompt + " "
+            if not color :
+                prompt=escape_ansi(prompt)
 
             session.app.ttimeoutlen = 0.2
             session.app.timeoutlen = 0.2
@@ -1036,8 +1092,10 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
     except asyncio.CancelledError:
         # Handle task cancellation from KeyboardInterrupt in asyncio.run()
         print("Exiting cli")
-interactive_loop.classic = False
-interactive_loop.print_name = True
+if platform.system() == "Darwin" or platform.system() == "Windows":
+    interactive_loop.classic = True
+else:
+    interactive_loop.classic = False
 
 async def process_contact_chat_line(mc, contact, line):
     if contact["type"] == 0:
@@ -1059,6 +1117,26 @@ async def process_contact_chat_line(mc, contact, line):
         await process_cmds(mc, args)
         return True
 
+    if line.startswith("contact_key") or line.startswith("ck"):
+        print(contact['public_key'],end="")
+        if " " in line:
+            print(" ", end="", flush=True)
+            secline = line.split(" ", 1)[1]
+            await process_contact_chat_line(mc, contact, secline)
+        else:
+            print("")
+        return True
+
+    if line.startswith("contact_type") or line.startswith("ct"):
+        print(f"{CONTACT_TYPENAMES[contact['type']]:4}",end="")
+        if " " in line:
+            print(" ", end="", flush=True)
+            secline = line.split(" ", 1)[1]
+            await process_contact_chat_line(mc, contact, secline)
+        else:
+            print("")
+        return True
+
     if line.startswith("contact_name") or line.startswith("cn"):
         print(contact['adv_name'],end="")
         if " " in line:
@@ -1069,6 +1147,44 @@ async def process_contact_chat_line(mc, contact, line):
             print("")
         return True
 
+    if line.startswith("path") :
+        if contact['out_path_len'] == -1:
+            print("Flood", end="")
+        elif contact['out_path_len'] == 0:
+            print("0 hop", end="")
+        else:
+            print(contact['out_path'],end="")
+        if " " in line:
+            print(" ", end="", flush=True)
+            secline = line.split(" ", 1)[1]
+            await process_contact_chat_line(mc, contact, secline)
+        else:
+            print("")
+        return True
+
+    if line.startswith("sleep ") or line.startswith("s "):
+        try:
+            sleeptime = int(line.split(" ",2)[1])
+            cmd_pos = 2
+        except IndexError: # nothing arg after sleep
+            sleeptime = 1
+            cmd_pos = 0
+        except ValueError:
+            sleeptime = 1
+            cmd_pos = 1
+
+        try:
+            if cmd_pos > 0:
+                secline = line.split(" ",cmd_pos)[cmd_pos]
+                await process_contact_chat_line(mc, contact, secline)
+        except IndexError:
+            pass
+
+        # will sleep after executed command if there is a command
+        await asyncio.sleep(sleeptime)
+
+        return True
+
     if line == "contact_lastmod":
         timestamp = contact["lastmod"]
         print(f"{contact['adv_name']} updated"
@@ -1077,21 +1193,24 @@ async def process_contact_chat_line(mc, contact, line):
         return True
 
     # commands that take contact as second arg will be sent to recipient
-    if line == "sc" or line == "share_contact" or\
-            line == "ec" or line == "export_contact" or\
-            line == "uc" or line == "upload_contact" or\
-            line == "rp" or line == "reset_path" or\
-            line == "dp" or line == "disc_path" or\
-            line == "contact_info" or line == "ci" or\
-            line == "req_status" or line == "rs" or\
-            line == "req_neighbours" or line == "rn" or\
-            line == "req_bstatus" or line == "rbs" or\
-            line == "req_telemetry" or line == "rt" or\
-            line == "req_acl" or\
-            line == "path" or\
-            line == "logout" :
-        args = [line, contact['adv_name']]
+    # and can be chained ...
+    if line.startswith("sc") or line.startswith("share_contact") or\
+            line.startswith("ec") or line.startswith("export_contact") or\
+            line.startswith("uc") or line.startswith("upload_contact") or\
+            line.startswith("rp") or line.startswith("reset_path") or\
+            line.startswith("dp") or line.startswith("disc_path") or\
+            line.startswith("contact_info") or line.startswith("ci") or\
+            line.startswith("req_status") or line.startswith("rs") or\
+            line.startswith("req_neighbours") or line.startswith("rn") or\
+            line.startswith("req_telemetry") or line.startswith("rt") or\
+            line.startswith("req_acl") or\
+            line.startswith("path") or\
+            line.startswith("logout") :
+        args = [line.split()[0], contact['adv_name']]
         await process_cmds(mc, args)
+        if " " in line:
+            secline = line.split(" ", 1)[1]
+            await process_contact_chat_line(mc, contact, secline)
         return True
 
     # special case for rp that can be chained from cmdline
@@ -1104,6 +1223,8 @@ async def process_contact_chat_line(mc, contact, line):
 
     if line.startswith("set timeout "):
         cmds=line.split(" ")
+        #args = ["contact_timeout", contact['adv_name'], cmds[2]]
+        #await process_cmds(mc, args)
         contact["timeout"] = float(cmds[2])
         return True
 
@@ -1241,12 +1362,13 @@ async def process_contact_chat_line(mc, contact, line):
 
     return False
 
-async def apply_command_to_contacts(mc, contact_filter, line):
+async def apply_command_to_contacts(mc, contact_filter, line, json_output=False):
     upd_before = None
     upd_after = None
     contact_type = None
     min_hops = None
     max_hops = None
+    count = 0
 
     await mc.ensure_contacts()
 
@@ -1301,6 +1423,9 @@ async def apply_command_to_contacts(mc, contact_filter, line):
                 (upd_after is None or contact["lastmod"] > upd_after) and\
                 (min_hops is None or contact["out_path_len"] >= min_hops) and\
                 (max_hops is None or contact["out_path_len"] <= max_hops):
+
+            count = count + 1
+
             if await process_contact_chat_line(mc, contact, line):
                 pass
 
@@ -1325,6 +1450,9 @@ async def apply_command_to_contacts(mc, contact_filter, line):
             else:
                 logger.error(f"Can't send {line} to {contact['adv_name']}")
 
+    if not json_output:
+        print(f"> {count} matches in contacts")
+
 async def send_cmd (mc, contact, cmd) :
     res = await mc.commands.send_cmd(contact, cmd)
     if not res is None and not res.type == EventType.ERROR:
@@ -1366,7 +1494,8 @@ async def send_msg (mc, contact, msg) :
     return res
 
 async def msg_ack (mc, contact, msg) :
-    timeout = 0 if not 'timeout' in contact else contact['timeout']
+    timeout = 0 if not isinstance(contact, dict) or not 'timeout' in contact\
+        else contact['timeout']
     res = await mc.commands.send_msg_with_retry(contact, msg,
                 max_attempts=msg_ack.max_attempts,
                 flood_after=msg_ack.flood_after,
@@ -1615,7 +1744,7 @@ async def print_disc_trace_to (mc, contact):
 
 async def next_cmd(mc, cmds, json_output=False):
     """ process next command """
-    global ARROW_TAIL, ARROW_HEAD
+    global ARROW_HEAD, SLASH_START, SLASH_END, INVERT_SLASH
     try :
         argnum = 0
 
@@ -1715,44 +1844,32 @@ async def next_cmd(mc, cmds, json_output=False):
 
             case "apply_to"|"at":
                 argnum = 2
-                await apply_command_to_contacts(mc, cmds[1], cmds[2])
+                await apply_command_to_contacts(mc, cmds[1], cmds[2], json_output=json_output)
 
             case "set":
                 argnum = 2
                 match cmds[1]:
                     case "help" :
                         argnum = 1
-                        print("""Available parameters :
-    pin <pin>                   : ble pin
-    radio <freq,bw,sf,cr>       : radio params
-    tuning <rx_dly,af>          : tuning params
-    tx <dbm>                    : tx power
-    name <name>                 : node name
-    lat <lat>                   : latitude
-    lon <lon>                   : longitude
-    coords <lat,lon>            : coordinates
-    print_snr <on/off>          : toggle snr display in messages
-    print_adverts <on/off>      : display adverts as they come
-    print_new_contacts <on/off> : display new pending contacts when available
-    print_path_updates <on/off> : display path updates as they come""")
+                        get_help_for("set")
                     case "max_flood_attempts":
                         msg_ack.max_flood_attempts=int(cmds[2])
                     case "max_attempts":
                         msg_ack.max_attempts=int(cmds[2])
                     case "flood_after":
                         msg_ack.flood_after=int(cmds[2])
-                    case "print_name":
-                        interactive_loop.print_name = (cmds[2] == "on")
-                        if json_output :
-                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
                     case "classic_prompt":
                         interactive_loop.classic = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
-                    case "arrow_tail":
-                        ARROW_TAIL = cmds[2]
                     case "arrow_head":
                         ARROW_HEAD = cmds[2]
+                    case "slash_start":
+                        SLASH_START = cmds[2]
+                    case "slash_end":
+                        SLASH_END = cmds[2]
+                    case "invert_slash":
+                        INVERT_SLASH = cmds[2] == "on"
                     case "color" :
                         process_event_message.color = (cmds[2] == "on")
                         if json_output :
@@ -1958,21 +2075,7 @@ async def next_cmd(mc, cmds, json_output=False):
                 argnum = 1
                 match cmds[1]:
                     case "help":
-                        print("""Gets parameters from node
-    name               : node name
-    bat                : battery level in mV
-    fstats             : fs statistics
-    coords             : adv coordinates
-    lat                : latitude
-    lon                : longitude
-    radio              : radio parameters
-    tx                 : tx power
-    print_snr          : snr display in messages
-    print_adverts      : display adverts as they come
-    print_new_contacts : display new pending contacts when available
-    print_path_updates : display path updates as they come
-    custom             : all custom variables in json format
-                each custom var can also be get/set directly""")
+                        get_help_for("get")
                     case "max_flood_attempts":
                         if json_output :
                             print(json.dumps({"max_flood_attempts" : msg_ack.max_flood_attempts}))
@@ -1983,11 +2086,6 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"flood_after" : msg_ack.flood_after}))
                         else:
                             print(f"flood_after: {msg_ack.flood_after}")
-                    case "print_name":
-                        if json_output :
-                            print(json.dumps({"print_name" : interactive_loop.print_name}))
-                        else:
-                            print(f"{'on' if interactive_loop.print_name else 'off'}")
                     case "classic_prompt":
                         if json_output :
                             print(json.dumps({"classic_prompt" : interactive_loop.classic}))
@@ -2237,7 +2335,7 @@ async def next_cmd(mc, cmds, json_output=False):
                 argnum = 2
                 dest = None
 
-                if len(cmds[1]) == 12: # possibly an hex prefix
+                if len(cmds[1]) >= 12: # possibly an hex prefix
                     try:
                         dest = bytes.fromhex(cmds[1])
                     except ValueError:
@@ -2344,12 +2442,12 @@ async def next_cmd(mc, cmds, json_output=False):
                         else :
                             color = process_event_message.color
                             classic = interactive_loop.classic or not color
-                            print("]",end="")
+                            print(" ", end="")
                             for t in ev.payload["path"]:
                                 if classic :
                                     print("→",end="")
                                 else:
-                                    print(f" {ANSI_INVERT}", end="")
+                                    print(f"{ANSI_INVERT}", end="")
                                 snr = t['snr']
                                 if color:
                                     if snr >= 10 :
@@ -2368,7 +2466,7 @@ async def next_cmd(mc, cmds, json_output=False):
                                 if "hash" in t:
                                     print(f"[{t['hash']}]",end="")
                                 else:
-                                    print("[")
+                                    print()
 
             case "login" | "l" :
                 argnum = 2
@@ -2428,46 +2526,6 @@ async def next_cmd(mc, cmds, json_output=False):
                 contact = mc.get_contact_by_name(cmds[1])
                 contact["timeout"] = float(cmds[2])
 
-            case "req_status" | "rs" :
-                argnum = 1
-                await mc.ensure_contacts()
-                contact = mc.get_contact_by_name(cmds[1])
-                res = await mc.commands.send_statusreq(contact)
-                logger.debug(res)
-                if res.type == EventType.ERROR:
-                    print(f"Error while requesting status: {res}")
-                else :
-                    timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
-                    res = await mc.wait_for_event(EventType.STATUS_RESPONSE, timeout=timeout)
-                    logger.debug(res)
-                    if res is None:
-                        if json_output :
-                            print(json.dumps({"error" : "Timeout waiting status"}))
-                        else:
-                            print("Timeout waiting status")
-                    else :
-                        print(json.dumps(res.payload, indent=4))
-
-            case "req_telemetry" | "rt" :
-                argnum = 1
-                await mc.ensure_contacts()
-                contact = mc.get_contact_by_name(cmds[1])
-                res = await mc.commands.send_telemetry_req(contact)
-                logger.debug(res)
-                if res.type == EventType.ERROR:
-                    print(f"Error while requesting telemetry")
-                else:
-                    timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
-                    res = await mc.wait_for_event(EventType.TELEMETRY_RESPONSE, timeout=timeout)
-                    logger.debug(res)
-                    if res is None:
-                        if json_output :
-                            print(json.dumps({"error" : "Timeout waiting telemetry"}))
-                        else:
-                            print("Timeout waiting telemetry")
-                    else :
-                        print(json.dumps(res.payload, indent=4))
-
             case "disc_path" | "dp" :
                 argnum = 1
                 await mc.ensure_contacts()
@@ -2538,22 +2596,18 @@ async def next_cmd(mc, cmds, json_output=False):
                         await mc.ensure_contacts()
                         print(f"Discovered {len(dn)} nodes:")
                         for n in dn:
-                            name = f"{n['pubkey'][0:2]} {mc.get_contact_by_key_prefix(n['pubkey'])['adv_name']}"
-                            if name is None:
+                            try :
+                                name = f"{n['pubkey'][0:2]} {mc.get_contact_by_key_prefix(n['pubkey'])['adv_name']}"
+                            except TypeError:
                                 name = n["pubkey"][0:16]
-                            type = f"t:{n['node_type']}"
-                            if n['node_type'] == 1:
-                                type = "CLI"
-                            elif n['node_type'] == 2:
-                                type = "REP"
-                            elif n['node_type'] == 3:
-                                type = "ROOM"
-                            elif n['node_type'] == 4:
-                                type = "SENS"
-
-                            print(f" {name:16} {type:>4} SNR: {n['SNR_in']:6,.2f}->{n['SNR']:6,.2f} RSSI: ->{n['RSSI']:4}")
-
-            case "req_btelemetry"|"rbt" :
+                            if n['node_type'] >= len(CONTACT_TYPENAMES):
+                                type = f"t:{n['node_type']}"
+                            else:
+                                type = CONTACT_TYPENAMES[n['node_type']]
+
+                            print(f" {name:22} {type:>4} SNR: {n['SNR_in']:6,.2f}->{n['SNR']:6,.2f} RSSI: ->{n['RSSI']:4}")
+
+            case "req_telemetry"|"rt" :
                 argnum = 1
                 await mc.ensure_contacts()
                 contact = mc.get_contact_by_name(cmds[1])
@@ -2565,9 +2619,13 @@ async def next_cmd(mc, cmds, json_output=False):
                     else:
                         print("Error getting data")
                 else :
-                    print(json.dumps(res))
+                    print(json.dumps({
+                        "name": contact["adv_name"],
+                        "pubkey_pre": contact["public_key"][0:16],
+                        "lpp": res,
+                    }, indent = 4))
 
-            case "req_bstatus"|"rbs" :
+            case "req_status"|"rs" :
                 argnum = 1
                 await mc.ensure_contacts()
                 contact = mc.get_contact_by_name(cmds[1])
@@ -2651,15 +2709,30 @@ async def next_cmd(mc, cmds, json_output=False):
                     if json_output:
                         print(json.dumps(res, indent=4))
                     else:
+                        width = os.get_terminal_size().columns
                         print(f"Got {res['results_count']} neighbours out of {res['neighbours_count']} from {contact['adv_name']}:")
                         for n in res['neighbours']:
                             ct = mc.get_contact_by_key_prefix(n["pubkey"])
-                            if ct :
+                            if ct and width > 60 :
                                 name = f"[{n['pubkey'][0:8]}] {ct['adv_name']}"
+                                name = f"{name:30}"
+                            elif ct :
+                                name = f"{ct['adv_name']}"
+                                name = f"{name:20}"
                             else:
                                 name = f"[{n['pubkey']}]"
 
-                            print(f" {name:30} last viewed {n['secs_ago']} sec ago at {n['snr']} ")
+                            t_s = n['secs_ago']
+                            time_ago = f"{t_s}s"
+                            if t_s / 86400 >= 1 : # result in days
+                                time_ago = f"{int(t_s/86400)}d ago{f' ({time_ago})' if width > 62 else ''}"
+                            elif t_s / 3600 >= 1 : # result in days
+                                time_ago = f"{int(t_s/3600)}h ago{f' ({time_ago})' if width > 62 else ''}"
+                            elif t_s / 60 >= 1 : # result in min
+                                time_ago = f"{int(t_s/60)}m ago{f' ({time_ago})' if width > 62 else ''}"
+
+
+                            print(f" {name} {time_ago}, {n['snr']}dB{' SNR' if width > 66 else ''}")
 
             case "req_binary" :
                 argnum = 2
@@ -2682,7 +2755,13 @@ async def next_cmd(mc, cmds, json_output=False):
                     print(json.dumps(res, indent=4))
                 else :
                     for c in res.items():
-                        print(c[1]["adv_name"])
+                        if c[1]['out_path_len'] == -1:
+                            path_str = "Flood"
+                        elif c[1]['out_path_len'] == 0:
+                            path_str = "0 hop"
+                        else:
+                            path_str = f"{c[1]['out_path']}"
+                        print(f"{c[1]['adv_name']:30} {CONTACT_TYPENAMES[c[1]['type']]:4}  {c[1]['public_key'][:12]}  {path_str}")
                     print(f"> {len(mc.contacts)} contacts in device")
 
             case "reload_contacts" | "rc":
@@ -2750,7 +2829,7 @@ async def next_cmd(mc, cmds, json_output=False):
                         if (path_len == 0) :
                             print("0 hop")
                         elif (path_len == -1) :
-                            print("Path not set")
+                            print("Flood")
                         else:
                             print(path)
 
@@ -2777,6 +2856,8 @@ async def next_cmd(mc, cmds, json_output=False):
                         print(f"Unknown contact {cmds[1]}")
                 else:
                     path = cmds[2].replace(",","") # we'll accept path with ,
+                    if path == "0":
+                        path = ""
                     try:
                         res = await mc.commands.change_contact_path(contact, path)
                         logger.debug(res)
@@ -3109,8 +3190,8 @@ def command_help():
     reboot                 : reboots node
     sleep <secs>           : sleeps for a given amount of secs      s
     wait_key               : wait until user presses <Enter>        wk
-    apply_to <scope> <cmds>: sends cmds to contacts matching scope  at
-  Messenging
+    apply_to <f> <cmds>    : sends cmds to contacts matching f      at
+  Messaging
     msg <name> <msg>       : send message to node by name           m  {
     wait_ack               : wait an ack                            wa }
     chan <nb> <msg>        : send message to channel number <nb>    ch
@@ -3123,6 +3204,7 @@ def command_help():
     get_channel <n>        : get info for channel (by number or name)
     set_channel n nm k     : set channel info (nb, name, key)
     remove_channel <n>     : remove channel (by number or name)
+    scope <s>              : sets scope for flood messages
   Management
     advert                 : sends advert                           a
     floodadv               : flood advert
@@ -3164,17 +3246,21 @@ def command_help():
 def usage () :
     """ Prints some help """
     version()
+    command_usage()
+    print(" Available Commands and shorcuts (can be chained) :""")
+    command_help()
+
+def command_usage() :
     print("""
    Usage : meshcore-cli <args> <commands>
 
  Arguments :
-    -h : prints this help
+    -h : prints help for arguments and commands
     -v : prints version
     -j : json output (disables init file)
     -D : debug
     -S : scan for devices and show a selector
     -l : list available ble/serial devices and exit
-    -c <on/off>     : disables most of color output if off
     -T <timeout>    : timeout for the ble scan (-S and -l) default 2s
     -a <address>    : specifies device address (can be a name)
     -d <name>       : filter meshcore devices with name or address
@@ -3183,14 +3269,14 @@ def usage () :
     -p <port>       : specifies tcp port (default 5000)
     -s <port>       : use serial port <port>
     -b <baudrate>   : specify baudrate
-
- Available Commands and shorcuts (can be chained) :""")
-    command_help()
+    -C              : toggles classic mode for prompt
+    -c <on/off>     : disables most of color output if off
+""")
 
 def get_help_for (cmdname, context="line") :
     if cmdname == "apply_to" or cmdname == "at" :
-        print("""apply_to <scope> <cmd> : applies cmd to contacts matching scope
-    Scope acts like a filter with comma separated fields :
+        print("""apply_to <f> <cmd> : applies cmd to contacts matching filter <f>
+    Filter is constructed with comma separated fields :
      - u, matches modification time < or > than a timestamp
             (can also be days hours or minutes ago if followed by d,h or m)
      - t, matches the type (1: client, 2: repeater, 3: room, 4: sensor)
@@ -3198,7 +3284,7 @@ def get_help_for (cmdname, context="line") :
      - d, direct, similar to h>-1
      - f, flood, similar to h<0 or h=-1
 
-    Note: Some commands like contact_name (aka cn), reset_path (aka rp), forget_password (aka fp) can be chained.
+    Note: Some commands like contact_name (aka cn), contact_key (aka ck), contact_type (aka ct), reset_path (aka rp), forget_password (aka fp) can be chained. There is also a sleep command taking an optional event. The sleep will be issued after the command, it helps limiting rate through repeaters ...
 
     Examples:
         # removes all clients that have not been updated in last 2 days
@@ -3209,7 +3295,7 @@ def get_help_for (cmdname, context="line") :
         at t=2 rp login
 """)
 
-    if cmdname == "node_discover" or cmdname == "nd" :
+    elif cmdname == "node_discover" or cmdname == "nd" :
         print("""node_discover <filter> : discovers 0-hop nodes and displays signal info
 
     filter can be "all" for all types or nodes or a comma separated list consisting of :
@@ -3221,6 +3307,98 @@ def get_help_for (cmdname, context="line") :
     nd can be used with no filter parameter ... !!! BEWARE WITH CHAINING !!!
 """)
 
+    elif cmdname == "get" :
+        print("""Gets parameters from node
+  Please see also help for set command, which is more up to date ...
+    name               : node name
+    bat                : battery level in mV
+    fstats             : fs statistics
+    coords             : adv coordinates
+    lat                : latitude
+    lon                : longitude
+    radio              : radio parameters
+    tx                 : tx power
+    print_snr          : snr display in messages
+    print_adverts      : display adverts as they come
+    print_new_contacts : display new pending contacts when available
+    print_path_updates : display path updates as they come
+    custom             : all custom variables in json format
+                each custom var can also be get/set directly
+""")
+
+    elif cmdname == "set" :
+        print("""Available parameters :
+  device:
+    pin <pin>                   : ble pin
+    radio <freq,bw,sf,cr>       : radio params
+    tuning <rx_dly,af>          : tuning params
+    tx <dbm>                    : tx power
+    name <name>                 : node name
+    lat <lat>                   : latitude
+    lon <lon>                   : longitude
+    coords <lat,lon>            : coordinates
+    multi_ack <on/off>          : multi-acks feature
+    telemetry_mode_base <mode>  : set basic telemetry mode all/selected/off
+    telemetry_mode_loc <mode>   : set location telemetry mode all/selected/off
+    telemetry_mode_env <mode>   : set env telemetry mode all/selected/off
+    advert_loc_policy <policy>  : "share" means loc will be shared in adv
+    manual_add_contacts <on/off>: let user manually add contacts to device
+      - when off device automatically adds contacts from adverts
+      - when on contacts must be added manually using add_pending 
+        (pending contacts list is built by meshcli from adverts while connected) 
+  display:
+    print_snr <on/off>          : toggle snr display in messages
+    print_adverts <on/off>      : display adverts as they come
+    print_new_contacts <on/off> : display new pending contacts when available
+    print_path_updates <on/off> : display path updates as they come
+    json_log_rx <on/off>        : logs packets incoming to device as json
+    channel_echoes <on/off>     : print repeats for channel data
+    echo_unk_channels <on/off>  : also dump unk channels (encrypted)
+    color <on/off>              : color off should remove ANSI codes from output
+  meshcore-cli behaviour:
+    classic_prompt <on/off>     : activates less fancier prompt
+    arrow_head <string>         : change arrow head in prompt
+    slash_start <string>        : idem for slash start
+    slash_end <string>          : slash end
+    invert_slash <on/off>       : apply color inversion to slash
+    auto_update_contacts <on/of>: auto sync contact list with device
+""")
+
+    elif cmdname == "scope":
+        print("""scope <scope> : changes flood scope of the node
+
+    The scope command can be used from command line or interactive mode to set the region in which flood packets will be transmitted.
+
+Managing Flood Scope in interactive mode
+    Flood scope has recently been introduced in meshcore (from v1.10.0). It limits the scope of packets to regions, using transport codes in the frame.
+    When entering chat mode, scope will be reset to *, meaning classic flood.
+    You can switch scope using the scope command, or postfixing the to command with %<scope>.
+    Scope can also be applied to a command using % before the scope name. For instance login%#Morbihan will limit diffusion of the login command (which is usually sent flood to get the path to a repeater) to the #Morbihan region.
+""")
+
+    elif cmdname == "contact_info":
+        print("""contact_info <ct> : displays contact info
+
+    in interactive mode, there are some lighter commands that can be chained to give more compact information
+        - contact_name (cn)
+        - contact_key (ck)
+        - contact_type (ct)
+""")
+
+    elif cmdname == "pending_contacts" or cmdname == "flush_pending" or cmdname == "add_pending":
+        print("""Contact management
+
+To receive a message from another user, it is necessary to have its public key. This key is stored on a contact list in the device, and this list has a finite size (50 when meshcore started, now over 350 for most devices).
+
+By default contacts are automatically added to the device contact list when an advertisement is received, so as soon as you receive an advert, you can talk with your buddy.
+
+With growing number of users, it becomes necessary to manage contact list and one of the ways is to add contacts manually to the device. This is done by turning on manual_add_contacts. Once this option has been turned on, a pending list is built by meshcore-cli from the received adverts. You can view the list issuing a pending_contacts command, flush the list using flush_pending or add a contact from the list with add_pending followed by the key of the contact or its name (both will be auto-completed with tab).
+
+This feature only really works in interactive mode.
+
+Note: There is also an auto_update_contacts setting that has nothing to do with adding contacts, it permits to automatically sync contact lists between device and meshcore-cli (when there is an update in name, location or path).
+""")
+
     else:
         print(f"Sorry, no help yet for {cmdname}")
 
@@ -3236,18 +3414,26 @@ async def main(argv):
     baudrate = 115200
     timeout = 2
     pin = None
+    first_device = False
     # If there is an address in config file, use it by default
     # unless an arg is explicitely given
     if os.path.exists(MCCLI_ADDRESS) :
         with open(MCCLI_ADDRESS, encoding="utf-8") as f :
             address = f.readline().strip()
 
-    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:")
+    try:
+        opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:C")
+    except getopt.GetoptError:
+        print("Unrecognized option, use -h to get more help")
+        command_usage()
+        return
     for opt, arg in opts :
         match opt:
             case "-c" :
                 if arg == "off":
                     process_event_message.color = False
+            case "-C":
+                interactive_loop.classic = not interactive_loop.classic
             case "-d" : # name specified on cmdline
                 address = arg
             case "-a" : # address specified on cmdline
@@ -3277,6 +3463,7 @@ async def main(argv):
                 return
             case "-f": # connect to first encountered device
                 address = ""
+                first_device = True
             case "-l" :
                 print("BLE devices:")
                 try :
@@ -3372,8 +3559,15 @@ async def main(argv):
 
         try :
             mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
+        except BleakError :
+            print("BLE connection asked (default behaviour), but no BLE HW found")
+            print("Call meshcore-cli with -h for some more help (on commands)")
+            command_usage()
+            return            
         except ConnectionError :
             logger.info("Error while connecting, retrying once ...")
+            if first_device :
+                address = "" # reset address to change device if first_device was asked
             if device is None and client is None: # Search for device
                 logger.info(f"Scanning BLE for device matching {address}")
                 devices = await BleakScanner.discover(timeout=timeout)