Updated version and dependencies

Move --daemon to CMD from ENTRYPOINT

.dockerignore

@@ -0,0 +1 @@
+.gitignore

.github/workflows/publish-container.yml

@@ -0,0 +1,42 @@
+name: Create and publish a Docker image
+
+on:
+  push:
+    branches: ['master']
+    tags: ['*.*.*']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,26 @@
+FROM python:3.11-rc-alpine3.14 as build
+
+RUN apk add --no-cache build-base linux-headers libffi-dev cargo
+
+# Create a virtualenv that we'll copy to the published image
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+RUN pip3 install setuptools-rust pyopenssl cryptography
+
+COPY . /app/
+RUN cd /app/ && python3 setup.py install
+
+# Use multi-stage build, as we don't need rust compilation on the final image
+FROM python:3.11-rc-alpine3.14
+
+LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"
+
+ENV PATH="/opt/venv/bin:$PATH"
+ENV PYTHONUNBUFFERED="yes"
+COPY --from=build /opt/venv /opt/venv
+
+VOLUME /root/.reticulum
+VOLUME /root/.nomadnetwork
+
+ENTRYPOINT ["nomadnet"]
+CMD ["--daemon"]

Makefile

@@ -0,0 +1,25 @@
+all: release
+
+clean:
+	@echo Cleaning...
+	-rm -r ./build
+	-rm -r ./dist
+
+remove_symlinks:
+	@echo Removing symlinks for build...
+	-rm ./LXMF
+	-rm ./RNS
+
+create_symlinks:
+	@echo Creating symlinks...
+	-ln -s ../Reticulum/RNS ./
+	-ln -s ../LXMF/LXMF ./
+
+build_wheel:
+	python3 setup.py sdist bdist_wheel
+
+release: remove_symlinks build_wheel create_symlinks
+
+upload:
+	@echo Uploading to PyPi...
+	twine upload dist/*

README.md

@@ -25,14 +25,9 @@ Nomad Network does not need any connections to the public internet to work. In f
 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
- - Access control and authentication for nodes, pages and files
  - Network-wide propagated bulletins and discussion threads
- - Geospatial information sharing and collaborative maps
+ - Collaborative maps and geospatial information sharing
-
+ - Facilitation of trade and barter
-## Dependencies:
- - Python 3
- - RNS
- - LXMF
 
 ## How do I get started?
 The easiest way to install Nomad Network is via pip:
@@ -43,11 +38,81 @@ pip3 install nomadnet
 
 # Run the client
 nomadnet
+
+# Or alternatively run as a daemon, with no user interface
+nomadnet --daemon
+
+# List options
+nomadnet --help
 ```
 
 The first time the program is running, you will be presented with the guide section, which contains all the information you need to start using Nomad Network.
 
-To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info.
+To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info. For a general introduction on how to set up such a system, take a look at [this post](https://unsigned.io/private-messaging-over-lora/).
+
+If you want to try Nomad Network without building your own physical network, you can connect to the [Unsigned.io RNS Testnet](https://github.com/markqvist/Reticulum#public-testnet) over the Internet, where there is already some Nomad Network and LXMF activity.
+
+**Please Note**: If this is the very first time you use pip to install a program on your system, you might need to reboot your system for the program to become available. If you get a "command not found" error or similar when running the program, reboot your system and try again.
+
+### Install on Android
+You can install Nomad Network on Android using Termux, but there's a few more commands involved than the above one-liner. The process is documented in the [Android Installation](https://markqvist.github.io/Reticulum/manual/gettingstartedfast.html#reticulum-on-android) section of the Reticulum Manual. Once the Reticulum has been installed according to the linked documentation, Nomad Network can be installed as usual with pip.
+
+For a native Android application with a graphical user interface, have a look at [Sideband](https://unsigned.io/sideband).
+
+### Docker Images
+
+Nomad Network is automatically published as a docker image on Github Packages. Image tags are one of either `master` (for the very latest commit) or the version number (eg `0.2.0`) for a specific release.
+
+```sh
+$ docker pull ghcr.io/markqvist/nomadnet:master
+
+# Run nomadnet interactively in a container
+$ docker run -it ghcr.io/markqvist/nomadnet:master --textui
+
+# Run nomadnet as a daemon, using config stored on the host machine in specified
+# directories, and connect the containers network to the host network (which will
+# allow the default AutoInterface to automatically peer with other discovered
+# Reticulum instances).
+$ docker run -d \
+  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
+  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
+  --network host
+  ghcr.io/markqvist/nomadnet:master
+
+# You can also keep the network of the container isolated from the host, but you
+# will need to manually configure one or more Reticulum interfaces to reach other
+# nodes in a network, by editing the Reticulum configuration file.
+$ docker run -d \
+  -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \
+  -v /local/path/reticulumconfigdir/:/root/.reticulum/ \
+  ghcr.io/markqvist/nomadnet:master
+
+# Send daemon log output to console instead of file
+$ docker run -i ghcr.io/markqvist/nomadnet:master --daemon --console
+```
+
+## Help & Discussion
+
+For help requests, discussion, sharing ideas or anything else related to Nomad Network, please have a look at the [Nomad Network discussions pages](https://github.com/markqvist/Reticulum/discussions/categories/nomad-network).
+
+## Support Nomad Network
+You can help support the continued development of open, free and private communications systems by donating via one of the following channels:
+
+- Monero:
+  ```
+  84FpY1QbxHcgdseePYNmhTHcrgMX4nFf
+  BYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD1
+  9b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
+  ```
+- Ethereum
+  ```
+  0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
+  ```
+- Bitcoin
+  ```
+  3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
+  ```
+- Ko-Fi: https://ko-fi.com/markqvist
 
 ## 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

@@ -14,20 +14,25 @@ class Conversation:
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
-        destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
-        # Check if the announced destination is in
-        # our list of conversations
-        if destination_hash_text in [e[0] for e in Conversation.conversation_list(app)]:
-            if app.directory.find(destination_hash):
-                if Conversation.created_callback != None:
-                    Conversation.created_callback()
-            else:
-                if Conversation.created_callback != None:
-                    Conversation.created_callback()
 
-        # Add the announce to the directory announce
+        if not destination_hash in app.ignored_list:
-        # stream logger
+            destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
-        app.directory.lxmf_announce_received(destination_hash, app_data)
+            # Check if the announced destination is in
+            # our list of conversations
+            if destination_hash_text in [e[0] for e in Conversation.conversation_list(app)]:
+                if app.directory.find(destination_hash):
+                    if Conversation.created_callback != None:
+                        Conversation.created_callback()
+                else:
+                    if Conversation.created_callback != None:
+                        Conversation.created_callback()
+
+            # Add the announce to the directory announce
+            # stream logger
+            app.directory.lxmf_announce_received(destination_hash, app_data)
+            
+        else:
+            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
 
     @staticmethod
     def query_for_peer(source_hash):
@@ -66,7 +71,8 @@ class Conversation:
             except Exception as e:
                 pass
 
-            Conversation.created_callback()
+            if Conversation.created_callback != None:
+                Conversation.created_callback()
 
         return ingested_path
 
@@ -233,10 +239,11 @@ class Conversation:
     def __str__(self):
         string = self.source_hash
 
-        if self.source_identity:
+        # TODO: Remove this
-            if self.source_identity.app_data:
+        # if self.source_identity:
-                # TODO: Sanitise for viewing
+        #     if self.source_identity.app_data:
-                string += " | "+self.source.source_identity.app_data.decode("utf-8")
+        #         # TODO: Sanitise for viewing, or just clean this
+        #         string += " | "+self.source_identity.app_data.decode("utf-8")
 
         return string
 

nomadnet/Directory.py

@@ -12,12 +12,17 @@ class Directory:
     @staticmethod
     def received_announce(destination_hash, announced_identity, app_data):
         app = nomadnet.NomadNetworkApp.get_shared_instance()
-        destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
 
-        associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
+        if not destination_hash in app.ignored_list:
+            destination_hash_text = RNS.hexrep(destination_hash, delimit=False)
 
-        app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+            associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity)
-        app.autoselect_propagation_node()
+
+            app.directory.node_announce_received(destination_hash, app_data, associated_peer)
+            app.autoselect_propagation_node()
+            
+        else:
+            RNS.log("Ignored announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG)
 
 
     def __init__(self, app):
@@ -32,7 +37,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))
+                packed_list.append((e.source_hash, e.display_name, e.trust_level, e.hosts_node, e.preferred_delivery, e.identify))
 
             directory = {
                 "entry_list": packed_list,
@@ -55,6 +60,7 @@ class Directory:
 
                 entries = {}
                 for e in unpacked_list:
+                        
                     if len(e) > 3:
                         hosts_node = e[3]
                     else:
@@ -65,7 +71,12 @@ class Directory:
                     else:
                         preferred_delivery = None
 
-                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery)
+                    if len(e) > 5:
+                        identify = e[5]
+                    else:
+                        identify = False
+
+                    entries[e[0]] = DirectoryEntry(e[0], e[1], e[2], hosts_node, preferred_delivery=preferred_delivery, identify_on_connect=identify)
 
                 self.directory_entries = entries
 
@@ -81,7 +92,9 @@ class Directory:
             self.announce_stream.insert(0, (timestamp, source_hash, app_data, False))
             while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
                 self.announce_stream.pop()
-            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
     def node_announce_received(self, source_hash, app_data, associated_peer):
         if app_data != None:
@@ -96,7 +109,8 @@ class Directory:
                     node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
                     self.remember(node_entry)
             
-            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+            if hasattr(self.app.ui, "main_display"):
+                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
     def remove_announce_with_timestamp(self, timestamp):
         selected_announce = None
@@ -119,10 +133,21 @@ class Directory:
             return "<"+RNS.hexrep(source_hash, delimit=False)+">"
         else:
             if source_hash in self.directory_entries:
-                return self.directory_entries[source_hash].display_name
+                dn = self.directory_entries[source_hash].display_name
+                if dn == None:
+                    return RNS.prettyhexrep(source_hash)
+                else:
+                    return dn
             else:
                 return "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
+    def alleged_display_str(self, source_hash):
+        if source_hash in self.directory_entries:
+            return self.directory_entries[source_hash].display_name
+        else:
+            return None
+
+
     def trust_level(self, source_hash, announced_display_name=None):
         if source_hash in self.directory_entries:
             if announced_display_name == None:
@@ -176,6 +201,18 @@ class Directory:
         except Exception as e:
             return False
 
+    def should_identify_on_connect(self, source_hash):
+        if source_hash in self.directory_entries:
+            entry = self.directory_entries[source_hash]
+            return entry.identify
+        else:
+            return False
+
+    def set_identify_on_connect(self, source_hash, state):
+        if source_hash in self.directory_entries:
+            entry = self.directory_entries[source_hash]
+            entry.identify = state
+    
     def known_nodes(self):
         node_list = []
         for eh in self.directory_entries:
@@ -207,12 +244,15 @@ class DirectoryEntry:
     DIRECT     = 0x01
     PROPAGATED = 0x02
 
-    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None):
+    def __init__(self, source_hash, display_name=None, trust_level=UNKNOWN, hosts_node=False, preferred_delivery=None, identify_on_connect=False):
         if len(source_hash) == RNS.Identity.TRUNCATED_HASHLENGTH//8:
             self.source_hash  = source_hash
+
+            # TODO: Clean
+            # if display_name  == None:
+            #     display_name  = source_hash
+
             self.display_name = display_name
-            if display_name  == None:
-                display_name  = source_hash
 
             if preferred_delivery == None:
                 self.preferred_delivery = DirectoryEntry.DIRECT
@@ -221,5 +261,6 @@ class DirectoryEntry:
 
             self.trust_level  = trust_level
             self.hosts_node   = hosts_node
+            self.identify     = identify_on_connect
         else:
             raise TypeError("Attempt to add invalid source hash to directory")

nomadnet/Node.py

@@ -7,13 +7,14 @@ import RNS.vendor.umsgpack as msgpack
 
 class Node:
     JOB_INTERVAL = 5
+    START_ANNOUNCE_DELAY = 6
 
     def __init__(self, app):
         RNS.log("Nomad Network Node starting...", RNS.LOG_VERBOSE)
         self.app = app
         self.identity = self.app.identity
         self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node")
-        self.last_announce = None
+        self.last_announce = time.time()
         self.announce_interval = self.app.node_announce_interval
         self.job_interval = Node.JOB_INTERVAL
         self.should_run_jobs = True
@@ -23,13 +24,21 @@ class Node:
         self.register_pages()
         self.register_files()
 
+        self.destination.set_link_established_callback(self.peer_connected)
+
         if self.name == None:
             self.name = self.app.peer_settings["display_name"]+"'s Node"
 
         RNS.log("Node \""+self.name+"\" ready for incoming connections on "+RNS.prettyhexrep(self.destination.hash), RNS.LOG_VERBOSE)
 
         if self.app.node_announce_at_start:
-            self.announce()
+            def delayed_announce():
+                time.sleep(Node.START_ANNOUNCE_DELAY)
+                self.announce()
+
+            da_thread = threading.Thread(target=delayed_announce)
+            da_thread.setDaemon(True)
+            da_thread.start()
 
         job_thread = threading.Thread(target=self.__jobs)
         job_thread.setDaemon(True)
@@ -72,7 +81,8 @@ class Node:
         directories = [file for file in os.listdir(base_path) if os.path.isdir(os.path.join(base_path, file)) and file[:1] != "."]
 
         for file in files:
-            self.servedpages.append(base_path+"/"+file)
+            if not file.endswith(".allowed"):
+                self.servedpages.append(base_path+"/"+file)
 
         for directory in directories:
             self.scan_pages(base_path+"/"+directory)
@@ -89,17 +99,69 @@ class Node:
 
     def serve_page(self, path, data, request_id, remote_identity, requested_at):
         RNS.log("Page request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
-        file_path = path.replace("/page", self.app.pagespath, 1)
         try:
-            RNS.log("Serving page: "+file_path, RNS.LOG_VERBOSE)
+            self.app.peer_settings["served_page_requests"] += 1
-            if os.access(file_path, os.X_OK):
+            self.app.save_peer_settings()
-                generated = subprocess.run([file_path], stdout=subprocess.PIPE)
+            
-                return generated.stdout
+        except Exception as e:
+            RNS.log("Could not increase served page request count", RNS.LOG_ERROR)
+
+        file_path = path.replace("/page", self.app.pagespath, 1)
+
+        allowed_path = file_path+".allowed"
+        request_allowed = False
+
+        if os.path.isfile(allowed_path):
+            allowed_list = []
+
+            try:
+                if os.access(allowed_path, os.X_OK):
+                    allowed_result = subprocess.run([allowed_path], stdout=subprocess.PIPE)
+                    allowed_input = allowed_result.stdout
+
+                else:
+                    fh = open(allowed_path, "rb")
+                    allowed_input = fh.read()
+                    fh.close()
+
+                allowed_hash_strs = allowed_input.splitlines()
+
+                for hash_str in allowed_hash_strs:
+                    if len(hash_str) == RNS.Identity.TRUNCATED_HASHLENGTH//8*2:
+                        try:
+                            allowed_hash = bytes.fromhex(hash_str.decode("utf-8"))
+                            allowed_list.append(allowed_hash)
+
+                        except Exception as e:
+                            RNS.log("Could not decode RNS Identity hash from: "+str(hash_str), RNS.LOG_DEBUG)
+                            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
+            except Exception as e:
+                RNS.log("Error while fetching list of allowed identities for request: "+str(e), RNS.LOG_ERROR)
+
+            if hasattr(remote_identity, "hash") and remote_identity.hash in allowed_list:
+                request_allowed = True
             else:
-                fh = open(file_path, "rb")
+                request_allowed = False
-                response_data = fh.read()
+                RNS.log("Denying request, remote identity was not in list of allowed identities", RNS.LOG_VERBOSE)
-                fh.close()
+
-                return response_data
+        else:
+            request_allowed = True
+
+        try:
+            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)
+                    return generated.stdout
+                else:
+                    fh = open(file_path, "rb")
+                    response_data = fh.read()
+                    fh.close()
+                    return response_data
+            else:
+                RNS.log("Request denied", RNS.LOG_VERBOSE)
+                return DEFAULT_NOTALLOWED.encode("utf-8")
 
         except Exception as e:
             RNS.log("Error occurred while handling request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_ERROR)
@@ -109,6 +171,13 @@ class Node:
     # TODO: Improve file handling, this will be slow for large files
     def serve_file(self, path, data, request_id, remote_identity, requested_at):
         RNS.log("File request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_VERBOSE)
+        try:
+            self.app.peer_settings["served_file_requests"] += 1
+            self.app.save_peer_settings()
+            
+        except Exception as e:
+            RNS.log("Could not increase served file request count", RNS.LOG_ERROR)
+
         file_path = path.replace("/file", self.app.filespath, 1)
         file_name = path.replace("/file/", "", 1)
         try:
@@ -138,15 +207,25 @@ class Node:
         while self.should_run_jobs:
             now = time.time()
             
-            if now > self.last_announce + self.announce_interval:
+            if now > self.last_announce + self.announce_interval*60:
                 self.announce()
 
             time.sleep(self.job_interval)
 
-    def peer_connected(link):
+    def peer_connected(self, link):
-        RNS.log("Peer connected to "+str(self.destination), RNS.LOG_INFO)
+        RNS.log("Peer connected to "+str(self.destination), RNS.LOG_VERBOSE)
+        try:
+            self.app.peer_settings["node_connects"] += 1
+            self.app.save_peer_settings()
+
+        except Exception as e:
+            RNS.log("Could not increase node connection count", RNS.LOG_ERROR)
+
         link.set_link_closed_callback(self.peer_disconnected)
 
+    def peer_disconnected(self, link):
+        RNS.log("Peer disconnected from "+str(self.destination), RNS.LOG_VERBOSE)
+        pass
 
 DEFAULT_INDEX = '''>Default Home Page
 
@@ -154,3 +233,8 @@ This node is serving pages, but the home page file (index.mu) was not found in t
 
 If you are the node operator, you can define your own home page by creating a file named `*index.mu`* in the page storage directory.
 '''
+
+DEFAULT_NOTALLOWED = '''>Request Not Allowed
+
+You are not authorised to carry out the request.
+'''

nomadnet/NomadNetworkApp.py

@@ -1,12 +1,20 @@
 import os
+import io
+import sys
 import time
+import shlex
 import atexit
+import threading
+import traceback
+import subprocess
+import contextlib
 
 import RNS
 import LXMF
 import nomadnet
 
 from nomadnet.Directory import DirectoryEntry
+from datetime import datetime
 
 import RNS.vendor.umsgpack as msgpack
 
@@ -19,13 +27,38 @@ class NomadNetworkApp:
 
     configdir = os.path.expanduser("~")+"/.nomadnetwork"
 
+    START_ANNOUNCE_DELAY = 3
+
     def exit_handler(self):
         RNS.log("Nomad Network Client exit handler executing...", RNS.LOG_VERBOSE)
+        self.should_run_jobs = False
+
         RNS.log("Saving directory...", RNS.LOG_VERBOSE)
         self.directory.save_to_disk()
+
+        if hasattr(self.ui, "restore_ixon"):
+            if self.ui.restore_ixon:
+                try:
+                    os.system("stty ixon")
+
+                except Exception as e:
+                    RNS.log("Could not restore flow control sequences. The contained exception was: "+str(e), RNS.LOG_WARNING)
+
         RNS.log("Nomad Network Client exiting now", RNS.LOG_VERBOSE)
 
-    def __init__(self, configdir = None, rnsconfigdir = None):
+    def exception_handler(self, e_type, e_value, e_traceback):
+        RNS.log("An unhandled exception occurred, the details of which will be dumped below", RNS.LOG_ERROR)
+        RNS.log("Type  : "+str(e_type), RNS.LOG_ERROR)
+        RNS.log("Value : "+str(e_value), RNS.LOG_ERROR)
+        t_string = ""
+        for line in traceback.format_tb(e_traceback):
+            t_string += line
+        RNS.log("Trace : \n"+t_string, RNS.LOG_ERROR)
+
+        if issubclass(e_type, KeyboardInterrupt):
+            sys.__excepthook__(e_type, e_value, e_traceback)
+
+    def __init__(self, configdir = None, rnsconfigdir = None, daemon = False, force_console = False):
         self.version       = __version__
         self.enable_client = False
         self.enable_node   = False
@@ -38,13 +71,20 @@ class NomadNetworkApp:
         else:
             self.configdir = configdir
 
+        if force_console:
+            self.force_console_log = True
+        else:
+            self.force_console_log = False
+
         if NomadNetworkApp._shared_instance == None:
             NomadNetworkApp._shared_instance = self
 
         self.rns = RNS.Reticulum(configdir = rnsconfigdir)
 
         self.configpath        = self.configdir+"/config"
+        self.ignoredpath       = self.configdir+"/ignored"
         self.logfilepath       = self.configdir+"/logfile"
+        self.errorfilepath     = self.configdir+"/errors"
         self.storagepath       = self.configdir+"/storage"
         self.identitypath      = self.configdir+"/storage/identity"
         self.cachepath         = self.configdir+"/storage/cache"
@@ -60,10 +100,17 @@ class NomadNetworkApp:
         self.downloads_path    = os.path.expanduser("~/Downloads")
 
         self.firstrun          = False
+        self.should_run_jobs   = True
+        self.job_interval      = 5
+        self.defer_jobs        = 90
 
         self.peer_announce_at_start  = True
         self.try_propagation_on_fail = True
 
+        self.periodic_lxmf_sync = True
+        self.lxmf_sync_interval = 360*60
+        self.lxmf_sync_limit    = 8
+
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
 
@@ -139,6 +186,18 @@ class NomadNetworkApp:
                 if not "propagation_node" in self.peer_settings:
                     self.peer_settings["propagation_node"] = None
 
+                if not "last_lxmf_sync" in self.peer_settings:
+                    self.peer_settings["last_lxmf_sync"] = 0
+
+                if not "node_connects" in self.peer_settings:
+                    self.peer_settings["node_connects"] = 0
+
+                if not "served_page_requests" in self.peer_settings:
+                    self.peer_settings["served_page_requests"] = 0
+
+                if not "served_file_requests" in self.peer_settings:
+                    self.peer_settings["served_file_requests"] = 0
+
             except Exception as e:
                 RNS.log("Could not load local peer settings from "+self.peersettingspath, RNS.LOG_ERROR)
                 RNS.log("The contained exception was: %s" % (str(e)), RNS.LOG_ERROR)
@@ -151,7 +210,11 @@ class NomadNetworkApp:
                     "announce_interval": None,
                     "last_announce": None,
                     "node_last_announce": None,
-                    "propagation_node": None
+                    "propagation_node": None,
+                    "last_lxmf_sync": 0,
+                    "node_connects": 0,
+                    "served_page_requests": 0,
+                    "served_file_requests": 0
                 }
                 self.save_peer_settings()
                 RNS.log("Created new peer settings file")
@@ -160,12 +223,36 @@ class NomadNetworkApp:
                 RNS.log("The contained exception was: %s" % (str(e)), RNS.LOG_ERROR)
                 nomadnet.panic()
 
+        self.ignored_list = []
+        if os.path.isfile(self.ignoredpath):
+            try:
+                fh = open(self.ignoredpath, "rb")
+                ignored_input = fh.read()
+                fh.close()
+
+                ignored_hash_strs = ignored_input.splitlines()
+
+                for hash_str in ignored_hash_strs:
+                    if len(hash_str) == RNS.Identity.TRUNCATED_HASHLENGTH//8*2:
+                        try:
+                            ignored_hash = bytes.fromhex(hash_str.decode("utf-8"))
+                            self.ignored_list.append(ignored_hash)
+
+                        except Exception as e:
+                            RNS.log("Could not decode RNS Identity hash from: "+str(hash_str), RNS.LOG_DEBUG)
+                            RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
+
+            except Exception as e:
+                RNS.log("Error while fetching loading list of ignored destinations: "+str(e), RNS.LOG_ERROR)
 
         self.directory = nomadnet.Directory(self)
 
         self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
         self.message_router.register_delivery_callback(self.lxmf_delivery)
 
+        for destination_hash in self.ignored_list:
+            self.message_router.ignore_destination(destination_hash)
+
         self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"])
         self.lxmf_destination.set_default_app_data(self.get_display_name_bytes)
 
@@ -179,7 +266,18 @@ class NomadNetworkApp:
         RNS.log("LXMF Router ready to receive on: "+RNS.prettyhexrep(self.lxmf_destination.hash))
 
         if self.enable_node:
+            self.message_router.set_message_storage_limit(megabytes=self.message_storage_limit)
+            for dest_str in self.prioritised_lxmf_destinations:
+                try:
+                    dest_hash = bytes.fromhex(dest_str)
+                    if len(dest_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
+                        self.message_router.prioritise(dest_hash)
+
+                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()
+
             RNS.log("LXMF Propagation Node started on: "+RNS.prettyhexrep(self.message_router.propagation_destination.hash))
             self.node = nomadnet.Node(self)
         else:
@@ -191,11 +289,59 @@ class NomadNetworkApp:
         self.autoselect_propagation_node()
 
         if self.peer_announce_at_start:
-            self.announce_now()
+            def delayed_announce():
+                time.sleep(NomadNetworkApp.START_ANNOUNCE_DELAY)
+                self.announce_now()
+
+            da_thread = threading.Thread(target=delayed_announce)
+            da_thread.setDaemon(True)
+            da_thread.start()
 
         atexit.register(self.exit_handler)
+        sys.excepthook = self.exception_handler
 
-        nomadnet.ui.spawn(self.uimode)
+        job_thread = threading.Thread(target=self.__jobs)
+        job_thread.setDaemon(True)
+        job_thread.start()
+
+        # Override UI choice from config on --daemon switch
+        if daemon:
+            self.uimode = nomadnet.ui.UI_NONE
+
+        # This stderr redirect is needed to stop urwid
+        # from spewing KeyErrors to the console and thus,
+        # messing up the UI. A pull request to fix the
+        # bug in urwid was submitted, but until it is
+        # merged, this hack will mitigate it.
+        strio = io.StringIO()
+        with contextlib.redirect_stderr(strio):
+            nomadnet.ui.spawn(self.uimode)
+
+        if strio.tell() > 0:
+            try:
+                strio.seek(0)
+                err_file = open(self.errorfilepath, "w")
+                err_file.write(strio.read())
+                err_file.close()
+
+            except Exception as e:
+                RNS.log("Could not write stderr output to error log file at "+str(self.errorfilepath)+".", RNS.LOG_ERROR)
+                RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR)
+
+
+    def __jobs(self):
+        RNS.log("Deferring scheduled jobs for "+str(self.defer_jobs)+" seconds...", RNS.LOG_DEBUG)
+        time.sleep(self.defer_jobs)
+
+        RNS.log("Starting job scheduler now", RNS.LOG_DEBUG)
+        while self.should_run_jobs:
+            now = time.time()
+            
+            if now > self.peer_settings["last_lxmf_sync"] + self.lxmf_sync_interval:
+                RNS.log("Initiating automatic LXMF sync", RNS.LOG_VERBOSE)
+                self.request_lxmf_sync(limit=self.lxmf_sync_limit)
+
+            time.sleep(self.job_interval)
 
     def set_display_name(self, display_name):
         self.peer_settings["display_name"] = display_name
@@ -218,6 +364,8 @@ class NomadNetworkApp:
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_LINK_ESTABLISHED:
             return "Link established"
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
+            return "Sync request sent"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
             return "Receiving messages"
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
             return "Messages received"
@@ -227,6 +375,10 @@ class NomadNetworkApp:
                 return "Done, no new messages"
             else:
                 return "Downloaded "+str(new_msgs)+" new messages"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_IDENTITY_RCVD:
+            return "Node did not receive identification"
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_NO_ACCESS:
+            return "Node did not allow request"
         else:
             return "Unknown"
 
@@ -241,6 +393,8 @@ class NomadNetworkApp:
             return True
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_REQUEST_SENT:
             return True
+        elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RECEIVING:
+            return True
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_RESPONSE_RECEIVED:
             return True
         elif self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
@@ -252,7 +406,9 @@ class NomadNetworkApp:
         return self.message_router.propagation_transfer_progress
 
     def request_lxmf_sync(self, limit = None):
-        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE or self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+        if self.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_IDLE or self.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
+            self.peer_settings["last_lxmf_sync"] = time.time()
+            self.save_peer_settings()
             self.message_router.request_messages_from_propagation_node(self.identity, max_messages = limit)
 
     def cancel_lxmf_sync(self):
@@ -284,7 +440,7 @@ class NomadNetworkApp:
                         selected_node = node
 
         if selected_node == None:
-            RNS.log("Could not autoselect a prepagation node! LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
+            RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network.", RNS.LOG_WARNING)
         else:
             node_identity = RNS.Identity.recall(selected_node.source_hash)
             if node_identity != None:
@@ -327,6 +483,69 @@ class NomadNetworkApp:
 
         nomadnet.Conversation.ingest(message, self)
 
+        if self.should_print(message):
+            self.print_message(message)
+
+    def should_print(self, message):
+        if self.print_messages:
+            if self.print_all_messages:
+                return True
+            
+            else:
+                source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
+
+                if self.print_trusted_messages:
+                    trust_level = self.directory.trust_level(message.source_hash)
+                    if trust_level == DirectoryEntry.TRUSTED:
+                        return True
+
+                if type(self.allowed_message_print_destinations) is list:
+                    if source_hash_text in self.allowed_message_print_destinations:
+                        return True
+
+        return False
+
+    def print_message(self, message, received = None):
+        try:
+            template = self.printing_template_msg
+
+            if received == None:
+                received = time.time()
+
+            g = self.ui.glyphs
+            
+            m_rtime = datetime.fromtimestamp(message.timestamp)
+            stime = m_rtime.strftime(self.time_format)
+
+            message_time = datetime.fromtimestamp(received)
+            rtime = message_time.strftime(self.time_format)
+
+            display_name = self.directory.simplest_display_str(message.source_hash)
+            title = message.title_as_string()
+            if title == "":
+                title = "None"
+
+            output = template.format(
+                origin=display_name,
+                stime=stime,
+                rtime=rtime,
+                mtitle=title,
+                mbody=message.content_as_string(),
+            )
+
+            filename = "/tmp/"+RNS.hexrep(RNS.Identity.full_hash(output.encode("utf-8")), delimit=False)
+            with open(filename, "wb") as f:
+                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)
+
+            os.unlink(filename)
+
+        except Exception as e:
+            RNS.log("Error while printing incoming LXMF message. The contained exception was: "+str(e))
+
     def conversations(self):
         return nomadnet.Conversation.conversation_list(self)
 
@@ -369,7 +588,7 @@ class NomadNetworkApp:
                     if RNS.loglevel > 7:
                         RNS.loglevel = 7
                 if option == "destination":
-                    if value.lower() == "file":
+                    if value.lower() == "file" and not self.force_console_log:
                         RNS.logdest = RNS.LOG_FILE
                         if "logfile" in self.config["logging"]:
                             self.logfilepath = self.config["logging"]["logfile"]
@@ -397,6 +616,24 @@ class NomadNetworkApp:
                     value = self.config["client"].as_bool(option)
                     self.try_propagation_on_fail = value
 
+                if option == "periodic_lxmf_sync":
+                    value = self.config["client"].as_bool(option)
+                    self.periodic_lxmf_sync = value
+
+                if option == "lxmf_sync_interval":
+                    value = self.config["client"].as_int(option)*60
+
+                    if value >= 60:
+                        self.lxmf_sync_interval = value
+
+                if option == "lxmf_sync_limit":
+                    value = self.config["client"].as_int(option)    
+
+                    if value > 0:
+                        self.lxmf_sync_limit = value
+                    else:
+                        self.lxmf_sync_limit = None
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -411,6 +648,9 @@ class NomadNetworkApp:
                             else:
                                 self.config["textui"]["intro_time"] = self.config["textui"].as_int("intro_time")
 
+                            if not "intro_text" in self.config["textui"]:
+                                self.config["textui"]["intro_text"] = "Nomad Network"
+
                             if not "editor" in self.config["textui"]:
                                 self.config["textui"]["editor"] = "editor"
 
@@ -499,6 +739,68 @@ class NomadNetworkApp:
             if "files_path" in self.config["node"]:
                 self.filespath = self.config["node"]["files_path"]
 
+            if "prioritise_destinations" in self.config["node"]:
+                self.prioritised_lxmf_destinations = self.config["node"].as_list("prioritise_destinations")
+            else:
+                self.prioritised_lxmf_destinations = []
+
+            if not "message_storage_limit" in self.config["node"]:
+                self.message_storage_limit = 2000
+            else:
+                value = self.config["node"].as_float("message_storage_limit")
+                if value < 0.005:
+                    value = 0.005
+                self.message_storage_limit = value
+
+        self.print_command = "lp"
+        self.print_messages = False
+        self.print_all_messages = False
+        self.print_trusted_messages = False
+        if "printing" in self.config:
+            if not "print_messages" in self.config["printing"]:
+                self.print_messages = False
+            else:
+                self.print_messages = self.config["printing"].as_bool("print_messages")
+
+                if "print_command" in self.config["printing"]:
+                    self.print_command = self.config["printing"]["print_command"]
+
+                if self.print_messages:
+                    if not "print_from" in self.config["printing"]:
+                        self.allowed_message_print_destinations = None
+                    else:
+                        if type(self.config["printing"]["print_from"]) == str:
+                            self.allowed_message_print_destinations = []
+                            if self.config["printing"]["print_from"].lower() == "everywhere":
+                                self.print_all_messages = True
+
+                            if self.config["printing"]["print_from"].lower() == "trusted":
+                                
+                                self.print_all_messages = False
+                                self.print_trusted_messages = True
+
+                            if len(self.config["printing"]["print_from"]) == (RNS.Identity.TRUNCATED_HASHLENGTH//8)*2:
+                                self.allowed_message_print_destinations.append(self.config["printing"]["print_from"])
+                        
+                        if type(self.config["printing"]["print_from"]) == list:
+                                self.allowed_message_print_destinations =  self.config["printing"].as_list("print_from")
+                                for allowed_entry in self.allowed_message_print_destinations:
+                                    if allowed_entry.lower() == "trusted":
+                                        self.print_trusted_messages = True
+
+
+                    if not "message_template" in self.config["printing"]:
+                        self.printing_template_msg = __printing_template_msg__
+                    else:
+                        mt_path = os.path.expanduser(self.config["printing"]["message_template"])
+                        if os.path.isfile(mt_path):
+                            template_file = open(mt_path, "rb")
+                            self.printing_template_msg = template_file.read().decode("utf-8")
+                        else:
+                            template_file = open(mt_path, "wb")
+                            template_file.write(__printing_template_msg__.encode("utf-8"))
+                            self.printing_template_msg = __printing_template_msg__
+
               
     @staticmethod
     def get_shared_instance():
@@ -547,6 +849,22 @@ announce_at_start = yes
 # possible.
 try_propagation_on_send_fail = yes
 
+# Nomadnet will periodically sync messages from
+# LXMF propagation nodes by default, if any are
+# present. You can disable this if you want to
+# only sync when manually initiated.
+periodic_lxmf_sync = yes
+
+# The sync interval in minutes. This value is
+# equal to 6 hours (360 minutes) by default.
+lxmf_sync_interval = 360
+
+# By default, automatic LXMF syncs will only
+# download 8 messages at a time. You can change
+# this number, or set the option to 0 to disable
+# the limit, and download everything every time.
+lxmf_sync_limit = 8
+
 [textui]
 
 # Amount of time to show intro screen
@@ -593,28 +911,99 @@ editor = editor
 
 # If you don't want the Guide section to
 # show up in the menu, you can disable it.
-
 hide_guide = no
 
 [node]
 
 # Whether to enable node hosting
-
 enable_node = no
 
 # The node name will be visible to other
 # peers on the network, and included in
 # announces.
-
 node_name = None
 
 # Automatic announce interval in minutes.
 # 6 hours by default.
-
 announce_interval = 360
 
-# Whether to announce when the node starts
+# Whether to announce when the node starts.
-
 announce_at_start = Yes
 
+# The maximum amount of storage to use for
+# the LXMF Propagation Node message store,
+# specified in megabytes. When this limit
+# is reached, LXMF will periodically remove
+# messages in its message store. By default,
+# LXMF prioritises keeping messages that are
+# new and small. Large and old messages will
+# be removed first. This setting is optional
+# and defaults to 2 gigabytes.
+# message_storage_limit = 2000
+
+# You can tell the LXMF message router to
+# prioritise storage for one or more
+# destinations. If the message store reaches
+# the specified limit, LXMF will prioritise
+# keeping messages for destinations specified
+# with this option. This setting is optional,
+# and generally you do not need to use it.
+# prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
+
+[printing]
+
+# You can configure Nomad Network to print
+# various kinds of information and messages.
+
+# Printing messages is disabled by default
+print_messages = No
+
+# You can configure a custom template for
+# message printing. If you uncomment this
+# option, set a path to the template and
+# restart Nomad Network, a default template
+# will be created that you can edit.
+# message_template = ~/.nomadnetwork/print_template_msg.txt
+
+# You can configure Nomad Network to only
+# print messages from trusted destinations.
+# print_from = trusted
+
+# Or specify the source LXMF addresses that
+# will automatically have messages printed
+# on arrival.
+# print_from = 76fe5751a56067d1e84eef3e88eab85b, 0e70b5848eb57c13154154feaeeb89b7
+
+# Or allow printing from anywhere, if you
+# are feeling brave and adventurous.
+# print_from = everywhere
+
+# You can configure the printing command.
+# This will use the default CUPS printer on
+# your system.
+print_command = lp
+
+# You can specify what printer to use
+# print_command = lp -d PRINTER_NAME
+
+# Or specify more advanced options. This
+# example works well for small thermal-
+# roll printers.
+# print_command = lp -d PRINTER_NAME -o cpi=16 -o lpi=8
+
+# This one is more suitable for full-sheet
+# printers.
+# print_command = lp -d PRINTER_NAME -o page-left=36 -o page-top=36 -o page-right=36 -o page-bottom=36
+
 '''.splitlines()
+
+__printing_template_msg__ = """
+---------------------------
+From: {origin}
+Sent: {stime}
+Rcvd: {rtime}
+Title: {mtitle}
+
+{mbody}
+---------------------------
+"""

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.2.0"

nomadnet/nomadnet.py

@@ -2,18 +2,27 @@
 
 from ._version import __version__
 
+import io
 import argparse
 import nomadnet
 
 
-def program_setup(configdir, rnsconfigdir):
+def program_setup(configdir, rnsconfigdir, daemon, console):
-    app = nomadnet.NomadNetworkApp(configdir = configdir, rnsconfigdir = rnsconfigdir)
+    app = nomadnet.NomadNetworkApp(
+        configdir = configdir,
+        rnsconfigdir = rnsconfigdir,
+        daemon = daemon,
+        force_console = console,
+    )
 
 def main():
     try:
         parser = argparse.ArgumentParser(description="Nomad Network Client")
         parser.add_argument("--config", action="store", default=None, help="path to alternative Nomad Network config directory", type=str)
         parser.add_argument("--rnsconfig", action="store", default=None, help="path to alternative Reticulum config directory", type=str)
+        parser.add_argument("-t", "--textui", action="store_true", default=False, help="run Nomad Network in text-UI mode")
+        parser.add_argument("-d", "--daemon", action="store_true", default=False, help="run Nomad Network in daemon mode")
+        parser.add_argument("-c", "--console", action="store_true", default=False, help="in daemon mode, log to console instead of file")
         parser.add_argument("--version", action="version", version="Nomad Network Client {version}".format(version=__version__))
         
         args = parser.parse_args()
@@ -28,7 +37,18 @@ def main():
         else:
             rnsconfigarg = None
 
-        program_setup(configarg, rnsconfigarg)
+        console = False
+        if args.daemon:
+            daemon = True
+            if args.console:
+                console = True
+        else:
+            daemon = False
+
+        if args.textui:
+            daemon = False
+
+        program_setup(configarg, rnsconfigarg, daemon, console)
 
     except KeyboardInterrupt:
         print("")

nomadnet/ui/MenuUI.py

@@ -4,5 +4,5 @@ import nomadnet
 class MenuUI:
 
     def __init__(self):
-        RNS.log("Menu UI not implemented", RNS.LOG_ERROR)
+        RNS.log("Menu UI not implemented", RNS.LOG_ERROR, _override_destination=True)
         nomadnet.panic()

nomadnet/ui/NoneUI.py

@@ -0,0 +1,19 @@
+import RNS
+import nomadnet
+import time
+
+from nomadnet import NomadNetworkApp
+
+class NoneUI:
+
+    def __init__(self):
+        self.app = NomadNetworkApp.get_shared_instance()
+        self.app.ui = self
+
+        if not self.app.force_console_log:
+            RNS.log("Nomad Network started in daemon mode, all further messages are logged to "+str(self.app.logfilepath), RNS.LOG_INFO, _override_destination=True)
+        else:
+            RNS.log("Nomad Network daemon started", RNS.LOG_INFO)
+
+        while True:
+            time.sleep(1)

nomadnet/ui/TextUI.py

@@ -22,9 +22,9 @@ THEMES = {
             # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
             ("heading",                     "light gray,underline", "default",      "underline",                "g93,underline", "default"),
             ("menubar",                     "black", "light gray",                  "standout",                 "#111", "#bbb"),
-            ("scrollbar",                   "light gray", "default",                "standout",                 "#444", "default"),
+            ("scrollbar",                   "light gray", "default",                "default",                  "#444", "default"),
             ("shortcutbar",                 "black", "light gray",                  "standout",                 "#111", "#bbb"),
-            ("body_text",                   "white", "default",                     "default",                  "#ddd", "default"),
+            ("body_text",                   "light gray", "default",                "default",                  "#ddd", "default"),
             ("error_text",                  "dark red", "default",                  "default",                  "dark red", "default"),
             ("warning_text",                "yellow", "default",                    "default",                  "#ba4", "default"),
             ("inactive_text",               "dark gray", "default",                 "default",                  "dark gray", "default"),
@@ -45,7 +45,7 @@ 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"),
-            ("topic_list_normal",           "white", "default",                     "default",                  "#ddd", "default"),
+            ("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"),
             ("progress_empty",              "light gray", "default",                "default",                  "#ddd", "default"),
@@ -56,9 +56,9 @@ THEMES = {
             # Style name                    # 16-color style                        # Monochrome style          # 88, 256 and true-color style
             ("heading",                     "dark gray,underline", "default",      "underline",                "g93,underline", "default"),
             ("menubar",                     "black", "dark gray",                  "standout",                 "#111", "#bbb"),
-            ("scrollbar",                   "dark gray", "default",                "standout",                 "#444", "default"),
+            ("scrollbar",                   "dark gray", "default",                "default",                  "#444", "default"),
             ("shortcutbar",                 "black", "dark gray",                  "standout",                 "#111", "#bbb"),
-            ("body_text",                   "black", "default",                    "default",                  "#222", "default"),
+            ("body_text",                   "dark gray", "default",                "default",                  "#222", "default"),
             ("error_text",                  "dark red", "default",                 "default",                  "dark red", "default"),
             ("warning_text",                "yellow", "default",                   "default",                  "#ba4", "default"),
             ("inactive_text",               "light gray", "default",               "default",                  "dark gray", "default"),
@@ -78,7 +78,7 @@ 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"),
-            ("topic_list_normal",           "black", "default",                    "default",                  "#222", "default"),
+            ("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"),
             ("progress_empty",              "dark gray", "default",                "default",                  "#ddd", "default"),
@@ -127,6 +127,21 @@ GLYPHS = {
 class TextUI:
 
     def __init__(self):
+        self.restore_ixon = False
+
+        try:
+            rval = os.system("stty -a | grep \"\\-ixon\"")
+            if rval == 0:
+                pass
+
+            else:
+                os.system("stty -ixon")
+                self.restore_ixon = True
+
+        except Exception as e:
+            RNS.log("Could not configure terminal flow control sequences, some keybindings may not work.", RNS.LOG_WARNING)
+            RNS.log("The contained exception was: "+str(e))
+
         self.app = NomadNetworkApp.get_shared_instance()
         self.app.ui = self
         self.loop = None
@@ -164,7 +179,7 @@ class TextUI:
         else:
             initial_widget = self.main_display.widget
 
-        self.loop = urwid.MainLoop(initial_widget, screen=self.screen, handle_mouse=mouse_enabled)
+        self.loop = urwid.MainLoop(initial_widget, unhandled_input=self.unhandled_input, screen=self.screen, handle_mouse=mouse_enabled)
 
         if intro_timeout > 0:
             self.loop.set_alarm_in(intro_timeout, self.display_main)
@@ -194,5 +209,9 @@ class TextUI:
         self.screen.set_terminal_properties(colormode)
         self.screen.reset_default_terminal_palette()
 
+    def unhandled_input(self, key):
+        if key == "ctrl q":
+            raise urwid.ExitMainLoop
+
     def display_main(self, loop, user_data):
         self.loop.widget = self.main_display.widget

nomadnet/ui/__init__.py

@@ -12,11 +12,15 @@ UI_MENU       = 0x01
 UI_TEXT       = 0x02
 UI_GRAPHICAL  = 0x03
 UI_WEB        = 0x04
-UI_MODES = [UI_MENU, UI_TEXT, UI_GRAPHICAL, UI_WEB]
+UI_MODES = [UI_NONE, UI_MENU, UI_TEXT, UI_GRAPHICAL, UI_WEB]
 
 def spawn(uimode):
     if uimode in UI_MODES:
-        RNS.log("Starting user interface...", RNS.LOG_INFO)
+        if uimode == UI_NONE:
+            RNS.log("Starting Nomad Network daemon...", RNS.LOG_INFO)
+        else:
+            RNS.log("Starting user interface...", RNS.LOG_INFO)
+
         if uimode == UI_MENU:
             from .MenuUI import MenuUI
             return MenuUI()
@@ -29,8 +33,11 @@ def spawn(uimode):
         elif uimode == UI_WEB:
             from .WebUI import WebUI
             return WebUI()
+        elif uimode == UI_NONE:
+            from .NoneUI import NoneUI
+            return NoneUI()
         else:
             return None
     else:
-        RNS.log("Invalid UI mode", RNS.LOG_ERROR)
+        RNS.log("Invalid UI mode", RNS.LOG_ERROR, _override_destination=True)
         nomadnet.panic()

nomadnet/ui/textui/Browser.py

@@ -6,6 +6,7 @@ import nomadnet
 import subprocess
 import threading
 from .MicronParser import markup_to_attrmaps
+from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.Scrollable import *
 
 class BrowserFrame(urwid.Frame):
@@ -20,6 +21,10 @@ class BrowserFrame(urwid.Frame):
             self.delegate.reload()
         elif key == "ctrl u":
             self.delegate.url_dialog()
+        elif key == "ctrl s":
+            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":
             return super(BrowserFrame, self).keypress(size, key)
             # if key == "up" and self.delegate.messagelist.top_is_visible:
@@ -128,17 +133,82 @@ class Browser:
             self.browser_footer = urwid.AttrMap(urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text("Link to: "+str(link_target))]), "browser_controls")
             self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
 
-    def handle_link(self, link_target):
+    def expand_shorthands(self, destination_type):
-        if self.status >= Browser.DISCONECTED:
+        if destination_type == "nnn":
-            RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+            return "nomadnetwork.node"
-            try:
+        elif destination_type == "lxmf":
-                self.retrieve_url(link_target)
+            return "lxmf.delivery"
-            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())
         else:
-            RNS.log("Browser aleady hadling link, cannot handle link to: "+str(link_target), RNS.LOG_DEBUG)
+            return destination_type
 
+    def handle_link(self, link_target):
+        components = link_target.split("@")
+        destination_type = None
+
+        if len(components) == 2:
+            destination_type = self.expand_shorthands(components[0])
+            link_target = components[1]
+        else:
+            destination_type = "nomadnetwork.node"
+            link_target = components[0]
+
+        if destination_type == "nomadnetwork.node":
+            if self.status >= Browser.DISCONECTED:
+                RNS.log("Browser handling link to: "+str(link_target), RNS.LOG_DEBUG)
+                try:
+                    self.retrieve_url(link_target)
+                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())
+            else:
+                RNS.log("Browser already handling link, cannot handle link to: "+str(link_target), RNS.LOG_DEBUG)
+
+        elif destination_type == "lxmf.delivery":
+            RNS.log("Passing LXMF link to handler", RNS.LOG_DEBUG)
+            self.handle_lxmf_link(link_target)
+
+        else:
+            RNS.log("No known handler for destination type "+str(destination_type), RNS.LOG_DEBUG)
+            self.browser_footer = urwid.Text("Could not open link: "+"No known handler for destination type "+str(destination_type))
+            self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
+
+    def handle_lxmf_link(self, link_target):
+        try:
+            if not type(link_target) is str:
+                raise ValueError("Invalid data type for LXMF link")
+
+            if len(link_target) != (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
+                raise ValueError("Invalid length for LXMF link")
+
+            try:
+                bytes.fromhex(link_target)
+
+            except Exception as e:
+                raise ValueError("Could not decode destination hash from LXMF link")
+
+            existing_conversations = nomadnet.Conversation.conversation_list(self.app)
+            
+            source_hash_text = link_target
+            display_name_data = RNS.Identity.recall_app_data(bytes.fromhex(source_hash_text))
+
+            display_name = None
+            if display_name_data != None:
+                display_name = display_name_data.decode("utf-8")
+
+            if not source_hash_text in [c[0] for c in existing_conversations]:
+                entry = DirectoryEntry(bytes.fromhex(source_hash_text), display_name=display_name)
+                self.app.directory.remember(entry)
+
+                new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+                self.app.ui.main_display.sub_displays.conversations_display.update_conversation_list()
+
+            self.app.ui.main_display.sub_displays.conversations_display.display_conversation(None, source_hash_text)
+            self.app.ui.main_display.show_conversations(None)
+
+        except Exception as e:
+            RNS.log("Error while starting conversation from link. The contained exception was: "+str(e), RNS.LOG_ERROR)
+            self.browser_footer = urwid.Text("Could not open LXMF link: "+str(e))
+            self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
 
 
     def micron_released_focus(self):
@@ -279,7 +349,7 @@ class Browser:
 
         components = url.split(":")
         if len(components) == 1:
-            if len(components[0]) == 20:
+            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -288,7 +358,7 @@ class Browser:
             else:
                 raise ValueError("Malformed URL")
         elif len(components) == 2:
-            if len(components[0]) == 20:
+            if len(components[0]) == (RNS.Reticulum.TRUNCATED_HASHLENGTH//8)*2:
                 try:
                     destination_hash = bytes.fromhex(components[0])
                 except Exception as e:
@@ -371,6 +441,46 @@ class Browser:
             RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def download_file(self, destination_hash, path):
+        if self.link == None or self.link.destination.hash != self.destination_hash:
+            if not RNS.Transport.has_path(self.destination_hash):
+                self.status = Browser.NO_PATH
+                self.update_display()
+
+                RNS.Transport.request_path(self.destination_hash)
+                self.status = Browser.PATH_REQUESTED
+                self.update_display()
+
+                pr_time = time.time()
+                while not RNS.Transport.has_path(self.destination_hash):
+                    now = time.time()
+                    if now > pr_time+self.timeout:
+                        self.request_timeout()
+                        return
+
+                    time.sleep(0.25)
+
+            self.status = Browser.ESTABLISHING_LINK
+            self.update_display()
+
+            identity = RNS.Identity.recall(self.destination_hash)
+            destination = RNS.Destination(
+                identity,
+                RNS.Destination.OUT,
+                RNS.Destination.SINGLE,
+                self.app_name,
+                self.aspects
+            )
+
+            self.link = RNS.Link(destination, established_callback = self.link_established, closed_callback = self.link_closed)
+
+            while self.status == Browser.ESTABLISHING_LINK:
+                time.sleep(0.1)
+
+            if self.status != Browser.LINK_ESTABLISHED:
+                return
+
+            self.update_display()
+
         if self.link != None and self.link.destination.hash == self.destination_hash:
             # Send the request
             self.status = Browser.REQUESTING
@@ -441,7 +551,12 @@ class Browser:
             self.close_dialogs()
 
         def confirmed(sender):
-            self.retrieve_url(e_url.get_edit_text())
+            try:
+                self.retrieve_url(e_url.get_edit_text())
+            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())
+
             self.close_dialogs()
 
         dialog = UrlDialogLineBox(
@@ -461,6 +576,40 @@ class Browser:
         self.delegate.columns.contents[1] = (overlay, options)
         self.delegate.columns.focus_position = 1
 
+    def save_node_dialog(self):
+        def dismiss_dialog(sender):
+            self.close_dialogs()
+
+        display_name = RNS.Identity.recall_app_data(self.destination_hash)
+        disp_str = ""
+        if display_name != None:
+            display_name = display_name.decode("utf-8")
+            disp_str = " \""+display_name+"\""
+            
+        def confirmed(sender):
+            node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True)
+            self.app.directory.remember(node_entry)
+            self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
+
+            self.close_dialogs()
+
+        dialog = UrlDialogLineBox(
+            urwid.Pile([
+                urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"),
+                urwid.Columns([("weight", 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), ("weight", 0.1, urwid.Text("")), ("weight", 0.45, urwid.Button("Save", on_press=confirmed))])
+            ]), title="Save Node"
+        )
+
+        dialog.confirmed = confirmed
+        dialog.delegate = self
+        bottom = self.display_widget
+
+        overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 50), valign="middle", height="pack", left=2, right=2)
+
+        options = self.delegate.columns.options("weight", self.delegate.right_area_width)
+        self.delegate.columns.contents[1] = (overlay, options)
+        self.delegate.columns.focus_position = 1
+
 
     def load_page(self):
         cached = self.get_cached(self.current_url())
@@ -603,6 +752,10 @@ class Browser:
     def link_established(self, link):
         self.status = Browser.LINK_ESTABLISHED
 
+        if self.app.directory.should_identify_on_connect(self.destination_hash):
+            RNS.log("Link established, identifying to remote system...", RNS.LOG_VERBOSE)
+            self.link.identify(self.app.identity)
+
 
     def link_closed(self, link):
         if self.status == Browser.DISCONECTED or self.status == Browser.DONE:

nomadnet/ui/textui/Conversations.py

@@ -14,13 +14,13 @@ class ConversationListDisplayShortcuts():
     def __init__(self, app):
         self.app = app
 
-        self.widget = urwid.AttrMap(urwid.Text("[Enter] Open  [C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New"), "shortcutbar")
+        self.widget = urwid.AttrMap(urwid.Text("[C-e] Peer Info  [C-x] Delete  [C-r] Sync  [C-n] New  [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 Editor  [C-w] Close  [C-t] Editor Type  [C-p] Purge  [C-x] Clear History  [C-o] Sort"), "shortcutbar")
+        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")
 
 class ConversationsArea(urwid.LineBox):
     def keypress(self, size, key):
@@ -32,6 +32,8 @@ class ConversationsArea(urwid.LineBox):
             self.delegate.new_conversation()
         elif key == "ctrl r":
             self.delegate.sync_conversations()
+        elif key == "ctrl g":
+            self.delegate.toggle_fullscreen()
         elif key == "tab":
             self.delegate.app.ui.main_display.frame.set_focus("header")
         elif key == "up" and (self.delegate.ilb.first_item_is_selected() or self.delegate.ilb.body_is_empty()):
@@ -48,6 +50,7 @@ class DialogLineBox(urwid.LineBox):
 
 class ConversationsDisplay():
     list_width = 0.33
+    given_list_width = 52
     cached_conversation_widgets = {}
 
     def __init__(self, app):
@@ -64,8 +67,10 @@ class ConversationsDisplay():
 
         self.columns_widget = urwid.Columns(
             [
-                ("weight", ConversationsDisplay.list_width, self.listbox),
+                # ("weight", ConversationsDisplay.list_width, self.listbox),
-                ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                # ("weight", 1-ConversationsDisplay.list_width, self.make_conversation_widget(None))
+                (ConversationsDisplay.given_list_width, self.listbox),
+                ("weight", 1, self.make_conversation_widget(None))
             ],
             dividechars=0, focus_column=0, box_columns=[0]
         )
@@ -98,7 +103,7 @@ class ConversationsDisplay():
             highlight_offFocus="list_off_focus"
         )
 
-        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)))
+        self.listbox = ConversationsArea(urwid.Filler(self.ilb, height=("relative", 100)), title="Conversations")
         self.listbox.delegate = self
 
     def delete_selected_conversation(self):
@@ -126,7 +131,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def edit_selected_in_directory(self):
@@ -226,7 +232,7 @@ class ConversationsDisplay():
                     (urwid.Button("OK", on_press=dismiss_dialog), options)
                 ]
             query_button = urwid.Button("Query network for keys", on_press=query_action, user_data=source_hash_text)
-            known_section = urwid.Pile([urwid.Divider(g["divider1"]), urwid.Text(g["info"]+"\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently communicate.\n", align="center"), query_button, urwid.Divider(g["divider1"])])
+            known_section = urwid.Pile([urwid.Divider(g["divider1"]), urwid.Text(g["info"]+"\n", align="center"), urwid.Text("The identity of this peer is not known, and you cannot currently send messages to it. You can query the network to obtain the identity.\n", align="center"), query_button, urwid.Divider(g["divider1"])])
 
         dialog_pile = urwid.Pile([
             selected_id_widget,
@@ -249,7 +255,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def new_conversation(self):
@@ -318,7 +325,8 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def delete_conversation(self, source_hash):
@@ -326,6 +334,15 @@ class ConversationsDisplay():
             conversation = ConversationsDisplay.cached_conversation_widgets[source_hash]
             self.close_conversation(conversation)
 
+    def toggle_fullscreen(self):
+        if ConversationsDisplay.given_list_width != 0:
+            self.saved_list_width = ConversationsDisplay.given_list_width
+            ConversationsDisplay.given_list_width = 0
+        else:
+            ConversationsDisplay.given_list_width = self.saved_list_width
+
+        self.update_conversation_list()
+
     def sync_conversations(self):
         g = self.app.ui.glyphs
         self.dialog_open = True
@@ -334,7 +351,7 @@ class ConversationsDisplay():
             self.dialog_open = False
             self.sync_dialog = None
             self.update_conversation_list()
-            if self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            if self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
                 self.app.cancel_lxmf_sync()
 
         max_messages_group = []
@@ -352,6 +369,7 @@ class ConversationsDisplay():
 
         def cancel_sync(sender):
             self.app.cancel_lxmf_sync()
+            self.update_sync_dialog()
 
         cancel_button = urwid.Button("Close", on_press=dismiss_dialog)
         sync_progress = SyncProgressBar("progress_empty" , "progress_full", current=self.app.get_sync_progress(), done=1.0, satt=None)
@@ -359,7 +377,7 @@ class ConversationsDisplay():
         real_sync_button = urwid.Button("Sync Now", on_press=sync_now)
         hidden_sync_button = urwid.Button("Cancel Sync", on_press=cancel_sync)
 
-        if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+        if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
             sync_button = real_sync_button
         else:
             sync_button = hidden_sync_button
@@ -397,7 +415,8 @@ class ConversationsDisplay():
             dialog = DialogLineBox(
                 urwid.Pile([
                     urwid.Text(""),
-                    urwid.Text("No trusted nodes found, cannot sync", align="center"),
+                    urwid.Text("No trusted nodes found, cannot sync!\n", align="center"),
+                    urwid.Text("To syncronise messages from the network, one or more nodes must be marked as trusted in the Known Nodes list. Nomad Network will then automatically sync from the nearest trusted node.", align="left"),
                     urwid.Text(""),
                     button_columns
                 ]), title="Message Sync"
@@ -415,14 +434,15 @@ class ConversationsDisplay():
 
         overlay = urwid.Overlay(dialog, bottom, align="center", width=("relative", 100), valign="middle", height="pack", left=2, right=2)
 
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         self.columns_widget.contents[0] = (overlay, options)
 
     def update_sync_dialog(self, loop = None, sender = None):
         if self.dialog_open and self.sync_dialog != None:
             self.sync_dialog.sync_progress.set_completion(self.app.get_sync_progress())
 
-            if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state == LXMF.LXMRouter.PR_COMPLETE:
+            if self.app.get_sync_status() == "Idle" or self.app.message_router.propagation_transfer_state >= LXMF.LXMRouter.PR_COMPLETE:
                 self.sync_dialog.bc.contents[0] = (self.sync_dialog.real_sync_button, self.sync_dialog.bc.options("weight", 0.45))
             else:
                 self.sync_dialog.bc.contents[0] = (self.sync_dialog.hidden_sync_button, self.sync_dialog.bc.options("weight", 0.45))
@@ -436,7 +456,8 @@ class ConversationsDisplay():
     def update_conversation_list(self):
         ilb_position = self.ilb.get_selected_position()
         self.update_listbox()
-        options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        # options = self.columns_widget.options("weight", ConversationsDisplay.list_width)
+        options = self.columns_widget.options("given", ConversationsDisplay.given_list_width)
         if not (self.dialog_open and self.sync_dialog != None):
             self.columns_widget.contents[0] = (self.listbox, options)
         else:
@@ -467,7 +488,8 @@ class ConversationsDisplay():
                 self.app.mark_conversation_read(self.currently_displayed_conversation)
 
         self.currently_displayed_conversation = source_hash
-        options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        # options = self.widget.options("weight", 1-ConversationsDisplay.list_width)
+        options = self.widget.options("weight", 1)
         self.widget.contents[1] = (self.make_conversation_widget(source_hash), options)
         if source_hash == None:
             self.widget.set_focus_column(0)
@@ -752,7 +774,7 @@ class ConversationWidget(urwid.WidgetWrap):
             if allowed:
                 self.frame.contents["footer"] = (self.minimal_editor, None)
             else:
-                warning = urwid.AttrMap(urwid.Padding(urwid.Text(g["info"]+" You cannot currently communicate with this peer, since it's identity keys are not known", align="center")), "msg_header_caution")
+                warning = urwid.AttrMap(urwid.Padding(urwid.Text("\n"+g["info"]+"\n\nYou cannot currently message this peer, since it's identity keys are not known.\n\nWait for an announce to arrive from the peer, or query the network for it.\n\nTo query the network, select this conversation in the conversation list, press Ctrl-E, and use the query button.\n", align="center")), "msg_header_caution")
                 self.frame.contents["footer"] = (warning, None)
 
     def toggle_focus_area(self):
@@ -779,6 +801,8 @@ class ConversationWidget(urwid.WidgetWrap):
             self.toggle_editor()
         elif key == "ctrl x":
             self.clear_history_dialog()
+        elif key == "ctrl g":
+            nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.conversations_display.toggle_fullscreen()
         elif key == "ctrl o":
             self.sort_by_timestamp ^= True
             self.conversation_changed(None)

nomadnet/ui/textui/Extras.py

@@ -5,7 +5,7 @@ class IntroDisplay():
 
         font = urwid.font.HalfBlock5x4Font()
 
-        big_text = urwid.BigText(("intro_title", "Nomad Network"), font)
+        big_text = urwid.BigText(("intro_title", self.app.config["textui"]["intro_text"]), font)
         big_text = urwid.Padding(big_text, align="center", width="clip")
 
         intro = urwid.Pile([
@@ -17,45 +17,3 @@ class IntroDisplay():
 
         self.widget = urwid.Filler(intro)
 
-
-class DemoDisplay():
-    def __init__(self, ui, app):
-        import urwid
-
-        def color_mono(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_MONO)
-
-        def color_16(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_16)
-
-        def color_88(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_88)
-
-        def color_8bit(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_256)
-
-        def color_true(btn):
-            ui.set_colormode(nomadnet.ui.COLORMODE_TRUE)
-
-        # pile = urwid.Pile([
-        #     urwid.Text(("heading", "This is a heading")),
-        #     urwid.Text(("body_text", "Hello World \U0001F332")),
-        #     urwid.Button(("buttons", "Monochrome"), color_mono),
-        #     urwid.Button(("buttons", "16 color"), color_16),
-        #     urwid.Button(("buttons", "88 color"), color_88),
-        #     urwid.Button(("buttons", "256 color"), color_8bit),
-        #     urwid.Button(("buttons", "True color"), color_true),
-        # ])
-
-        gf = urwid.GridFlow([
-            urwid.Text(("heading", "This is a heading")),
-            urwid.Text(("body_text", "Hello World \U0001F332")),
-            urwid.Button(("buttons", "Monochrome"), color_mono),
-            urwid.Button(("buttons", "16 color"), color_16),
-            urwid.Button(("buttons", "88 color"), color_88),
-            urwid.Button(("buttons", "256 color"), color_8bit),
-            urwid.Button(("buttons", "True color"), color_true),
-        ], cell_width=20, h_sep=0, v_sep=0, align="left")
-
-        self.widget = urwid.Filler(urwid.Padding((urwid.Text("Test"),urwid.Text("Test 2"))), 'top')
-        #self.widget = urwid.Filler(pile, 'top')

nomadnet/ui/textui/Guide.py

@@ -110,6 +110,8 @@ class TopicList(urwid.WidgetWrap):
             GuideEntry(self.app, self, guide_display, "Introduction"),
             GuideEntry(self.app, self, guide_display, "Concepts & Terminology"),
             GuideEntry(self.app, self, guide_display, "Hosting a Node"),
+            GuideEntry(self.app, self, guide_display, "Configuration Options"),
+            GuideEntry(self.app, self, guide_display, "Keyboard Shortcuts"),
             GuideEntry(self.app, self, guide_display, "Markup"),
             self.first_run_entry,
             GuideEntry(self.app, self, guide_display, "Network Configuration"),
@@ -193,6 +195,48 @@ The current version of the program should be considered a beta release. The prog
 
 '''
 
+TOPIC_SHORTCUTS = '''>Keyboard Shortcuts
+
+The different sections of the program has a number of keyboard shortcuts mapped, that makes operating and navigating the program easier. The following lists details all mapped shortcuts.
+
+>>`!Conversations Window`!
+>>>Conversation List
+ - Ctrl-N   Start a new conversation
+ - Ctrl-E   Display and edit selected peer info
+ - Ctrl-X   Delete conversation
+ - Ctrl-R   Open LXMF syncronisation dialog
+
+>>>Conversation Display
+ - Ctrl-D   Send message
+ - Ctrl-K   Clear input fields
+ - Ctrl-T   Toggle message title field
+ - Ctrl-O   Toggle sort mode
+ - Ctrl-P   Purge failed messages
+ - Ctrl-X   Clear conversation history
+ - Ctrl-G   Toggle fullscreen conversation
+ - Ctrl-W   Close conversation
+
+>>`!Network Window`!
+>>>Announce Stream
+ - Ctrl-L   Switch to Known Nodes list
+ - Ctrl-X   Delete selected announce
+ - Ctrl-P   Display peered LXMF Propagation Nodes
+
+>>>Known Nodes
+ - Ctrl-L   Switch to Announce Stream
+ - 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
+'''
+
 TOPIC_CONCEPTS = '''>Concepts and Terminology
 
 The following section will briefly introduce various concepts and terms used in the program.
@@ -201,9 +245,9 @@ The following section will briefly introduce various concepts and terms used in
 
 A `*peer`* refers to another Nomad Network client, which will generally be operated by another person. But since Nomad Network is a general LXMF client, it could also be any other LXMF client, program, automated system or machine that can communicate over LXMF.
 
-All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 20 hexadecimal characters, and looks like this:
+All peers (and nodes) are identified by their `*address`* (which is, technically speaking, a Reticulum destination hash). An address consist of 32 hexadecimal characters (16 bytes), and looks like this:
 
-`c<b8ea8f92541c9a275f0e>
+`c<e9eafceea9e3664a5c55611c5e8c420a>
 `l
 
 Anyone can choose whatever display name they want, but addresses are always unique, and generated from the unique cryptographic keys of the peer. This is an important point to understand. Since there is not anyone controlling naming or address spaces in Nomad Network, you can easily come across another user with the same display name as you.
@@ -234,13 +278,17 @@ For propagated delivery to work, one or more nodes must be available on the netw
 
 To select a node manually, go to the `![ Network ]`! part of the program, choose the desired node in the `*Known Nodes`* list, and select the `!< Info >`! button. In the `!Node Info`! dialog, you can specify the selected node as the default propagation node.
 
+By default, Nomad Network will check in with propagation nodes, and download any available messages every 6 hours. You can change this interval, or disable automatic syncronisation completely, by editing the configuration file.
+
+You can always initiate a sync manually, by pressing `!Ctrl-R`! in the `![ Conversations ]`! part of the program, which will open the syncronisation window.
+
 >>Node
 
 A Nomad Network `*node`* is an instance of the Nomad Network program that has been configured to host information for other peers and help propagate messages and information on the network.
 
 Nodes can host pages (similar to webpages) written in a markup-language called `*micron`*, as well as make files and other resources available for download for peers on the network. Nodes also form a distributed message store for offline users, and allows messages to be exchanged between peers that are not online at the same time.
 
-If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle synchronisation of message stores.
+If no nodes exist on a network, all peers will still be able to communicate directly peer-to-peer, but both endpoints of a conversation will need to be available at the same time to converse. When nodes exist on the network, messages will be held and syncronised between nodes for deferred delivery if the destination peer is unavailable. Nodes will automatically discover and peer with each other, and handle syncronisation of message stores.
 
 To learn how to host your own node, read the `*Hosting a Node`* section of this guide.
 
@@ -248,10 +296,20 @@ To learn how to host your own node, read the `*Hosting a Node`* section of this
 
 TOPIC_HOSTING = '''>Hosting a Node
 
-To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is lauched, and other peers on the network will be able to connect and interact with content on your node.
+To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node.
 
 By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on.
 
+>>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.
+
+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.
+
+To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!.
+
+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.
@@ -262,6 +320,26 @@ You can control how long a peer will cache your pages by including the cache hea
 
 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`!.
 
+>>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".
+
+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
+`=
+``
+
+You can also dynamically generate this list, by making the file executable, and writing a script (in whatever language you want), that prints the list to stdout. Every time someone tries to request the page, Nomad Network will check the allowed identities list, and only grant access to allowed users.
+
+By default, Nomad Network connects anonymously to all nodes. To be able to identify, and access restricted pages, you must allow identifying on a per-node basis. To allow identifying when connecting to a node, you must go to the `!Known Nodes`! list in the `![ Network ]`! part of the program, and enable the `!Identify When Connecting`! checkbox under `!Node Info`!.
+
 >>Files
 
 Like pages, you can place files you want to make available in the `!~/.nomadnetwork/storage/files`! directory. To let a peer download a file, you should create a link to it in one of your pages.
@@ -302,9 +380,11 @@ You're currently located in the guide section of the program. I'm sorry I had to
 
 To get the most out of Nomad Network, you will need a terminal that supports UTF-8 and at least 256 colors, ideally true-color. If your terminal supports true-color, you can go to the `![ Config ]`! menu item, launch the editor and change the configuration.
 
+It is recommended to use a terminal size of at least 122x32. Nomad Network will work with smaller terminal sizes, but the interface might feel a bit cramped.
+
 If you don't already have a Nerd Font installed (see https://www.nerdfonts.com/), I also highly recommend to do so, since it will greatly expand the amount of glyphs, icons and graphics that Nomad Network can use. Once you have your terminal set up with a Nerd Font, go to the `![ Config ]`! menu item and enable Nerd Fonts in the configuration instead of normal unicode glyphs.
 
-Nomad Network expects that you are already connected to some form of Reticulum network. That could be as simple as the default UDP-based demo interface on your local ethernet network. This short guide won't go into any details on building networks, but you will find other entries in the guide that deal with network setup and configuration.
+Nomad Network expects that you are already connected to some form of Reticulum network. That could be as simple as the default one that Reticulum auto-generates on your local ethernet/WiFi network, or something much more complex. This short guide won't go into any details on building networks, but you will find other entries in the guide that deal with network setup and configuration.
 
 At least, if Nomad Network launches, it means that it is connected to a running Reticulum instance, that should in turn be connected to `*something`*, which should get you started.
 
@@ -318,20 +398,262 @@ Now go out there and explore. This is still early days. See what you can find an
 
 '''
 
+TOPIC_CONFIG = '''>Configuration Options
+
+To change the configuration of Nomad Network, you must edit the configuration file. By default, this is located at `!~/.nomadnetwork/config`! on your system. You can open it in any text-editor, and change the options. You can also use the editor built in to this program, under the `![ Config ]`! menu item. The default configuration file contains comments on all the different configuration options present, and explains their possible settings.
+
+For reference, all the configuration options are listed and explained here as well. The configuration is divided into different sections, each with their own options.
+
+>> Logging Section
+
+This section hold configuration directives related to logging output, and is delimited by the `![logging]`! header in the configuration file. Available directives, along with their default values, are as follows:
+
+>>>
+`!loglevel = 4`!
+>>>>
+Sets the verbosity of the log output. Must be an integer from 0 through 7.
+>>>>>
+0: Log only critical information
+1: Log errors and lower log levels
+2: Log warnings and lower log levels
+3: Log notices and lower log levels
+4: Log info and lower (this is the default)
+5: Verbose logging
+6: Debug logging
+7: Extreme logging
+<
+
+>>>
+`!destination = file`!
+>>>>
+Determines the output destination of logged information. Must be `!file`! or `!console`!.
+<
+
+>>>
+`!logfile = ~/.nomadnetwork/logfile`!
+>>>>
+Path to the log file. Must be a writable filesystem path.
+<
+
+>> Client Section
+
+This section hold configuration directives related to the client behaviour and user interface of the program. It is delimited by the `![client]`! header in the configuration file. Available directives, along with their default values, are as follows:
+
+>>>
+`!enable_client = yes`!
+>>>>
+Determines whether the client part of the program should be started on launch. Must be a boolean value.
+<
+
+>>>
+`!user_interface = text`!
+>>>>
+Selects which interface to use. Currently, only the `!text`! interface is available.
+<
+
+>>>
+`!downloads_path = ~/Downloads`!
+>>>>
+Sets the filesystem path to store downloaded files in.
+<
+
+>>>
+`!announce_at_start = yes`!
+>>>>
+Determines whether your LXMF address is automatically announced when the program starts. Must be a boolean value.
+<
+
+>>>
+`!try_propagation_on_send_fail = yes`!
+>>>>
+When this option is enabled, and sending a message directly to a peer fails, Nomad Network will instead deliver the message to the propagation network, for later retrieval by the recipient.
+<
+
+>>>
+`!periodic_lxmf_sync = yes`!
+>>>>
+Whether the program should periodically download messages from available propagation nodes in the background.
+<
+
+>>>
+`!lxmf_sync_interval = 360`!
+>>>>
+The number of minutes between each automatic sync. The default is equal to 6 hours.
+<
+
+>>>
+`!lxmf_sync_limit = 8`!
+>>>>
+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.
+<
+
+>> 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:
+
+>>>
+`!intro_time = 1`!
+>>>>
+Number of seconds to display the intro screen. Set to 0 to disable the intro screen.
+<
+
+>>>
+`!intro_text = Nomad Network`!
+>>>>
+The text to display on the intro screen.
+<
+
+>>>
+`!editor = editor`!
+>>>>
+What editor program to use when launching a text editor from within the program. Defaults to the `!editor`! alias, which in turn will use the default editor of the operating system.
+<
+
+>>>
+`!glyphs = unicode`!
+>>>>
+Determines what set of glyphs the program uses for rendering the user interface.
+>>>>>
+The `!plain`! set only uses ASCII characters, and should work on all terminals, but is rather boring.
+The `!unicode`! set uses more interesting glyphs and icons, and should work on most terminals. This is the default.
+The `!nerdfont`! set allows using a much wider range of glyphs, icons and graphics, and should be enabled if you are using a Nerd Font in your terminal.
+<
+
+>>>
+`!mouse_enabled = yes`!
+>>>>
+Determines whether the program should react to mouse/touch input. Must be a boolean value.
+<
+
+>>>
+`!hide_guide = no`!
+>>>>
+This option allows hiding the `![ Guide ]`! section of the program.
+<
+
+>>>
+`!animation_interval = 1`!
+>>>>
+Sets the animation refresh rate for certain animations and graphics in the program. Must be an integer.
+<
+
+>>>
+`!colormode = 256`!
+>>>>
+Tells the program what color palette is supported by the terminal. Most terminals support `!256`! colors. If your terminal supports full-color / RGB-mode, set to `!24bit`!. Available options:
+>>>>>
+`!monochrome`! Single-color (black/white) palette, for monochrome displays
+`!16`! Low-color mode for really old-school terminals
+`!88`! Standard palletised color-mode for terminals
+`!256`! Almost all modern terminals support this mode
+`!24bit`! Most new terminals support this full-color mode
+<
+
+>>>
+`!theme = dark`!
+>>>>
+What color theme to use. Set it to match your terminal theme. Can be either `!dark`! or `!light`!.
+<
+
+>> Node Section
+
+This section holds configuration directives related to the node hosting. It is delimited by the `![node]`! header in the configuration file. Available directives, along with example values, are as follows:
+
+>>>
+`!enable_node = no`!
+>>>>
+Determines whether the node server should be started on launch. Must be a boolean value, and is turned off by default.
+<
+
+>>>
+`!node_name = DisplayName's Node`!
+>>>>
+Defines what the announced name of the node should be.
+<
+
+>>>
+`!announce_at_start = yes`!
+>>>>
+Determines whether your node is automatically announced on the network when the program starts. Must be a boolean value.
+<
+
+>>>
+`!announce_interval = 360`!
+>>>>
+Determines how often, in minutes, your node is announced on the network. Defaults to 6 hours.
+<
+
+>>>
+`!pages_path = ~/.nomadnetwork/storage/pages`!
+>>>>
+Determines where the node server will look for hosted pages. Must be a readable filesystem path.
+<
+
+>>>
+`!files_path = ~/.nomadnetwork/storage/files`!
+>>>>
+Determines where the node server will look for downloadable files. Must be a readable filesystem path.
+<
+
+>>>
+`!message_storage_limit = 2000`!
+>>>>
+Configures the maximum amount of storage, in megabytes, that the LXMF Propagation Node will use to store messages.
+<
+
+>>>
+`!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`!
+>>>>
+Configures the LXMF Propagation Node to prioritise storing messages for certain destinations. If the message store reaches the specified limit, LXMF will prioritise keeping messages for destinations specified with this option. This setting is optional, and generally you do not need to use it.
+<
+
+>> Printing Section
+
+This section holds configuration directives related to printing. It is delimited by the `![printing]`! header in the configuration file. Available directives, along with example values, are as follows:
+
+>>>
+`!print_messages = no`!
+>>>>
+Determines whether messages should be printed upon arrival. Must be a boolean value, and is turned off by default.
+<
+
+>>>
+`!message_template = ~/.nomadnetwork/print_template_msg.txt`!
+>>>>
+Determines where the template for printed messages is found. Must be a filesystem path. If you set this path to a non-existing file, an example will be generated in the specified location.
+<
+
+>>>
+`!print_from = 76fe5751a56067d1e84eef3e88eab85b, trusted`!
+>>>>
+Determines from which destinations messages are printed. Can be a list of destinations hashes, the keyword "trusted", or "everywhere".
+<
+
+>>>
+`!print_command = lp -d PRINTER_NAME -o cpi=16 -o lpi=8`!
+>>>>
+Specifies the command that Nomad Network uses to print the message. Defaults to "lp". The above example works well for small thermal-roll printers.
+<
+
+>Ignoring Destinations
+
+If you encounter peers or nodes on the network, that you would rather not see in your client, you can add them to the `!~/.nomadnetwork/ignored`! file. To ignore nodes or peers, add one 32-character hexadecimal destination hash per line to the file. To unignore one again, simply remove the corresponding entry from the file and restart Nomad Network.
+'''
+
 TOPIC_NETWORKS = '''>Network Configuration
 
 Nomad Network uses the Reticulum Network Stack for communication and encryption. This means that it will use any interfaces and communications channels already defined in your Reticulum configuration.
 
 Reticulum supports using many kinds of devices as networking interfaces, and allows you to mix and match them in any way you choose. The number of distinct network topologies you can create with Reticulum is more or less endless, but common to them all is that you will need to define one or more interfaces for Reticulum to use.
 
-If you have not changed the default Reticulum configuration, which should be located at `!~/.reticulum/config`!, you will have one interface active right now. With it, you should be able to communicate with any other peers and nodes that exist on your local ethernet or WiFi network, if your system is connected to one, and most probably nothing else outside of that.
+If you have not changed the default Reticulum configuration, which should be located at `!~/.reticulum/config`!, you will have one interface active right now. With it, you should be able to communicate with any other peers and systems that exist on your local ethernet or WiFi network, if your computer is connected to one, and most probably nothing else outside of that.
 
 To learn how to configure your Reticulum setup to use LoRa radios, packet radio or other interfaces, or connect to other Reticulum networks via the Internet, the best places to start is to read the relevant parts of the Reticulum Manual, which can be found on GitHub:
 
 `c`_https://markqvist.github.io/Reticulum/manual/interfaces.html`_
 `l
 
-If you don't currently have access to the Internet, the default Reticulum configuration file is also full of examples of all the supported interface types, and it should be relatively simple to get a working setup going just from those examples.
+If you don't currently have access to the Internet, you can generate a configuration file full of examples of all the supported interface types, by using the command `!rnsd --exampleconfig`!. Using those examples, it should be possible to get a working setup going.
 
 For future reference, you can download the Reticulum Manual in PDF format here:
 
@@ -385,6 +707,9 @@ The following line should contain a green gradient bar:
 The following line should contain a blue gradient bar:
 `B001 `B002 `B003 `B004 `B005 `B006 `B007 `B008 `B009 `B00a `B00b `B00c `B00d `B00e `B00f`b
 
+The following line should contain a grayscale gradient bar:
+`Bg06 `Bg13 `Bg20 `Bg26 `Bg33 `Bg40 `Bg46 `Bg53 `Bg59 `Bg66 `Bg73 `Bg79 `Bg86 `Bg92 `Bg99`b
+
 Unicode Glyphs   : \u2713  \u2715  \u26a0  \u24c3  \u2193
 
 Nerd Font Glyphs : \uf484  \uf9c4 \uf719  \uf502  \uf415  \uf023  \uf06e
@@ -452,7 +777,7 @@ While micron can output formatted text to even the most basic terminal, there's
 
 Formatting such as `_underline`_, `!bold`! or `*italics`* will be displayed if your terminal supports it.
 
-If you are having trouble getting micron output to display correctly, try using `*gnome-terminal`*, which should work with all formatting options out of the box. Most other terminals will work fine as well, but you might have to change some settings to get certain formatting to display correctly.
+If you are having trouble getting micron output to display correctly, try using `*gnome-terminal`* or `*alacritty`*, which should work with all formatting options out of the box. Most other terminals will work fine as well, but you might have to change some settings to get certain formatting to display correctly.
 
 >>>Encoding
 
@@ -632,11 +957,11 @@ Here's a few examples:
 
 `Faaa
 `=
-Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+Here is a link without any label: `[72914442a3689add83a09a767963f57c:/page/index.mu]
 
-This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+This is a `[labeled link`72914442a3689add83a09a767963f57c:/page/index.mu] to the same page, but it's hard to see if you don't know it
 
-Here is `F00a`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+Here is `F00a`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/index.mu]`_`f
 `=
 ``
 
@@ -644,11 +969,11 @@ The above markup produces the following output:
 
 `Faaa`B333
 
-Here is a link without any label: `[1385edace36466a6b3dd:/page/index.mu]
+Here is a link without any label: `[72914442a3689add83a09a767963f57c:/page/index.mu]
 
-This is a `[labeled link`1385edace36466a6b3dd:/page/index.mu] to the same page, but it's hard to see if you don't know it
+This is a `[labeled link`72914442a3689add83a09a767963f57c:/page/index.mu] to the same page, but it's hard to see if you don't know it
 
-Here is `F00f`_`[a more visible link`1385edace36466a6b3dd:/page/index.mu]`_`f
+Here is `F00f`_`[a more visible link`72914442a3689add83a09a767963f57c:/page/index.mu]`_`f
 
 ``
 
@@ -694,9 +1019,11 @@ TOPICS = {
     "Concepts & Terminology": TOPIC_CONCEPTS,
     "Conversations": TOPIC_CONVERSATIONS,
     "Hosting a Node": TOPIC_HOSTING,
+    "Configuration Options": TOPIC_CONFIG,
+    "Keyboard Shortcuts": TOPIC_SHORTCUTS,
     "Markup": TOPIC_MARKUP,
-    "First Run": TOPIC_FIRST_RUN,
     "Display Test": TOPIC_DISPLAYTEST,
     "Network Configuration": TOPIC_NETWORKS,
     "Credits & Licenses": TOPIC_LICENSES,
+    "First Run": TOPIC_FIRST_RUN,
 }

nomadnet/ui/textui/Main.py

@@ -125,15 +125,18 @@ class MainDisplay():
     def update_active_sub_display(self):
         self.frame.contents["body"] = (self.sub_displays.active().widget, None)
         self.update_active_shortcuts()
+        # TODO: Remove when new mitigation has been tested
+        # self.app.ui.main_display.request_redraw(extra_delay=0.0)
 
     def update_active_shortcuts(self):
         self.frame.contents["footer"] = (self.sub_displays.active().shortcuts().widget, None)
 
-    def request_redraw(self):
+    def request_redraw(self, extra_delay=0.0):
-        self.app.ui.loop.set_alarm_in(0.25, self.redraw_now)
+        self.app.ui.loop.set_alarm_in(0.25+extra_delay, self.redraw_now)
     
     def redraw_now(self, sender=None, data=None):
-        self.app.ui.loop.draw_screen()
+        self.app.ui.loop.screen.clear()
+        #self.app.ui.loop.draw_screen()
 
     def start(self):
         self.menu_display.start()

nomadnet/ui/textui/MicronParser.py

@@ -185,14 +185,155 @@ def style_to_state(style, state):
 def make_style(state):
     def mono_color(fg, bg):
         return "default"
+
     def low_color(color):
-        # TODO: Implement low-color mapper
+        try:
-        return "default"
+            result = "default"
+            if color == "default":
+                result = "default"
+
+            elif len(color) == 6:
+                r = str(color[0])
+                g = str(color[2])
+                b = str(color[4])
+                color = r+g+b
+
+            if len(color) == 3:
+                t = 7
+
+                if color[0] == "g":
+                    val = int(color[1:2])
+                    if val < 25:
+                        result = "black"
+                    elif val < 50:
+                        result = "dark gray"
+                    elif val < 75:
+                        result = "light gray"
+                    else:
+                        result = "white"
+                else:
+                    r = int(color[0], 16)
+                    g = int(color[1], 16)
+                    b = int(color[2], 16)
+
+                    if r == g == b:
+                        val = int(color[0], 16)*6
+                        if val < 12:
+                            result = "black"
+                        elif val < 50:
+                            result = "dark gray"
+                        elif val < 80:
+                            result = "light gray"
+                        else:
+                            result = "white"
+
+                    else:
+                        if r == b:
+                            if r > g:
+                                if r > t:
+                                    result = "light magenta"
+                                else:
+                                    result = "dark magenta"
+                            else:
+                                if g > t:
+                                    result = "light green"
+                                else:
+                                    result = "dark green"
+                        if b == g:
+                            if b > r:
+                                if b > t:
+                                    result = "light cyan"
+                                else:
+                                    result = "dark cyan"
+                            else:
+                                if r > t:
+                                    result = "light red"
+                                else:
+                                    result = "dark red"
+                        if g == r:
+                            if g > b:
+                                if g > t:
+                                    result = "yellow"
+                                else:
+                                    result = "brown"
+                            else:
+                                if b > t:
+                                    result = "light blue"
+                                else:
+                                    result = "dark blue"
+
+                        if r > g and r > b:
+                            if r > t:
+                                result = "light red"
+                            else:
+                                result = "dark red"
+                        if g > r and g > b:
+                            if g > t:
+                                result = "light green"
+                            else:
+                                result = "dark green"
+                        if b > g and b > r:
+                            if b > t:
+                                result = "light blue"
+                            else:
+                                result = "dark blue"
+
+        except Exception as e:
+            result = "default"
+
+        return result
+
     def high_color(color):
+        def parseval_hex(char):
+            return hex(max(0,min(int(char, 16),16)))[2:]
+
+        def parseval_dec(char):
+            return str(max(0,min(int(char), 9)))
+
         if color == "default":
-            return color
+            return "default"
         else:
-            return "#"+color
+            if len(color) == 6:
+                try:
+                    v1 = parseval_hex(color[0])
+                    v2 = parseval_hex(color[1])
+                    v3 = parseval_hex(color[2])
+                    v4 = parseval_hex(color[3])
+                    v5 = parseval_hex(color[4])
+                    v6 = parseval_hex(color[5])
+                    color = "#"+v1+v2+v3+v4+v5+v6
+
+                except Exception as e:
+                    return "default"
+
+                return color
+
+            elif len(color) == 3:
+                if color[0] == "g":
+                    try:
+                        v1 = parseval_dec(color[1])
+                        v2 = parseval_dec(color[2])
+
+                    except Exception as e:
+                        return "default"
+
+                    return "g"+v1+v2
+                
+                else:
+                    try:
+                        v1 = parseval_hex(color[0])
+                        v2 = parseval_hex(color[1])
+                        v3 = parseval_hex(color[2])
+                        color = v1+v2+v3
+                        
+                    except Exception as e:
+                        return "default"
+
+                    r = color[0]
+                    g = color[1]
+                    b = color[2]
+                    return "#"+r+r+g+g+b+b
+
 
     bold      = state["formatting"]["bold"]
     underline = state["formatting"]["underline"]
@@ -387,7 +528,6 @@ class LinkableText(urwid.Text):
         if self.delegate != None:
             self.delegate.handle_link(link_target)
 
-
     def find_next_part_pos(self, pos, part_positions):
         for position in part_positions:
             if position > pos:
@@ -455,7 +595,12 @@ class LinkableText(urwid.Text):
             return key
         
         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"
+
             self._invalidate()
         
         elif key == "left":
@@ -500,9 +645,33 @@ class LinkableText(urwid.Text):
         if button != 1 or not is_mouse_press(event):
             return False
         else:
-            pos = (y * size[0]) + x
+            (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]
+
+            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)

nomadnet/ui/textui/Network.py

@@ -13,7 +13,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"), "shortcutbar")
+        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"
 
 
@@ -51,6 +51,13 @@ class ListEntry(urwid.Text):
 
 
 class AnnounceInfo(urwid.WidgetWrap):
+    def keypress(self, size, key):
+        if key == "esc":
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
+        else:
+            return super(AnnounceInfo, self).keypress(size, key)
+
     def __init__(self, announce, parent, app):
         self.app = nomadnet.NomadNetworkApp.get_shared_instance()
         self.parent = self.app.ui.main_display.sub_displays.network_display
@@ -107,6 +114,8 @@ class AnnounceInfo(urwid.WidgetWrap):
             self.parent.left_pile.contents[0] = (self.parent.announce_stream_display, options)
 
         def connect(sender):
+            # TODO: Remove when new mitigation has been tested
+            # self.app.ui.main_display.request_redraw(extra_delay=0.75)
             self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
             show_announce_stream(None)
 
@@ -116,6 +125,33 @@ class AnnounceInfo(urwid.WidgetWrap):
             self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
             show_announce_stream(None)
 
+        if is_node:
+            node_ident = RNS.Identity.recall(source_hash)
+            op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
+            op_str = self.app.directory.simplest_display_str(op_hash)
+
+        def msg_op(sender):
+            show_announce_stream(None)
+            if is_node:
+                try:
+                    existing_conversations = nomadnet.Conversation.conversation_list(self.app)
+                    
+                    source_hash_text = RNS.hexrep(op_hash, delimit=False)
+                    display_name = op_str
+
+                    if not source_hash_text in [c[0] for c in existing_conversations]:
+                        entry = DirectoryEntry(source_hash, display_name, trust_level)
+                        self.app.directory.remember(entry)
+
+                        new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+                        self.app.ui.main_display.sub_displays.conversations_display.update_conversation_list()
+
+                    self.app.ui.main_display.sub_displays.conversations_display.display_conversation(None, source_hash_text)
+                    self.app.ui.main_display.show_conversations(None)
+
+                except Exception as e:
+                    RNS.log("Error while starting conversation from announce. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
         def converse(sender):
             show_announce_stream(None)
             try:
@@ -139,13 +175,14 @@ class AnnounceInfo(urwid.WidgetWrap):
 
         if is_node:
             type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+            msg_button =  ("weight", 0.45, urwid.Button("Msg Op", on_press=msg_op))
             save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
         else:
             type_button = ("weight", 0.45, urwid.Button("Converse", on_press=converse))
             save_button = None
 
         if is_node:
-            button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+            button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button, ("weight", 0.1, urwid.Text("")), msg_button, ("weight", 0.1, urwid.Text("")), save_button])
         else:
             button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_announce_stream)), ("weight", 0.1, urwid.Text("")), type_button])
 
@@ -162,9 +199,6 @@ class AnnounceInfo(urwid.WidgetWrap):
         ]
 
         if is_node:
-            node_ident = RNS.Identity.recall(source_hash)
-            op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
-            op_str = self.app.directory.simplest_display_str(op_hash)
             operator_entry = urwid.Text("Oprtr : "+op_str, align="left")
             pile_widgets.insert(4, operator_entry)
 
@@ -254,7 +288,7 @@ class AnnounceStream(urwid.WidgetWrap):
         self.widget_list = []
         self.update_widget_list()
 
-        self.ilb = IndicativeListBox(
+        self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.list_selection,
             initialization_is_selection_change=False,
@@ -360,6 +394,13 @@ class ListDialogLineBox(urwid.LineBox):
             return super(ListDialogLineBox, self).keypress(size, key)
 
 class KnownNodeInfo(urwid.WidgetWrap):
+    def keypress(self, size, key):
+        if key == "esc":
+            options = self.parent.left_pile.options(height_type="weight", height_amount=1)
+            self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
+        else:
+            return super(KnownNodeInfo, self).keypress(size, key)
+
     def __init__(self, node_hash):
         self.app = nomadnet.NomadNetworkApp.get_shared_instance()
         self.parent = self.app.ui.main_display.sub_displays.network_display
@@ -379,10 +420,13 @@ class KnownNodeInfo(urwid.WidgetWrap):
 
         addr_str     = "<"+RNS.hexrep(source_hash, delimit=False)+">"
 
+        if display_str == None:
+            display_str = addr_str
+
         if node_ident != None:
-            lxmf_addr_str = RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
+            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", node_ident))
         else:
-            lxmf_addr_str = "Unknown"
+            lxmf_addr_str = "No associated Propagation Node known"
 
 
         type_string = "Node " + g["node"]
@@ -428,6 +472,15 @@ class KnownNodeInfo(urwid.WidgetWrap):
 
         e_name = urwid.Edit(caption="Name      : ",edit_text=display_str)
 
+        node_ident = RNS.Identity.recall(source_hash)
+        op_hash = None
+        op_str = None
+        if node_ident != None:
+            op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
+            op_str = self.app.directory.simplest_display_str(op_hash)
+        else:
+            op_str = "Unknown"
+
         def show_known_nodes(sender):
             options = self.parent.left_pile.options(height_type="weight", height_amount=1)
             self.parent.left_pile.contents[0] = (self.parent.known_nodes_display, options)
@@ -436,10 +489,36 @@ class KnownNodeInfo(urwid.WidgetWrap):
             self.parent.browser.retrieve_url(RNS.hexrep(source_hash, delimit=False))
             show_known_nodes(None)
 
+        def msg_op(sender):
+            show_known_nodes(None)
+            if node_ident != None:
+                try:
+                    existing_conversations = nomadnet.Conversation.conversation_list(self.app)
+                    
+                    source_hash_text = RNS.hexrep(op_hash, delimit=False)
+                    display_name = op_str
+
+                    if not source_hash_text in [c[0] for c in existing_conversations]:
+                        entry = DirectoryEntry(source_hash, display_name, trust_level)
+                        self.app.directory.remember(entry)
+
+                        new_conversation = nomadnet.Conversation(source_hash_text, nomadnet.NomadNetworkApp.get_shared_instance(), initiator=True)
+                        self.app.ui.main_display.sub_displays.conversations_display.update_conversation_list()
+
+                    self.app.ui.main_display.sub_displays.conversations_display.display_conversation(None, source_hash_text)
+                    self.app.ui.main_display.show_conversations(None)
+
+                except Exception as e:
+                    RNS.log("Error while starting conversation from node info. The contained exception was: "+str(e), RNS.LOG_ERROR)
+
         def pn_change(sender, userdata):
             self.pn_changed = True
 
+        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)
+        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):
             if self.pn_changed:
@@ -457,24 +536,28 @@ class KnownNodeInfo(urwid.WidgetWrap):
 
             display_str = e_name.get_edit_text()
 
-            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True)
+            node_entry = DirectoryEntry(source_hash, display_name=display_str, trust_level=trust_level, hosts_node=True, identify_on_connect=connect_identify_checkbox.get_state())
             self.app.directory.remember(node_entry)
             self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
             show_known_nodes(None)
 
-        type_button = ("weight", 0.45, urwid.Button("Connect", on_press=connect))
+        back_button = ("weight", 0.2, urwid.Button("Back", on_press=show_known_nodes))
-        save_button = ("weight", 0.45, urwid.Button("Save", on_press=save_node))
+        connect_button = ("weight", 0.2, urwid.Button("Connect", on_press=connect))
-        button_columns = urwid.Columns([("weight", 0.45, urwid.Button("Back", on_press=show_known_nodes)), ("weight", 0.1, urwid.Text("")), save_button, ("weight", 0.1, urwid.Text("")), type_button])
+        save_button = ("weight", 0.2, urwid.Button("Save", on_press=save_node))
+        msg_button = ("weight", 0.2, urwid.Button("Msg Op", on_press=msg_op))
+        bdiv = ("weight", 0.02, urwid.Text(""))
+
+        button_columns = urwid.Columns([back_button, bdiv, connect_button, bdiv, msg_button, bdiv, save_button])
 
         pile_widgets = [
             urwid.Text("Type      : "+type_string, align="left"),
-            # urwid.Text("Name      : "+display_str, align="left"),
             e_name,
             urwid.Text("Node Addr : "+addr_str, align="left"),
-            urwid.Text("LXMF Addr : "+lxmf_addr_str, align="left"),
+            urwid.Divider(g["divider1"]),
-            # urwid.Text(["Trust     : ", (style, trust_str)], align="left"),
+            urwid.Text(lxmf_addr_str, align="center"),
             urwid.Divider(g["divider1"]),
             propagation_node_checkbox,
+            connect_identify_checkbox,
             urwid.Divider(g["divider1"]),
             r_untrusted,
             r_unknown,
@@ -483,19 +566,49 @@ class KnownNodeInfo(urwid.WidgetWrap):
             button_columns
         ]
 
-        node_ident = RNS.Identity.recall(source_hash)
-        op_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", node_ident)
-        op_str = self.app.directory.simplest_display_str(op_hash)
         operator_entry = urwid.Text("Operator  : "+op_str, align="left")
+        pile_widgets.insert(3, operator_entry)
+
+        hops = RNS.Transport.hops_to(source_hash)
+        if hops == 1:
+            str_s = ""
+        else:
+            str_s = "s"
+
+        if hops != RNS.Transport.PATHFINDER_M:
+            hops_str = str(hops)+" hop"+str_s
+        else:
+            hops_str = "Unknown"
+
+        operator_entry = urwid.Text("Distance  : "+hops_str, align="left")
         pile_widgets.insert(4, operator_entry)
 
         pile = urwid.Pile(pile_widgets)
         
+        pile.focus_position = len(pile.contents)-1
+        button_columns.focus_position = 0
+
+
         self.display_widget = urwid.Filler(pile, valign="top", height="pack")
 
         urwid.WidgetWrap.__init__(self, urwid.LineBox(self.display_widget, title="Node Info"))
 
 
+# Yes, this is weird. There is a bug in Urwid/ILB that causes
+# an indexing exception when the list is very small vertically.
+# This mitigates it.
+class ExceptionHandlingListBox(IndicativeListBox):
+    def keypress(self, size, key):
+        try:
+            return super(ExceptionHandlingListBox, self).keypress(size, key)
+
+        except Exception as e:
+            if key == "up":
+                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.set_focus("header")
+            elif key == "down":
+                nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.sub_displays.network_display.left_pile.set_focus(1)
+
+
 class KnownNodes(urwid.WidgetWrap):
     def __init__(self, app):
         self.app = app
@@ -504,7 +617,7 @@ class KnownNodes(urwid.WidgetWrap):
 
         self.widget_list = self.make_node_widgets()
         
-        self.ilb = IndicativeListBox(
+        self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.node_list_selection,
             initialization_is_selection_change=False,
@@ -521,7 +634,7 @@ class KnownNodes(urwid.WidgetWrap):
             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.display_widget = urwid.Filler(self.pile, valign="top", height="pack")
 
-        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Known Nodes"), widget_style))
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="Saved Nodes"), widget_style))
 
     def keypress(self, size, key):
         if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
@@ -682,7 +795,7 @@ class AnnounceTime(urwid.WidgetWrap):
         if self.app.peer_settings["last_announce"] != None:
             self.last_announce_string = pretty_date(int(self.app.peer_settings["last_announce"]))
 
-        self.display_widget.set_text("Last Announce : "+self.last_announce_string)
+        self.display_widget.set_text("Announced : "+self.last_announce_string)
 
     def update_time_callback(self, loop=None, user_data=None):
         self.update_time()
@@ -714,7 +827,7 @@ class NodeAnnounceTime(urwid.WidgetWrap):
         if self.app.peer_settings["node_last_announce"] != None:
             self.last_announce_string = pretty_date(int(self.app.peer_settings["node_last_announce"]))
 
-        self.display_widget.set_text("Last Announce   : "+self.last_announce_string)
+        self.display_widget.set_text("Last Announce  : "+self.last_announce_string)
 
     def update_time_callback(self, loop=None, user_data=None):
         self.update_time()
@@ -745,7 +858,145 @@ class NodeActiveConnections(urwid.WidgetWrap):
         if self.app.node != None:
             self.stat_string = str(len(self.app.node.destination.links))
 
-        self.display_widget.set_text("Connected Peers : "+self.stat_string)
+        self.display_widget.set_text("Conneced Now   : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+class NodeStorageStats(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+
+            limit = self.app.message_router.message_storage_limit
+            used = self.app.message_router.message_storage_size()
+
+            if limit != None:
+                pct = round((used/limit)*100, 1)
+                pct_str = str(pct)+"%, "
+                limit_str = " of "+RNS.prettysize(limit)
+            else:
+                limit_str = ""
+                pct_str = ""
+
+            self.stat_string = pct_str+RNS.prettysize(used)+limit_str
+
+        self.display_widget.set_text("LXMF Storage   : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+class NodeTotalConnections(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+            self.stat_string = str(self.app.peer_settings["node_connects"])
+
+        self.display_widget.set_text("Total Connects : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+
+class NodeTotalPages(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+            self.stat_string = str(self.app.peer_settings["served_page_requests"])
+
+        self.display_widget.set_text("Served Pages   : "+self.stat_string)
+
+    def update_stat_callback(self, loop=None, user_data=None):
+        self.update_stat()
+        if self.started:
+            self.app.ui.loop.set_alarm_in(self.timeout, self.update_stat_callback)
+
+    def start(self):
+        was_started = self.started
+        self.started = True
+        if not was_started:
+            self.update_stat_callback()
+
+    def stop(self):
+        self.started = False
+
+
+class NodeTotalFiles(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.started = False
+        self.app = app
+        self.timeout = self.app.config["textui"]["animation_interval"]
+        self.display_widget = urwid.Text("")
+        self.update_stat()
+
+        urwid.WidgetWrap.__init__(self, self.display_widget)
+
+    def update_stat(self):
+        self.stat_string = "None"
+        if self.app.node != None:
+            self.stat_string = str(self.app.peer_settings["served_file_requests"])
+
+        self.display_widget.set_text("Served Files   : "+self.stat_string)
 
     def update_stat_callback(self, loop=None, user_data=None):
         self.update_stat()
@@ -774,13 +1025,14 @@ class LocalPeer(urwid.WidgetWrap):
         if display_name == None:
             display_name = ""
 
-        t_id = urwid.Text("Addr : "+RNS.hexrep(self.app.lxmf_destination.hash, delimit=False))
+        t_id =           urwid.Text("LXMF Addr : "+RNS.prettyhexrep(self.app.lxmf_destination.hash))
-        e_name = urwid.Edit(caption="Name : ", edit_text=display_name)
+        i_id =           urwid.Text("Identity  : "+RNS.prettyhexrep(self.app.identity.hash))
+        e_name = urwid.Edit(caption="Name      : ", edit_text=display_name)
 
         def save_query(sender):
             def dismiss_dialog(sender):
                 self.dialog_open = False
-                self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
+                self.parent.left_pile.contents[1] = (LocalPeer(self.app, self.parent), options)
 
             self.app.set_display_name(e_name.get_edit_text())
 
@@ -797,19 +1049,19 @@ class LocalPeer(urwid.WidgetWrap):
             overlay = dialog
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
             self.dialog_open = True
-            self.parent.left_pile.contents[2] = (overlay, options)
+            self.parent.left_pile.contents[1] = (overlay, options)
 
         def announce_query(sender):
             def dismiss_dialog(sender):
                 self.dialog_open = False
                 options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-                self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
+                self.parent.left_pile.contents[1] = (LocalPeer(self.app, self.parent), options)
 
             self.app.announce_now()
 
             dialog = DialogLineBox(
                 urwid.Pile([
-                    urwid.Text("\n\n\nAnnounce Sent\n\n", align="center"),
+                    urwid.Text("\n\n\nAnnounce Sent\n\n\n", align="center"),
                     urwid.Button("OK", on_press=dismiss_dialog)
                 ]), title=g["info"]
             )
@@ -821,11 +1073,11 @@ class LocalPeer(urwid.WidgetWrap):
             
             self.dialog_open = True
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[2] = (overlay, options)
+            self.parent.left_pile.contents[1] = (overlay, options)
 
         def node_info_query(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[2] = (self.parent.node_info_display, options)
+            self.parent.left_pile.contents[1] = (self.parent.node_info_display, options)
 
         if LocalPeer.announce_timer == None:
             self.t_last_announce = AnnounceTime(self.app)
@@ -839,6 +1091,7 @@ class LocalPeer(urwid.WidgetWrap):
         self.display_widget = urwid.Pile(
             [
                 t_id,
+                i_id,
                 e_name,
                 urwid.Divider(g["divider1"]),
                 self.t_last_announce,
@@ -857,6 +1110,10 @@ class LocalPeer(urwid.WidgetWrap):
 class NodeInfo(urwid.WidgetWrap):
     announce_timer = None
     links_timer = None
+    conns_timer = None
+    pages_timer = None
+    files_timer = None
+    storage_timer = None
 
     def __init__(self, app, parent):
         self.app = app
@@ -869,7 +1126,7 @@ class NodeInfo(urwid.WidgetWrap):
 
         def show_peer_info(sender):
             options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-            self.parent.left_pile.contents[2] = (LocalPeer(self.app, self.parent), options)
+            self.parent.left_pile.contents[1] = (LocalPeer(self.app, self.parent), options)
         
         if self.app.enable_node:
             if self.app.node != None:
@@ -883,11 +1140,17 @@ class NodeInfo(urwid.WidgetWrap):
             t_id = urwid.Text("Addr : "+RNS.hexrep(self.app.node.destination.hash, delimit=False))
             e_name = urwid.Text("Name : "+display_name)
 
+            def stats_query(sender):
+                self.app.peer_settings["node_connects"] = 0
+                self.app.peer_settings["served_page_requests"] = 0
+                self.app.peer_settings["served_file_requests"] = 0
+                self.app.save_peer_settings()
+
             def announce_query(sender):
                 def dismiss_dialog(sender):
                     self.dialog_open = False
                     options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-                    self.parent.left_pile.contents[2] = (NodeInfo(self.app, self.parent), options)
+                    self.parent.left_pile.contents[1] = (NodeInfo(self.app, self.parent), options)
 
                 self.app.node.announce()
 
@@ -905,7 +1168,7 @@ class NodeInfo(urwid.WidgetWrap):
                 
                 self.dialog_open = True
                 options = self.parent.left_pile.options(height_type="pack", height_amount=None)
-                self.parent.left_pile.contents[2] = (overlay, options)
+                self.parent.left_pile.contents[1] = (overlay, options)
 
             def connect_query(sender):
                 self.parent.browser.retrieve_url(RNS.hexrep(self.app.node.destination.hash, delimit=False))
@@ -924,22 +1187,62 @@ class NodeInfo(urwid.WidgetWrap):
                 self.t_active_links = NodeInfo.links_timer
                 self.t_active_links.update_stat()
 
-            announce_button = urwid.Button("Announce Now", on_press=announce_query)
+            if NodeInfo.storage_timer == None:
+                self.t_storage_stats = NodeStorageStats(self.app)
+                NodeInfo.storage_timer = self.t_storage_stats
+            else:
+                self.t_active_links = NodeInfo.links_timer
+                self.t_active_links.update_stat()
+
+            if NodeInfo.conns_timer == None:
+                self.t_total_connections = NodeTotalConnections(self.app)
+                NodeInfo.conns_timer = self.t_total_connections
+            else:
+                self.t_total_connections = NodeInfo.conns_timer
+                self.t_total_connections.update_stat()
+
+            if NodeInfo.pages_timer == None:
+                self.t_total_pages = NodeTotalPages(self.app)
+                NodeInfo.pages_timer = self.t_total_pages
+            else:
+                self.t_total_pages = NodeInfo.pages_timer
+                self.t_total_pages.update_stat()
+
+            if NodeInfo.files_timer == None:
+                self.t_total_files = NodeTotalFiles(self.app)
+                NodeInfo.files_timer = self.t_total_files
+            else:
+                self.t_total_files = NodeInfo.files_timer
+                self.t_total_files.update_stat()
+
+            lxmf_addr_str = g["sent"]+" LXMF Propagation Node Address is "+RNS.prettyhexrep(RNS.Destination.hash_from_name_and_identity("lxmf.propagation", self.app.node.destination.identity))
+            e_lxmf = urwid.Text(lxmf_addr_str, align="center")
+
+            announce_button = urwid.Button("Announce", on_press=announce_query)
             connect_button = urwid.Button("Browse", on_press=connect_query)
+            reset_button = urwid.Button("Rst Stats", on_press=stats_query)
 
             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", 0.3, urwid.Button("Back", on_press=show_peer_info)),
+                    ("weight", 5, urwid.Button("Back", on_press=show_peer_info)),
-                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Text("")),
-                    ("weight", 0.3, connect_button),
+                    ("weight", 6, connect_button),
-                    ("weight", 0.1, urwid.Text("")),
+                    ("weight", 0.5, urwid.Text("")),
-                    ("weight", 0.3, announce_button)
+                    ("weight", 8, reset_button),
+                    ("weight", 0.5, urwid.Text("")),
+                    ("weight", 7, announce_button),
                 ])
             ])
         else:
@@ -957,7 +1260,9 @@ class NodeInfo(urwid.WidgetWrap):
         if self.app.node != None:
             self.t_last_announce.start()
             self.t_active_links.start()
-
+            self.t_total_connections.start()
+            self.t_total_pages.start()
+            self.t_total_files.start()
 
 
 class UpdatingText(urwid.WidgetWrap):
@@ -1004,7 +1309,7 @@ class NetworkStats(urwid.WidgetWrap):
         def get_num_nodes():
             return self.app.directory.number_of_known_nodes()
 
-        self.w_heard_peers = UpdatingText(self.app, "Heard Peers: ", get_num_peers, append_text=" (last 30m)")
+        self.w_heard_peers = UpdatingText(self.app, "Heard Peers: ", get_num_peers, append_text=" (30m)")
         self.w_known_nodes = UpdatingText(self.app, "Known Nodes: ", get_num_nodes)
 
         pile = urwid.Pile([
@@ -1024,6 +1329,10 @@ class NetworkLeftPile(urwid.Pile):
     def keypress(self, size, key):
         if key == "ctrl l":
             self.parent.toggle_list()
+        elif key == "ctrl g":
+            self.parent.toggle_fullscreen()
+        elif key == "ctrl e":
+            self.parent.selected_node_info()
         elif key == "ctrl p":
             self.parent.reinit_lxmf_peers()
             self.parent.show_peers()
@@ -1031,12 +1340,16 @@ class NetworkLeftPile(urwid.Pile):
             self.parent.browser.disconnect()
         elif key == "ctrl u":
             self.parent.browser.url_dialog()
+        elif key == "ctrl s":
+            self.parent.browser.save_node_dialog()
+
         else:
             return super(NetworkLeftPile, self).keypress(size, key)
 
 
 class NetworkDisplay():
     list_width = 0.33
+    given_list_width = 52
 
     def __init__(self, app):
         self.app = app
@@ -1059,7 +1372,7 @@ class NetworkDisplay():
         self.list_display = 1
         self.left_pile = NetworkLeftPile([
             ("weight", 1, self.known_nodes_display),
-            ("pack", self.network_stats_display),
+            # ("pack", self.network_stats_display),
             ("pack", self.local_peer_display),
         ])
 
@@ -1071,8 +1384,10 @@ class NetworkDisplay():
 
         self.columns = urwid.Columns(
             [
-                ("weight", NetworkDisplay.list_width, self.left_area),
+                # ("weight", NetworkDisplay.list_width, self.left_area),
-                ("weight", self.right_area_width, self.right_area)
+                # ("weight", self.right_area_width, self.right_area)
+                (NetworkDisplay.given_list_width, self.left_area),
+                ("weight", 1, self.right_area)
             ],
             dividechars=0, focus_column=0
         )
@@ -1090,6 +1405,16 @@ class NetworkDisplay():
             self.left_pile.contents[0] = (self.known_nodes_display, options)
             self.list_display = 1
 
+    def toggle_fullscreen(self):
+        if NetworkDisplay.given_list_width != 0:
+            self.saved_list_width = NetworkDisplay.given_list_width
+            NetworkDisplay.given_list_width = 0
+        else:
+            NetworkDisplay.given_list_width = self.saved_list_width
+
+        options = self.widget.options("given", NetworkDisplay.given_list_width)
+        self.widget.contents[0] = (self.left_area, options)
+
     def show_peers(self):
         options = self.left_pile.options(height_type="weight", height_amount=1)
         self.left_pile.contents[0] = (self.lxmf_peers_display, options)
@@ -1099,6 +1424,18 @@ class NetworkDisplay():
         else:
             self.list_display = 1
 
+    def selected_node_info(self):
+        if self.list_display == 1:
+            parent = self.app.ui.main_display.sub_displays.network_display
+            selected_node_entry = parent.known_nodes_display.ilb.get_selected_item()
+            if selected_node_entry != None:
+                selected_node_hash = selected_node_entry._get_base_widget().display_widget.source_hash
+                
+                if selected_node_hash != None:
+                    info_widget = KnownNodeInfo(selected_node_hash)
+                    options = parent.left_pile.options(height_type="weight", height_amount=1)
+                    parent.left_pile.contents[0] = (info_widget, options)
+    
     def focus_lists(self):
         self.columns.focus_position = 0
 
@@ -1168,7 +1505,7 @@ 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 Peers"), widget_style))
+        urwid.WidgetWrap.__init__(self, urwid.AttrMap(urwid.LineBox(self.display_widget, title="LXMF Propagation Peers"), widget_style))
 
     def keypress(self, size, key):
         if key == "up" and (self.no_content or self.ilb.first_item_is_selected()):
@@ -1219,13 +1556,19 @@ class LXMFPeerEntry(urwid.WidgetWrap):
         self.app = app
         g = self.app.ui.glyphs
 
+        node_identity = RNS.Identity.recall(destination_hash)
         display_str = RNS.prettyhexrep(destination_hash)
+        if node_identity != None:            
+            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)
 
         sym = g["sent"]
         style         = "list_unknown"
         focus_style   = "list_focus"
 
-        widget = ListEntry(sym+" "+display_str+"\n   Last heard "+pretty_date(int(peer.last_heard))+"\n   "+str(len(peer.unhandled_messages))+" unhandled")
+        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)
 
         self.display_widget = urwid.AttrMap(widget, style, focus_style)

nomadnet/vendor/configobj.py

@@ -19,7 +19,7 @@ import sys
 
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
 
-import six
+import RNS.vendor.six as six
 __version__ = '5.0.6'
 
 # imported lazily to avoid startup performance hit if it isn't used

setup.py

@@ -23,6 +23,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=['rns>=0.2.8', 'lxmf>=0.1.1', 'urwid>=2.1.2'],
+    install_requires=['rns>=0.3.9', 'lxmf>=0.1.7', 'urwid>=2.1.2'],
     python_requires='>=3.6',
 )