Updated LXMF version

Update Guide.py

README.md

@@ -4,7 +4,7 @@ Off-grid, resilient mesh communication with strong encryption, forward secrecy a
 
 ![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png)
 
-Nomad Network Allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them. No signups, no agreements, no handover of any data, no permissions and gatekeepers.
+Nomad Network allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them. No signups, no agreements, no handover of any data, no permissions and gatekeepers.
 
 Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber optics.
 
@@ -30,7 +30,36 @@ The easiest way to install Nomad Network is via pip:
 
 ```bash
 # Install Nomad Network and dependencies
-pip3 install nomadnet
+pip install nomadnet
+
+# Run the client
+nomadnet
+
+# Or alternatively run as a daemon, with no user interface
+nomadnet --daemon
+
+# List options
+nomadnet --help
+```
+
+If you are using an operating system that blocks normal user package installation via `pip`, you can return `pip` to normal behaviour by editing the `~/.config/pip/pip.conf` file, and adding the following directive in the `[global]` section:
+
+```text
+[global]
+break-system-packages = true
+```
+
+Alternatively, you can use the `pipx` tool to install Nomad Network in an isolated environment:
+
+```bash
+# Install Nomad Network
+pipx install nomadnet
+
+# Optionally install Reticulum utilities
+pipx install rns
+
+# Optionally install standalone LXMF utilities
+pipx install lxmf
 
 # Run the client
 nomadnet

nomadnet/Conversation.py

@@ -227,7 +227,7 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
-    def paper_output(self, content="", title=""):
+    def paper_output(self, content="", title="", mode="print_qr"):
         if self.send_destination:
             try:
                 dest = self.send_destination
@@ -235,18 +235,41 @@ class Conversation:
                 desired_method = LXMF.LXMessage.PAPER
 
                 lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
-                qr_code = lxm.as_qr()
-                qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
-                qr_code.save(qr_tmp_path)
 
-                print_result = self.app.print_file(qr_tmp_path)
-                os.unlink(qr_tmp_path)
+                if mode == "print_qr":
+                    qr_code = lxm.as_qr()
+                    qr_tmp_path = self.app.tmpfilespath+"/"+str(RNS.hexrep(lxm.hash, delimit=False))
+                    qr_code.save(qr_tmp_path)
 
-                if print_result:
+                    print_result = self.app.print_file(qr_tmp_path)
+                    os.unlink(qr_tmp_path)
+                    
+                    if print_result:
+                        message_path = Conversation.ingest(lxm, self.app, originator=True)
+                        self.messages.append(ConversationMessage(message_path))
+
+                    return print_result
+
+                elif mode == "save_qr":
+                    qr_code = lxm.as_qr()
+                    qr_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".png")
+                    qr_code.save(qr_save_path)
                     message_path = Conversation.ingest(lxm, self.app, originator=True)
                     self.messages.append(ConversationMessage(message_path))
+                    return qr_save_path
 
-                return print_result
+                elif mode == "save_uri":
+                    lxm_uri = lxm.as_uri()+"\n"
+                    uri_save_path = self.app.downloads_path+"/LXM_"+str(RNS.hexrep(lxm.hash, delimit=False)+".txt")
+                    with open(uri_save_path, "wb") as f:
+                        f.write(lxm_uri.encode("utf-8"))
+
+                    message_path = Conversation.ingest(lxm, self.app, originator=True)
+                    self.messages.append(ConversationMessage(message_path))
+                    return uri_save_path
+
+                elif mode == "return_uri":
+                    return lxm.as_uri()
 
             except Exception as e:
                 RNS.log("An error occurred while generating paper message, the contained exception was: "+str(e), RNS.LOG_ERROR)

nomadnet/Directory.py

@@ -34,16 +34,21 @@ class Directory:
     aspect_filter = "nomadnetwork.node"
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
-        app = nomadnet.NomadNetworkApp.get_shared_instance()
+        try:
+            app = nomadnet.NomadNetworkApp.get_shared_instance()
 
-        if not destination_hash in app.ignored_list:
-            associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+            if not destination_hash in app.ignored_list:
+                associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
 
-            app.directory.node_announce_received(destination_hash, app_data, associated_peer)
-            app.autoselect_propagation_node()
+                app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+                app.autoselect_propagation_node()
                 
-        else:
-            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
+            else:
+                RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
+
+        except Exception as e:
+            RNS.log("Error while evaluating LXMF destination announce, ignoring announce.", RNS.LOG_DEBUG)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
 
 
     def __init__(self, app):
@@ -61,7 +66,7 @@ class Directory:
             packed_list = []
             for source_hash in self.directory_entries:
                 e = self.directory_entries[source_hash]
-                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery, e.identify))
+                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery, e.identify, e.sort_rank))
 
             directory = {
                 "entry_list": packed_list,
@@ -101,18 +106,35 @@ class Directory:
                     else:
                         identify = False
 
-                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify)
+                    if len(e) > 6:
+                        sort_rank = e[6]
+                    else:
+                        sort_rank = None
+
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify, sort_rank=sort_rank)
 
                 self.directory_entries = entries
 
                 self.announce_stream = unpacked_directory["announce_stream"]
 
-
             except Exception as e:
                 RNS.log("Could not load directory from disk. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def lxmf_announce_received(self, source_hash, app_data):
         if app_data != None:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
             timestamp = time.time()
             self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
@@ -123,6 +145,19 @@ class Directory:
 
     def node_announce_received(self, source_hash, app_data, associated_peer):
         if app_data != None:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
             timestamp = time.time()
             self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
@@ -150,6 +185,19 @@ class Directory:
                 break
 
         if not found_node:
+            if self.app.compact_stream:
+                try:
+                    remove_announces = []
+                    for announce in self.announce_stream:
+                        if announce[1] == source_hash:
+                            remove_announces.append(announce)
+
+                    for a in remove_announces:
+                        self.announce_stream.remove(a)
+                
+                except Exception as e:
+                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
             timestamp = time.time()
             self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
@@ -176,7 +224,14 @@ class Directory:
     def simplest_display_str(self, source_hash):
         trust_level = self.trust_level(source_hash)
         if trust_level == DirectoryEntry.WARNING or trust_level == DirectoryEntry.UNTRUSTED:
-            return "<"+RNS.hexrep(source_hash, delimit=False)+">"
+            if source_hash in self.directory_entries:
+                dn = self.directory_entries[source_hash].display_name
+                if dn == None:
+                    return RNS.prettyhexrep(source_hash)
+                else:
+                    return dn+" <"+RNS.hexrep(source_hash, delimit=False)+">"
+            else:
+                return "<"+RNS.hexrep(source_hash, delimit=False)+">"
         else:
             if source_hash in self.directory_entries:
                 dn = self.directory_entries[source_hash].display_name
@@ -209,6 +264,18 @@ class Directory:
         else:
             return DirectoryEntry.UNKNOWN
 
+    def pn_trust_level(self, source_hash):
+        recalled_identity = RNS.Identity.recall(source_hash)
+        if recalled_identity != None:
+            associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", recalled_identity)
+            return self.trust_level(associated_node)
+
+    def sort_rank(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].sort_rank
+        else:
+            return None
+
     def preferred_delivery(self, source_hash):
         if source_hash in self.directory_entries:
             return self.directory_entries[source_hash].preferred_delivery
@@ -268,6 +335,7 @@ class Directory:
             if e.hosts_node:
                 node_list.append(e)
 
+        node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name))
         return node_list
 
     def number_of_known_nodes(self):
@@ -292,10 +360,11 @@ class DirectoryEntry:
     DIRECT     = 0x01
     PROPAGATED = 0x02
 
-    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False):
+    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False, sort_rank=None):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
             self.display_name = display_name
+            self.sort_rank = sort_rank
 
             if preferred_delivery == None:
                 self.preferred_delivery = DirectoryEntry.DIRECT

nomadnet/Node.py

@@ -153,6 +153,8 @@ class Node:
                 RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
                 if os.access(file_path, os.X_OK):
                     env_map = {}
+                    if "PATH" in os.environ:
+                        env_map["PATH"] = os.environ["PATH"]
                     if link_id != None:
                         env_map["link_id"] = RNS.hexrep(link_id, delimit=False)
                     if remote_identity != None:

nomadnet/NomadNetworkApp.py

@@ -122,10 +122,12 @@ class NomadNetworkApp:
 
         self.peer_announce_at_start  = True
         self.try_propagation_on_fail = True
+        self.disable_propagation     = False
 
         self.periodic_lxmf_sync = True
         self.lxmf_sync_interval = 360*60
         self.lxmf_sync_limit    = 8
+        self.compact_stream     = False
 
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
@@ -307,15 +309,27 @@ class NomadNetworkApp:
                 except Exception as e:
                     RNS.log("Cannot prioritise "+str(dest_str)+", it is not a valid destination hash", RNS.LOG_ERROR)
 
-            self.message_router.enable_propagation()
-            try:
-                with open(self.pnannouncedpath, "wb") as pnf:
-                    pnf.write(msgpack.packb(time.time()))
-                    pnf.close()
-            except Exception as e:
-                RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR)
+            if self.disable_propagation:
+                if os.path.isfile(self.pnannouncedpath):
+                    try:
+                        RNS.log("Sending indication to peered LXMF Propagation Node that this node is no longer participating", RNS.LOG_DEBUG)
+                        self.message_router.disable_propagation()
+                        os.unlink(self.pnannouncedpath)
+                    except Exception as e:
+                        RNS.log("An error ocurred while indicating that this LXMF Propagation Node is no longer participating. The contained exception was: "+str(e), RNS.LOG_ERROR)
+            else:
+                self.message_router.enable_propagation()
+                try:
+                    with open(self.pnannouncedpath, "wb") as pnf:
+                        pnf.write(msgpack.packb(time.time()))
+                        pnf.close()
+
+                except Exception as e:
+                    RNS.log("An error ocurred while writing Propagation Node announce timestamp. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+            if not self.disable_propagation:
+                RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
                 
-            RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
             self.node = nomadnet.Node(self)
         else:
             self.node = None
@@ -698,6 +712,10 @@ class NomadNetworkApp:
                     else:
                         self.lxmf_sync_limit = None
 
+                if option == "compact_announce_stream":
+                    value = self.config["client"].as_bool(option)
+                    self.compact_stream = value
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -783,6 +801,11 @@ class NomadNetworkApp:
                 else:
                     self.node_name = self.config["node"]["node_name"]
 
+            if not "disable_propagation" in self.config["node"]:
+                self.disable_propagation = False
+            else:
+                self.disable_propagation = self.config["node"].as_bool("disable_propagation")
+
             if not "announce_at_start" in self.config["node"]:
                 self.node_announce_at_start = False
             else:
@@ -929,6 +952,12 @@ lxmf_sync_interval = 360
 # the limit, and download everything every time.
 lxmf_sync_limit = 8
 
+# The announce stream will only show one entry
+# per destination or node by default. You can
+# change this to show as many announces as have
+# been received, for every destination.
+compact_announce_stream = yes
+
 [textui]
 
 # Amount of time to show intro screen
@@ -992,6 +1021,14 @@ announce_interval = 360
 # Whether to announce when the node starts.
 announce_at_start = Yes
 
+# By default, when Nomad Network is hosting a
+# node, it will also act as an LXMF propagation
+# node. If there is already a large amount of
+# propagation nodes on the network, or you
+# simply want to run a pageserving-only node,
+# you can disable running a propagation node.
+# disable_propagation = False
+
 # The maximum amount of storage to use for
 # the LXMF Propagation Node message store,
 # specified in megabytes. When this limit

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.3.4"
+__version__ = "0.4.0"

nomadnet/ui/TextUI.py

@@ -45,6 +45,8 @@ THEMES = {
             ("list_normal",                 "dark gray", "default",                 "default",                  "#bbb", "default"),
             ("list_untrusted",              "dark red", "default",                  "default",                  "#a22", "default"),
             ("list_focus_untrusted",        "black", "light gray",                  "standout",                 "#810", "#aaa"),
+            ("list_unresponsive",           "yellow", "default",                    "default",                  "#b92", "default"),
+            ("list_focus_unresponsive",     "black", "light gray",                  "standout",                 "#530", "#aaa"),
             ("topic_list_normal",           "light gray", "default",                "default",                  "#ddd", "default"),
             ("browser_controls",            "light gray", "default",                "default",                  "#bbb", "default"),
             ("progress_full",               "black", "light gray",                  "standout",                 "#111", "#bbb"),
@@ -78,6 +80,8 @@ THEMES = {
             ("list_normal",                 "dark gray", "default",                "default",                  "#444", "default"),
             ("list_untrusted",              "dark red", "default",                 "default",                  "#a22", "default"),
             ("list_focus_untrusted",        "black", "dark gray",                  "standout",                 "#810", "#aaa"),
+            ("list_unresponsive",           "yellow", "default",                   "default",                  "#b92", "default"),
+            ("list_focus_unresponsive",     "black", "light gray",                 "standout",                 "#530", "#aaa"),
             ("topic_list_normal",           "dark gray", "default",                "default",                  "#222", "default"),
             ("browser_controls",            "dark gray", "default",                "default",                  "#444", "default"),
             ("progress_full",               "black", "dark gray",                  "standout",                 "#111", "#bbb"),

nomadnet/ui/textui/Browser.py

@@ -23,6 +23,8 @@ class BrowserFrame(urwid.Frame):
             self.delegate.url_dialog()
         elif key == "ctrl s":
             self.delegate.save_node_dialog()
+        elif key == "ctrl b":
+            self.delegate.save_node_dialog()
         elif key == "ctrl g":
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.toggle_fullscreen()
         elif self.get_focus() == "body":
@@ -719,6 +721,10 @@ class Browser:
                             env_map = self.request_data
                         else:
                             env_map = {}
+                            
+                        if "PATH" in os.environ:
+                            env_map["PATH"] = os.environ["PATH"]
+
                         generated = subprocess.run([page_path], stdout=subprocess.PIPE, env=env_map)
                         page_data = generated.stdout
                     else:
@@ -750,7 +756,7 @@ class Browser:
     def __load(self):
         # If an established link exists, but it doesn't match the target
         # destination, we close and clear it.
-        if self.link != None and self.link.destination.hash != self.destination_hash:
+        if self.link != None and (self.link.destination.hash != self.destination_hash or self.link.status != RNS.Link.ACTIVE):
             self.link.teardown()
             self.link = None
 
@@ -999,6 +1005,11 @@ class Browser:
                 self.response_transfer_size = None
 
                 self.update_display()
+                if self.link != None:
+                    try:
+                        self.link.teardown()
+                    except Exception as e:
+                        pass
         else:
             self.status = Browser.REQUEST_FAILED
             self.response_progress = 0
@@ -1006,6 +1017,11 @@ class Browser:
             self.response_transfer_size = None
 
             self.update_display()
+            if self.link != None:
+                try:
+                    self.link.teardown()
+                except Exception as e:
+                    pass
 
 
     def request_timeout(self, request_receipt=None):
@@ -1015,6 +1031,11 @@ class Browser:
         self.response_transfer_size = None
 
         self.update_display()
+        if self.link != None:
+            try:
+                self.link.teardown()
+            except Exception as e:
+                pass
 
 
     def response_progressed(self, request_receipt):

nomadnet/ui/textui/Conversations.py

@@ -974,7 +974,27 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
-    def paper_message(self):
+    def paper_message_saved(self, path):
+        g = self.app.ui.glyphs
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("The paper message was saved to:\n\n"+str(path)+"\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+            ]), title=g["papermsg"].replace(" ", "")
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=60, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
+    def print_paper_message_qr(self):
         content = self.content_editor.get_edit_text()
         title = self.title_editor.get_edit_text()
         if not content == "":
@@ -983,6 +1003,67 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 self.paper_message_failed()
 
+    def save_paper_message_qr(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            output_result = self.conversation.paper_output(content, title, mode="save_qr")
+            if output_result != False:
+                self.clear_editor()
+                self.paper_message_saved(output_result)
+            else:
+                self.paper_message_failed()
+
+    def save_paper_message_uri(self):
+        content = self.content_editor.get_edit_text()
+        title = self.title_editor.get_edit_text()
+        if not content == "":
+            output_result = self.conversation.paper_output(content, title, mode="save_uri")
+            if output_result != False:
+                self.clear_editor()
+                self.paper_message_saved(output_result)
+            else:
+                self.paper_message_failed()
+
+    def paper_message(self):
+        def dismiss_dialog(sender):
+            self.dialog_open = False
+            self.conversation_changed(None)
+
+        def print_qr(sender):
+            dismiss_dialog(self)
+            self.print_paper_message_qr()
+
+        def save_qr(sender):
+            dismiss_dialog(self)
+            self.save_paper_message_qr()
+
+        def save_uri(sender):
+            dismiss_dialog(self)
+            self.save_paper_message_uri()
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Select the desired paper message output method.\nSaved files will be written to:\n\n"+str(self.app.downloads_path)+"\n", align="center"),
+                urwid.Columns([
+                    ("weight", 0.5, urwid.Button("Print QR", on_press=print_qr)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Button("Save QR", on_press=save_qr)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Button("Save URI", on_press=save_uri)),
+                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Button("Cancel", on_press=dismiss_dialog))
+                ])
+            ]), title="Create Paper Message"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=60, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
     def paper_message_failed(self):
         def dismiss_dialog(sender):
             self.dialog_open = False

nomadnet/ui/textui/Guide.py

@@ -217,6 +217,15 @@ The different sections of the program has a number of keyboard shortcuts mapped,
  - Ctrl-W   Close conversation
 
 >>`!Network Window`!
+>>>Browser
+ - Ctrl-D   Back
+ - Ctrl-F   Forward
+ - Ctrl-R   Reload page
+ - Ctrl-U   Open URL entry dialog
+ - Ctrl-S   Save connected node
+ - Ctrl-G   Toggle fullscreen browser window
+ - Ctrl-W   Disconnect from node
+
 >>>Announce Stream
  - Ctrl-L   Switch to Known Nodes list
  - Ctrl-X   Delete selected announce
@@ -227,14 +236,10 @@ The different sections of the program has a number of keyboard shortcuts mapped,
  - Ctrl-X   Delete selected node entry
  - Ctrl-P   Display peered LXMF Propagation Nodes
 
->>>Browser
- - Ctrl-D   Back
- - Ctrl-F   Forward
- - Ctrl-R   Reload page
- - Ctrl-U   Open URL entry dialog
- - Ctrl-S   Save connected node
- - Ctrl-G   Toggle fullscreen browser window
- - Ctrl-W   Disconnect from node
+>>>Peered LXMF Propagation Nodes
+ - Ctrl-L   Switch to Announce Stream or Known Nodes
+ - Ctrl-X   Break peering with selected node entry
+ - Ctrl-R   Request immediate delivery sync of unhandled LXMs
 '''
 
 TOPIC_CONCEPTS = '''>Concepts and Terminology
@@ -302,11 +307,13 @@ By default, no content is defined, apart from a short placeholder home page. To
 
 >>Distributed Message Store
 
-All nodes on the network automatically form a distributed message store that allows users to exchange messages, even when they are not available at the same time.
+All nodes on the network will automatically participate in a distributed message store that allows users to exchange messages, even when they are not connected to the network at the same time.
 
-When Nomad Network is configured to host a node, it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator.
+When Nomad Network is configured to host a node, by default it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator.
 
-To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!.
+If there is already an abundance of Propagation Nodes on the network, or the operator simply wishes to host a pageserving-only node, Propagation Node hosting can be disabled in the configuration file.
+
+To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!. In the list of peered Propagation Nodes, it is possible to break peering with a node by pressing `!Ctrl-X`!. It is also possible to request an immediate delivery sync of all unhandled messages for a node, by pressing `!Ctrl-R`!.
 
 The distributed message store is resilient to intermittency, and will remain functional as long as at least one node remains on the network. Nodes that were offline for a time will automatically be synced up to date when they regain connectivity.
 
@@ -335,7 +342,7 @@ By default, you can find the examples in `!~/.nomadnetwork/examples`!. If you bu
 
 Sometimes, you don't want everyone to be able to view certain pages or execute certain scripts. In such cases, you can use `*authentication`* to control who gets to run certain requests.
 
-To enable authentication for any page, simply add a new file to your pages directory with ".allowed" added to the file-name of the page. If your page is named "secret_page.mu", just add a file named "secret_page.mu.allowed".
+To enable authentication for any page, simply add a new file to your pages directory with ".allowed" added to the file-name of the page. If your page is named "secret_page.mu", just add a file named "secret_page.allowed".
 
 For each user allowed to access the page, add a line to this file, containing the hash of that users primary identity. Users can find their own identity hash in the `![ Network ]`! part of the program, under `!Local Peer Info`!. If you want to allow access for three different users, your file would look like this:
 
@@ -506,6 +513,12 @@ The number of minutes between each automatic sync. The default is equal to 6 hou
 On low-bandwidth networks, it can be useful to limit the amount of messages downloaded in each sync. The default is 8. Set to 0 to download all available messages every time a sync occurs.
 <
 
+>>>
+`!compact_announce_stream = yes`!
+>>>>
+With this option enabled, Nomad Network will only display one entry in the announce stream per destination. Older announces are culled when a new one arrives.
+<
+
 >> Text UI Section
 
 This section hold configuration directives related to the look and feel of the text-based user interface of the program. It is delimited by the `![textui]`! header in the configuration file. Available directives, along with their default values, are as follows:
@@ -614,6 +627,12 @@ Determines where the node server will look for hosted pages. Must be a readable
 Determines where the node server will look for downloadable files. Must be a readable filesystem path.
 <
 
+>>>
+`!disable_propagation = no`!
+>>>>
+By default, when Nomad Network is hosting a node, it will also run an LXMF propagation node. If there is already a large amount of propagation nodes on the network, or you simply want to run a pageserving-only node, you can disable running a propagation node.
+<
+
 >>>
 `!message_storage_limit = 2000`!
 >>>>

nomadnet/ui/textui/MicronParser.py

@@ -751,41 +751,45 @@ class LinkableText(urwid.Text):
             return x, y
 
     def mouse_event(self, size, event, button, x, y, focus):
-        if button != 1 or not is_mouse_press(event):
-            return False
-        else:
-            (maxcol,) = size
-            translation = self.get_line_translation(maxcol)
-            line_offset = 0
-
-            if self.align == "center":
-                line_offset = translation[y][1][1]-translation[y][0][0]
-                if x < translation[y][0][0]:
-                    x = translation[y][0][0]
-
-                if x > translation[y][1][0]+translation[y][0][0]:
-                    x = translation[y][1][0]+translation[y][0][0]
-
-            elif self.align == "right":
-                line_offset = translation[y][1][1]-translation[y][0][0]
-                if x < translation[y][0][0]:
-                    x = translation[y][0][0]
-
+        try:
+            if button != 1 or not is_mouse_press(event):
+                return False
             else:
-                line_offset = translation[y][0][1]
-                if x > translation[y][0][0]:
-                    x = translation[y][0][0]
+                (maxcol,) = size
+                translation = self.get_line_translation(maxcol)
+                line_offset = 0
 
-            pos = line_offset+x
+                if self.align == "center":
+                    line_offset = translation[y][1][1]-translation[y][0][0]
+                    if x < translation[y][0][0]:
+                        x = translation[y][0][0]
 
-            self._cursor_position = pos
-            item = self.find_item_at_pos(self._cursor_position)
+                    if x > translation[y][1][0]+translation[y][0][0]:
+                        x = translation[y][1][0]+translation[y][0][0]
 
-            if item != None:
-                if isinstance(item, LinkSpec):
-                    self.handle_link(item.link_target, item.link_fields)
+                elif self.align == "right":
+                    line_offset = translation[y][1][1]-translation[y][0][0]
+                    if x < translation[y][0][0]:
+                        x = translation[y][0][0]
 
-            self._invalidate()
-            self._emit("change")
+                else:
+                    line_offset = translation[y][0][1]
+                    if x > translation[y][0][0]:
+                        x = translation[y][0][0]
 
-            return True
+                pos = line_offset+x
+
+                self._cursor_position = pos
+                item = self.find_item_at_pos(self._cursor_position)
+
+                if item != None:
+                    if isinstance(item, LinkSpec):
+                        self.handle_link(item.link_target, item.link_fields)
+
+                self._invalidate()
+                self._emit("change")
+                
+                return True
+            
+        except Exception as e:
+            return False

nomadnet/ui/textui/Network.py

@@ -2,6 +2,7 @@ import RNS
 import urwid
 import nomadnet
 import time
+import threading
 from datetime import datetime
 from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox, MODIFIER_KEY
@@ -13,9 +14,7 @@ class NetworkDisplayShortcuts():
         self.app = app
         g = app.ui.glyphs
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL  [C-g] Fullscreen"), "shortcutbar")
-        #   "[C-"+g["arrow_u"]+g["arrow_d"]+"] Navigate Lists"
-
+        self.widget = urwid.AttrMap(urwid.Text("[C-l] Nodes/Announces  [C-x] Remove  [C-w] Disconnect  [C-d] Back  [C-f] Forward  [C-r] Reload  [C-u] URL  [C-g] Fullscreen  [C-s / C-b] Save Node"), "shortcutbar")
 
 class DialogLineBox(urwid.LineBox):
     def keypress(self, size, key):
@@ -482,6 +481,12 @@ class KnownNodeInfo(urwid.WidgetWrap):
         trust_level  = self.app.directory.trust_level(source_hash)
         trust_str    = ""
         node_entry   = self.app.directory.find(source_hash)
+        sort_str     = self.app.directory.sort_rank(source_hash)
+        if sort_str == None:
+            sort_str = "None"
+        else:
+            sort_str = str(sort_str)
+
         if node_entry == None:
             display_str = self.app.directory.simplest_display_str(source_hash)
         else:
@@ -542,6 +547,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
         r_trusted   = urwid.RadioButton(trust_button_group, "Trusted", state=trusted_selected)
 
         e_name = urwid.Edit(caption="Name      : ",edit_text=display_str)
+        e_sort = urwid.Edit(caption="Sort Rank : ",edit_text=sort_str)
 
         node_ident = RNS.Identity.recall(source_hash)
         op_hash = None
@@ -588,7 +594,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
         def ident_change(sender, userdata):
             pass
 
-        propagation_node_checkbox = urwid.CheckBox("Use as default propagation node", state=(self.app.get_user_selected_propagation_node() == source_hash), on_state_change=pn_change)
+        propagation_node_checkbox = urwid.CheckBox("Use as default propagation node", state=(self.app.get_user_selected_propagation_node() == pn_hash), on_state_change=pn_change)
         connect_identify_checkbox = urwid.CheckBox("Identify when connecting", state=self.app.directory.should_identify_on_connect(source_hash), on_state_change=ident_change)
 
         def save_node(sender):
@@ -606,8 +612,16 @@ class KnownNodeInfo(urwid.WidgetWrap):
                 trust_level = DirectoryEntry.TRUSTED
 
             display_str = e_name.get_edit_text()
+            sort_rank = e_sort.get_edit_text()
+            try:
+                if int(sort_rank) >= 0:
+                    sort_rank = int(sort_rank)
+                else:
+                    sort_rank = None
+            except:
+                sort_rank = None
 
-            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True, identify_on_connect=connect_identify_checkbox.get_state())
+            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True, identify_on_connect=connect_identify_checkbox.get_state(), sort_rank=sort_rank)
             self.app.directory.remember(node_entry)
             self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
@@ -628,6 +642,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
             urwid.Text("Type      : "+type_string, align="left"),
             e_name,
             urwid.Text("Node Addr : "+addr_str, align="left"),
+            e_sort,
             urwid.Divider(g["divider1"]),
             urwid.Text(lxmf_addr_str, align="center"),
             urwid.Divider(g["divider1"]),
@@ -963,12 +978,12 @@ class NodeStorageStats(urwid.WidgetWrap):
 
     def update_stat(self):
         self.stat_string = "None"
-        if self.app.node != None:
+        if self.app.node != None and not self.app.disable_propagation:
 
             limit = self.app.message_router.message_storage_limit
             used = self.app.message_router.message_storage_size()
 
-            if limit != None:
+            if limit != None and used != None:
                 pct = round((used/limit)*100, 1)
                 pct_str = str(pct)+"%, "
                 limit_str = " of "+RNS.prettysize(limit)
@@ -1299,12 +1314,35 @@ class NodeInfo(urwid.WidgetWrap):
             connect_button = urwid.Button("Browse", on_press=connect_query)
             reset_button = urwid.Button("Rst Stats", on_press=stats_query)
 
-            pile = urwid.Pile([
+            if not self.app.disable_propagation:
+                pile = urwid.Pile([
+                    t_id,
+                    e_name,
+                    urwid.Divider(g["divider1"]),
+                    e_lxmf,
+                    urwid.Divider(g["divider1"]),
+                    self.t_last_announce,
+                    self.t_storage_stats,
+                    self.t_active_links,
+                    self.t_total_connections,
+                    self.t_total_pages,
+                    self.t_total_files,
+                    urwid.Divider(g["divider1"]),
+                    urwid.Columns([
+                        ("weight", 5, urwid.Button("Back", on_press=show_peer_info)),
+                        ("weight", 0.5, urwid.Text("")),
+                        ("weight", 6, connect_button),
+                        ("weight", 0.5, urwid.Text("")),
+                        ("weight", 8, reset_button),
+                        ("weight", 0.5, urwid.Text("")),
+                        ("weight", 7, announce_button),
+                    ])
+                ])
+            else:
+                pile = urwid.Pile([
                 t_id,
                 e_name,
                 urwid.Divider(g["divider1"]),
-                e_lxmf,
-                urwid.Divider(g["divider1"]),
                 self.t_last_announce,
                 self.t_storage_stats,
                 self.t_active_links,
@@ -1578,13 +1616,19 @@ class LXMFPeers(urwid.WidgetWrap):
             self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no LXMF nodes are peered\n\n"), align="center")])
             self.display_widget = urwid.Filler(self.pile, valign="top", height="pack")
 
-        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="LXMF Propagation Peers"), widget_style))
+        if hasattr(self, "peer_list") and self.peer_list:
+            pl = len(self.peer_list)
+        else:
+            pl = 0
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title=f"LXMF Propagation Peers ({pl})"), widget_style))
 
     def keypress(self, size, key):
         if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
         elif key == "ctrl x":
             self.delete_selected_entry()
+        elif key == "ctrl r":
+            self.sync_selected_entry()
             
         return super(LXMFPeers, self).keypress(size, key)
 
@@ -1600,6 +1644,43 @@ class LXMFPeers(urwid.WidgetWrap):
             self.delegate.reinit_lxmf_peers()
             self.delegate.show_peers()
 
+    def sync_selected_entry(self):
+        sync_grace = 10
+        si = self.ilb.get_selected_item()
+        if si != None:
+            destination_hash = si.original_widget.destination_hash
+            if destination_hash in self.app.message_router.peers:
+                peer = self.app.message_router.peers[destination_hash]
+                if time.time() > peer.last_sync_attempt+sync_grace:
+                    peer.next_sync_attempt = time.time()-1
+                    
+                    def job():
+                        peer.sync()
+                    threading.Thread(target=job, daemon=True).start()
+
+                    time.sleep(0.25)
+
+                    def dismiss_dialog(sender):
+                        self.close_list_dialogs()
+
+                    dialog = ListDialogLineBox(
+                        urwid.Pile([
+                            urwid.Text("A delivery sync of all unhandled LXMs was manually requested for the selected node\n", align="center"),
+                            urwid.Columns([("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("OK", on_press=dismiss_dialog))])
+                        ]), title="!"
+                    )
+                    dialog.delegate = self.delegate
+                    bottom = self
+
+                    overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.delegate.left_pile.options("weight", 1)
+                    self.delegate.left_pile.contents[0] = (overlay, options)
+
+
+    def close_list_dialogs(self):
+        self.delegate.reinit_lxmf_peers()
+        self.delegate.show_peers()
 
     def rebuild_widget_list(self):
         self.peer_list = self.app.message_router.peers
@@ -1613,17 +1694,18 @@ class LXMFPeers(urwid.WidgetWrap):
 
     def make_peer_widgets(self):
         widget_list = []
-        for peer_id in self.peer_list:
+        sorted_peers = sorted(self.peer_list, key=lambda pid: (self.app.directory.pn_trust_level(pid), self.peer_list[pid].link_establishment_rate), reverse=True)
+        for peer_id in sorted_peers:
             peer = self.peer_list[peer_id]
-            pe = LXMFPeerEntry(self.app, peer, self)
+            trust_level = self.app.directory.pn_trust_level(peer_id)
+            pe = LXMFPeerEntry(self.app, peer, self, trust_level)
             pe.destination_hash = peer.destination_hash
             widget_list.append(pe)
 
-        # TODO: Sort list
         return widget_list
 
 class LXMFPeerEntry(urwid.WidgetWrap):
-    def __init__(self, app, peer, delegate):
+    def __init__(self, app, peer, delegate, trust_level):
         destination_hash = peer.destination_hash
 
         self.app = app
@@ -1635,7 +1717,7 @@ class LXMFPeerEntry(urwid.WidgetWrap):
             node_hash = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", node_identity)
             display_name = self.app.directory.alleged_display_str(node_hash)
             if display_name != None:
-                display_str += " "+str(display_name)
+                display_str = str(display_name)+"\n  "+display_str
 
         sym = g["sent"]
         style         = "list_unknown"
@@ -1645,12 +1727,18 @@ class LXMFPeerEntry(urwid.WidgetWrap):
         if hasattr(peer, "alive"):
             if peer.alive:
                 alive_string = "Available"
+                if trust_level == DirectoryEntry.TRUSTED:
+                    style = "list_trusted"
+                    focus_style = "list_focus_trusted"
+                else:
+                    style = "list_normal"
+                    focus_style = "list_focus"
             else:
                 alive_string = "Unresponsive"
+                style = "list_unresponsive"
+                focus_style = "list_focus_unresponsive"
 
         widget = ListEntry(sym+" "+display_str+"\n  "+alive_string+", last heard "+pretty_date(int(peer.last_heard))+"\n  "+str(len(peer.unhandled_messages))+" unhandled LXMs, "+RNS.prettysize(peer.link_establishment_rate/8, "b")+"/s LER")
-        # urwid.connect_signal(widget, "click", delegate.connect_node, node)
-
         self.display_widget = urwid.AttrMap(widget, style, focus_style)
         self.display_widget.destination_hash = destination_hash
         urwid.WidgetWrap.__init__(self, self.display_widget)

setup.py

@@ -30,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=0.4.9", "lxmf>=0.3.1", "urwid>=2.1.2", "qrcode"],
+    install_requires=["rns>=0.6.2", "lxmf>=0.3.6", "urwid==2.1.2", "qrcode"],
     python_requires=">=3.6",
 )