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

meshcore_cli/meshcore_cli.py

@@ -24,7 +24,6 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import radiolist_dialog
 from prompt_toolkit.completion.word_completer import WordCompleter
 from prompt_toolkit.document import Document
-from hashlib import sha256
 from Crypto.Cipher import AES
 from Crypto.Hash import HMAC, SHA256
 
@@ -33,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.2.10"
+VERSION = "v1.2.12"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -579,6 +578,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "logout" : None,
         "req_status" : None,
         "req_bstatus" : None,
+        "req_neighbours": None,
         "cmd" : None,
         "ver" : None,
         "advert" : None,
@@ -720,6 +720,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
     prev_contact = None
 
     scope = await set_scope(mc, "*")
+    prev_scope = scope
 
     await get_contacts(mc, anim=True)
     await get_channels(mc, anim=True)
@@ -772,13 +773,14 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                 prompt = f"{ANSI_INVERT}"
 
             if print_name or contact is None :
-                prompt = prompt + f"{ANSI_BGRAY}"
+                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}"
                 if classic :
-                    prompt = prompt + " > "
+                    prompt = prompt + "> "
                 else :
                     prompt = prompt + f"{ANSI_NORMAL}{ARROW_HEAD}{ANSI_INVERT}"
 
@@ -816,7 +818,7 @@ 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}"
 
@@ -937,7 +939,7 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
                             nc["adv_name"] = mc.channels[dest]["channel_name"]
                     elif dest == ".." : # previous recipient
                         nc = prev_contact
-                        if dest_scope is None and not scope is None:
+                        if dest_scope is None and not prev_scope is None:
                             dest_scope = prev_scope
                     elif dest == "~" or dest == "/" or dest == mc.self_info['name']:
                         nc = None
@@ -1082,6 +1084,7 @@ async def process_contact_chat_line(mc, contact, line):
             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\
@@ -1442,7 +1445,7 @@ async def set_channel (mc, chan, name, key=None):
         return None
 
     info = res.payload
-    info["channel_hash"] = sha256(info["channel_secret"]).digest()[0:1].hex()
+    info["channel_hash"] = SHA256.new(info["channel_secret"]).hexdigest()[0:2]
     info["channel_secret"] = info["channel_secret"].hex()
 
     if hasattr(mc,'channels') :
@@ -1531,7 +1534,7 @@ async def get_channels (mc, anim=False) :
         if res.type == EventType.ERROR:
             break
         info = res.payload
-        info["channel_hash"] = sha256(info["channel_secret"]).digest()[0:1].hex()
+        info["channel_hash"] = SHA256.new(info["channel_secret"]).hexdigest()[0:2]
         info["channel_secret"] = info["channel_secret"].hex()
         mc.channels.append(info)
         ch = ch + 1
@@ -2339,7 +2342,8 @@ async def next_cmd(mc, cmds, json_output=False):
                         if json_output:
                             print(json.dumps(ev.payload, indent=2))
                         else :
-                            classic = interactive_loop.classic or not process_event_message.color
+                            color = process_event_message.color
+                            classic = interactive_loop.classic or not color
                             print("]",end="")
                             for t in ev.payload["path"]:
                                 if classic :
@@ -2347,18 +2351,20 @@ async def next_cmd(mc, cmds, json_output=False):
                                 else:
                                     print(f" {ANSI_INVERT}", end="")
                                 snr = t['snr']
-                                if snr >= 10 :
-                                    print(ANSI_BGREEN, end="")
-                                elif snr <= 0:
-                                    print(ANSI_BRED, end="")
-                                else :
-                                    print(ANSI_BGRAY, end="")
+                                if color:
+                                    if snr >= 10 :
+                                        print(ANSI_BGREEN, end="")
+                                    elif snr <= 0:
+                                        print(ANSI_BRED, end="")
+                                    else :
+                                        print(ANSI_BGRAY, end="")
                                 print(f"{snr:.2f}",end="")
                                 if classic :
                                     print("→",end="")
                                 else :
                                     print(f"{ANSI_NORMAL}{ARROW_HEAD}",end="")
-                                print(ANSI_END, end="")
+                                if color:
+                                    print(ANSI_END, end="")
                                 if "hash" in t:
                                     print(f"[{t['hash']}]",end="")
                                 else:
@@ -2630,6 +2636,31 @@ async def next_cmd(mc, cmds, json_output=False):
                                 name = f"{ct['adv_name']:<20} [{e['key']}]"
                             print(f"{name:{' '}<35}: {e['perm']:02x}")
 
+            case "req_neighbours"|"rn" :
+                argnum = 1
+                await mc.ensure_contacts()
+                contact = mc.get_contact_by_name(cmds[1])
+                timeout = 0 if not "timeout" in contact else contact["timeout"]
+                res = await mc.commands.fetch_all_neighbours(contact, timeout=timeout)
+                if res is None :
+                    if json_output :
+                        print(json.dumps({"error" : "Getting data"}))
+                    else:
+                        print("Error getting data")
+                else :
+                    if json_output:
+                        print(json.dumps(res, indent=4))
+                    else:
+                        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 :
+                                name = f"[{n['pubkey'][0:8]}] {ct['adv_name']}"
+                            else:
+                                name = f"[{n['pubkey']}]"
+
+                            print(f" {name:30} last viewed {n['secs_ago']} sec ago at {n['snr']} ")
+
             case "req_binary" :
                 argnum = 2
                 await mc.ensure_contacts()
@@ -3127,6 +3158,7 @@ def command_help():
     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_neighbours <name>  : requests for neighbours in binary form rn
     trace <path>           : run a trace, path is comma separated""")
 
 def usage () :
@@ -3142,6 +3174,7 @@ def usage () :
     -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
@@ -3209,9 +3242,12 @@ 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:fjDhvSlT:P")
+    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:")
     for opt, arg in opts :
         match opt:
+            case "-c" :
+                if arg == "off":
+                    process_event_message.color = False
             case "-d" : # name specified on cmdline
                 address = arg
             case "-a" : # address specified on cmdline

{meshcore_cli-1.2.10.dist-info → meshcore_cli-1.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.2.10
+Version: 1.2.12
 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.23
+Requires-Dist: meshcore>=2.1.24
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pycryptodome
 Requires-Dist: requests>=2.28.0

meshcore_cli-1.2.12.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=cbZPbXrhDENJvnGlR63lrupJQ22Nzk4bxGzudBKQMxQ,143616
+meshcore_cli-1.2.12.dist-info/METADATA,sha256=XU2LqLOUEHonAUDaa2VaiLsp_wvVa5XIwobda-mP_NE,11658
+meshcore_cli-1.2.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore_cli-1.2.12.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.2.12.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.2.12.dist-info/RECORD,,

meshcore_cli-1.2.10.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=IH0LlN7z14UgiUMGRhJmzp055d9AJ1jvEKV3CrXBfCA,141831
-meshcore_cli-1.2.10.dist-info/METADATA,sha256=p4qn8oBD1_Hlegrk4Gw4pQwd3_2_Mt5yDtX6pWt41DI,11658
-meshcore_cli-1.2.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore_cli-1.2.10.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.2.10.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.2.10.dist-info/RECORD,,