meshcore-cli 1.3.1__tar.gz → 1.3.2__tar.gz

{meshcore_cli-1.3.1 → meshcore_cli-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.3.1
+Version: 1.3.2
 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.24
+Requires-Dist: meshcore>=2.2.0
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pycryptodome
 Requires-Dist: requests>=2.28.0
@@ -198,6 +198,18 @@ f1down/#fdl|*> 8
 #fdl f1down: 8                                               [2521]  1.00-109
 ```
 
+### 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).
+
 ### Issuing batch commands to contacts with apply to
 
 `apply_to <f> <cmd>` : applies cmd to contacts matching filter `<f>` it can be used to apply the same command to a pool of repeaters, or remove some contacts matching a condition.

{meshcore_cli-1.3.1 → meshcore_cli-1.3.2}/README.md

@@ -180,6 +180,18 @@ f1down/#fdl|*> 8
 #fdl f1down: 8                                               [2521]  1.00-109
 ```
 
+### 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).
+
 ### Issuing batch commands to contacts with apply to
 
 `apply_to <f> <cmd>` : applies cmd to contacts matching filter `<f>` it can be used to apply the same command to a pool of repeaters, or remove some contacts matching a condition.

{meshcore_cli-1.3.1 → meshcore_cli-1.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.3.1"
+version = "1.3.2"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 2.1.24", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0", "pycryptodome" ]
+dependencies = [ "meshcore >= 2.2.0", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0", "pycryptodome" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-1.3.1 → meshcore_cli-1.3.2}/src/meshcore_cli/meshcore_cli.py

@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.3.1"
+VERSION = "v1.3.2"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -285,7 +285,7 @@ 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)
@@ -591,6 +591,9 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "?at":None,
         "?node_discover":None,
         "?nd":None,
+        "?pending_contacts":None,
+        "?add_pending":None,
+        "?flush_pending":None,
     }
 
     contact_completion_list = {
@@ -1158,7 +1161,7 @@ async def process_contact_chat_line(mc, contact, line):
             print("")
         return True
 
-    if line.startswith("sleep") or line.startswith("s"):
+    if line.startswith("sleep ") or line.startswith("s "):
         try:
             sleeptime = int(line.split(" ",2)[1])
             cmd_pos = 2
@@ -1219,6 +1222,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
 
@@ -2598,7 +2603,7 @@ async def next_cmd(mc, cmds, json_output=False):
                             else:
                                 type = CONTACT_TYPENAMES[n['node_type']]
 
-                            print(f" {name:16} {type:>4} SNR: {n['SNR_in']:6,.2f}->{n['SNR']:6,.2f} RSSI: ->{n['RSSI']:4}")
+                            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
@@ -3327,12 +3332,15 @@ def get_help_for (cmdname, context="line") :
     lat <lat>                   : latitude
     lon <lon>                   : longitude
     coords <lat,lon>            : coordinates
-    auto_update_contacts <>     : automatically updates contact list
     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
@@ -3342,12 +3350,13 @@ def get_help_for (cmdname, context="line") :
     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
-  prompt:
+  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":
@@ -3371,6 +3380,20 @@ Managing Flood Scope in interactive mode
         - 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}")