Added funding

Fix Scrollable.py

.github/ISSUE_TEMPLATE/🐛-bug-report.md

@@ -12,7 +12,7 @@ Before creating a bug report on this issue tracker, you **must** read the [Contr
 
 - The issue tracker is used by developers of this project. **Do not use it to ask general questions, or for support requests**.
 - Ideas and feature requests can be made on the [Discussions](https://github.com/markqvist/Reticulum/discussions). **Only** feature requests accepted by maintainers and developers are tracked and included on the issue tracker. **Do not post feature requests here**.
-- After reading the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md), delete this section from your bug report.
+- After reading the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md), **delete this section only** (*"Read the Contribution Guidelines"*) from your bug report, **and fill in all the other sections**.
 
 **Describe the Bug**
 A clear and concise description of what the bug is.

Dockerfile.build

@@ -16,10 +16,6 @@ ENV PATH="/home/myuser/.local/bin:${PATH}"
 
 ################### BEGIN NomadNet ###########################################
 
-COPY --chown=myuser:myuser requirements.txt requirements.txt
-
-RUN pip install --user -r requirements.txt
-
 
 COPY --chown=myuser:myuser . .
 

FUNDING.yml

@@ -0,0 +1,3 @@
+liberapay: Reticulum
+ko_fi: markqvist
+custom: "https://unsigned.io/donate"

README.md

@@ -146,13 +146,13 @@ You can help support the continued development of open, free and private communi
   ```
   84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
   ```
-- Ethereum
-  ```
-  0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73
-  ```
 - Bitcoin
   ```
-  35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH
+  bc1p4a6axuvl7n9hpapfj8sv5reqj8kz6uxa67d5en70vzrttj0fmcusgxsfk5
+  ```
+- Ethereum
+  ```
+  0xae89F3B94fC4AD6563F0864a55F9a697a90261ff
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 

nomadnet/Directory.py

@@ -3,6 +3,7 @@ import RNS
 import LXMF
 import time
 import nomadnet
+import threading
 import RNS.vendor.umsgpack as msgpack
 
 class PNAnnounceHandler:
@@ -29,7 +30,7 @@ class PNAnnounceHandler:
             RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)
 
 class Directory:
-    ANNOUNCE_STREAM_MAXLENGTH = 64
+    ANNOUNCE_STREAM_MAXLENGTH = 256
 
     aspect_filter = "nomadnetwork.node"
     @staticmethod
@@ -55,6 +56,7 @@ class Directory:
         self.directory_entries = {}
         self.announce_stream = []
         self.app = app
+        self.announce_lock = threading.Lock()
         self.load_from_disk()
 
         self.pn_announce_handler = PNAnnounceHandler(self)
@@ -124,90 +126,94 @@ class Directory:
                 RNS.log("Could not load directory from disk. The contained exception was: "+str(e), RNS.LOG_ERROR)
 
     def lxmf_announce_received(self, source_hash, app_data):
-        if app_data != None:
+        with self.announce_lock:
-            if self.app.compact_stream:
+            if app_data != None:
-                try:
+                if self.app.compact_stream:
-                    remove_announces = []
+                    try:
-                    for announce in self.announce_stream:
+                        remove_announces = []
-                        if announce[1] == source_hash:
+                        for announce in self.announce_stream:
-                            remove_announces.append(announce)
+                            if announce[1] == source_hash:
+                                remove_announces.append(announce)
 
-                    for a in remove_announces:
+                        for a in remove_announces:
-                        self.announce_stream.remove(a)
+                            self.announce_stream.remove(a)
-                
+                    
-                except Exception as e:
+                    except Exception as e:
-                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
 
-            timestamp = time.time()
+                timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
+                self.announce_stream.insert(0, (timestamp, source_hash, app_data, "peer"))
-            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
-                self.announce_stream.pop()
+                    self.announce_stream.pop()
 
-            if hasattr(self.app.ui, "main_display"):
+                if hasattr(self.app, "ui") and self.app.ui != None:
-                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:
+        with self.announce_lock:
-            if self.app.compact_stream:
+            if app_data != None:
-                try:
+                if self.app.compact_stream:
-                    remove_announces = []
+                    try:
-                    for announce in self.announce_stream:
+                        remove_announces = []
-                        if announce[1] == source_hash:
+                        for announce in self.announce_stream:
-                            remove_announces.append(announce)
+                            if announce[1] == source_hash:
+                                remove_announces.append(announce)
 
-                    for a in remove_announces:
+                        for a in remove_announces:
-                        self.announce_stream.remove(a)
+                            self.announce_stream.remove(a)
+                    
+                    except Exception as e:
+                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
+                timestamp = time.time()
+                self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
+                while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                    self.announce_stream.pop()
+
+                if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
+                    existing_entry = self.find(source_hash)
+                    if not existing_entry:
+                        node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
+                        self.remember(node_entry)
                 
-                except Exception as e:
+                if hasattr(self.app.ui, "main_display"):
-                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+                    self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
-
-            timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "node"))
-            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
-                self.announce_stream.pop()
-
-            if self.trust_level(associated_peer) == DirectoryEntry.TRUSTED:
-                existing_entry = self.find(source_hash)
-                if not existing_entry:
-                    node_entry = DirectoryEntry(source_hash, display_name=app_data.decode("utf-8"), trust_level=DirectoryEntry.TRUSTED, hosts_node=True)
-                    self.remember(node_entry)
-            
-            if hasattr(self.app.ui, "main_display"):
-                self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
 
     def pn_announce_received(self, source_hash, app_data, associated_peer, associated_node):
-        found_node = None
+        with self.announce_lock:
-        for sh in self.directory_entries:
+            found_node = None
-            if sh == associated_node:
+            for sh in self.directory_entries:
-                found_node = True
+                if sh == associated_node:
-                break
+                    found_node = True
+                    break
 
-        for e in self.announce_stream:
+            for e in self.announce_stream:
-            if e[1] == associated_node:
+                if e[1] == associated_node:
-                found_node = True
+                    found_node = True
-                break
+                    break
 
-        if not found_node:
+            if not found_node:
-            if self.app.compact_stream:
+                if self.app.compact_stream:
-                try:
+                    try:
-                    remove_announces = []
+                        remove_announces = []
-                    for announce in self.announce_stream:
+                        for announce in self.announce_stream:
-                        if announce[1] == source_hash:
+                            if announce[1] == source_hash:
-                            remove_announces.append(announce)
+                                remove_announces.append(announce)
 
-                    for a in remove_announces:
+                        for a in remove_announces:
-                        self.announce_stream.remove(a)
+                            self.announce_stream.remove(a)
+                    
+                    except Exception as e:
+                        RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+
+                timestamp = time.time()
+                self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
+                while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
+                    self.announce_stream.pop()
                 
-                except Exception as e:
+                if hasattr(self.app, "ui") and hasattr(self.app.ui, "main_display"):
-                    RNS.log("An error occurred while compacting the announce stream. The contained exception was:"+str(e), RNS.LOG_ERROR)
+                    self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
-
-            timestamp = time.time()
-            self.announce_stream.insert(0, (timestamp, source_hash, app_data, "pn"))
-            while len(self.announce_stream) > Directory.ANNOUNCE_STREAM_MAXLENGTH:
-                self.announce_stream.pop()
-            
-            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
@@ -339,7 +345,7 @@ class Directory:
             if e.hosts_node:
                 node_list.append(e)
 
-        node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name))
+        node_list.sort(key = lambda e: (e.sort_rank if e.sort_rank != None else 2^32, DirectoryEntry.TRUSTED-e.trust_level, e.display_name if e.display_name != None else "_"))
         return node_list
 
     def number_of_known_nodes(self):

nomadnet/Node.py

@@ -61,16 +61,14 @@ class Node:
             self.destination.register_request_handler(
                 "/page/index.mu",
                 response_generator = self.serve_default_index,
-                allow = RNS.Destination.ALLOW_ALL
+                allow = RNS.Destination.ALLOW_ALL)
-            )
 
         for page in self.servedpages:
             request_path = "/page"+page.replace(self.app.pagespath, "")
             self.destination.register_request_handler(
                 request_path,
                 response_generator = self.serve_page,
-                allow = RNS.Destination.ALLOW_ALL
+                allow = RNS.Destination.ALLOW_ALL)
-            )
 
     def register_files(self):
         # TODO: Deregister previously registered files
@@ -83,8 +81,8 @@ class Node:
             self.destination.register_request_handler(
                 request_path,
                 response_generator = self.serve_file,
-                allow = RNS.Destination.ALLOW_ALL
+                allow = RNS.Destination.ALLOW_ALL,
-            )
+                auto_compress = 32_000_000)
 
     def scan_pages(self, base_path):
         files = [file for file in os.listdir(base_path) if os.path.isfile(os.path.join(base_path, file)) and file[:1] != "."]
@@ -205,10 +203,7 @@ class Node:
         file_name = path.replace("/file/", "", 1)
         try:
             RNS.log("Serving file: "+file_path, RNS.LOG_VERBOSE)
-            fh = open(file_path, "rb")
+            return [open(file_path, "rb"), {"name": file_name.encode("utf-8")}]
-            file_data = fh.read()
-            fh.close()
-            return [file_name, file_data]
 
         except Exception as e:
             RNS.log("Error occurred while handling request "+RNS.prettyhexrep(request_id)+" for: "+str(path), RNS.LOG_ERROR)

nomadnet/NomadNetworkApp.py

@@ -19,7 +19,7 @@ from datetime import datetime
 import RNS.vendor.umsgpack as msgpack
 
 from ._version import __version__
-from .vendor.configobj import ConfigObj
+from RNS.vendor.configobj import ConfigObj
 
 class NomadNetworkApp:
     time_format      = "%Y-%m-%d %H:%M:%S"
@@ -290,9 +290,20 @@ class NomadNetworkApp:
 
         self.directory = nomadnet.Directory(self)
 
+        static_peers = []
+        for static_peer in self.static_peers:
+            try:
+                dh = bytes.fromhex(static_peer)
+                if len(dh) != RNS.Reticulum.TRUNCATED_HASHLENGTH//8:
+                    raise ValueError("Invalid destination length")
+                static_peers.append(dh)
+            except Exception as e:
+                RNS.log(f"Could not decode static peer destination hash {static_peer}: {e}", RNS.LOG_ERROR)
+
         self.message_router = LXMF.LXMRouter(
             identity = self.identity, storagepath = self.storagepath, autopeer = True,
             propagation_limit = self.lxmf_max_propagation_size, delivery_limit = self.lxmf_max_incoming_size,
+            max_peers = self.max_peers, static_peers = static_peers,
         )
 
         self.message_router.register_delivery_callback(self.lxmf_delivery)
@@ -526,7 +537,7 @@ class NomadNetworkApp:
             RNS.log("Could not autoselect a propagation node! LXMF propagation will not be available until a trusted node announces on the network, or a propagation node is manually selected.", RNS.LOG_WARNING)
         else:
             pn_name_str = ""
-            RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_INFO)
+            RNS.log("Selecting "+RNS.prettyhexrep(selected_node)+pn_name_str+" as default LXMF propagation node", RNS.LOG_DEBUG)
             self.message_router.set_outbound_propagation_node(selected_node)
 
     def get_user_selected_propagation_node(self):
@@ -920,6 +931,19 @@ class NomadNetworkApp:
             else:
                 self.prioritised_lxmf_destinations = []
 
+            if "static_peers" in self.config["node"]:
+                self.static_peers = self.config["node"].as_list("static_peers")
+            else:
+                self.static_peers = []
+                
+            if not "max_peers" in self.config["node"]:
+                self.max_peers = None
+            else:
+                value = self.config["node"].as_int("max_peers")
+                if value < 0:
+                    value = 0
+                self.max_peers = value
+
             if not "message_storage_limit" in self.config["node"]:
                 self.message_storage_limit = 2000
             else:
@@ -1178,6 +1202,17 @@ max_transfer_size = 256
 # and generally you do not need to use it.
 # prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
 
+# You can configure the maximum number of other
+# propagation nodes that this node will peer
+# with automatically. The default is 50.
+# max_peers = 25
+
+# You can configure a list of static propagation
+# node peers, that this node will always be
+# peered with, by specifying a list of
+# destination hashes.
+# static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4
+
 # You can specify the interval in minutes for
 # rescanning the hosted pages path. By default,
 # this option is disabled, and the pages path

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.5.7"
+__version__ = "0.7.0"

nomadnet/ui/TextUI.py

@@ -51,7 +51,15 @@ THEMES = {
             ("browser_controls",            "light gray", "default",                "default",                  "#bbb", "default"),
             ("progress_full",               "black", "light gray",                  "standout",                 "#111", "#bbb"),
             ("progress_empty",              "light gray", "default",                "default",                  "#ddd", "default"),
-        ],        
+            ("interface_title",             "", "",                                 "default",                  "", ""),
+            ("interface_title_selected",    "bold", "",                             "bold",                     "", ""),
+            ("connected_status",            "dark green", "default",                "default",                  "dark green", "default"),
+            ("disconnected_status",         "dark red", "default",                  "default",                  "dark red", "default"),
+            ("placeholder",                 "dark gray", "default",                 "default",                  "dark gray", "default"),
+            ("placeholder_text",            "dark gray", "default",                 "default",                  "dark gray", "default"),
+            ("error",                       "light red,blink",                      "default", "blink",         "#f44,blink", "default"),
+
+        ],
     },
     THEME_LIGHT: {
         "urwid_theme": [
@@ -69,6 +77,7 @@ THEMES = {
             ("msg_header_ok",               "black", "dark green",                 "standout",                 "#111", "#6b2"),
             ("msg_header_caution",          "black", "yellow",                     "standout",                 "#111", "#fd3"),
             ("msg_header_sent",             "black", "dark gray",                  "standout",                 "#111", "#ddd"),
+            ("msg_header_propagated",       "black", "light blue",                 "standout",                 "#111", "#28b"),
             ("msg_header_delivered",        "black", "light blue",                 "standout",                 "#111", "#28b"),
             ("msg_header_failed",           "black", "dark gray",                  "standout",                 "#000", "#777"),
             ("msg_warning_untrusted",       "black", "dark red",                   "standout",                 "#111", "dark red"),
@@ -86,6 +95,13 @@ THEMES = {
             ("browser_controls",            "dark gray", "default",                "default",                  "#444", "default"),
             ("progress_full",               "black", "dark gray",                  "standout",                 "#111", "#bbb"),
             ("progress_empty",              "dark gray", "default",                "default",                  "#ddd", "default"),
+            ("interface_title",             "dark gray", "default",                "default",                  "#444", "default"),
+            ("interface_title_selected",    "dark gray,bold", "default",           "bold",                     "#444,bold", "default"),
+            ("connected_status",            "dark green", "default",               "default",                  "#4a0", "default"),
+            ("disconnected_status",         "dark red", "default",                 "default",                  "#a22", "default"),
+            ("placeholder",                 "light gray", "default",               "default",                  "#999", "default"),
+            ("placeholder_text",            "light gray", "default",               "default",                  "#999", "default"),
+            ("error",                       "dark red,blink", "default",           "blink",                    "#a22,blink", "default"),
         ],        
     }
 }
@@ -128,6 +144,8 @@ GLYPHS = {
     ("sent",            "/\\",       "\u2191",      "\U000f0cd8"),
     ("papermsg",        "P",         "\u25a4",      "\uf719"),
     ("qrcode",          "QR",        "\u25a4",      "\uf029"),
+    ("selected",        "[*] ",      "\u25CF",      "\u25CF"),
+    ("unselected",      "[ ] ",      "\u25CB",      "\u25CB"),
 }
 
 class TextUI:
@@ -163,7 +181,7 @@ class TextUI:
 
         if self.app.config["textui"]["glyphs"] == "plain":
             glyphset = "plain"
-        elif self.app.config["textui"]["glyphs"] == "unicoode":
+        elif self.app.config["textui"]["glyphs"] == "unicode":
             glyphset = "unicode"
         elif self.app.config["textui"]["glyphs"] == "nerdfont":
             glyphset = "nerdfont"

nomadnet/ui/textui/Browser.py

@@ -1,12 +1,14 @@
 import RNS
 import LXMF
+import io
 import os
 import time
 import urwid
+import shutil
 import nomadnet
 import subprocess
 import threading
-from .MicronParser import markup_to_attrmaps
+from .MicronParser import markup_to_attrmaps, make_style, default_state
 from nomadnet.Directory import DirectoryEntry
 from nomadnet.vendor.Scrollable import *
 
@@ -91,9 +93,14 @@ class Browser:
         self.link = None
         self.loopback = None
         self.status = Browser.DISCONECTED
+        self.progress_updated_at = None
+        self.previous_progress = 0
         self.response_progress = 0
+        self.response_speed = None
         self.response_size = None
         self.response_transfer_size = None
+        self.page_background_color = None
+        self.page_foreground_color = None
         self.saved_file_name = None
         self.page_data = None
         self.displayed_page_data = None
@@ -152,10 +159,16 @@ class Browser:
                 self.browser_footer = self.make_status_widget()
                 self.frame.contents["footer"] = (self.browser_footer, self.frame.options())
                 self.link_status_showing = False
+                if self.page_background_color != None or self.page_foreground_color != None:
+                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                    self.browser_footer.set_attr_map({None: style_name})
         else:
             self.link_status_showing = True
             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())
+            if self.page_background_color != None or self.page_foreground_color != None:
+                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                self.browser_footer.set_attr_map({None: style_name})
 
     def expand_shorthands(self, destination_type):
         if destination_type == "nnn":
@@ -316,7 +329,14 @@ class Browser:
 
     def make_status_widget(self):
         if self.response_progress > 0:
-            pb = ResponseProgressBar("progress_empty" , "progress_full", current=self.response_progress, done=1.0, satt=None)
+            if self.page_background_color != None or self.page_foreground_color != None:
+                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                style_name_inverted = make_style(default_state(bg=self.page_foreground_color, fg=self.page_background_color))
+            else:
+                style_name = "progress_empty"
+                style_name_inverted = "progress_full"
+
+            pb = ResponseProgressBar(style_name , style_name_inverted, current=self.response_progress, done=1.0, satt=None, owner=self)
             widget = urwid.Pile([urwid.Divider(self.g["divider1"]), pb])
         else:
             widget = urwid.Pile([urwid.Divider(self.g["divider1"]), urwid.Text(self.status_text())])
@@ -363,6 +383,10 @@ class Browser:
         else:
             self.display_widget.set_attr_map({None: "body_text"})
             self.browser_header = self.make_control_widget()
+            if self.page_background_color != None or self.page_foreground_color != None:
+                style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                self.browser_header.set_attr_map({None: style_name})
+
             if self.destination_hash != None:
                 remote_display_string = self.app.directory.simplest_display_str(self.destination_hash)
             else:
@@ -376,6 +400,13 @@ class Browser:
             if self.status == Browser.DONE:
                 self.browser_footer = self.make_status_widget()
                 self.update_page_display()
+
+                if self.page_background_color != None or self.page_foreground_color != None:
+                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                    self.browser_body.set_attr_map({None: style_name})
+                    self.browser_footer.set_attr_map({None: style_name})
+                    self.browser_header.set_attr_map({None: style_name})
+                    self.display_widget.set_attr_map({None: style_name})
             
             elif self.status == Browser.LINK_TIMEOUT:
                 self.browser_body = self.make_request_failed_widget()
@@ -389,6 +420,12 @@ class Browser:
                     )
 
                 self.browser_footer = self.make_status_widget()
+
+                if self.page_background_color != None or self.page_foreground_color != None:
+                    style_name = make_style(default_state(fg=self.page_foreground_color, bg=self.page_background_color))
+                    self.browser_footer.set_attr_map({None: style_name})
+                    self.browser_header.set_attr_map({None: style_name})
+                    self.display_widget.set_attr_map({None: style_name})
             
             elif self.status == Browser.REQUEST_FAILED:
                 self.browser_body = self.make_request_failed_widget()
@@ -425,6 +462,9 @@ class Browser:
         self.attr_maps = []
         self.status = Browser.DISCONECTED
         self.response_progress = 0
+        self.response_speed = None
+        self.progress_updated_at = None
+        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
 
@@ -535,6 +575,9 @@ class Browser:
 
             self.status = Browser.DONE
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
             
         except Exception as e:
             RNS.log("An error occurred while handling file response. The contained exception was: "+str(e), RNS.LOG_ERROR)
@@ -584,6 +627,9 @@ class Browser:
             # Send the request
             self.status = Browser.REQUESTING
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
             self.saved_file_name = None
@@ -750,9 +796,29 @@ class Browser:
             self.status = Browser.DONE
             self.page_data = cached
             self.markup = self.page_data.decode("utf-8")
-            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+            
+            self.page_background_color = None
+            bgpos = self.markup.find("#!bg=")
+            if bgpos:
+                endpos = self.markup.find("\n", bgpos)
+                if endpos-(bgpos+5) == 3:
+                    bg = self.markup[bgpos+5:endpos]
+                    self.page_background_color = bg
+
+            self.page_foreground_color = None
+            fgpos = self.markup.find("#!fg=")
+            if fgpos:
+                endpos = self.markup.find("\n", fgpos)
+                if endpos-(fgpos+5) == 3:
+                    fg = self.markup[fgpos+5:endpos]
+                    self.page_foreground_color = fg
+
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
             
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
             self.saved_file_name = None
@@ -797,9 +863,29 @@ class Browser:
                 self.status = Browser.DONE
                 self.page_data = page_data
                 self.markup = self.page_data.decode("utf-8")
-                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+                
+                self.page_background_color = None
+                bgpos = self.markup.find("#!bg=")
+                if bgpos:
+                    endpos = self.markup.find("\n", bgpos)
+                    if endpos-(bgpos+5) == 3:
+                        bg = self.markup[bgpos+5:endpos]
+                        self.page_background_color = bg
+
+                self.page_foreground_color = None
+                fgpos = self.markup.find("#!fg=")
+                if fgpos:
+                    endpos = self.markup.find("\n", fgpos)
+                    if endpos-(fgpos+5) == 3:
+                        fg = self.markup[fgpos+5:endpos]
+                        self.page_foreground_color = fg
+
+                self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
                 
                 self.response_progress = 0
+                self.response_speed = None
+                self.progress_updated_at = None
+                self.previous_progress = 0
                 self.response_size = None
                 self.response_transfer_size = None
                 self.saved_file_name = None
@@ -866,6 +952,9 @@ class Browser:
         # Send the request
         self.status = Browser.REQUESTING
         self.response_progress = 0
+        self.response_speed = None
+        self.progress_updated_at = None
+        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
         self.saved_file_name = None
@@ -911,6 +1000,9 @@ class Browser:
     def link_establishment_timeout(self):
         self.status = Browser.LINK_TIMEOUT
         self.response_progress = 0
+        self.response_speed = None
+        self.progress_updated_at = None
+        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
         self.link = None
@@ -923,8 +1015,28 @@ class Browser:
             self.status = Browser.DONE
             self.page_data = request_receipt.response
             self.markup = self.page_data.decode("utf-8")
-            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self)
+
+            self.page_background_color = None
+            bgpos = self.markup.find("#!bg=")
+            if bgpos:
+                endpos = self.markup.find("\n", bgpos)
+                if endpos-(bgpos+5) == 3:
+                    bg = self.markup[bgpos+5:endpos]
+                    self.page_background_color = bg
+
+            self.page_foreground_color = None
+            fgpos = self.markup.find("#!fg=")
+            if fgpos:
+                endpos = self.markup.find("\n", fgpos)
+                if endpos-(fgpos+5) == 3:
+                    fg = self.markup[fgpos+5:endpos]
+                    self.page_foreground_color = fg
+
+            self.attr_maps = markup_to_attrmaps(self.markup, url_delegate=self, fg_color=self.page_foreground_color, bg_color=self.page_background_color)
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
             self.loaded_from_cache = False
 
             # Simple header handling. Should be expanded when more
@@ -1036,25 +1148,41 @@ class Browser:
 
     def file_received(self, request_receipt):
         try:
-            file_name = request_receipt.response[0]
+            if type(request_receipt.response) == io.BufferedReader:
-            file_data = request_receipt.response[1]
+                if request_receipt.metadata != None:
-            file_destination_name = file_name.split("/")
+                    file_name   = os.path.basename(request_receipt.metadata["name"].decode("utf-8"))
-            file_destination_name = file_destination_name[len(file_destination_name)-1]
+                    file_handle = request_receipt.response
-            file_destination = self.app.downloads_path+"/"+file_destination_name
+                    file_destination = self.app.downloads_path+"/"+file_name
 
-            
+                    counter = 0
-            counter = 0
+                    while os.path.isfile(file_destination):
-            while os.path.isfile(file_destination):
+                        counter += 1
-                counter += 1
+                        file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
-                file_destination = self.app.downloads_path+"/"+file_name+"."+str(counter)
 
-            fh = open(file_destination, "wb")
+                    shutil.move(file_handle.name, file_destination)
-            fh.write(file_data)
-            fh.close()
 
-            self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
+            else:
+                file_name = request_receipt.response[0]
+                file_data = request_receipt.response[1]
+                file_destination_name = os.path.basename(file_name)
+                file_destination = self.app.downloads_path+"/"+file_destination_name
+
+                counter = 0
+                while os.path.isfile(file_destination):
+                    counter += 1
+                    file_destination = self.app.downloads_path+"/"+file_destination_name+"."+str(counter)
+
+                fh = open(file_destination, "wb")
+                fh.write(file_data)
+                fh.close()
+
+                self.saved_file_name = file_destination.replace(self.app.downloads_path+"/", "", 1)
+                    
             self.status = Browser.DONE
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
 
             self.update_display()
         except Exception as e:
@@ -1066,6 +1194,9 @@ class Browser:
             if request_receipt.request_id == self.last_request_id:
                 self.status = Browser.REQUEST_FAILED
                 self.response_progress = 0
+                self.response_speed = None
+                self.progress_updated_at = None
+                self.previous_progress = 0
                 self.response_size = None
                 self.response_transfer_size = None
 
@@ -1078,6 +1209,9 @@ class Browser:
         else:
             self.status = Browser.REQUEST_FAILED
             self.response_progress = 0
+            self.response_speed = None
+            self.progress_updated_at = None
+            self.previous_progress = 0
             self.response_size = None
             self.response_transfer_size = None
 
@@ -1092,6 +1226,9 @@ class Browser:
     def request_timeout(self, request_receipt=None):
         self.status = Browser.REQUEST_TIMEOUT
         self.response_progress = 0
+        self.response_speed = None
+        self.progress_updated_at = None
+        self.previous_progress = 0
         self.response_size = None
         self.response_transfer_size = None
 
@@ -1108,6 +1245,17 @@ class Browser:
         self.response_time          = request_receipt.get_response_time()
         self.response_size          = request_receipt.response_size
         self.response_transfer_size = request_receipt.response_transfer_size
+        
+        now = time.time()
+        if self.progress_updated_at == None: self.progress_updated_at = now
+        if now > self.progress_updated_at+1:
+            td = now - self.progress_updated_at
+            pd = self.response_progress - self.previous_progress
+            bd = pd*self.response_size
+            self.response_speed = (bd/td)*8
+            self.previous_progress = self.response_progress
+            self.progress_updated_at = now
+
         self.update_display()
 
 
@@ -1158,8 +1306,14 @@ class Browser:
 
 
 class ResponseProgressBar(urwid.ProgressBar):
+    def __init__(self, empty, full, current=None, done=None, satt=None, owner=None):
+        super().__init__(empty, full, current=current, done=done, satt=satt)
+        self.owner = owner
+
     def get_text(self):
-        return "Receiving response "+super().get_text()
+        if self.owner.response_speed: speed_str = " "+RNS.prettyspeed(self.owner.response_speed)
+        else: speed_str = ""
+        return "Receiving response "+super().get_text().replace(" %", "%")+speed_str
 
 # A convenience function for printing a human-
 # readable file size

nomadnet/ui/textui/Guide.py

@@ -109,6 +109,7 @@ class TopicList(urwid.WidgetWrap):
         self.topic_list = [
             GuideEntry(self.app, self, guide_display, "Introduction"),
             GuideEntry(self.app, self, guide_display, "Concepts & Terminology"),
+            GuideEntry(self.app, self, guide_display, "Interfaces"),
             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"),
@@ -386,6 +387,225 @@ Links can be inserted into micron documents. See the `*Markup`* section of this
 
 '''
 
+TOPIC_INTERFACES   = '''>Interfaces
+
+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.
+
+The `![ Interfaces ]`! section of NomadNet lets you add, monitor, and update interfaces configured for your Reticulum instance.
+
+If you are starting NomadNet for the first time you will find that an `!AutoInterface`! has been added by default. This interface will try to use your available network device to communicate with other peers discovered on your local network. 
+
+Interfaces come in many different types and can interact with physical mediums like LoRa radios or standard IP networks. 
+
+>>Viewing Interfaces
+
+To view more info about an interface, navigate using the `!Up`! and `!Down`! arrow keys or by clicking with the mouse. Pressing `! < Enter >`! on a selected interface will bring you to a detailed interface view, which will show configuration parameters and realtime charts. From here you can also disable or edit the interface. To change the orientation of the TX/RX charts, press `!< V >`! for a vertical layout, and `!< H >`! for a horizontal view. 
+
+>>Updating Interfaces
+
+To edit an interface, select the interface and press `!< Ctrl + E >`!. 
+
+To remove an interface, select the interface and press `!< Ctrl + X >`!. You can also perform both of these actions  from the details view.
+
+>>Adding Interfaces
+
+To add a new interface, press `!< Ctrl + A >`!. From here you can select which type of interface you want to add. Each unique interface type will have different configuration options. 
+
+`Ffff`! (!) Note:`! After adding or modifying interfaces, you will need to restart NomadNet or your Reticulum instance for changes to take effect.`f`b
+
+
+>Interface Types
+
+>>AutoInterface
+
+The Auto Interface enables communication with other discoverable Reticulum nodes over autoconfigured IPv6 and UDP. It does not need any functional IP infrastructure like routers or DHCP servers, but will require at least some sort of switching medium between peers (a wired switch, a hub, a WiFi access point or similar).
+
+```
+Required Parameters:
+Interface Name
+
+Optional Parameters:
+Devices: Specific network devices to use
+Ignored Devices: Network devices to exclude
+Group ID: Create isolated networks on the same physical LAN
+Discovery Scope: Can set to link, admin, site, organisation or global
+```
+
+The AutoInterface is ideal for quickly connecting to other Reticulum nodes on your local network without complex configuration.
+
+>>TCPClientInterface
+
+The TCP Client interface connects to remote TCP server interfaces, enabling communication over the Internet or private networks.
+
+```
+Required Parameters:
+Target Host: Hostname or IP address of the server
+Target Port: Port number to connect to
+
+Optional Parameters:
+I2P Tunneled: Enable for connecting through I2P
+KISS Framing: Enable for KISS framing for software modems 
+```
+
+This interface is commonly used to connect to Reticulum testnets or other persistent nodes on the Internet.
+
+>>TCPServerInterface
+
+The TCP Server interface listens for incoming connections, allowing other Reticulum peers to connect to your node using TCPClientInterface. 
+
+```
+Required Parameters:
+Listen IP: IP address to bind to (0.0.0.0 for all interfaces)
+Listen Port: Port number to listen on
+
+Optional Parameters:
+Prefer IPv6: Bind to IPv6 address if available
+I2P Tunneled: Enable for I2P tunnel support
+Device: Specific network device to use (e,g
+```
+
+Useful when you want other nodes to be able to connect to your Transport instance over TCP/IP.
+
+>>UDPInterface
+
+The UDP interface allows communication over IP networks using UDP packets.
+
+```
+Required Parameters:
+Listen IP: IP address to bind to
+Listen Port: Port to listen on
+Forward IP: IP address to forward to (Can be broadcast address)
+Forward Port: Port to forward to
+
+Optional Parameters:
+Device: Specific network device to use
+```
+
+>>I2PInterface
+
+The I2P interface enables connections over the Invisible Internet Protocol. The I2PInterface requires an I2P daemon to be running on your system, such as `!i2pd`!
+
+```
+Optional Parameters:
+Peers: I2P addresses to connect to (Can be left as none if running as a Transport)
+```
+
+
+>>RNodeInterface
+
+The RNode interface allows using LoRa transceivers running RNode firmware as Reticulum network interfaces.
+
+```
+Required Parameters:
+Port: Serial port or BLE device path
+Frequency: Operating frequency in MHz
+Bandwidth: Channel bandwidth 
+TX Power: Transmit power in dBm
+Spreading Factor: LoRa spreading factor (7-12)
+Coding Rate: LoRa coding rate (4:5-4:8)
+
+Optional Parameters:
+ID Callsign: Station identification
+ID Interval: Identification interval in seconds
+Airtime Limits: Control duty cycle
+```
+
+The interface includes a parameter calculator to estimate link budget, sensitivity, and data rate on the air based on your settings. 
+
+>>RNodeMultiInterface
+
+The RNode Multi Interface is designed for use with specific hardware platforms that support multiple subinterfaces or virtual radios. For most LoRa hardware platforms, you will want to use the standard `!RNodeInterface`! instead.
+
+```
+Required Parameters:
+Port: Serial port or BLE device path
+Subinterfaces: Configuration for each subinterface / virtual radio port
+
+```
+
+>>SerialInterface
+
+The Serial interface enables using direct serial connections as Reticulum interfaces.
+
+```
+Required Parameters:
+Port: Serial port path
+Speed: Baud rate of serial device
+Databits: Number of data bits
+Parity: Parity setting
+Stopbits: Number of stop bits
+```
+
+>>KISSInterface
+
+The KISS interface supports packet radio modems and TNCs using the KISS protocol.
+
+```
+Required Parameters:
+
+Port: Serial port path
+Speed: Baud rate of serial device 
+Databits: Number of data bits
+Parity: Parity setting
+Stopbits: Number of stop bits
+Preamble: Modem preamble in milliseconds
+TX Tail: Transmit tail in milliseconds
+Slottime: CSMA slottime in milliseconds
+Persistence: CSMA persistence value
+
+Optional Parameters:
+
+ID Callsign: Station identification
+ID Interval: Identification interval in seconds
+Flow Control: Enable packet flow control
+```
+
+>>PipeInterface
+
+The Pipe interface allows using external programs as Reticulum interfaces via stdin and stdout.
+
+```
+Required Parameters:
+
+Command: External command to execute
+
+Optional Parameters:
+Respawn Delay: Seconds to wait before restarting after failure
+```
+
+<
+>>
+-∿
+  For more information and to view the full Interface documentation consult the Reticulum   manual or visit  https://reticulum.network/manual/interfaces.html (Requires external Internet connection)
+
+
+>Interface Access Code (IFAC) Settings
+
+Interface Access Codes create private networks and securely segment network traffic. Under `!Show more options`!, you'll find these IFAC settings:
+
+`!Virtual Network Name`! (network_name):
+When added, creates a logical network that only communicates with other interfaces using the same name. This allows multiple separate Reticulum networks to exist on the same physical channel or medium.
+
+`!IFAC Passphrase`! (passphrase):
+Sets an authentication passphrase for the interface. Only interfaces configured with the same passphrase will be able to communicate. Can be used with or without a network name.
+
+`!IFAC Size`! (ifac_size):
+Controls the length of Interface Authentication Codes (8-512 bits). Larger sizes provide stronger security but add overhead to each packet. The default of `!8`! is usually appropriate for most uses.
+
+>Interface Modes
+
+When running a Transport node, you can configure interface modes that affect how Reticulum selects paths, propagates announces, and discovers routes:
+
+`!full`!: Default mode with all discovery, meshing and transport functionality
+`!gateway`!: Discovers paths on behalf of other nodes
+`!access_point`!: Operates as a network access point
+`!roaming`!: For physically mobile interfaces
+`!boundary`!: For interfaces connecting different network segments
+
+'''
+
 TOPIC_CONVERSATIONS = '''>Conversations
 
 Conversations in Nomad Network
@@ -666,9 +886,9 @@ Determines the interval in minutes for rescanning the hosted files path. By defa
 <
 
 >>>
-`!disable_propagation = no`!
+`!disable_propagation = yes`!
 >>>>
-By default, when Nomad Network is hosting a node, it will also run an LXMF propagation node. If there is already a large amount of propagation nodes on the network, or you simply want to run a pageserving-only node, you can disable running a propagation node.
+When Nomad Network is hosting a node, it can also run an LXMF propagation node. If there is already a large amount of propagation nodes on the network, or you simply want to run a pageserving-only node, you can disable running a propagation node.
 <
 
 >>>
@@ -689,6 +909,18 @@ The maximum accepted transfer size per incoming propagation transfer, in kilobyt
 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.
 <
 
+>>>
+`!max_peers = 25`!
+>>>>
+Configures the maximum number of other nodes the LXMF Propagation Node will automatically peer with. The default is 50, but can be lowered or increased according to available resources.
+<
+
+>>>
+`!static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4`!
+>>>>
+Configures the LXMF Propagation Node to always maintain propagation node peering with the specified list of destination hashes.
+<
+
 >> 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:
@@ -1036,6 +1268,9 @@ You can use `B5d5`F222 color `f`B333 `Ff00f`Ff80o`Ffd0r`F9f0m`F0f2a`F0fdt`F07ft`
 
 ``
 
+>Page Foreground and Background Colors
+
+To specify a background color for the entire page, place the `!#!bg=X`! header on one of the first lines of your page, where `!X`! is the color you want to use, for example `!444`!. If you're also using the cache control header, the background specifier must come `*after`* the cache control header. Likewise, you can specify the default text color by using the `!#!fg=X`! header.
 
 >Links
 
@@ -1153,6 +1388,7 @@ A masked input field: `B444`<!|masked_demo`hidden text>`B333
 
 Full control: `B444`<!32|all_options`hidden text>`B333
 `b
+
 >>> Checkboxes
 
 In addition to text fields, Checkboxes are another way of submitting data. They allow the user to make a single selection or select multiple options. 
@@ -1235,6 +1471,7 @@ TOPICS = {
     "Introduction": TOPIC_INTRODUCTION,
     "Concepts & Terminology": TOPIC_CONCEPTS,
     "Conversations": TOPIC_CONVERSATIONS,
+    "Interfaces": TOPIC_INTERFACES,
     "Hosting a Node": TOPIC_HOSTING,
     "Configuration Options": TOPIC_CONFIG,
     "Keyboard Shortcuts": TOPIC_SHORTCUTS,

nomadnet/ui/textui/Main.py

@@ -4,6 +4,7 @@ from .Network import *
 from .Conversations import *
 from .Directory import *
 from .Config import *
+from .Interfaces import *
 from .Map import *
 from .Log import *
 from .Guide import *
@@ -16,6 +17,7 @@ class SubDisplays():
         self.conversations_display = ConversationsDisplay(self.app)
         self.directory_display = DirectoryDisplay(self.app)
         self.config_display = ConfigDisplay(self.app)
+        self.interface_display = InterfaceDisplay(self.app)
         self.map_display = MapDisplay(self.app)
         self.log_display = LogDisplay(self.app)
         self.guide_display = GuideDisplay(self.app)
@@ -113,6 +115,11 @@ class MainDisplay():
         self.sub_displays.active_display = self.sub_displays.config_display
         self.update_active_sub_display()
 
+    def show_interfaces(self, user_data):
+        self.sub_displays.active_display = self.sub_displays.interface_display
+        self.update_active_sub_display()
+        self.sub_displays.interface_display.start()
+
     def show_log(self, user_data):
         self.sub_displays.active_display = self.sub_displays.log_display
         self.sub_displays.log_display.show()
@@ -171,21 +178,22 @@ class MenuDisplay():
 
         self.menu_indicator  = urwid.Text("")
 
-        menu_text            = (urwid.PACK, self.menu_indicator)
+        menu_text             = (urwid.PACK, self.menu_indicator)
-        button_network       = (11, MenuButton("Network", on_press=handler.show_network))
+        button_network        = (11, MenuButton("Network", on_press=handler.show_network))
-        button_conversations = (17, MenuButton("Conversations", on_press=handler.show_conversations))
+        button_conversations  = (17, MenuButton("Conversations", on_press=handler.show_conversations))
-        button_directory     = (13, MenuButton("Directory", on_press=handler.show_directory))
+        button_directory      = (13, MenuButton("Directory", on_press=handler.show_directory))
-        button_map           = (7,  MenuButton("Map", on_press=handler.show_map))
+        button_map            = (7,  MenuButton("Map", on_press=handler.show_map))
-        button_log           = (7,  MenuButton("Log", on_press=handler.show_log))
+        button_log            = (7,  MenuButton("Log", on_press=handler.show_log))
-        button_config        = (10, MenuButton("Config", on_press=handler.show_config))
+        button_config         = (10, MenuButton("Config", on_press=handler.show_config))
-        button_guide         = (9,  MenuButton("Guide", on_press=handler.show_guide))
+        button_interfaces     = (14, MenuButton("Interfaces", on_press=handler.show_interfaces))
-        button_quit          = (8,  MenuButton("Quit", on_press=handler.quit))
+        button_guide          = (9,  MenuButton("Guide", on_press=handler.show_guide))
+        button_quit           = (8,  MenuButton("Quit", on_press=handler.quit))
 
         # buttons = [menu_text, button_conversations, button_node, button_directory, button_map]
         if self.app.config["textui"]["hide_guide"]:
-            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_quit]
+            buttons = [menu_text, button_conversations, button_network, button_log, button_interfaces, button_config, button_quit]
         else:
-            buttons = [menu_text, button_conversations, button_network, button_log, button_config, button_guide, button_quit]
+            buttons = [menu_text, button_conversations, button_network, button_log, button_interfaces, button_config, button_guide, button_quit]
 
         columns = MenuColumns(buttons, dividechars=1)
         columns.handler = handler

nomadnet/ui/textui/MicronParser.py

@@ -31,20 +31,14 @@ SYNTH_SPECS  = {}
 SECTION_INDENT = 2
 INDENT_RIGHT   = 1
 
-def markup_to_attrmaps(markup, url_delegate = None):
+def default_state(fg=None, bg=None):
-    global SELECTED_STYLES
+    if fg == None: fg = SELECTED_STYLES["plain"]["fg"]
-    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
+    if bg == None: bg = DEFAULT_BG
-        SELECTED_STYLES = STYLES_DARK
-    else:
-        SELECTED_STYLES = STYLES_LIGHT
-
-    attrmaps = []
-
     state = {
         "literal": False,
         "depth": 0,
-        "fg_color": SELECTED_STYLES["plain"]["fg"],
+        "fg_color": fg,
-        "bg_color": DEFAULT_BG,
+        "bg_color": bg,
         "formatting": {
             "bold": False,
             "underline": False,
@@ -54,7 +48,25 @@ def markup_to_attrmaps(markup, url_delegate = None):
         },
         "default_align": "left",
         "align": "left",
+        "default_fg": fg,
+        "default_bg": bg,
     }
+    return state
+
+def markup_to_attrmaps(markup, url_delegate = None, fg_color=None, bg_color=None):
+    global SELECTED_STYLES
+    if nomadnet.NomadNetworkApp.get_shared_instance().config["textui"]["theme"] == nomadnet.ui.TextUI.THEME_DARK:
+        SELECTED_STYLES = STYLES_DARK
+    else:
+        SELECTED_STYLES = STYLES_LIGHT
+
+    attrmaps = []
+
+    fgc = None; bgc = DEFAULT_BG
+    if bg_color != None: bgc = bg_color
+    if fg_color != None: fgc = fg_color
+
+    state = default_state(fgc, bgc)
 
     # Split entire document into lines for
     # processing.
@@ -73,8 +85,8 @@ def markup_to_attrmaps(markup, url_delegate = None):
 
     return attrmaps
 
-
 def parse_line(line, state, url_delegate):
+    pre_escape = False
     if len(line) > 0:
         first_char = line[0]
 
@@ -88,6 +100,7 @@ def parse_line(line, state, url_delegate):
             # Check if the command is an escape
             if first_char == "\\":
                 line = line[1:]
+                pre_escape = True
 
             # Check for comments
             elif first_char == "#":
@@ -142,7 +155,7 @@ def parse_line(line, state, url_delegate):
                 else:
                     return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))]
 
-        output = make_output(state, line, url_delegate)
+        output = make_output(state, line, url_delegate, pre_escape)
 
         if output != None:
             text_only = True
@@ -425,7 +438,7 @@ def make_style(state):
 
     return name
 
-def make_output(state, line, url_delegate):
+def make_output(state, line, url_delegate, pre_escape=False):
     output = []
     if state["literal"]:
         if line == "\\`=":
@@ -434,8 +447,9 @@ def make_output(state, line, url_delegate):
     else:
         part = ""
         mode = "text"
-        escape = False
+        escape = pre_escape
         skip = 0
+
         for i in range(0, len(line)):
             c = line[i]
             if skip > 0:
@@ -454,20 +468,20 @@ def make_output(state, line, url_delegate):
                             state["fg_color"] = color
                             skip = 3
                     elif c == "f":
-                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
+                        state["fg_color"] = state["default_fg"]
                     elif c == "B":
                         if len(line) >= i+4:
                             color = line[i+1:i+4]
                             state["bg_color"] = color
                             skip = 3
                     elif c == "b":
-                        state["bg_color"] = DEFAULT_BG
+                        state["bg_color"] = state["default_bg"]
                     elif c == "`":
                         state["formatting"]["bold"]      = False 
                         state["formatting"]["underline"] = False
                         state["formatting"]["italic"]    = False
-                        state["fg_color"] = SELECTED_STYLES["plain"]["fg"]
+                        state["fg_color"] = state["default_fg"]
-                        state["bg_color"] = DEFAULT_BG
+                        state["bg_color"] = state["default_bg"]
                         state["align"] = state["default_align"]
                     elif c == "c":
                         if state["align"] != "center":
@@ -666,6 +680,7 @@ def make_output(state, line, url_delegate):
                                 part = ""
                     else:
                         part += c
+                        escape = False
 
             if i == len(line)-1:
                 if len(part) > 0:

nomadnet/ui/textui/Network.py

@@ -141,7 +141,7 @@ class AnnounceInfo(urwid.WidgetWrap):
             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
 
@@ -162,7 +162,7 @@ class AnnounceInfo(urwid.WidgetWrap):
             show_announce_stream(None)
             try:
                 existing_conversations = nomadnet.Conversation.conversation_list(self.app)
-                
+
                 source_hash_text = RNS.hexrep(source_hash, delimit=False)
                 display_name = data_str
 
@@ -316,7 +316,7 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
         info_widget = AnnounceInfo(announce, parent, self.app)
         options = parent.left_pile.options(height_type=urwid.WEIGHT, height_amount=1)
         parent.left_pile.contents[0] = (info_widget, options)
-      
+
       except KeyError as e:
         def dismiss_dialog(sender):
             self.delegate.parent.close_list_dialogs()
@@ -368,6 +368,10 @@ class AnnounceStreamEntry(urwid.WidgetWrap):
     def timestamp(self):
         return self.timestamp
 
+class TabButton(urwid.Button):
+    button_left = urwid.Text("[")
+    button_right = urwid.Text("]")
+
 class AnnounceStream(urwid.WidgetWrap):
     def __init__(self, app, parent):
         self.app = app
@@ -376,11 +380,24 @@ class AnnounceStream(urwid.WidgetWrap):
         self.timeout = self.app.config["textui"]["animation_interval"]*2
         self.ilb = None
         self.no_content = True
-        
+        self.current_tab = "nodes"
+
         self.added_entries = []
         self.widget_list = []
         self.update_widget_list()
 
+        # Create tab buttons
+        self.tab_nodes = TabButton("Nodes", on_press=self.show_nodes_tab)
+        self.tab_peers = TabButton("Peers", on_press=self.show_peers_tab)
+        self.tab_pn = TabButton("Propagation Nodes", on_press=self.show_pn_tab)
+
+        # Create tab bar with proportional widths
+        self.tab_bar = urwid.Columns([
+            ('weight', 1, self.tab_nodes),
+            ('weight', 1, self.tab_peers),
+            ('weight', 3, self.tab_pn),
+        ], dividechars=1)  # Add 1 character spacing between tabs
+
         self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.list_selection,
@@ -389,7 +406,13 @@ class AnnounceStream(urwid.WidgetWrap):
             #highlight_offFocus="list_off_focus"
         )
 
-        self.display_widget = self.ilb
+        # Combine tab bar and list box
+        self.pile = urwid.Pile([
+            ('pack', self.tab_bar),
+            ('weight', 1, self.ilb),
+        ])
+
+        self.display_widget = self.pile
         super().__init__(urwid.LineBox(self.display_widget, title="Announce Stream"))
 
     def keypress(self, size, key):
@@ -397,7 +420,7 @@ class AnnounceStream(urwid.WidgetWrap):
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
         elif key == "ctrl x":
             self.delete_selected_entry()
-            
+
         return super(AnnounceStream, self).keypress(size, key)
 
     def delete_selected_entry(self):
@@ -412,28 +435,45 @@ class AnnounceStream(urwid.WidgetWrap):
         self.update_widget_list()
 
     def update_widget_list(self):
+        self.widget_list = []
         new_entries = []
+
         for e in self.app.directory.announce_stream:
-            if not e[0] in self.added_entries:
+            announce_type = e[3]
-                self.added_entries.insert(0, e[0])
+
-                new_entries.insert(0, e)
+            # Filter based on current tab
+            if self.current_tab == "nodes" and (announce_type == "node" or announce_type == True):
+                new_entries.append(e)
+            elif self.current_tab == "peers" and (announce_type == "peer" or announce_type == False):
+                new_entries.append(e)
+            elif self.current_tab == "pn" and announce_type == "pn":
+                new_entries.append(e)
 
         for e in new_entries:
             nw = AnnounceStreamEntry(self.app, e, self)
             nw.timestamp = e[0]
-            self.widget_list.insert(0, nw)
+            self.widget_list.append(nw)
 
         if len(new_entries) > 0:
             self.no_content = False
-            if self.ilb != None:
-                self.ilb.set_body(self.widget_list)
         else:
-            if len(self.widget_list) == 0:
+            self.no_content = True
-                self.no_content = True
+            self.widget_list = [urwid.Text(f"No {self.current_tab} announces", align='center')]
-            
-            if self.ilb != None:
-                self.ilb.set_body(self.widget_list)
 
+        if self.ilb:
+            self.ilb.set_body(self.widget_list)
+
+    def show_nodes_tab(self, button):
+        self.current_tab = "nodes"
+        self.update_widget_list()
+
+    def show_peers_tab(self, button):
+        self.current_tab = "peers"
+        self.update_widget_list()
+
+    def show_pn_tab(self, button):
+        self.current_tab = "pn"
+        self.update_widget_list()
 
     def list_selection(self, arg1, arg2):
         pass
@@ -596,7 +636,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
             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
 
@@ -632,7 +672,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
             trust_level = DirectoryEntry.UNTRUSTED
             if r_unknown.get_state() == True:
                 trust_level = DirectoryEntry.UNKNOWN
-            
+
             if r_trusted.get_state() == True:
                 trust_level = DirectoryEntry.TRUSTED
 
@@ -699,7 +739,7 @@ class KnownNodeInfo(urwid.WidgetWrap):
         pile_widgets.insert(4, operator_entry)
 
         pile = urwid.Pile(pile_widgets)
-        
+
         pile.focus_position = len(pile.contents)-1
         button_columns.focus_position = 0
 
@@ -733,7 +773,7 @@ class KnownNodes(urwid.WidgetWrap):
         g = self.app.ui.glyphs
 
         self.widget_list = self.make_node_widgets()
-        
+
         self.ilb = ExceptionHandlingListBox(
             self.widget_list,
             on_selection_change=self.node_list_selection,
@@ -767,7 +807,7 @@ class KnownNodes(urwid.WidgetWrap):
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
         elif key == "ctrl x":
             self.delete_selected_entry()
-            
+
         return super(KnownNodes, self).keypress(size, key)
 
 
@@ -910,7 +950,7 @@ class NodeEntry(urwid.WidgetWrap):
             focus_style   = "list_focus_untrusted"
 
         type_symbol = g["node"]
-        
+
         widget = ListEntry(type_symbol+" "+display_str)
         urwid.connect_signal(widget, "click", delegate.connect_node, node)
 
@@ -1209,7 +1249,7 @@ class LocalPeer(urwid.WidgetWrap):
 
             #overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=urwid.RELATIVE_100, valign=urwid.MIDDLE, height=urwid.PACK, left=4, right=4)
             overlay = dialog
-            
+
             self.dialog_open = True
             options = self.parent.left_pile.options(height_type=urwid.PACK, height_amount=None)
             self.parent.left_pile.contents[1] = (overlay, options)
@@ -1226,7 +1266,7 @@ class LocalPeer(urwid.WidgetWrap):
             self.t_last_announce.update_time()
 
         announce_button = urwid.Button("Announce Now", on_press=announce_query)
-        
+
         self.display_widget = urwid.Pile(
             [
                 t_id,
@@ -1270,13 +1310,13 @@ class NodeInfo(urwid.WidgetWrap):
         def show_peer_info(sender):
             options = self.parent.left_pile.options(height_type=urwid.PACK, height_amount=None)
             self.parent.left_pile.contents[1] = (LocalPeer(self.app, self.parent), options)
-        
+
         if self.app.enable_node:
             if self.app.node != None:
                 display_name = self.app.node.name
             else:
                 display_name = None
-        
+
             if display_name == None:
                 display_name = ""
 
@@ -1308,7 +1348,7 @@ class NodeInfo(urwid.WidgetWrap):
 
                 #overlay = urwid.Overlay(dialog, bottom, align=urwid.CENTER, width=urwid.RELATIVE_100, valign=urwid.MIDDLE, height=urwid.PACK, left=4, right=4)
                 overlay = dialog
-                
+
                 self.dialog_open = True
                 options = self.parent.left_pile.options(height_type=urwid.PACK, height_amount=None)
                 self.parent.left_pile.contents[1] = (overlay, options)
@@ -1596,12 +1636,12 @@ class NetworkDisplay():
             selected_node_entry = parent.known_nodes_display.ilb.get_selected_item()
             if selected_node_entry is not None:
                 selected_node_hash = selected_node_entry.base_widget.display_widget.source_hash
-                
+
                 if selected_node_hash is not None:
                     info_widget = KnownNodeInfo(selected_node_hash)
                     options = parent.left_pile.options(height_type=urwid.WEIGHT, height_amount=1)
                     parent.left_pile.contents[0] = (info_widget, options)
-    
+
     def focus_lists(self):
         self.columns.focus_position = 0
 
@@ -1612,9 +1652,15 @@ class NetworkDisplay():
         self.announce_stream_display.rebuild_widget_list()
 
     def reinit_lxmf_peers(self):
+        if self.lxmf_peers_display:
+            si = self.lxmf_peers_display.ilb.get_selected_position()
+        else:
+            si = None
         self.lxmf_peers_display = LXMFPeers(self.app)
         self.lxmf_peers_display.delegate = self
         self.close_list_dialogs()
+        if si != None:
+            self.lxmf_peers_display.ilb.select_item(si)
 
     def close_list_dialogs(self):
         if self.list_display == 0:
@@ -1683,7 +1729,7 @@ class LXMFPeers(urwid.WidgetWrap):
             self.delete_selected_entry()
         elif key == "ctrl r":
             self.sync_selected_entry()
-            
+
         return super(LXMFPeers, self).keypress(size, key)
 
 
@@ -1707,7 +1753,7 @@ class LXMFPeers(urwid.WidgetWrap):
                 peer = self.app.message_router.peers[destination_hash]
                 if time.time() > peer.last_sync_attempt+sync_grace:
                     peer.next_sync_attempt = time.time()-1
-                    
+
                     def job():
                         peer.sync()
                     threading.Thread(target=job, daemon=True).start()
@@ -1753,7 +1799,7 @@ class LXMFPeers(urwid.WidgetWrap):
 
     def make_peer_widgets(self):
         widget_list = []
-        sorted_peers = sorted(self.peer_list, key=lambda pid: (self.app.directory.pn_trust_level(pid), self.peer_list[pid].link_establishment_rate), reverse=True)
+        sorted_peers = sorted(self.peer_list, key=lambda pid: (self.app.directory.pn_trust_level(pid), self.peer_list[pid].sync_transfer_rate), reverse=True)
         for peer_id in sorted_peers:
             peer = self.peer_list[peer_id]
             trust_level = self.app.directory.pn_trust_level(peer_id)
@@ -1772,7 +1818,7 @@ class LXMFPeerEntry(urwid.WidgetWrap):
 
         node_identity = RNS.Identity.recall(destination_hash)
         display_str = RNS.prettyhexrep(destination_hash)
-        if node_identity != None:            
+        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:
@@ -1801,10 +1847,11 @@ class LXMFPeerEntry(urwid.WidgetWrap):
             txfer_limit = RNS.prettysize(peer.propagation_transfer_limit*1000)
         else:
             txfer_limit = "No"
+        ar = round(peer.acceptance_rate*100, 2)
         peer_info_str  = sym+" "+display_str+"\n  "+alive_string+", last heard "+pretty_date(int(peer.last_heard))
-        peer_info_str += "\n  "+str(len(peer.unhandled_messages))+f" unhandled LXMs, {txfer_limit} sync limit\n"
+        peer_info_str += "\n  "+str(peer.unhandled_message_count)+f" unhandled LXMs, {txfer_limit} sync limit\n"
         peer_info_str += f"  {RNS.prettyspeed(peer.sync_transfer_rate)} STR, "
-        peer_info_str += f"{RNS.prettyspeed(peer.link_establishment_rate)} LER\n"
+        peer_info_str += f"{RNS.prettyspeed(peer.link_establishment_rate)} LER, {ar}% AR\n"
         widget = ListEntry(peer_info_str)
         self.display_widget = urwid.AttrMap(widget, style, focus_style)
         self.display_widget.destination_hash = destination_hash

nomadnet/vendor/AsciiChart.py

@@ -0,0 +1,91 @@
+from __future__ import division
+from math import ceil, floor, isnan
+# Derived from asciichartpy |  https://github.com/kroitor/asciichart/blob/master/asciichartpy/__init__.py
+class AsciiChart:
+    def __init__(self, glyphset="unicode"):
+        self.symbols = ['┼', '┤', '╶', '╴', '─', '╰', '╭', '╮', '╯', '│']
+        if glyphset == "plain":
+            self.symbols = ['+', '|', '-', '-', '-', '\'', ',', '.', '`', '|']
+    def plot(self, series, cfg=None):
+        if len(series) == 0:
+            return ''
+        if not isinstance(series[0], list):
+            if all(isnan(n) for n in series):
+                return ''
+            else:
+                series = [series]
+        cfg = cfg or {}
+        minimum = cfg.get('min', min(filter(lambda n: not isnan(n), [j for i in series for j in i])))
+        maximum = cfg.get('max', max(filter(lambda n: not isnan(n), [j for i in series for j in i])))
+        symbols = cfg.get('symbols', self.symbols)
+        if minimum > maximum:
+            raise ValueError('The min value cannot exceed the max value.')
+        interval = maximum - minimum
+        offset = cfg.get('offset', 3)
+        height = cfg.get('height', interval)
+        ratio = height / interval if interval > 0 else 1
+
+        min2 = int(floor(minimum * ratio))
+        max2 = int(ceil(maximum * ratio))
+
+        def clamp(n):
+            return min(max(n, minimum), maximum)
+
+        def scaled(y):
+            return int(round(clamp(y) * ratio) - min2)
+
+        rows = max2 - min2
+
+        width = 0
+        for i in range(0, len(series)):
+            width = max(width, len(series[i]))
+        width += offset
+
+        placeholder = cfg.get('format', '{:8.2f} ')
+
+        result = [[' '] * width for i in range(rows + 1)]
+
+        for y in range(min2, max2 + 1):
+            if callable(placeholder):
+                label = placeholder(maximum - ((y - min2) * interval / (rows if rows else 1))).rjust(12)
+            else:
+                label = placeholder.format(maximum - ((y - min2) * interval / (rows if rows else 1)))
+
+            result[y - min2][max(offset - len(label), 0)] = label
+            result[y - min2][offset - 1] = symbols[0] if y == 0 else symbols[1]
+
+        d0 = series[0][0]
+        if not isnan(d0):
+            result[rows - scaled(d0)][offset - 1] = symbols[0]
+
+        for i in range(0, len(series)):
+            for x in range(0, len(series[i]) - 1):
+                d0 = series[i][x + 0]
+                d1 = series[i][x + 1]
+
+                if isnan(d0) and isnan(d1):
+                    continue
+
+                if isnan(d0) and not isnan(d1):
+                    result[rows - scaled(d1)][x + offset] = symbols[2]
+                    continue
+
+                if not isnan(d0) and isnan(d1):
+                    result[rows - scaled(d0)][x + offset] = symbols[3]
+                    continue
+
+                y0 = scaled(d0)
+                y1 = scaled(d1)
+                if y0 == y1:
+                    result[rows - y0][x + offset] = symbols[4]
+                    continue
+
+                result[rows - y1][x + offset] = symbols[5] if y0 > y1 else symbols[6]
+                result[rows - y0][x + offset] = symbols[7] if y0 > y1 else symbols[8]
+
+                start = min(y0, y1) + 1
+                end = max(y0, y1)
+                for y in range(start, end):
+                    result[rows - y][x + offset] = symbols[9]
+
+        return '\n'.join([''.join(row).rstrip() for row in result])

nomadnet/vendor/Scrollable.py

@@ -50,7 +50,7 @@ class Scrollable(urwid.WidgetDecoration):
         self._old_cursor_coords = None
         self._rows_max_cached = 0
         self.force_forward_keypress = force_forward_keypress
-        self.__super.__init__(widget)
+        super().__init__(widget)
 
     def render(self, size, focus=False):
         maxcol, maxrow = size
@@ -340,7 +340,7 @@ class ScrollBar(urwid.WidgetDecoration):
         """
         if BOX not in widget.sizing():
             raise ValueError('Not a box widget: %r' % widget)
-        self.__super.__init__(widget)
+        super().__init__(widget)
         self._thumb_char = thumb_char
         self._trough_char = trough_char
         self.scrollbar_side = side

nomadnet/vendor/additional_urwid_widgets/FormWidgets.py

@@ -0,0 +1,537 @@
+import urwid
+
+class DialogLineBox(urwid.LineBox):
+    def __init__(self, body, parent=None, title="?"):
+        super().__init__(body, title=title)
+        self.parent = parent
+
+    def keypress(self, size, key):
+        if key == "esc":
+            if self.parent and hasattr(self.parent, "dismiss_dialog"):
+                self.parent.dismiss_dialog()
+            return None
+        return super().keypress(size, key)
+
+class Placeholder(urwid.Edit):
+    def __init__(self, caption="", edit_text="", placeholder="", **kwargs):
+        super().__init__(caption, edit_text, **kwargs)
+        self.placeholder = placeholder
+
+    def render(self, size, focus=False):
+        if not self.edit_text and not focus:
+            placeholder_widget = urwid.Text(("placeholder", self.placeholder))
+            return placeholder_widget.render(size, focus)
+        else:
+            return super().render(size, focus)
+
+class Dropdown(urwid.WidgetWrap):
+    signals = ['change'] # emit for urwid.connect_signal fn
+
+    def __init__(self, label, options, default=None):
+        self.label = label
+        self.options = options
+        self.selected = default if default is not None else options[0]
+
+        self.main_text = f"{self.selected}"
+        self.main_button = urwid.SelectableIcon(self.main_text, 0)
+        self.main_button = urwid.AttrMap(self.main_button, "button_normal", "button_focus")
+
+        self.option_widgets = []
+        for opt in options:
+            icon = urwid.SelectableIcon(opt, 0)
+            icon = urwid.AttrMap(icon, "list_normal", "list_focus")
+            self.option_widgets.append(icon)
+
+        self.options_walker = urwid.SimpleFocusListWalker(self.option_widgets)
+        self.options_listbox = urwid.ListBox(self.options_walker)
+        self.dropdown_box = None  # will be created on open_dropdown
+
+        self.pile = urwid.Pile([self.main_button])
+        self.dropdown_visible = False
+
+        super().__init__(self.pile)
+
+    def open_dropdown(self):
+        if not self.dropdown_visible:
+            height = len(self.options)
+            self.dropdown_box = urwid.BoxAdapter(self.options_listbox, height)
+            self.pile.contents.append((self.dropdown_box, self.pile.options()))
+            self.dropdown_visible = True
+            self.pile.focus_position = 1
+            self.options_walker.set_focus(0)
+
+    def close_dropdown(self):
+        if self.dropdown_visible:
+            self.pile.contents.pop()  # remove the dropdown_box
+            self.dropdown_visible = False
+            self.pile.focus_position = 0
+            self.dropdown_box = None
+
+    def keypress(self, size, key):
+        if not self.dropdown_visible:
+            if key == "enter":
+                self.open_dropdown()
+                return None
+            return self.main_button.keypress(size, key)
+        else:
+            if key == "enter":
+                focus_result = self.options_walker.get_focus()
+                if focus_result is not None:
+                    focus_widget = focus_result[0]
+                    new_val = focus_widget.base_widget.text
+                    old_val = self.selected
+                    self.selected = new_val
+                    self.main_button.base_widget.set_text(f"{self.selected}")
+
+                    if old_val != new_val:
+                        self._emit('change', new_val)
+
+                self.close_dropdown()
+                return None
+            return self.dropdown_box.keypress(size, key)
+
+    def get_value(self):
+        return self.selected
+
+class ValidationError(urwid.Text):
+    def __init__(self, message=""):
+        super().__init__(("error", message))
+
+class FormField:
+    def __init__(self, config_key, transform=None):
+        self.config_key = config_key
+        self.transform = transform or (lambda x: x)
+
+class FormEdit(Placeholder, FormField):
+    def __init__(self, config_key, caption="", edit_text="", placeholder="", validation_types=None, transform=None, **kwargs):
+        Placeholder.__init__(self, caption, edit_text, placeholder, **kwargs)
+        FormField.__init__(self, config_key, transform)
+        self.validation_types = validation_types or []
+        self.error_widget = urwid.Text("")
+        self.error = None
+
+    def get_value(self):
+        return self.transform(self.edit_text.strip())
+
+    def validate(self):
+        value = self.edit_text.strip()
+        self.error = None
+
+        for validation in self.validation_types:
+            if validation == "required":
+                if not value:
+                    self.error = "This field is required"
+                    break
+            elif validation == "number":
+                if value and not value.replace('-', '').replace('.', '').isdigit():
+                    self.error = "This field must be a number"
+                    break
+            elif validation == "float":
+                try:
+                    if value:
+                        float(value)
+                except ValueError:
+                    self.error = "This field must be decimal number"
+                    break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None
+
+class FormCheckbox(urwid.CheckBox, FormField):
+    def __init__(self, config_key, label="", state=False, validation_types=None, transform=None, **kwargs):
+        urwid.CheckBox.__init__(self, label, state, **kwargs)
+        FormField.__init__(self, config_key, transform)
+        self.validation_types = validation_types or []
+        self.error_widget = urwid.Text("")
+        self.error = None
+
+    def get_value(self):
+        return self.transform(self.get_state())
+
+    def validate(self):
+
+        value = self.get_state()
+        self.error = None
+
+        for validation in self.validation_types:
+            if validation == "required":
+                if not value:
+                    self.error = "This field is  required"
+                    break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None
+
+class FormDropdown(Dropdown, FormField):
+    signals = ['change']
+
+    def __init__(self, config_key, label, options, default=None, validation_types=None, transform=None):
+        self.options = [str(opt) for opt in options]
+
+        if default is not None:
+            default_str = str(default)
+            if default_str in self.options:
+                default = default_str
+            elif transform:
+                try:
+                    default_transformed = transform(default_str)
+                    for opt in self.options:
+                        if transform(opt) == default_transformed:
+                            default = opt
+                            break
+                except:
+                    default = self.options[0]
+            else:
+                default = self.options[0]
+        else:
+            default = self.options[0]
+
+        Dropdown.__init__(self, label, self.options, default)
+        FormField.__init__(self, config_key, transform)
+
+        self.validation_types = validation_types or []
+        self.error_widget = urwid.Text("")
+        self.error = None
+
+        if hasattr(self, 'main_button'):
+            self.main_button.base_widget.set_text(str(default))
+
+    def get_value(self):
+        return self.transform(self.selected)
+
+    def validate(self):
+        value = self.get_value()
+        self.error = None
+
+        for validation in self.validation_types:
+            if validation == "required":
+                if not value:
+                    self.error = "This field is required"
+                    break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None
+
+    def open_dropdown(self):
+        if not self.dropdown_visible:
+            super().open_dropdown()
+            try:
+                current_index = self.options.index(self.selected)
+                self.options_walker.set_focus(current_index)
+            except ValueError:
+                pass
+
+class FormMultiList(urwid.Pile, FormField):
+    def __init__(self, config_key, placeholder="", validation_types=None, transform=None, **kwargs):
+        self.entries = []
+        self.error_widget = urwid.Text("")
+        self.error = None
+        self.placeholder = placeholder
+        self.validation_types = validation_types or []
+
+        first_entry = self.create_entry_row()
+        self.entries.append(first_entry)
+
+        self.add_button = urwid.Button("+ Add Another", on_press=self.add_entry)
+        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
+
+        pile_widgets = [first_entry, add_button_padded]
+        urwid.Pile.__init__(self, pile_widgets)
+        FormField.__init__(self, config_key, transform)
+
+    def create_entry_row(self):
+        edit = urwid.Edit("", "")
+        entry_row = urwid.Columns([
+            ('weight', 1, edit),
+            (3, urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))),
+        ])
+        return entry_row
+
+    def remove_entry(self, button, entry_row):
+        if len(self.entries) > 1:
+            self.entries.remove(entry_row)
+            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def add_entry(self, button):
+        new_entry = self.create_entry_row()
+        self.entries.append(new_entry)
+
+        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def get_pile_widgets(self):
+        return self.entries + [urwid.Padding(self.add_button, left=2, right=2)]
+
+    def get_value(self):
+        values = []
+        for entry in self.entries:
+            edit_widget = entry.contents[0][0]
+            value = edit_widget.edit_text.strip()
+            if value:
+                values.append(value)
+        return self.transform(values)
+
+    def validate(self):
+        values = self.get_value()
+        self.error = None
+
+        for validation in self.validation_types:
+            if validation == "required" and not values:
+                self.error = "At least one entry is required"
+                break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None
+
+
+class FormMultiTable(urwid.Pile, FormField):
+    def __init__(self, config_key, fields, validation_types=None, transform=None, **kwargs):
+        self.entries = []
+        self.fields = fields
+        self.error_widget = urwid.Text("")
+        self.error = None
+        self.validation_types = validation_types or []
+
+        header_columns = [('weight', 3, urwid.Text(("list_focus", "Name")))]
+        for field_key, field_config in self.fields.items():
+            header_columns.append(('weight', 2, urwid.Text(("list_focus", field_config.get("label", field_key)))))
+        header_columns.append((4, urwid.Text(("list_focus", ""))))
+
+        self.header_row = urwid.Columns(header_columns)
+
+        first_entry = self.create_entry_row()
+        self.entries.append(first_entry)
+
+        self.add_button = urwid.Button("+ Add ", on_press=self.add_entry)
+        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
+
+        pile_widgets = [
+            self.header_row,
+            urwid.Divider("-"),
+            first_entry,
+            add_button_padded
+        ]
+
+        urwid.Pile.__init__(self, pile_widgets)
+        FormField.__init__(self, config_key, transform)
+
+    def create_entry_row(self, name="", values=None):
+        if values is None:
+            values = {}
+
+        name_edit = urwid.Edit("", name)
+
+        columns = [('weight', 3, name_edit)]
+
+        field_widgets = {}
+        for field_key, field_config in self.fields.items():
+            field_value = values.get(field_key, "")
+
+            if field_config.get("type") == "checkbox":
+                widget = urwid.CheckBox("", state=bool(field_value))
+            elif field_config.get("type") == "dropdown":
+                # TODO: dropdown in MultiTable
+                widget = urwid.Edit("", str(field_value))
+            else:
+                widget = urwid.Edit("", str(field_value))
+
+            field_widgets[field_key] = widget
+            columns.append(('weight', 2, widget))
+
+        remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
+        columns.append((4, remove_button))
+
+        entry_row = urwid.Columns(columns)
+        entry_row.name_edit = name_edit
+        entry_row.field_widgets = field_widgets
+
+        return entry_row
+
+    def remove_entry(self, button, entry_row):
+        if len(self.entries) > 1:
+            self.entries.remove(entry_row)
+            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def add_entry(self, button):
+        new_entry = self.create_entry_row()
+        self.entries.append(new_entry)
+
+        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def get_pile_widgets(self):
+        return [
+            self.header_row,
+            urwid.Divider("-")
+        ] + self.entries + [
+            urwid.Padding(self.add_button, left=2, right=2)
+        ]
+
+    def get_value(self):
+        values = {}
+        for entry in self.entries:
+            name = entry.name_edit.edit_text.strip()
+            if name:
+                subinterface = {}
+                subinterface["interface_enabled"] = True
+
+                for field_key, widget in entry.field_widgets.items():
+                    field_config = self.fields.get(field_key, {})
+
+                    if hasattr(widget, "get_state"):
+                        value = widget.get_state()
+                    elif hasattr(widget, "edit_text"):
+                        value = widget.edit_text.strip()
+
+                        transform = field_config.get("transform")
+                        if transform and value:
+                            try:
+                                value = transform(value)
+                            except (ValueError, TypeError):
+                                value = ""
+
+                    if value:
+                        subinterface[field_key] = value
+
+                values[name] = subinterface
+
+        return self.transform(values) if self.transform else values
+
+    def set_value(self, value):
+        self.entries = []
+
+        if not value:
+            self.entries.append(self.create_entry_row())
+        else:
+            for name, config in value.items():
+                self.entries.append(self.create_entry_row(name=name, values=config))
+
+        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def validate(self):
+        values = self.get_value()
+        self.error = None
+
+        for validation in self.validation_types:
+            if validation == "required" and not values:
+                self.error = "At least one subinterface is required"
+                break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None
+
+
+class FormKeyValuePairs(urwid.Pile, FormField):
+    def __init__(self, config_key, validation_types=None, transform=None, **kwargs):
+        self.entries = []
+        self.error_widget = urwid.Text("")
+        self.error = None
+        self.validation_types = validation_types or []
+
+        header_columns = [
+            ('weight', 1, urwid.AttrMap(urwid.Text("Parameter Key"), "multitable_header")),
+            ('weight', 1, urwid.AttrMap(urwid.Text("Parameter Value"), "multitable_header")),
+            (4, urwid.AttrMap(urwid.Text("Action"), "multitable_header"))
+        ]
+
+        self.header_row = urwid.AttrMap(urwid.Columns(header_columns), "multitable_header")
+
+        first_entry = self.create_entry_row()
+        self.entries.append(first_entry)
+
+        self.add_button = urwid.Button("+ Add Parameter", on_press=self.add_entry)
+        add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
+
+        pile_widgets = [
+            self.header_row,
+            urwid.Divider("-"),
+            first_entry,
+            add_button_padded
+        ]
+
+        urwid.Pile.__init__(self, pile_widgets)
+        FormField.__init__(self, config_key, transform)
+
+    def create_entry_row(self, key="", value=""):
+        key_edit = urwid.Edit("", key)
+        value_edit = urwid.Edit("", value)
+
+        remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
+
+        entry_row = urwid.Columns([
+            ('weight', 1, key_edit),
+            ('weight', 1, value_edit),
+            (4, remove_button)
+        ])
+
+        entry_row.key_edit = key_edit
+        entry_row.value_edit = value_edit
+
+        return entry_row
+
+    def remove_entry(self, button, entry_row):
+        if len(self.entries) > 1:
+            self.entries.remove(entry_row)
+            self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def add_entry(self, button):
+        new_entry = self.create_entry_row()
+        self.entries.append(new_entry)
+
+        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def get_pile_widgets(self):
+        return [
+            self.header_row,
+            urwid.Divider("-")
+        ] + self.entries + [
+            urwid.Padding(self.add_button, left=2, right=2)
+        ]
+
+    def get_value(self):
+        values = {}
+        for entry in self.entries:
+            key = entry.key_edit.edit_text.strip()
+            value = entry.value_edit.edit_text.strip()
+
+            if key:
+                if value.isdigit():
+                    values[key] = int(value)
+                elif value.replace('.', '', 1).isdigit() and value.count('.') <= 1:
+                    values[key] = float(value)
+                elif value.lower() == 'true':
+                    values[key] = True
+                elif value.lower() == 'false':
+                    values[key] = False
+                else:
+                    values[key] = value
+
+        return self.transform(values) if self.transform else values
+
+    def set_value(self, value):
+        self.entries = []
+
+        if not value or not isinstance(value, dict):
+            self.entries.append(self.create_entry_row())
+        else:
+            for key, val in value.items():
+                self.entries.append(self.create_entry_row(key=key, value=str(val)))
+
+        self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
+
+    def validate(self):
+        values = self.get_value()
+        self.error = None
+
+        keys = [entry.key_edit.edit_text.strip() for entry in self.entries
+                if entry.key_edit.edit_text.strip()]
+        if len(keys) != len(set(keys)):
+            self.error = "Duplicate keys are not allowed"
+            self.error_widget.set_text(("error", self.error))
+            return False
+
+        for validation in self.validation_types:
+            if validation == "required" and not values:
+                self.error = "Atleast one parameter is required"
+                break
+
+        self.error_widget.set_text(("error", self.error or ""))
+        return self.error is None

setup.py

@@ -30,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=0.9.1", "lxmf>=0.6.0", "urwid>=2.6.16", "qrcode"],
+    install_requires=["rns>=0.9.6", "lxmf>=0.7.1", "urwid>=2.6.16", "qrcode"],
     python_requires=">=3.7",
 )