Updated LXMF version

Update Guide.py

README.md

@@ -1,11 +1,10 @@
-Nomad Network - Communicate Freely
-==========
+# Nomad Network - Communicate Freely
 
 Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy.
 
 ![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.
 
@@ -26,17 +25,41 @@ If you'd rather want to use an LXMF client with a graphical user interface, you
 ## Current Status
 The current version of the program should be considered a beta release. The program works well, but there will most probably be bugs and possibly sub-optimal performance in some scenarios. On the other hand, this is the ideal time to have an influence on the direction of the development of Nomad Network. To do so, join the discussion, report bugs and request features here on the GitHub project.
 
-### Feature roadmap
- - Network-wide propagated bulletins and discussion threads
- - Collaborative maps and geospatial information sharing
- - Facilitation of trade and barter
-
 ## How do I get started?
 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
@@ -119,6 +142,29 @@ You can help support the continued development of open, free and private communi
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 
+## Development Roadmap
+
+- New major features
+    - Network-wide propagated bulletins and discussion threads
+    - Collaborative maps and geospatial information sharing
+    - Facilitation of trade and barter
+- Minor improvements and fixes
+    - Link status (RSSI and SNR) in conversation or conv list
+    - Ctrl-M shorcut for jumping to menu
+    - Share node with other users / send node info to user
+    - Fix internal editor failing on some OSes with no "editor" alias
+    - Possibly add a required-width header
+    - Improve browser handling of remote link close
+    - Better navigation handling when requests fail (also because of closed links)
+    - Retry failed messages mechanism
+    - Re-arrange buttons to be more consistent
+    - Input field for pages
+    - Post mechanism
+    - Term compatibility notice in readme
+    - Selected icon in conversation list
+    - Possibly a Search Local Nodes function
+    - Possibly add via entry in node info box, next to distance
+
 ## Caveat Emptor
 Nomad Network is beta software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch.
 

nomadnet/Conversation.py

@@ -227,6 +227,58 @@ class Conversation:
             RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
             return False
 
+    def paper_output(self, content="", title="", mode="print_qr"):
+        if self.send_destination:
+            try:
+                dest = self.send_destination
+                source = self.app.lxmf_destination
+                desired_method = LXMF.LXMessage.PAPER
+
+                lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
+
+                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)
+
+                    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
+
+                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)
+                return False
+
+        else:
+            RNS.log("Destination is not known, cannot create LXMF Message.", RNS.LOG_VERBOSE)
+            return False
+
     def message_notification(self, message):
         if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
             RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)

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()
-            
-        else:
-            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
+                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)
+
+        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

@@ -97,7 +97,7 @@ class Node:
         for directory in directories:
             self.scan_files(base_path+"/"+directory)
 
-    def serve_page(self, path, data, request_id, remote_identity, requested_at):
+    def serve_page(self, path, data, request_id, link_id, remote_identity, requested_at):
         RNS.log("Page request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
         try:
             self.app.peer_settings["served_page_requests"] += 1
@@ -152,7 +152,20 @@ class Node:
             if request_allowed:
                 RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
                 if os.access(file_path, os.X_OK):
-                    generated = subprocess.run([file_path], stdout=subprocess.PIPE)
+                    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:
+                        env_map["remote_identity"] = RNS.hexrep(remote_identity.hash, delimit=False)
+
+                    if data != None and isinstance(data, dict):
+                        for e in data:
+                            if isinstance(e, str) and (e.startswith("field_") or e.startswith("var_")):
+                                env_map[e] = data[e]
+
+                    generated = subprocess.run([file_path], stdout=subprocess.PIPE, env=env_map)
                     return generated.stdout
                 else:
                     fh = open(file_path, "rb")
@@ -237,4 +250,4 @@ If you are the node operator, you can define your own home page by creating a fi
 DEFAULT_NOTALLOWED = '''>Request Not Allowed
 
 You are not authorised to carry out the request.
-'''
+'''

nomadnet/NomadNetworkApp.py

@@ -98,6 +98,7 @@ class NomadNetworkApp:
         self.ignoredpath       = self.configdir+"/ignored"
         self.logfilepath       = self.configdir+"/logfile"
         self.errorfilepath     = self.configdir+"/errors"
+        self.pnannouncedpath   = self.configdir+"/pnannounced"
         self.storagepath       = self.configdir+"/storage"
         self.identitypath      = self.configdir+"/storage/identity"
         self.cachepath         = self.configdir+"/storage/cache"
@@ -105,10 +106,12 @@ class NomadNetworkApp:
         self.conversationpath  = self.configdir+"/storage/conversations"
         self.directorypath     = self.configdir+"/storage/directory"
         self.peersettingspath  = self.configdir+"/storage/peersettings"
+        self.tmpfilespath      = self.configdir+"/storage/tmp"
 
         self.pagespath         = self.configdir+"/storage/pages"
         self.filespath         = self.configdir+"/storage/files"
         self.cachepath         = self.configdir+"/storage/cache"
+        self.examplespath      = self.configdir+"/examples"
 
         self.downloads_path    = os.path.expanduser("~/Downloads")
 
@@ -119,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)
@@ -145,6 +150,11 @@ class NomadNetworkApp:
         if not os.path.isdir(self.cachepath):
             os.makedirs(self.cachepath)
 
+        if not os.path.isdir(self.tmpfilespath):
+            os.makedirs(self.tmpfilespath)
+        else:
+            self.clear_tmp_dir()
+
         if os.path.isfile(self.configpath):
             try:
                 self.config = ConfigObj(self.configpath)
@@ -160,6 +170,16 @@ class NomadNetworkApp:
                 RNS.log("Check your configuration file for errors!", RNS.LOG_ERROR)
                 nomadnet.panic()
         else:
+            if not os.path.isdir(self.examplespath):
+                try:
+                    import shutil
+                    examplespath = os.path.join(os.path.dirname(__file__), "examples")
+                    shutil.copytree(examplespath, self.examplespath, ignore=shutil.ignore_patterns("__pycache__"))
+                
+                except Exception as e:
+                    RNS.log("Could not copy examples into the "+self.examplespath+" directory.", RNS.LOG_ERROR)
+                    RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+            
             RNS.log("Could not load config file, creating default configuration file...")
             self.createDefaultConfig()
             self.firstrun = True
@@ -289,12 +309,37 @@ 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()
+            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()
 
-            RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
+                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))
+                
             self.node = nomadnet.Node(self)
         else:
             self.node = None
+            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)
 
         RNS.Transport.register_announce_handler(nomadnet.Conversation)
         RNS.Transport.register_announce_handler(nomadnet.Directory)
@@ -436,9 +481,8 @@ class NomadNetworkApp:
     def autoselect_propagation_node(self):
         selected_node = None
 
-        if "propagation_node" in self.peer_settings:
+        if "propagation_node" in self.peer_settings and self.peer_settings["propagation_node"] != None:
             selected_node = self.peer_settings["propagation_node"]
-        
         else:
             nodes = self.directory.known_nodes()
             trusted_nodes = []
@@ -514,6 +558,26 @@ class NomadNetworkApp:
 
         return False
 
+    def print_file(self, filename):
+        print_command = self.print_command+" "+filename
+
+        try:
+            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
+        except Exception as e:
+            RNS.log("An error occurred while executing print command: "+str(print_command), RNS.LOG_ERROR)
+            RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+            return False
+
+        if return_code == 0:
+            RNS.log("Successfully printed "+str(filename)+" using print command: "+print_command, RNS.LOG_DEBUG)
+            return True
+
+        else:
+            RNS.log("Printing "+str(filename)+" failed using print command: "+print_command, RNS.LOG_DEBUG)
+            return False
+
+
     def print_message(self, message, received = None):
         try:
             template = self.printing_template_msg
@@ -547,8 +611,7 @@ class NomadNetworkApp:
                 f.write(output.encode("utf-8"))
                 f.close()
 
-            print_command = "lp -d thermal -o cpi=16 -o lpi=8 "+filename
-            return_code = subprocess.call(shlex.split(print_command), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            self.print_file(filename)
 
             os.unlink(filename)
 
@@ -576,6 +639,12 @@ class NomadNetworkApp:
             if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
                 os.unlink(self.conversationpath + "/" + source_hash + "/unread")
 
+    def clear_tmp_dir(self):
+        if os.path.isdir(self.tmpfilespath):
+            for file in os.listdir(self.tmpfilespath):
+                fpath = self.tmpfilespath+"/"+file
+                os.unlink(fpath)
+
     def createDefaultConfig(self):
         self.config = ConfigObj(__default_nomadnet_config__)
         self.config.filename = self.configpath
@@ -643,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":
@@ -661,7 +734,7 @@ class NomadNetworkApp:
                                 self.config["textui"]["intro_text"] = "Nomad Network"
 
                             if not "editor" in self.config["textui"]:
-                                self.config["textui"]["editor"] = "editor"
+                                self.config["textui"]["editor"] = "nano"
 
                             if not "glyphs" in self.config["textui"]:
                                 self.config["textui"]["glyphs"] = "unicode"
@@ -728,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:
@@ -874,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
@@ -913,10 +997,8 @@ glyphs = unicode
 # application. On by default.
 mouse_enabled = True
 
-# What editor to use for editing text. By
-# default the operating systems "editor"
-# alias will be used.
-editor = editor
+# What editor to use for editing text.
+editor = nano
 
 # If you don't want the Guide section to
 # show up in the menu, you can disable it.
@@ -939,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.2.7"
+__version__ = "0.4.0"

nomadnet/examples/messageboard/README.md

@@ -0,0 +1,18 @@
+# lxmf_messageboard
+Simple message board that can be hosted on a NomadNet node, messages can be posted by 'conversing' with a unique peer, all messages are then forwarded to the message board.
+
+## How Do I Use It?
+A user can submit messages to the message board by initiating a chat with the message board peer, they are assigned a username (based on the first 5 characters of their address) and their messages are added directly to the message board. The message board can be viewed on a page hosted by a NomadNet node.
+
+An example message board can be found on the reticulum testnet hosted on the SolarExpress Node `<d16df67bff870a8eaa2af6957c5a2d7d>` and the message board peer `<ad713cd3fedf36cc190f0cb89c4be1ff>`
+
+## How Does It Work?
+The message board page itself is hosted on a NomadNet node, you can place the message_board.mu into the pages directory. You can then run the message_board.py script which provides the peer that the users can send messages to. The two parts are joined together using umsgpack and a flat file system similar to NomadNet and Reticulum and runs in the background.
+
+## How Do I Set It Up?
+* Turn on node hosting in NomadNet
+* Put the `message_board.mu` file into `pages` directory in the config file for `NomadNet`. Edit the file to customise from the default page.
+* Run the `message_board.py` script (`python3 message_board.py` either in a `screen` or as a system service), this script uses `NomadNet` and `RNS` libraries and has no additional libraries that need to be installed. Take a note of the message boards address, it is printed on starting the board, you can then place this address in `message_board.mu` file to make it easier for users to interact the board.
+
+## Credits
+* This example application was written and contributed by @chengtripp

nomadnet/examples/messageboard/messageboard.mu

@@ -0,0 +1,41 @@
+#!/bin/python3
+import time
+import os
+import RNS.vendor.umsgpack as msgpack
+
+message_board_peer = 'please_replace'
+userdir = os.path.expanduser("~")
+
+if os.path.isdir("/etc/nomadmb") and os.path.isfile("/etc/nomadmb/config"):
+    configdir = "/etc/nomadmb"
+elif os.path.isdir(userdir+"/.config/nomadmb") and os.path.isfile(userdir+"/.config/nomadmb/config"):
+    configdir = userdir+"/.config/nomadmb"
+else:
+    configdir = userdir+"/.nomadmb"
+
+storagepath  = configdir+"/storage"
+if not os.path.isdir(storagepath):
+    os.makedirs(storagepath)
+
+boardpath = configdir+"/storage/board"
+
+print('`!`F222`Bddd`cNomadNet Message Board')
+
+print('-')
+print('`a`b`f')
+print("")
+print("To add a message to the board just converse with the NomadNet Message Board at `[lxmf@{}]".format(message_board_peer))
+time_string = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))
+print("Last Updated: {}".format(time_string))
+print("")
+print('>Messages')
+print("  Date       Time    Username     Message")
+f = open(boardpath, "rb")
+board_contents = msgpack.unpack(f)
+board_contents.reverse()
+
+for content in board_contents:
+    print("`a{}".format(content.rstrip()))
+    print("")
+
+f.close()

nomadnet/examples/messageboard/messageboard.py

@@ -0,0 +1,187 @@
+# Simple message board that can be hosted on a NomadNet node, messages can be posted by 'conversing' with a unique peer, all messages are then forwarded to the message board.
+# https://github.com/chengtripp/lxmf_messageboard
+
+import RNS
+import LXMF
+import os, time
+from queue import Queue
+import RNS.vendor.umsgpack as msgpack
+
+display_name = "NomadNet Message Board"
+max_messages = 20
+
+def setup_lxmf():
+    if os.path.isfile(identitypath):
+        identity = RNS.Identity.from_file(identitypath)
+        RNS.log('Loaded identity from file', RNS.LOG_INFO)
+    else:
+        RNS.log('No Primary Identity file found, creating new...', RNS.LOG_INFO)
+        identity = RNS.Identity()
+        identity.to_file(identitypath)
+
+    return identity
+
+def lxmf_delivery(message):
+    # Do something here with a received message
+    RNS.log("A message was received: "+str(message.content.decode('utf-8')))
+
+    message_content = message.content.decode('utf-8')
+    source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
+
+    #Create username (just first 5 char of your addr)
+    username = source_hash_text[0:5]
+
+    RNS.log('Username: {}'.format(username), RNS.LOG_INFO)
+
+    time_string = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(message.timestamp))
+    new_message = '{} {}: {}\n'.format(time_string, username, message_content)
+
+    # Push message to board
+    # First read message board (if it exists
+    if os.path.isfile(boardpath):
+        f = open(boardpath, "rb")
+        message_board = msgpack.unpack(f)
+        f.close()
+    else:
+        message_board = []
+
+    #Check we aren't doubling up (this can sometimes happen if there is an error initially and it then gets fixed)
+    if new_message not in message_board:
+        # Append our new message to the list
+        message_board.append(new_message)
+
+    # Prune the message board if needed
+    while len(message_board) > max_messages:
+        RNS.log('Pruning Message Board')
+        message_board.pop(0)
+
+    # Now open the board and write the updated list
+    f = open(boardpath, "wb")
+    msgpack.pack(message_board, f)
+    f.close()
+
+    # Send reply
+    message_reply = '{}_{}_Your message has been added to the messageboard'.format(source_hash_text, time.time())
+    q.put(message_reply)
+
+def announce_now(lxmf_destination):
+    lxmf_destination.announce()
+
+def send_message(destination_hash, message_content):
+    try:
+      # Make a binary destination hash from a hexadecimal string
+      destination_hash = bytes.fromhex(destination_hash)
+
+    except Exception as e:
+      RNS.log("Invalid destination hash", RNS.LOG_ERROR)
+      return
+
+    # Check that size is correct
+    if not len(destination_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
+      RNS.log("Invalid destination hash length", RNS.LOG_ERROR)
+
+    else:
+      # Length of address was correct, let's try to recall the
+      # corresponding Identity
+      destination_identity = RNS.Identity.recall(destination_hash)
+
+      if destination_identity == None:
+        # No path/identity known, we'll have to abort or request one
+        RNS.log("Could not recall an Identity for the requested address. You have probably never received an announce from it. Try requesting a path from the network first. In fact, let's do this now :)", RNS.LOG_ERROR)
+        RNS.Transport.request_path(destination_hash)
+        RNS.log("OK, a path was requested. If the network knows a path, you will receive an announce with the Identity data shortly.", RNS.LOG_INFO)
+
+      else:
+        # We know the identity for the destination hash, let's
+        # reconstruct a destination object.
+        lxmf_destination = RNS.Destination(destination_identity, RNS.Destination.OUT, RNS.Destination.SINGLE, "lxmf", "delivery")
+
+        # Create a new message object
+        lxm = LXMF.LXMessage(lxmf_destination, local_lxmf_destination, message_content, title="Reply", desired_method=LXMF.LXMessage.DIRECT)
+
+        # You can optionally tell LXMF to try to send the message
+        # as a propagated message if a direct link fails
+        lxm.try_propagation_on_fail = True
+
+        # Send it
+        message_router.handle_outbound(lxm)
+
+def announce_check():
+    if os.path.isfile(announcepath):
+        f = open(announcepath, "r")
+        announce = int(f.readline())
+        f.close()
+    else:
+        RNS.log('failed to open announcepath', RNS.LOG_DEBUG)
+        announce = 1
+
+    if announce > int(time.time()):
+        RNS.log('Recent announcement', RNS.LOG_DEBUG)
+    else:
+        f = open(announcepath, "w")
+        next_announce = int(time.time()) + 1800
+        f.write(str(next_announce))
+        f.close()
+        announce_now(local_lxmf_destination)
+        RNS.log('Announcement sent, expr set 1800 seconds', RNS.LOG_INFO)
+
+#Setup Paths and Config Files
+userdir = os.path.expanduser("~")
+
+if os.path.isdir("/etc/nomadmb") and os.path.isfile("/etc/nomadmb/config"):
+    configdir = "/etc/nomadmb"
+elif os.path.isdir(userdir+"/.config/nomadmb") and os.path.isfile(userdir+"/.config/nomadmb/config"):
+    configdir = userdir+"/.config/nomadmb"
+else:
+    configdir = userdir+"/.nomadmb"
+
+storagepath  = configdir+"/storage"
+if not os.path.isdir(storagepath):
+    os.makedirs(storagepath)
+
+identitypath = configdir+"/storage/identity"
+announcepath = configdir+"/storage/announce"
+boardpath = configdir+"/storage/board"
+
+# Message Queue
+q = Queue(maxsize = 5)
+
+# Start Reticulum and print out all the debug messages
+reticulum = RNS.Reticulum(loglevel=RNS.LOG_VERBOSE)
+
+# Create a Identity.
+current_identity = setup_lxmf()
+
+# Init the LXMF router
+message_router = LXMF.LXMRouter(identity = current_identity, storagepath = configdir)
+
+# Register a delivery destination (for yourself)
+# In this example we use the same Identity as we used
+# to instantiate the LXMF router. It could be a different one,
+# but it can also just be the same, depending on what you want.
+local_lxmf_destination = message_router.register_delivery_identity(current_identity, display_name=display_name)
+
+# Set a callback for when a message is received
+message_router.register_delivery_callback(lxmf_delivery)
+
+# Announce node properties
+
+RNS.log('LXMF Router ready to receive on: {}'.format(RNS.prettyhexrep(local_lxmf_destination.hash)), RNS.LOG_INFO)
+announce_check()
+
+while True:
+
+    # Work through internal message queue
+    for i in list(q.queue):
+        message_id = q.get()
+        split_message = message_id.split('_')
+        destination_hash = split_message[0]
+        message = split_message[2]
+        RNS.log('{} {}'.format(destination_hash, message), RNS.LOG_INFO)
+        send_message(destination_hash, message)
+
+    # Check whether we need to make another announcement
+    announce_check()
+
+    #Sleep
+    time.sleep(10)

nomadnet/examples/various/input_fields.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+import os
+env_string = ""
+for e in os.environ:
+  env_string += "{}={}\n".format(e, os.environ[e])
+
+template = """>Fields and Submitting Data
+
+Nomad Network let's you use simple input fields for submitting data to node-side applications. Submitted data, along with other session variables will be available to the node-side script / program as environment variables. This page contains a few examples.
+
+>> Read Environment Variables
+
+{@ENV}
+>>Examples of Fields and Submissions
+
+The following section contains a simple set of fields, and a few different links that submit the field data in different ways.
+
+-=
+
+An input field    : `B444`<username`Entered data>`b
+
+An masked field   : `B444`<!|password`Value of Field>`b
+
+An small field    : `B444`<8|small`test>`b, and some more text.
+
+Two fields        : `B444`<8|one`One>`b `B444`<8|two`Two>`b
+
+The data can be `!`[submitted`:/page/input_fields.mu`username|two]`!.
+
+You can `!`[submit`:/page/input_fields.mu`one|password|small]`! other fields, or just `!`[a single one`:/page/input_fields.mu`username]`!
+
+Or simply `!`[submit them all`:/page/input_fields.mu`*]`!.
+
+Submission links can also `!`[include pre-configured variables`:/page/input_fields.mu`username|two|entitiy_id=4611|action=view]`!.
+
+Or take all fields and `!`[pre-configured variables`:/page/input_fields.mu`*|entitiy_id=4611|action=view]`!.
+
+Or only `!`[pre-configured variables`:/page/input_fields.mu`entitiy_id=4688|task=something]`!
+
+-=
+
+"""
+print(template.replace("{@ENV}", env_string))

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"),
@@ -121,7 +125,9 @@ GLYPHS = {
     ("decoration_menu", " +",        " +",          " \uf93a"),
     ("unread_menu",     " !",        " \u2709",     urm_char),
     ("globe",           "",          "",            "\uf484"),
-    ("sent",            "/\\",       "\u2191",      "\ufbf4")
+    ("sent",            "/\\",       "\u2191",      "\ufbf4"),
+    ("papermsg",        "P",         "\u25a4",      "\uf719"),
+    ("qrcode",          "QR",        "\u25a4",      "\uf029"),
 }
 
 class TextUI:
@@ -215,6 +221,8 @@ class TextUI:
     def unhandled_input(self, key):
         if key == "ctrl q":
             raise urwid.ExitMainLoop
+        elif key == "ctrl e":
+            pass
 
     def display_main(self, loop, user_data):
         self.loop.widget = self.main_display.widget

nomadnet/ui/textui/Browser.py

@@ -23,16 +23,37 @@ 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":
+            if key == "down" or key == "up":
+                try:
+                    if hasattr(self.delegate, "page_pile") and self.delegate.page_pile:
+                        def df(loop, user_data):
+                            st = None
+                            nf = self.delegate.page_pile.get_focus()
+                            if hasattr(nf, "key_timeout"):
+                                st = nf
+                            elif hasattr(nf, "original_widget"):
+                                no = nf.original_widget
+                                if hasattr(no, "original_widget"):
+                                    st = no.original_widget
+                                else:
+                                    if hasattr(no, "key_timeout"):
+                                        st = no
+                        
+                            if st and hasattr(st, "key_timeout") and hasattr(st, "keypress") and callable(st.keypress):
+                                st.keypress(None, None)
+
+                        nomadnet.NomadNetworkApp.get_shared_instance().ui.loop.set_alarm_in(0.25, df)
+                
+                except Exception as e:
+                    RNS.log("Error while setting up cursor timeout. The contained exception was: "+str(e), RNS.LOG_ERROR)
+                                        
             return super(BrowserFrame, self).keypress(size, key)
-            # if key == "up" and self.delegate.messagelist.top_is_visible:
-            #     nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
-            # elif key == "down" and self.delegate.messagelist.bottom_is_visible:
-            #     self.set_focus("footer")
-            # else:
-            #     return super(ConversationFrame, self).keypress(size, key)
+
         else:
             return super(BrowserFrame, self).keypress(size, key)
 
@@ -62,6 +83,7 @@ class Browser:
         self.aspects = aspects
         self.destination_hash = destination_hash
         self.path = path
+        self.request_data = None
         self.timeout = Browser.DEFAULT_TIMEOUT
         self.last_keypress = None
 
@@ -80,6 +102,7 @@ class Browser:
         self.link_target = None
         self.frame = None
         self.attr_maps = []
+        self.page_pile = None
         self.build_display()
 
         self.history = []
@@ -141,7 +164,42 @@ class Browser:
         else:
             return destination_type
 
-    def handle_link(self, link_target):
+    def handle_link(self, link_target, link_data = None):
+        request_data = None
+        if link_data != None:
+            link_fields = []
+            request_data = {}
+            all_fields = True if "*" in link_data else False
+
+            for e in link_data:
+                if "=" in e:
+                    c = e.split("=")
+                    if len(c) == 2:
+                        request_data["var_"+str(c[0])] = str(c[1])
+                else:
+                    link_fields.append(e)
+
+            def recurse_down(w):
+                target = None
+                if isinstance(w, list):
+                    for t in w:
+                        recurse_down(t)
+                elif isinstance(w, tuple):
+                    for t in w:
+                        recurse_down(t)
+                elif hasattr(w, "contents"):
+                    recurse_down(w.contents)
+                elif hasattr(w, "original_widget"):
+                    recurse_down(w.original_widget)
+                elif hasattr(w, "_original_widget"):
+                    recurse_down(w._original_widget)
+                else:
+                    if hasattr(w, "field_name") and (all_fields or w.field_name in link_fields):
+                        request_data["field_"+w.field_name] = w.get_edit_text()
+                
+            recurse_down(self.attr_maps)
+            RNS.log("Including request data: "+str(request_data), RNS.LOG_DEBUG)
+
         components = link_target.split("@")
         destination_type = None
 
@@ -155,8 +213,9 @@ class Browser:
         if destination_type == "nomadnetwork.node":
             if self.status >= Browser.DISCONECTED:
                 RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+                self.browser_footer = urwid.Text("Opening link to: "+str(link_target))
                 try:
-                    self.retrieve_url(link_target)
+                    self.retrieve_url(link_target, request_data)
                 except Exception as e:
                     self.browser_footer = urwid.Text("Could not open link: "+str(e))
                     self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
@@ -219,6 +278,7 @@ class Browser:
         self.browser_header = urwid.Text("")
         self.browser_footer = urwid.Text("")
 
+        self.page_pile = None
         self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
 
         self.frame = BrowserFrame(self.browser_body, header=self.browser_header, footer=self.browser_footer)
@@ -266,6 +326,7 @@ class Browser:
     def update_display(self):
         if self.status == Browser.DISCONECTED:
             self.display_widget.set_attr_map({None: "inactive_text"})
+            self.page_pile = None
             self.browser_body = urwid.Filler(urwid.Text("Disconnected\n"+self.g["arrow_l"]+"  "+self.g["arrow_r"], align="center"), "middle")
             self.browser_footer = urwid.Text("")
             self.browser_header = urwid.Text("")
@@ -314,6 +375,8 @@ class Browser:
 
     def update_page_display(self):
         pile = urwid.Pile(self.attr_maps)
+        pile.automove_cursor_on_scroll = True
+        self.page_pile = pile
         self.browser_body = urwid.AttrMap(ScrollBar(Scrollable(pile, force_forward_keypress=True), thumb_char="\u2503", trough_char=" "), "scrollbar")
 
     def identify(self):
@@ -326,6 +389,7 @@ class Browser:
         if self.link != None:
             self.link.teardown()
         
+        self.request_data = None
         self.attr_maps = []
         self.status = Browser.DISCONECTED
         self.response_progress = 0
@@ -340,7 +404,7 @@ class Browser:
         self.update_display()
 
 
-    def retrieve_url(self, url):
+    def retrieve_url(self, url, request_data = None):
         self.previous_destination_hash = self.destination_hash
         self.previous_path = self.path
 
@@ -393,6 +457,7 @@ class Browser:
             else:
                 self.set_destination_hash(destination_hash)
                 self.set_path(path)
+                self.set_request_data(request_data)
                 self.load_page()
 
     def set_destination_hash(self, destination_hash):
@@ -406,6 +471,8 @@ class Browser:
     def set_path(self, path):
         self.path = path
 
+    def set_request_data(self, request_data):
+        self.request_data = request_data
 
     def set_timeout(self, timeout):
         self.timeout = timeout
@@ -612,7 +679,11 @@ class Browser:
 
 
     def load_page(self):
-        cached = self.get_cached(self.current_url())
+        if self.request_data == None:
+            cached = self.get_cached(self.current_url())
+        else:
+            cached = None
+
         if cached:
             self.status = Browser.DONE
             self.page_data = cached
@@ -646,7 +717,15 @@ class Browser:
                 page_data = b"The requested local page did not exist in the file system"
                 if os.path.isfile(page_path):
                     if os.access(page_path, os.X_OK):
-                        generated = subprocess.run([page_path], stdout=subprocess.PIPE)
+                        if self.request_data != None:
+                            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:
                         file = open(page_path, "rb")
@@ -677,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
 
@@ -733,7 +812,7 @@ class Browser:
         self.update_display()
         receipt = self.link.request(
             self.path,
-            data = None,
+            data = self.request_data,
             response_callback = self.response_received,
             failed_callback = self.request_failed,
             progress_callback = self.response_progressed
@@ -926,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
@@ -933,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):
@@ -942,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):
@@ -1035,4 +1129,4 @@ class UrlEdit(urwid.Edit):
         if key == "enter":
             self.confirmed(self)
         else:
-            return super(UrlEdit, self).keypress(size, key)
+            return super(UrlEdit, self).keypress(size, key)

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-g] Fullscreen"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [C-u] Ingest URI  [C-g] Fullscreen"), "shortcutbar")
 
 class ConversationDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-k] Clear  [C-w] Close  [C-t] Title  [C-p] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-d] Send  [C-p] Paper Msg  [C-t] Title  [C-k] Clear  [C-w] Close  [C-u] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -30,6 +30,8 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.delete_selected_conversation()
         elif key == "ctrl n":
             self.delegate.new_conversation()
+        elif key == "ctrl u":
+            self.delegate.ingest_lxm_uri()
         elif key == "ctrl r":
             self.delegate.sync_conversations()
         elif key == "ctrl g":
@@ -108,7 +110,10 @@ class ConversationsDisplay():
 
     def delete_selected_conversation(self):
         self.dialog_open = True
-        source_hash = self.ilb.get_selected_item().source_hash
+        item = self.ilb.get_selected_item()
+        if item == None:
+            return
+        source_hash = item.source_hash
 
         def dismiss_dialog(sender):
             self.update_conversation_list()
@@ -138,7 +143,10 @@ class ConversationsDisplay():
     def edit_selected_in_directory(self):
         g = self.app.ui.glyphs
         self.dialog_open = True
-        source_hash_text = self.ilb.get_selected_item().source_hash
+        item = self.ilb.get_selected_item()
+        if item == None:
+            return
+        source_hash_text = item.source_hash
         display_name = self.ilb.get_selected_item().display_name
         if display_name == None:
             display_name = ""
@@ -330,6 +338,110 @@ class ConversationsDisplay():
         options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
+    def ingest_lxm_uri(self):
+        self.dialog_open = True
+        lxm_uri = ""
+        e_uri = urwid.Edit(caption="URI : ",edit_text=lxm_uri)
+
+        def dismiss_dialog(sender):
+            self.update_conversation_list()
+            self.dialog_open = False
+
+        def confirmed(sender):
+            try:
+                local_delivery_signal = "local_delivery_occurred"
+                duplicate_signal = "duplicate_lxm"
+                lxm_uri = e_uri.get_edit_text()
+
+                ingest_result = self.app.message_router.ingest_lxm_uri(
+                    lxm_uri,
+                    signal_local_delivery=local_delivery_signal,
+                    signal_duplicate=duplicate_signal
+                )
+
+                if ingest_result == False:
+                    raise ValueError("The URI contained no decodable messages")
+                
+                elif ingest_result == local_delivery_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("Message was decoded, decrypted successfully, and added to your conversation list."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                elif ingest_result == duplicate_signal:
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text("The decoded message has already been processed by the LXMF Router, and will not be ingested again."),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+                
+                else:
+                    if self.app.enable_node:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, but has been added to the propagation node queues, and will be distributed on the propagation network."
+                    else:
+                        propagation_text = "The decoded message was not addressed to this LXMF address, and has been discarded."
+
+                    rdialog_pile = urwid.Pile([
+                        urwid.Text(propagation_text),
+                        urwid.Text(""),
+                        urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+                    ])
+                    rdialog_pile.error_display = False
+
+                    rdialog = DialogLineBox(rdialog_pile, title="Ingest message URI")
+                    rdialog.delegate = self
+                    bottom = self.listbox
+
+                    roverlay = urwid.Overlay(rdialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+                    options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+                    self.columns_widget.contents[0] = (roverlay, options)
+
+            except Exception as e:
+                RNS.log("Could not ingest LXM URI. The contained exception was: "+str(e), RNS.LOG_VERBOSE)
+                if not dialog_pile.error_display:
+                    dialog_pile.error_display = True
+                    options = dialog_pile.options(height_type="pack")
+                    dialog_pile.contents.append((urwid.Text(""), options))
+                    dialog_pile.contents.append((urwid.Text(("error_text", "Could ingest LXM from URI data. Check your input."), align="center"), options))
+
+        dialog_pile = urwid.Pile([
+            e_uri,
+            urwid.Text(""),
+            urwid.Columns([("weight", 0.45, urwid.Button("Ingest", on_press=confirmed)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Back", on_press=dismiss_dialog))])
+        ])
+        dialog_pile.error_display = False
+
+        dialog = DialogLineBox(dialog_pile, title="Ingest message URI")
+        dialog.delegate = self
+        bottom = self.listbox
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
+        self.columns_widget.contents[0] = (overlay, options)
+
     def delete_conversation(self, source_hash):
         if source_hash in ConversationsDisplay.cached_conversation_widgets:
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
@@ -636,6 +748,8 @@ class MessageEdit(urwid.Edit):
     def keypress(self, size, key):
         if key == "ctrl d":
             self.delegate.send_message()
+        elif key == "ctrl p":
+            self.delegate.paper_message()
         elif key == "ctrl k":
             self.delegate.clear_editor()
         elif key == "up":
@@ -800,7 +914,7 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_focus_area()
         elif key == "ctrl w":
             self.close()
-        elif key == "ctrl p":
+        elif key == "ctrl u":
             self.conversation.purge_failed()
             self.conversation_changed(None)
         elif key == "ctrl t":
@@ -860,6 +974,115 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 pass
 
+    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 == "":
+            if self.conversation.paper_output(content, title):
+                self.clear_editor()
+            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
+            self.conversation_changed(None)
+
+        dialog = DialogLineBox(
+            urwid.Pile([
+                urwid.Text("Could not output paper message,\ncheck your settings. See the log\nfile for any error messages.\n", align="center"),
+                urwid.Columns([("weight", 0.6, urwid.Text("")), ("weight", 0.4, urwid.Button("OK", on_press=dismiss_dialog))])
+            ]), title="!"
+        )
+        dialog.delegate = self
+        bottom = self.messagelist
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=34, valign="middle", height="pack", left=2, right=2)
+
+        self.frame.contents["body"] = (overlay, self.frame.options())
+        self.frame.set_focus("body")
+
     def close(self):
         self.delegate.close_conversation(self)
 
@@ -890,6 +1113,9 @@ class LXMessageWidget(urwid.WidgetWrap):
             elif message.lxm.method == LXMF.LXMessage.PROPAGATED and message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_propagated"
                 title_string = g["sent"]+" "+title_string
+            elif message.lxm.method == LXMF.LXMessage.PAPER and message.lxm.state == LXMF.LXMessage.PAPER:
+                header_style = "msg_header_propagated"
+                title_string = g["papermsg"]+" "+title_string
             elif message.lxm.state == LXMF.LXMessage.SENT:
                 header_style = "msg_header_sent"
                 title_string = g["sent"]+" "+title_string

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,37 +307,50 @@ 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.
 
 >>Pages
 
-Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked arbitrarily with hyperlinks, that can also link to pages (or other resources) on other nodes.
+Nomad Network nodes can host pages similar to web pages, that other peers can read and interact with. Pages are written in a compact markup language called `*micron`*. To learn how to write formatted pages with micron, see the `*Markup`* section of this guide (which is, itself, written in micron). Pages can be linked together with hyperlinks, that can also link to pages (or other resources) on other nodes.
 
 To add pages to your node, place micron files in the `*pages`* directory of your Nomad Network programs `*storage`* directory. By default, the path to this will be `!~/.nomadnetwork/storage/pages`!. You should probably create the file `!index.mu`! first, as this is the page that will get served by default to a connecting peer.
 
 You can control how long a peer will cache your pages by including the cache header in a page. To do so, the first line of your page must start with `!#!c=X`!, where `!X`! is the cache time in seconds. To tell the peer to always load the page from your node, and never cache it, set the cache time to zero. You should only do this if there is a real need, for example if your page displays dynamic content that `*must`* be updated at every page view. The default caching time is 12 hours. In most cases, you should not need to include the cache control header in your pages.
 
+>> Dynamic Pages
+
 You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
 
+Data from fields and link variables will be passed to these scipts or programs as environment variables, and can simply be read by any method for acessing such.
+
+In the `!examples`! directory, you can find various small examples for the use of this feature. The currently included examples are:
+
+ - A messageboard that receives messages over LXMF, contributed by trippcheng
+ - A simple demonstration on how to create fields and read entered data in node-side scripts
+
+By default, you can find the examples in `!~/.nomadnetwork/examples`!. If you build something neat, that you feel would fit here, you are more than welcome to contribute it.
+
 >>Authenticating Users
 
 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:
 
 `Faaa
 `=
-24c2dc2248953e0a3c21
-564a476410f4fca2ae93
-8bb864743f12f53395a1
+d454bcdac0e64fb68ba8e267543ae110
+2b9ff3fb5902c9ca5ff97bdfb239ef50
+7106d5abbc7208bfb171f2dd84b36490
 `=
 ``
 
@@ -348,7 +366,7 @@ Like pages, you can place files you want to make available in the `!~/.nomadnetw
 
 Links to pages and resources in Nomad Network use a simple URL format. Here is an example:
 
-`!1385edace36466a6b3dd:/page/index.mu`!
+`!18176ffddcc8cce1ddf8e3f72068f4a6:/page/index.mu`!
 
 The first part is the 10 byte destination address of the node (represented as readable hexadecimal), followed by the `!:`! character. Everything after the `!:`! represents the request path.
 
@@ -495,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:
@@ -603,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`!
 >>>>
@@ -670,19 +700,19 @@ For future reference, you can download the Reticulum Manual in PDF format here:
 
 It might be nice to keep that handy when you are not connected to the Internet, as it is full of information and examples that are also very relevant to Nomad Network.
 
->The Unsigned.io Testnet
+>The Reticulum Testnet
 
 If you have Internet access, and just want to get started experimenting, you are welcome to join the Unsigned.io RNS Testnet. The testnet is just that, an informal network for testing and experimenting. It will be up most of the time, and anyone can join, but it also means that there's no guarantees for service availability.
 
 The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
 
 >>
-[[RNS Testnet Frankfurt]]
+[[RNS Testnet Zurich]]
   type = TCPClientInterface
   interface_enabled = yes
   outgoing = True
-  target_host = frankfurt.rns.unsigned.io
-  target_port = 4965
+  target_host = zurich.connect.reticulum.network
+  target_port = 4242
 <
 
 If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here:
@@ -994,6 +1024,94 @@ Here is `F00f`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/inde
 
 When links like these are displayed in the built-in browser, clicking on them or activating them using the keyboard will cause the browser to load the specified URL.
 
+>Fields & Requests
+
+Nomad Network let's you use simple input fields for submitting data to node-side applications. Submitted data, along with other session variables will be available to the node-side script / program as environment variables.
+
+>>Request Links
+
+Links can contain request variables and a list of fields to submit to the node-side application. You can include all fields on the page, only specific ones, and any number of request variables. To simply submit all fields on a page to a specified node-side page, create a link like this:
+
+`Faaa
+`=
+`[Submit Fields`:/page/fields.mu`*]
+`=
+``
+
+Note the `!*`! following the extra `!\``! at the end of the path. This `!*`! denotes `*all fields`*. You can also specify a list of fields to include:
+
+`Faaa
+`=
+`[Submit Fields`:/page/fields.mu`username|auth_token]
+`=
+``
+
+If you want to include pre-set variables, you can do it like this:
+
+`Faaa
+`=
+`[Query the System`:/page/fields.mu`username|auth_token|action=view|amount=64]
+`=
+``
+
+>> Fields
+
+Here's an example of creating a field. We'll create a field named `!user_input`! and fill it with the text `!Pre-defined data`!. Note that we are using background color tags to make the field more visible to the user:
+
+`Faaa
+`=
+A simple input field: `B444`<user_input`Pre-defined data>`b
+`=
+``
+
+You must always set a field `*name`*, but you can of course omit the pre-defined value of the field:
+
+`Faaa
+`=
+An empty input field: `B444`<demo_empty`>`b
+`=
+``
+
+You can set the size of the field like this:
+
+`Faaa
+`=
+A sized input field:  `B444`<16|with_size`>`b
+`=
+``
+
+It is possible to mask fields, for example for use with passwords and similar:
+
+`Faaa
+`=
+A masked input field: `B444`<!|masked_demo`hidden text>`b
+`=
+``
+
+And you can of course control all parameters at the same time:
+
+`Faaa
+`=
+Full control: `B444`<!32|all_options`hidden text>`b
+`=
+``
+
+Collecting the above markup produces the following output:
+
+`Faaa`B333
+
+A simple input field: `B444`<user_input`Pre-defined data>`B333
+
+An empty input field: `B444`<demo_empty`>`B333
+
+A sized input field:  `B444`<16|with_size`>`B333
+
+A masked input field: `B444`<!|masked_demo`hidden text>`B333
+
+Full control: `B444`<!32|all_options`hidden text>`B333
+
+``
+
 >Comments
 
 You can insert comments that will not be displayed in the output by starting a line with the # character.
@@ -1026,7 +1144,7 @@ To display literal content, for example source-code, or blocks of text that shou
 `=
 '''
 TOPIC_MARKUP += TOPIC_MARKUP.replace("`=", "\\`=") + "[ micron source for document goes here, we don't want infinite recursion now, do we? ]\n\\`="
-TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, you should be well equipped to write documents and pages using micron. Thank you for staying with me.\n\n`c\U0001F332\n"
+TOPIC_MARKUP += "\n`=\n\n>Closing Remarks\n\nIf you made it all the way here, you should be well equipped to write documents, pages and applications using micron and Nomad Network. Thank you for staying with me.\n\n`c\U0001F332\n"
 
 
 TOPICS = {

nomadnet/ui/textui/Main.py

@@ -140,6 +140,15 @@ class MainDisplay():
         self.menu_display.start()
 
     def quit(self, sender=None):
+        logterm_pid = None
+        if True or RNS.vendor.platformutils.is_android():
+            if self.sub_displays.log_display != None and self.sub_displays.log_display.log_term != None:
+                if self.sub_displays.log_display.log_term.log_term != None:
+                    logterm_pid = self.sub_displays.log_display.log_term.log_term.pid
+                    if logterm_pid != None:
+                        import os, signal
+                        os.kill(logterm_pid, signal.SIGKILL)
+
         raise urwid.ExitMainLoop
 
 

nomadnet/ui/textui/MicronParser.py

@@ -1,5 +1,6 @@
 import nomadnet
 import urwid
+import random
 import time
 from urwid.util import is_mouse_press
 from urwid.text_layout import calc_coords
@@ -62,13 +63,14 @@ def markup_to_attrmaps(markup, url_delegate = None):
 
     for line in lines:
         if len(line) > 0:
-            display_widget = parse_line(line, state, url_delegate)
+            display_widgets = parse_line(line, state, url_delegate)
         else:
-            display_widget = urwid.Text("")
+            display_widgets = [urwid.Text("")]
         
-        if display_widget != None:
-            attrmap = urwid.AttrMap(display_widget, make_style(state))
-            attrmaps.append(attrmap)
+        if display_widgets != None and len(display_widgets) != 0:
+            for display_widget in display_widgets:
+                attrmap = urwid.AttrMap(display_widget, make_style(state))
+                attrmaps.append(attrmap)
 
     return attrmaps
 
@@ -124,7 +126,7 @@ def parse_line(line, state, url_delegate):
 
                         heading_style = first_style
                         output.insert(0, " "*left_indent(state))
-                        return urwid.AttrMap(urwid.Text(output, align=state["align"]), heading_style)
+                        return [urwid.AttrMap(urwid.Text(output, align=state["align"]), heading_style)]
                     else:
                         return None
                 else:
@@ -137,22 +139,56 @@ def parse_line(line, state, url_delegate):
                 else:
                     divider_char = "\u2500"
                 if state["depth"] == 0:
-                    return urwid.Divider(divider_char)
+                    return [urwid.Divider(divider_char)]
                 else:
-                    return urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))
+                    return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))]
 
         output = make_output(state, line, url_delegate)
 
         if output != None:
-            if url_delegate != None:
-                text_widget = LinkableText(output, align=state["align"], delegate=url_delegate)
+            text_only = True
+            for o in output:
+                if not isinstance(o, tuple):
+                    text_only = False
+                    break
+
+            if not text_only:
+                widgets = []
+                for o in output:
+                    if isinstance(o, tuple):
+                        if url_delegate != None:
+                            tw = LinkableText(o, align=state["align"], delegate=url_delegate)
+                            tw.in_columns = True
+                        else:
+                            tw = urwid.Text(o, align=state["align"])
+                        
+                        widgets.append(("pack", tw))
+                    else:
+                        if o["type"] == "field":
+                            fw = o["width"]
+                            fd = o["data"]
+                            fn = o["name"]
+                            fs = o["style"]
+                            fmask = "*" if o["masked"] else None
+                            f = urwid.Edit(caption="", edit_text=fd, align=state["align"], multiline=True, mask=fmask)
+                            f.field_name = fn
+                            fa = urwid.AttrMap(f, fs)
+                            widgets.append((fw, fa))
+
+                columns_widget = urwid.Columns(widgets, dividechars=0)
+                text_widget = columns_widget
+                # text_widget = urwid.Text("<"+output+">", align=state["align"])
+
             else:
-                text_widget = urwid.Text(output, align=state["align"])
+                if url_delegate != None:
+                    text_widget = LinkableText(output, align=state["align"], delegate=url_delegate)
+                else:
+                    text_widget = urwid.Text(output, align=state["align"])
 
             if state["depth"] == 0:
-                return text_widget
+                return [text_widget]
             else:
-                return urwid.Padding(text_widget, left=left_indent(state), right=right_indent(state))
+                return [urwid.Padding(text_widget, left=left_indent(state), right=right_indent(state))]
         else:
             return None
     else:
@@ -423,6 +459,54 @@ def make_output(state, line, url_delegate):
                     elif c == "a":
                         state["align"] = state["default_align"]
 
+                    elif c == "<":
+                        try:
+                            field_name = None
+                            field_name_end = line[i:].find("`")
+                            if field_name_end == -1:
+                                pass
+                            else:
+                                field_name = line[i+1:i+field_name_end]
+                                field_name_skip = len(field_name)
+                                field_masked = False
+                                field_width = 24
+
+                                if "|" in field_name:
+                                    f_components = field_name.split("|")
+                                    field_flags = f_components[0]
+                                    field_name = f_components[1]
+                                    if "!" in field_flags:
+                                        field_flags = field_flags.replace("!", "")
+                                        field_masked = True
+                                    if len(field_flags) > 0:
+                                        field_width = min(int(field_flags), 256)
+
+                                def sr():
+                                    return "@{"+str(random.randint(1000,9999))+"}"
+                                rsg = sr()
+                                while rsg in line[i+field_name_end:]:
+                                    rsg = sr()
+                                lr = line[i+field_name_end:].replace("\\>", rsg)
+                                endpos = lr.find(">")
+                                
+                                if endpos == -1:
+                                    pass
+                                
+                                else:
+                                    field_data = lr[1:endpos].replace(rsg, "\\>")
+                                    skip = len(field_data)+field_name_skip+2
+                                    field_data = field_data.replace("\\>", ">")
+                                    output.append({
+                                        "type":"field",
+                                        "name": field_name,
+                                        "width": field_width,
+                                        "masked": field_masked,
+                                        "data": field_data,
+                                        "style": make_style(state)
+                                    })
+                        except Exception as e:
+                            pass
+    
                     elif c == "[":
                         endpos = line[i:].find("]")
                         if endpos == -1:
@@ -434,13 +518,20 @@ def make_output(state, line, url_delegate):
                             link_components = link_data.split("`")
                             if len(link_components) == 1:
                                 link_label = ""
+                                link_fields = ""
                                 link_url = link_data
                             elif len(link_components) == 2:
                                 link_label = link_components[0]
                                 link_url = link_components[1]
+                                link_fields = ""
+                            elif len(link_components) == 3:
+                                link_label = link_components[0]
+                                link_url = link_components[1]
+                                link_fields = link_components[2]
                             else:
                                 link_url = ""
                                 link_label = ""
+                                link_fields = ""
 
                             if len(link_url) != 0:
                                 if link_label == "":
@@ -468,6 +559,11 @@ def make_output(state, line, url_delegate):
 
                                 if url_delegate != None:
                                     linkspec = LinkSpec(link_url, orig_spec)
+                                    if link_fields != "":
+                                        lf = link_fields.split("|")
+                                        if len(lf) > 0:
+                                            linkspec.link_fields = lf
+
                                     output.append((linkspec, link_label))
                                 else:
                                     output.append(make_part(state, link_label)) 
@@ -510,6 +606,7 @@ def make_output(state, line, url_delegate):
 class LinkSpec(urwid.AttrSpec):
     def __init__(self, link_target, orig_spec):
         self.link_target = link_target
+        self.link_fields = None
 
         urwid.AttrSpec.__init__(self, orig_spec.foreground, orig_spec.background)
 
@@ -525,12 +622,13 @@ class LinkableText(urwid.Text):
         self.delegate = delegate
         self._cursor_position = 0
         self.key_timeout = 3
+        self.in_columns = False
         if self.delegate != None:
             self.delegate.last_keypress = 0
 
-    def handle_link(self, link_target):
+    def handle_link(self, link_target, link_fields):
         if self.delegate != None:
-            self.delegate.handle_link(link_target)
+            self.delegate.handle_link(link_target, link_fields)
 
     def find_next_part_pos(self, pos, part_positions):
         for position in part_positions:
@@ -588,7 +686,7 @@ class LinkableText(urwid.Text):
             item = self.find_item_at_pos(self._cursor_position)
             if item != None:
                 if isinstance(item, LinkSpec):
-                    self.handle_link(item.link_target)
+                    self.handle_link(item.link_target, item.link_fields)
 
         elif key == "up":
             self._cursor_position = 0
@@ -601,16 +699,23 @@ class LinkableText(urwid.Text):
         elif key == "right":
             old = self._cursor_position
             self._cursor_position = self.find_next_part_pos(self._cursor_position, part_positions)
+
             if self._cursor_position == old:
-                self._cursor_position = 0
-                return "down"
+                if self.in_columns:
+                    return "right"
+                else:
+                    self._cursor_position = 0
+                    return "down"
 
             self._invalidate()
         
         elif key == "left":
             if self._cursor_position > 0:
-                self._cursor_position = self.find_prev_part_pos(self._cursor_position, part_positions)
-                self._invalidate()
+                if self.in_columns:
+                    return "left"
+                else:
+                    self._cursor_position = self.find_prev_part_pos(self._cursor_position, part_positions)
+                    self._invalidate()
 
             else:
                 if self.delegate != None:
@@ -646,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)
+                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]
+
+                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
             
-            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):
@@ -239,7 +238,7 @@ class AnnounceInfo(urwid.WidgetWrap):
 
 
 class AnnounceStreamEntry(urwid.WidgetWrap):
-    def __init__(self, app, announce):
+    def __init__(self, app, announce, delegate):
         full_time_format = "%Y-%m-%d %H:%M:%S"
         date_time_format = "%Y-%m-%d"
         time_time_format = "%H:%M:%S"
@@ -250,6 +249,7 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
         source_hash = announce[1]
         announce_type = announce[3]
         self.app = app
+        self.delegate = delegate
         self.timestamp = timestamp
         time_format = app.time_format
         dt = datetime.fromtimestamp(self.timestamp)
@@ -299,10 +299,46 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
         urwid.WidgetWrap.__init__(self, self.display_widget)
 
     def display_announce(self, event, announce):
+      try:
         parent = self.app.ui.main_display.sub_displays.network_display
         info_widget = AnnounceInfo(announce, parent, self.app)
         options = parent.left_pile.options(height_type="weight", height_amount=1)
         parent.left_pile.contents[0] = (info_widget, options)
+      
+      except KeyError as e:
+        def dismiss_dialog(sender):
+            self.delegate.parent.close_list_dialogs()
+
+        def confirmed(sender):
+            def close_req(sender):
+                self.delegate.parent.close_list_dialogs()
+
+            dialog_pile.contents[0] = (urwid.Text("\nKeys requested from network\n", align="center"), options)
+            RNS.Transport.request_path(announce[1])
+
+        confirmed_button = urwid.Button("Request keys", on_press=confirmed)
+
+        dialog_pile = urwid.Pile([
+            urwid.Text("The keys for the announced destination could not be recalled. You can wait for an announce to arrive, or request the keys from the network.\n", align="center"),
+            urwid.Columns([
+                ("weight", 0.45, confirmed_button),
+                ("weight", 0.1, urwid.Text("")),
+                ("weight", 0.45, urwid.Button("Close", on_press=dismiss_dialog)),
+            ])
+        ])
+
+        dialog = ListDialogLineBox(
+            dialog_pile,
+            title="Keys Unknown"
+        )
+        confirmed_button.dialog_pile = dialog_pile
+        dialog.delegate = self.delegate.parent
+        bottom = self.delegate
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.parent.left_pile.options("weight", 1)
+        self.delegate.parent.left_pile.contents[0] = (overlay, options)
 
     def timestamp(self):
         return self.timestamp
@@ -358,7 +394,7 @@ class AnnounceStream(urwid.WidgetWrap):
                 new_entries.insert(0, e)
 
         for e in new_entries:
-            nw = AnnounceStreamEntry(self.app, e)
+            nw = AnnounceStreamEntry(self.app, e, self)
             nw.timestamp = e[0]
             self.widget_list.insert(0, nw)
 
@@ -445,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:
@@ -505,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
@@ -551,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):
@@ -569,10 +612,22 @@ 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()
+
+            if trust_level == DirectoryEntry.TRUSTED:
+                self.app.autoselect_propagation_node()
+
             show_known_nodes(None)
 
         back_button = ("weight", 0.2, urwid.Button("Back", on_press=show_known_nodes))
@@ -587,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"]),
@@ -667,7 +723,7 @@ class KnownNodes(urwid.WidgetWrap):
         else:
             self.no_content = True
             widget_style = "inactive_text"
-            self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no nodes are known\n\n"), align="center")])
+            self.pile = urwid.Pile([urwid.Text(("warning_text", g["info"]+"\n"), align="center"), SelectText(("warning_text", "Currently, no nodes are saved\n\nCtrl+L to view the announce stream\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="Saved Nodes"), widget_style))
@@ -894,7 +950,7 @@ class NodeActiveConnections(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(len(self.app.node.destination.links))
 
-        self.display_widget.set_text("Conneced Now   : "+self.stat_string)
+        self.display_widget.set_text("Connected Now  : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -922,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)
@@ -1258,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,
@@ -1498,10 +1577,6 @@ class NetworkDisplay():
         self.local_peer_display.start()
         self.node_info_display.start()
         self.network_stats_display.start()
-        # There seems to be an intermittent memory leak somewhere
-        # in the periodic updating here. The periodic updater should
-        # not be needed anymore, so dis
-        #self.announce_stream_display.start()
 
     def shortcuts(self):
         return self.shortcuts_display
@@ -1541,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)
 
@@ -1563,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
@@ -1576,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
@@ -1598,15 +1717,28 @@ 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"
         focus_style   = "list_focus"
 
-        widget = ListEntry(sym+" "+display_str+"\n  "+str(len(peer.unhandled_messages))+" unhandled LXMs - "+"Last heard "+pretty_date(int(peer.last_heard)))
-        # urwid.connect_signal(widget, "click", delegate.connect_node, node)
+        alive_string = "Unknown"
+        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")
         self.display_widget = urwid.AttrMap(widget, style, focus_style)
         self.display_widget.destination_hash = destination_hash
         urwid.WidgetWrap.__init__(self, self.display_widget)

nomadnet/vendor/Scrollable.py

@@ -107,6 +107,51 @@ class Scrollable(urwid.WidgetDecoration):
             if canv_full.cursor is not None:
                 # Full canvas contains the cursor, but scrolled out of view
                 self._forward_keypress = False
+                
+                # Reset cursor position on page/up down scrolling
+                try:
+                    if hasattr(ow, "automove_cursor_on_scroll") and ow.automove_cursor_on_scroll:
+                        pwi = 0
+                        ch = 0
+                        last_hidden = False
+                        first_visible = False
+                        for w,o in ow.contents:
+                            wcanv = w.render((maxcol,))
+                            wh = wcanv.rows()
+                            if wh:
+                                ch += wh
+
+                            if not last_hidden and ch >= self._trim_top:
+                                last_hidden = True
+
+                            elif last_hidden:
+                                if not first_visible:
+                                    first_visible = True
+
+                                if w.selectable():
+                                    ow.focus_item = pwi
+
+                                    st = None
+                                    nf = ow.get_focus()
+                                    if hasattr(nf, "key_timeout"):
+                                        st = nf
+                                    elif hasattr(nf, "original_widget"):
+                                        no = nf.original_widget
+                                        if hasattr(no, "original_widget"):
+                                            st = no.original_widget
+                                        else:
+                                            if hasattr(no, "key_timeout"):
+                                                st = no
+                                    
+                                    if st and hasattr(st, "key_timeout") and hasattr(st, "keypress") and callable(st.keypress):
+                                        st.keypress(None, None)
+                                    
+                                    break
+
+                            pwi += 1
+                except Exception as e:
+                    pass
+
             else:
                 # Original widget does not have a cursor, but may be selectable
 

nomadnet/vendor/quotes.py

@@ -3,4 +3,5 @@ quotes = [
     ("That's enough entropy for you my friend", "Unknown"),
     ("Any time two people connect online, it's financed by a third person who believes they can manipulate the first two", "Jaron Lanier"),
     ("The landscape of the future is set, but how one will march across it is not determined", "Terence McKenna")
+    ("Freedom originates in the division of power, despotism in its concentration.", "John Acton")
 ]

setup.py

@@ -5,6 +5,12 @@ exec(open("nomadnet/_version.py", "r").read())
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+package_data = {
+"": [
+    "examples/messageboard/*",
+    ]
+}
+
 setuptools.setup(
     name="nomadnet",
     version=__version__,
@@ -15,6 +21,7 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/markqvist/nomadnet",
     packages=setuptools.find_packages(),
+    package_data=package_data,
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
@@ -23,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=['rns>=0.4.1', 'lxmf>=0.2.4', 'urwid>=2.1.2'],
-    python_requires='>=3.6',
+    install_requires=["rns>=0.6.2", "lxmf>=0.3.6", "urwid==2.1.2", "qrcode"],
+    python_requires=">=3.6",
 )