meshcore-cli 1.1.40__py3-none-any.whl → 1.2.0__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python
-""" 
+"""
     mccli.py : CLI interface to MeschCore BLE companion app
 """
+
 import asyncio
 import os, sys
 import time, datetime
@@ -9,21 +10,27 @@ import getopt, json, shlex, re
 import logging
 import requests
 from bleak import BleakScanner, BleakClient
+from bleak.exc import BleakError
 import serial.tools.list_ports
 from pathlib import Path
 import traceback
 from prompt_toolkit.shortcuts import PromptSession
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.completion import NestedCompleter
+from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.formatted_text import ANSI
 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
+
+import re
 
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.1.40"
+VERSION = "v1.2.0"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -296,6 +303,29 @@ async def subscribe_to_msgs(mc, json_output=False, above=False):
         CS = mc.subscribe(EventType.CHANNEL_MSG_RECV, handle_message)
     await mc.start_auto_message_fetching()
 
+# redefine get_completion to let user put symbols in first item
+# and handle navigating in path ...
+class MyNestedCompleter(NestedCompleter):
+    def get_completions( self, document, complete_event):
+        txt = document.text_before_cursor.lstrip()
+        if not " " in txt: 
+            if txt != "" and txt[0] == "/" and txt.count("/") == 1:
+                opts = []
+                for k in self.options.keys():
+                    if k[0] == "/" :
+                        v = "/" + k.split("/")[1] #+ ("/" if k.count("/") == 2 else "")
+                        if v not in opts:
+                            opts.append(v)
+            else:
+                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]+)"))
+            yield from completer.get_completions(document, complete_event)
+        else: # normal behavior for remainder
+            yield from super().get_completions(document, complete_event)
+
+
 def make_completion_dict(contacts, pending={}, to=None, channels=None):
     contact_list = {}
     pending_list = {}
@@ -306,7 +336,6 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
     if not process_event_message.last_node is None:
         to_list["!"] = None
     to_list[".."] = None
-    to_list["public"] = None
 
     it = iter(contacts.items())
     for c in it :
@@ -332,229 +361,248 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "chan" : None,
     }
 
+    root_completion_list = {
+        "ver" : None,
+        "infos" : None,
+        "advert" : None,
+        "floodadv" : None,
+        "msg" : contact_list,
+        "wait_ack" : None,
+        "time" : None,
+        "clock" : {"sync" : None},
+        "reboot" : None,
+        "card" : None,
+        "upload_card" : None,
+        "contacts": None,
+        "pending_contacts": None,
+        "add_pending": pending_list,
+        "flush_pending": None,
+        "contact_info": contact_list,
+        "export_contact" : contact_list,
+        "upload_contact" : contact_list,
+        "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,
+        "remove_contact" : contact_list,
+        "import_contact" : {"meshcore://":None},
+        "reload_contacts" : None,
+        "login" : contact_list,
+        "cmd" : contact_list,
+        "req_status" : contact_list,
+        "req_bstatus" : contact_list,
+        "logout" : contact_list,
+        "req_telemetry" : contact_list,
+        "req_binary" : contact_list,
+        "req_mma" : contact_list,
+        "self_telemetry" : None,
+        "get_channel": None,
+        "set_channel": None,
+        "get_channels": None,
+        "remove_channel": None,
+        "set" : {
+            "name" : None,
+            "pin" : None,
+            "radio" : {",,,":None, "f,bw,sf,cr":None},
+            "tx" : None,
+            "tuning" : {",", "af,tx_d"},
+            "lat" : None,
+            "lon" : None,
+            "coords" : 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},
+            "print_new_contacts" : {"on": None, "off":None},
+            "print_path_updates" : {"on":None,"off":None},
+            "classic_prompt" : {"on" : None, "off":None},
+            "manual_add_contacts" : {"on" : None, "off":None},
+            "telemetry_mode_base" : {"always" : None, "device":None, "never":None},
+            "telemetry_mode_loc" : {"always" : None, "device":None, "never":None},
+            "telemetry_mode_env" : {"always" : None, "device":None, "never":None},
+            "advert_loc_policy" : {"none" : None, "share" : None},
+            "auto_update_contacts" : {"on":None, "off":None},
+            "multi_acks" : {"on": None, "off":None},
+            "max_attempts" : None,
+            "max_flood_attempts" : None,
+            "flood_after" : None,
+        },
+        "get" : {"name":None,
+            "bat":None,
+            "fstats": None,
+            "radio":None,
+            "tx":None,
+            "coords":None,
+            "lat":None,
+            "lon":None,
+            "print_snr":None,
+            "json_msgs":None,
+            "color":None,
+            "print_name":None,
+            "print_adverts":None,
+            "print_path_updates":None,
+            "print_new_contacts":None,
+            "classic_prompt":None,
+            "manual_add_contacts":None,
+            "telemetry_mode_base":None,
+            "telemetry_mode_loc":None,
+            "telemetry_mode_env":None,
+            "advert_loc_policy":None,
+            "auto_update_contacts":None,
+            "multi_acks":None,
+            "max_attempts":None,
+            "max_flood_attempts":None,
+            "flood_after":None,
+            "custom":None,
+        },
+    }
+
+    contact_completion_list = {
+        "contact_info": None,
+        "export_contact" : None,
+        "share_contact" : None,
+        "upload_contact" : None,
+        "path": None,
+        "disc_path": None,
+        "trace": None,
+        "dtrace": None,
+        "reset_path" : None,
+        "change_path" : None,
+        "change_flags" : None,
+        "req_telemetry" : None,
+        "req_binary" : None,
+        "forget_password" : None,
+    }
+
+    client_completion_list = dict(contact_completion_list)
+    client_completion_list.update({
+        "get" : { "timeout":None, },
+        "set" : { "timeout":None, },
+    })
+
+    repeater_completion_list = dict(contact_completion_list)
+    repeater_completion_list.update({
+        "login" : None,
+        "logout" : None,
+        "req_status" : None,
+        "req_bstatus" : None,
+        "cmd" : None,
+        "ver" : None,
+        "advert" : None,
+        "time" : None,
+        "clock" : {"sync" : None},
+        "reboot" : None,
+        "start ota" : None,
+        "password" : None,
+        "neighbors" : None,
+        "req_acl":None,
+        "setperm":contact_list,
+        "gps" : {"on":None,"off":None,"sync":None,"setloc":None,
+            "advert" : {"none": None, "share": None, "prefs": None},
+        },
+        "sensor": {"list": None, "set": {"gps": None}, "get": {"gps": None}},
+        "get" : {"name" : None,
+            "role":None,
+            "radio" : None,
+            "freq":None,
+            "tx":None,
+            "af" : None,
+            "repeat" : None,
+            "allow.read.only" : None,
+            "flood.advert.interval" : None,
+            "flood.max":None,
+            "advert.interval" : None,
+            "guest.password" : None,
+            "rxdelay": None,
+            "txdelay": None,
+            "direct.tx_delay":None,
+            "public.key":None,
+            "lat" : None,
+            "lon" : None,
+            "telemetry" : None,
+            "status" : None,
+            "timeout" : None,
+            "acl":None,
+            "bridge.enabled":None,
+            "bridge.delay":None,
+            "bridge.source":None,
+            "bridge.baud":None,
+            "bridge.secret":None,
+            "bridge.type":None,
+            },
+        "set" : {"name" : None,
+            "radio" : {",,,":None, "f,bw,sf,cr": None},
+            "freq" : None,
+            "tx" : None,
+            "af": None,
+            "repeat" : {"on": None, "off": None},
+            "flood.advert.interval" : None,
+            "flood.max" : None,
+            "advert.interval" : None,
+            "guest.password" : None,
+            "allow.read.only" : {"on": None, "off": None},
+            "rxdelay" : None,
+            "txdelay": None,
+            "direct.txdelay" : None,
+            "lat" : None,
+            "lon" : None,
+            "timeout" : None,
+            "perm":contact_list,
+            "bridge.enabled":{"on": None, "off": None},
+            "bridge.delay":None,
+            "bridge.source":None,
+            "bridge.baud":None,
+            "bridge.secret":None,
+            },
+        "erase": None,
+        "log" : {"start" : None, "stop" : None, "erase" : None}
+    })
+
+    sensor_completion_list = dict(repeater_completion_list)
+    sensor_completion_list.update({"req_mma":{"begin end":None}})
+    sensor_completion_list["get"].update({ "mma":None, })
+
     if to is None :
-        completion_list.update({
-            "ver" : None,
-            "infos" : None,
-            "advert" : None,
-            "floodadv" : None,
-            "msg" : contact_list,
-            "wait_ack" : None,
-            "time" : None,
-            "clock" : {"sync" : None},
-            "reboot" : None,
-            "card" : None,
-            "upload_card" : None,
-            "contacts": None,
-            "pending_contacts": None,
-            "add_pending": pending_list,
-            "flush_pending": None,
-            "contact_info": contact_list,
-            "export_contact" : contact_list,
-            "upload_contact" : contact_list,
-            "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,
-            "remove_contact" : contact_list,
-            "import_contact" : {"meshcore://":None},
-            "reload_contacts" : None,
-            "login" : contact_list,
-            "cmd" : contact_list,
-            "req_status" : contact_list,
-            "req_bstatus" : contact_list,
-            "logout" : contact_list,
-            "req_telemetry" : contact_list,
-            "req_binary" : contact_list,
-            "req_mma" : contact_list,
-            "self_telemetry" : None,
-            "get_channel": None,
-            "set_channel": None,
-            "get_channels": None,
-            "remove_channel": None,
-            "set" : {
-                    "name" : None,
-                    "pin" : None,
-                    "radio" : {",,,":None, "f,bw,sf,cr":None},
-                    "tx" : None,
-                    "tuning" : {",", "af,tx_d"},
-                    "lat" : None,
-                    "lon" : None,
-                    "coords" : 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},
-                    "print_new_contacts" : {"on": None, "off":None},
-                    "print_path_updates" : {"on":None,"off":None},
-                    "classic_prompt" : {"on" : None, "off":None},
-                    "manual_add_contacts" : {"on" : None, "off":None},
-                    "telemetry_mode_base" : {"always" : None, "device":None, "never":None},
-                    "telemetry_mode_loc" : {"always" : None, "device":None, "never":None},
-                    "telemetry_mode_env" : {"always" : None, "device":None, "never":None},
-                    "advert_loc_policy" : {"none" : None, "share" : None},
-                    "auto_update_contacts" : {"on":None, "off":None},
-                    "multi_acks" : {"on": None, "off":None},
-                    "max_attempts" : None,
-                    "max_flood_attempts" : None,
-                    "flood_after" : None,
-                    },
-            "get" : {"name":None,
-                     "bat":None,
-                     "fstats": None,
-                     "radio":None,
-                     "tx":None,
-                     "coords":None,
-                     "lat":None,
-                     "lon":None,
-                     "print_snr":None,
-                     "json_msgs":None,
-                     "color":None,
-                     "print_name":None,
-                     "print_adverts":None,
-                     "print_path_updates":None,
-                     "print_new_contacts":None,
-                     "classic_prompt":None,
-                     "manual_add_contacts":None,
-                     "telemetry_mode_base":None,
-                     "telemetry_mode_loc":None,
-                     "telemetry_mode_env":None,
-                     "advert_loc_policy":None,
-                     "auto_update_contacts":None,
-                     "multi_acks":None,
-                     "max_attempts":None,
-                     "max_flood_attempts":None,
-                     "flood_after":None,
-                     "custom":None,
-                     },
-        })
+        completion_list.update(dict(root_completion_list))
         completion_list["set"].update(make_completion_dict.custom_vars)
         completion_list["get"].update(make_completion_dict.custom_vars)
     else :
         completion_list.update({
             "send" : None,
         })
+        if to['type'] == 1 :
+            completion_list.update(client_completion_list)
+        if to['type'] == 2 or to['type'] == 3 : # repeaters and room servers
+            completion_list.update(repeater_completion_list)
+        if (to['type'] == 4) : #specific to sensors
+            completion_list.update(sensor_completion_list)
 
-        if to['type'] > 0: # contact
-            completion_list.update({
-                "contact_info": None,
-                "export_contact" : None,
-                "share_contact" : None,
-                "upload_contact" : None,
-                "path": None,
-                "disc_path": None,
-                "trace": None,
-                "dtrace": None,
-                "reset_path" : None,
-                "change_path" : None,
-                "change_flags" : None,
-                "req_telemetry" : None,
-                "req_binary" : None,
-            })
+    slash_root_completion_list = {}
+    for k,v in root_completion_list.items():
+        slash_root_completion_list["/"+k]=v
+    
+    completion_list.update(slash_root_completion_list)
 
-        if to['type'] == 1 :
-            completion_list.update({
-                "get" : {
-                    "timeout":None,
-                },
-                "set" : {
-                    "timeout":None,
-                },
-            })
-
-        if to['type'] > 1 : # repeaters and room servers
-            completion_list.update({
-                "login" : None,
-                "logout" : None,
-                "req_status" : None,
-                "req_bstatus" : None,
-                "cmd" : None,
-                "ver" : None,
-                "advert" : None,
-                "time" : None,
-                "clock" : {"sync" : None},
-                "reboot" : None,
-                "start ota" : None,
-                "password" : None,
-                "neighbors" : None,
-                "req_acl":None,
-                "setperm":contact_list,
-                "gps" : {"on":None,"off":None,"sync":None,"setloc":None, 
-                         "advert" : {"none": None, "share": None, "prefs": None}, 
-                },
-                "sensor": {"list": None, "set": {"gps": None}, "get": {"gps": None}},
-                "get" : {"name" : None,
-                         "role":None,
-                         "radio" : None,
-                         "freq":None,
-                         "tx":None,
-                         "af" : None,
-                         "repeat" : None,
-                         "allow.read.only" : None,
-                         "flood.advert.interval" : None,
-                         "flood.max":None,
-                         "advert.interval" : None,
-                         "guest.password" : None,
-                         "rxdelay": None,
-                         "txdelay": None,
-                         "direct.tx_delay":None,
-                         "public.key":None,
-                         "lat" : None,
-                         "lon" : None,
-                         "telemetry" : None,
-                         "status" : None,
-                         "timeout" : None,
-                         "acl":None,
-                         "bridge.enabled":None,
-                         "bridge.delay":None,
-                         "bridge.source":None,
-                         "bridge.baud":None,
-                         "bridge.secret":None,
-                         "bridge.type":None,
-                         },
-                "set" : {"name" : None,
-                         "radio" : {",,,":None, "f,bw,sf,cr": None},
-                         "freq" : None,
-                         "tx" : None,
-                         "af": None,
-                         "repeat" : {"on": None, "off": None},
-                         "flood.advert.interval" : None,
-                         "flood.max" : None,
-                         "advert.interval" : None,
-                         "guest.password" : None,
-                         "allow.read.only" : {"on": None, "off": None},
-                         "rxdelay" : None,
-                         "txdelay": None,
-                         "direct.txdelay" : None,
-                         "lat" : None,
-                         "lon" : None,
-                         "timeout" : None,
-                         "perm":contact_list,
-                         "bridge.enabled":{"on": None, "off": None},
-                         "bridge.delay":None,
-                         "bridge.source":None,
-                         "bridge.baud":None,
-                         "bridge.secret":None,
-                         },
-                "erase": None,
-                "log" : {"start" : None, "stop" : None, "erase" : None}
-            })
+    slash_contacts_completion_list = {}
+    for k,v in contacts.items():
+        d={}
+        if v["type"] == 1:
+            l = client_completion_list
+        elif v["type"] == 2 or v["type"] == 3:
+            l = repeater_completion_list
+        elif v["type"] == 4:
+            l = sensor_completion_list
 
-        if (to['type'] == 4) : #specific to sensors
-            completion_list.update({
-                "req_mma":{"begin end":None},
-            })
+        for kk, vv in l.items():
+            d["/" + v["adv_name"] + "/" + kk] = vv
 
-            completion_list["get"].update({
-                "mma":None,
-            })
+        slash_contacts_completion_list.update(d)
 
-            completion_list["set"].update({
-            })
+    completion_list.update(slash_contacts_completion_list)
 
     completion_list.update({
         "script" : None,
@@ -573,7 +621,6 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
     contact = to
     prev_contact = None
 
-#    await get_contacts(mc, anim=True)
     await get_contacts(mc, anim=True)
     await get_channels(mc, anim=True)
     await subscribe_to_msgs(mc, above=True)
@@ -665,7 +712,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
             session.app.ttimeoutlen = 0.2
             session.app.timeoutlen = 0.2
 
-            completer = NestedCompleter.from_nested_dict(
+            completer = MyNestedCompleter.from_nested_dict(
                             make_completion_dict(mc.contacts,
                                     mc.pending_contacts,
                                     to=contact,
@@ -684,6 +731,24 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 args = shlex.split(line[1:])
                 await process_cmds(mc, args)
 
+            elif line.startswith("/") :
+                path = line.split(" ", 1)[0]
+                if path.count("/") == 1:
+                    args = shlex.split(line[1:])
+                    await process_cmds(mc, args)
+                else:
+                    cmdline = line[1:].split("/",1)[1]
+                    contact_name = path[1:].split("/",1)[0]
+                    tct = mc.get_contact_by_name(contact_name)
+                    if tct is None:
+                        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])
+
             elif line.startswith("to ") : # dest
                 dest = line[3:]
                 if dest.startswith("\"") or dest.startswith("\'") : # if name starts with a quote
@@ -706,7 +771,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                     elif dest == "!" :
                         nc = process_event_message.last_node
                     else :
-                        chan = await get_channel_by_name(mc, dest)            
+                        chan = await get_channel_by_name(mc, dest)
                         if chan is None :
                             print(f"Contact '{dest}' not found in contacts.")
                             nc = contact
@@ -751,104 +816,8 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 args = shlex.split(line)
                 await process_cmds(mc, args)
 
-            # commands that take contact as second arg will be sent to recipient
-            elif contact["type"] > 0 and (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_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']]
-                await process_cmds(mc, args)
-
-            elif contact["type"] > 0 and line.startswith("set timeout "):
-                cmds=line.split(" ")
-                contact["timeout"] = float(cmds[2])
-
-            elif contact["type"] > 0 and line == "get timeout":
-                print(f"timeout: {0 if not 'timeout' in contact else contact['timeout']}")
-
-            elif contact["type"] == 4 and\
-                    (line.startswith("get mma ")) or\
-                 contact["type"] > 1 and\
-                    (line.startswith("get telemetry") or line.startswith("get status") or line.startswith("get acl")):
-                cmds = line.split(" ")
-                args = [f"req_{cmds[1]}", contact['adv_name']]
-                if len(cmds) > 2 :
-                    args = args + cmds[2:]
-                if line.startswith("get mma ") and len(args) < 4:
-                    args.append("0")
-                await process_cmds(mc, args)
-
-            # special treatment for setperm to support contact name as param
-            elif contact["type"] > 1 and\
-                (line.startswith("setperm ") or line.startswith("set perm ")):
-                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:
-                        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")
-
-            # trace called on a contact
-            elif contact["type"] > 0 and (
-                    line == "trace" or line == "tr") :
-                await print_trace_to(mc, contact)
-
-            elif contact["type"] > 0 and (
-                    line == "dtrace" or line == "dt") :
-                await print_disc_trace_to(mc, contact)
-                
-            # same but for commands with a parameter
-            elif contact["type"] > 0 and (line.startswith("cmd ") or\
-                    line.startswith("cp ") or line.startswith("change_path ") or\
-                    line.startswith("cf ") or line.startswith("change_flags ") or\
-                    line.startswith("req_binary ") or\
-                    line.startswith("login ")) :
-                cmds = line.split(" ", 1)
-                args = [cmds[0], contact['adv_name'], cmds[1]]
-                await process_cmds(mc, args)
-
-            elif contact["type"] == 4 and \
-                (line.startswith("req_mma ") or line.startswith('rm ')) :
-                cmds = line.split(" ")
-                if len(cmds) < 3 :
-                    cmds.append("0")
-                args = [cmds[0], contact['adv_name'], cmds[1], cmds[2]]
-                await process_cmds(mc, args)
-
-            elif line.startswith(":") : # : will send a command to current recipient
-                args=["cmd", contact['adv_name'], line[1:]]
-                await process_cmds(mc, args)
-
-            elif line == "reset path" : # reset path for compat with terminal chat
-                args = ["reset_path", contact['adv_name']]
-                await process_cmds(mc, args)
+            elif await process_contact_chat_line(mc, contact, line):
+                pass
 
             elif line == "list" : # list command from chat displays contacts on a line
                 it = iter(mc.contacts.items())
@@ -886,6 +855,165 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 interactive_loop.classic = False
 interactive_loop.print_name = True
 
+async def process_contact_chat_line(mc, contact, line):
+    if contact["type"] == 0:
+        return False
+
+    if line.startswith(":") : # : will send a command to current recipient
+        args=["cmd", contact['adv_name'], line[1:]]
+        await process_cmds(mc, args)
+        return True
+
+    if line == "reset path" : # reset path for compat with terminal chat
+        args = ["reset_path", contact['adv_name']]
+        await process_cmds(mc, args)
+        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_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']]
+        await process_cmds(mc, args)
+        return True
+
+    # special case for rp that can be chained from cmdline
+    if line.startswith("rp ") or line.startswith("reset_path ") :
+        args = ["rp", contact['adv_name']]
+        await process_cmds(mc, args)
+        secline = line.split(" ", 1)[1]
+        await process_contact_chat_line(mc, contact, secline)
+        return True
+
+    if line.startswith("set timeout "):
+        cmds=line.split(" ")
+        contact["timeout"] = float(cmds[2])
+        return True
+
+    if line == "get timeout":
+        print(f"timeout: {0 if not 'timeout' in contact else contact['timeout']}")
+        return True
+
+    if contact["type"] == 4 and\
+            (line.startswith("get mma ")) or\
+         contact["type"] > 1 and\
+            (line.startswith("get telemetry") or line.startswith("get status") or line.startswith("get acl")):
+        cmds = line.split(" ")
+        args = [f"req_{cmds[1]}", contact['adv_name']]
+        if len(cmds) > 2 :
+            args = args + cmds[2:]
+        if line.startswith("get mma ") and len(args) < 4:
+            args.append("0")
+        await process_cmds(mc, args)
+        return True
+
+    # special treatment for setperm to support contact name as param
+    if contact["type"] > 1 and\
+        (line.startswith("setperm ") or line.startswith("set perm ")):
+        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:
+                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")
+        return True
+
+    # trace called on a contact
+    if line == "trace" or line == "tr" :
+        await print_trace_to(mc, contact)
+        return True
+
+    if line == "dtrace" or line == "dt" :
+        await print_disc_trace_to(mc, contact)
+        return True
+
+    # same but for commands with a parameter
+    if line.startswith("cmd ") or\
+            line.startswith("cp ") or line.startswith("change_path ") or\
+            line.startswith("cf ") or line.startswith("change_flags ") or\
+            line.startswith("req_binary ") or\
+            line.startswith("login ") :
+        cmds = line.split(" ", 1)
+        args = [cmds[0], contact['adv_name'], cmds[1]]
+        await process_cmds(mc, args)
+        return True
+
+    if line == "login": # use stored password or prompt for it
+        password_file = ""
+        password = ""
+        if os.path.isdir(MCCLI_CONFIG_DIR) :
+            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()
+
+        if password == "":
+            try:
+                sess = PromptSession("Password: ", is_password=True)
+                password = await sess.prompt_async()
+            except EOFError:
+                logger.info("Canceled")
+                return True
+
+            if password_file != "":
+                with open(password_file, "w", encoding="utf-8") as f :
+                    f.write(password)
+
+        args = ["login", contact['adv_name'], password]
+        await process_cmds(mc, args)
+        return True
+
+    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)
+        try:
+            secline = line.split(" ", 1)[1]
+            await process_contact_chat_line(mc, contact, secline)
+        except IndexError:
+            pass
+        return True
+
+    if contact["type"] == 4 and \
+        (line.startswith("req_mma ") or line.startswith('rm ')) :
+        cmds = line.split(" ")
+        if len(cmds) < 3 :
+            cmds.append("0")
+        args = [cmds[0], contact['adv_name'], cmds[1], cmds[2]]
+        await process_cmds(mc, args)
+        return True
+
+    return False
+
+
 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:
@@ -909,7 +1037,7 @@ async def send_chan_msg(mc, nb, msg):
         sent["text"] = msg
         sent["txt_type"] = 0
         sent["name"] = mc.self_info['name']
-        await log_message(mc, sent) 
+        await log_message(mc, sent)
     return res
 
 async def send_msg (mc, contact, msg) :
@@ -1002,6 +1130,9 @@ async def get_channel_by_name (mc, name):
     return None
 
 async def get_contacts (mc, anim=False, lastomod=0, timeout=5) :
+    if mc._contacts:
+        return
+
     if anim:
         print("Fetching contacts ", end="", flush=True)
 
@@ -1020,7 +1151,7 @@ async def get_contacts (mc, anim=False, lastomod=0, timeout=5) :
         done, pending = await asyncio.wait(
             futures, timeout=timeout, return_when=asyncio.FIRST_COMPLETED
         )
-    
+
         # Check if any future completed successfully
         if len(done) == 0:
             logger.debug("Timeout while getting contacts")
@@ -1040,7 +1171,7 @@ async def get_contacts (mc, anim=False, lastomod=0, timeout=5) :
                     if anim:
                         if event.type == EventType.CONTACTS:
                             print ((len(event.payload)-contact_nb)*"." + " Done")
-                        else : 
+                        else :
                             print(" Error")
                     for future in pending:
                         future.cancel()
@@ -1702,7 +1833,7 @@ async def next_cmd(mc, cmds, json_output=False):
                     res = await set_channel(mc, cmds[1], cmds[2])
                 elif len(cmds[3]) != 32:
                     res = None
-                else: 
+                else:
                     res = await set_channel(mc, cmds[1], cmds[2], bytes.fromhex(cmds[3]))
                 if res is None:
                     print("Error setting channel")
@@ -1722,8 +1853,8 @@ async def next_cmd(mc, cmds, json_output=False):
             case "msg" | "m" | "{" : # sends to a contact from name
                 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:
@@ -1800,11 +1931,18 @@ async def next_cmd(mc, cmds, json_output=False):
 
             case "trace" | "tr":
                 argnum = 1
-                res = await mc.commands.send_trace(path=cmds[1])
+                path = cmds[1]
+                plen = int(len(path)/2)
+                if plen > 1 and path.count(",") == 0:
+                    path = cmds[1][0:2]
+                    for i in range(1, plen):
+                        path = path + "," + cmds[1][2*i:2*i+2]
+
+                res = await mc.commands.send_trace(path=path)
                 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, 
+                    ev = await mc.wait_for_event(EventType.TRACE_DATA,
                         attribute_filters={"tag": tag},
                         timeout=timeout)
                     if ev is None:
@@ -1856,7 +1994,12 @@ async def next_cmd(mc, cmds, json_output=False):
                     else:
                         print(f"Unknown contact {cmds[1]}")
                 else:
-                    res = await mc.commands.send_login(contact, cmds[2])
+                    password = cmds[2]
+                    if password == "$":
+                        sess = PromptSession("Password: ", is_password=True)
+                        password = await sess.prompt_async()
+
+                    res = await mc.commands.send_login(contact, password)
                     logger.debug(res)
                     if res.type == EventType.ERROR:
                         if json_output :
@@ -1938,7 +2081,7 @@ async def next_cmd(mc, cmds, json_output=False):
                             print("Timeout waiting telemetry")
                     else :
                         print(json.dumps(res.payload, indent=4))
-        
+
             case "disc_path" | "dp" :
                 argnum = 1
                 await mc.ensure_contacts()
@@ -2438,6 +2581,9 @@ async def next_cmd(mc, cmds, json_output=False):
     except IndexError:
         logger.error("Error in parameters, returning")
         return None
+    except EOFError:
+        logger.error("Cancelled")
+        return None
 
 async def process_cmds (mc, args, json_output=False) :
     cmds = args
@@ -2568,7 +2714,7 @@ async def main(argv):
         with open(MCCLI_ADDRESS, encoding="utf-8") as f :
             address = f.readline().strip()
 
-    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:jDhvSlT:P")
+    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:P")
     for opt, arg in opts :
         match opt:
             case "-d" : # name specified on cmdline
@@ -2598,25 +2744,34 @@ async def main(argv):
             case "-v":
                 version()
                 return
+            case "-f": # connect to first encountered device
+                address = ""
             case "-l" :
                 print("BLE devices:")
-                devices = await BleakScanner.discover(timeout=timeout)
-                if len(devices) == 0:
-                    print(" No ble device found")
-                for d in devices :
-                    if not d.name is None and d.name.startswith("MeshCore-"):
-                        print(f" {d.address}  {d.name}")
+                try :
+                    devices = await BleakScanner.discover(timeout=timeout)
+                    if len(devices) == 0:
+                        print(" No ble device found")
+                    for d in devices :
+                        if not d.name is None and d.name.startswith("MeshCore-"):
+                            print(f" {d.address}  {d.name}")
+                except BleakError:
+                    print(" No BLE HW")
                 print("\nSerial ports:")
                 ports = serial.tools.list_ports.comports()
                 for port, desc, hwid in sorted(ports):
                     print(f" {port:<18} {desc} [{hwid}]")
                 return
             case "-S" :
-                devices = await BleakScanner.discover(timeout=timeout)
                 choices = []
-                for d in devices:
-                    if not d.name is None and d.name.startswith("MeshCore-"):
-                        choices.append(({"type":"ble","device":d}, f"{d.address:<22} {d.name}"))
+
+                try :
+                    devices = await BleakScanner.discover(timeout=timeout)
+                    for d in devices:
+                        if not d.name is None and d.name.startswith("MeshCore-"):
+                            choices.append(({"type":"ble","device":d}, f"{d.address:<22} {d.name}"))
+                except BleakError:
+                    logger.info("No BLE Device")
 
                 ports = serial.tools.list_ports.comports()
                 for port, desc, hwid in sorted(ports):
@@ -2642,7 +2797,7 @@ async def main(argv):
                 else:
                     logger.error("Invalid choice")
                     return
-                    
+
     if (debug==True):
         logger.setLevel(logging.DEBUG)
     elif (json_output) :
@@ -2660,7 +2815,10 @@ async def main(argv):
         elif address and len(address) == 36 and len(address.split("-")) == 5:
             client = BleakClient(address) # mac uses uuid, we'll pass a client
         else:
-            logger.info(f"Scanning BLE for device matching {address}")
+            if address == "":
+                logger.info(f"Searching first MC BLE device")
+            else:
+                logger.info(f"Scanning BLE for device matching {address}")
             devices = await BleakScanner.discover(timeout=timeout)
             found = False
             for d in devices:
@@ -2685,6 +2843,26 @@ async def main(argv):
             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 ...")
+            if device is None or client is None: # Search for device
+                logger.info(f"Scanning BLE for device matching {address}")
+                devices = await BleakScanner.discover(timeout=timeout)
+                found = False
+                for d in devices:
+                    if not d.name is None and d.name.startswith("MeshCore-") and\
+                            (address is None or address in d.name) :
+                        address=d.address
+                        device=d
+                        logger.info(f"Found device {d.name} {d.address}")
+                        found = True
+                        break
+                    elif d.address == address : # on a mac, address is an uuid
+                        device = d
+                        logger.info(f"Found device {d.name} {d.address}")
+                        found = True
+                        break
+                if not found :
+                    logger.info(f"Couldn't find device {address}")
+                    return
             try :
                 mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
             except ConnectionError :

{meshcore_cli-1.1.40.dist-info → meshcore_cli-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.1.40
+Version: 1.2.0
 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.0.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=xvBECDCbnHtrK7VAEsQNHcYB1T9k3dQyJiAf_0VSct4,120884
+meshcore_cli-1.2.0.dist-info/METADATA,sha256=OTBsXmevebzoVaxfVclgLgkkXWRYzQr5zySZUCAZd2k,11629
+meshcore_cli-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore_cli-1.2.0.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.2.0.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.2.0.dist-info/RECORD,,

meshcore_cli-1.1.40.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=oWPnTuetuus4oaP-QQlNJx7IIeRRYGCXUG4FSYTF7AM,116312
-meshcore_cli-1.1.40.dist-info/METADATA,sha256=wsHZfVpYP4kvQMI2KvKyHbygTO-Sgq_-8Nr6ghnnPrk,11630
-meshcore_cli-1.1.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore_cli-1.1.40.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.1.40.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.1.40.dist-info/RECORD,,