Updated dependencies

Add Checkbox and Radio Group fields to Micron

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ✨ Feature Request or Idea
+    url: https://github.com/markqvist/Reticulum/discussions/new?category=ideas
+    about: Propose and discuss features and ideas
+  - name: 💬 Questions, Help & Discussion
+    about: Ask anything, or get help
+    url: https://github.com/markqvist/Reticulum/discussions/new/choose
+  - name: 📖 Read the Reticulum Manual
+    url: https://markqvist.github.io/Reticulum/manual/
+    about: The complete documentation for Reticulum

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

@@ -0,0 +1,35 @@
+---
+name: "\U0001F41B Bug Report"
+about: Report a reproducible bug
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Read the Contribution Guidelines**
+Before creating a bug report on this issue tracker, you **must** read the [Contribution Guidelines](https://github.com/markqvist/Reticulum/blob/master/Contributing.md). Issues that do not follow the contribution guidelines **will be deleted without comment**.
+
+- 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.
+
+**Describe the Bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Describe in detail how to reproduce the bug.
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs & Screenshots**
+Please include any relevant log output. If applicable, also add screenshots to help explain your problem.
+
+**System Information**
+- OS and version
+- Python version
+- Program version
+
+**Additional context**
+Add any other context about the problem here.

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-rc-alpine3.14 as build
+FROM python:3.12-alpine as build
 
 RUN apk add --no-cache build-base linux-headers libffi-dev cargo
 
@@ -8,10 +8,10 @@ ENV PATH="/opt/venv/bin:$PATH"
 RUN pip3 install setuptools-rust pyopenssl cryptography
 
 COPY . /app/
-RUN cd /app/ && python3 setup.py install
+RUN cd /app/ && pip3 install .
 
 # Use multi-stage build, as we don't need rust compilation on the final image
-FROM python:3.11-rc-alpine3.14
+FROM python:3.12-alpine
 
 LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"
 

Dockerfile.build

@@ -0,0 +1,32 @@
+FROM python:alpine
+LABEL authors="Petr Blaha petr.blaha@cleverdata.cz"
+USER root
+RUN apk update
+RUN apk add  build-base libffi-dev cargo pkgconfig   linux-headers py3-virtualenv
+
+RUN addgroup -S myuser && adduser -S -G myuser myuser
+USER myuser
+WORKDIR /home/myuser
+
+RUN pip install --upgrade pip
+RUN pip install setuptools-rust pyopenssl cryptography
+
+
+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 . .
+
+#Python create virtual environment
+RUN virtualenv /home/myuser/NomadNet/venv
+RUN source /home/myuser/NomadNet/venv/bin/activate
+
+RUN make all
+
+################### END NomadNet ###########################################

Dockerfile.howto

@@ -0,0 +1,6 @@
+# Run docker command one by one(all four), it will build NomadNet artifact and copy to dist directory.
+# No need to build locally and install dependencies
+docker build -t nomadnetdockerimage -f Dockerfile.build .
+docker run -d -it --name nomadnetdockercontainer nomadnetdockerimage /bin/sh
+docker cp nomadnetdockercontainer:/home/myuser/dist .
+docker rm -f nomadnetdockercontainer

README.md

@@ -8,7 +8,7 @@ Nomad Network allows you to build private and resilient communications platforms
 
 Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticulum](https://github.com/markqvist/Reticulum), which together provides the cryptographic mesh functionality and peer-to-peer message routing that Nomad Network relies on. This foundation also makes it possible to use the program over a very wide variety of communication mediums, from packet radio to fiber optics.
 
-Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours.
+Nomad Network does not need any connections to the public internet to work. In fact, it doesn't even need an IP or Ethernet network. You can use it entirely over packet radio, LoRa or even serial lines. But if you wish, you can bridge islanded networks over the Internet or private ethernet networks, or you can build networks running completely over the Internet. The choice is yours. Since Nomad Network uses Reticulum, it is efficient enough to run even over *extremely* low-bandwidth medium, and has been succesfully used over 300bps radio links.
 
 If you'd rather want to use an LXMF client with a graphical user interface, you may want to take a look at [Sideband](https://github.com/markqvist/sideband), which is available for Linux, Android and macOS.
 
@@ -148,11 +148,11 @@ You can help support the continued development of open, free and private communi
   ```
 - Ethereum
   ```
-  0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a
+  0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73
   ```
 - Bitcoin
   ```
-  3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq
+  35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 
@@ -161,7 +161,6 @@ You can help support the continued development of open, free and private communi
 - New major features
     - Network-wide propagated bulletins and discussion threads
     - Collaborative maps and geospatial information sharing
-    - Facilitation of trade and barter
 - Minor improvements and fixes
     - Link status (RSSI and SNR) in conversation or conv list
     - Ctrl-M shorcut for jumping to menu

nomadnet/Conversation.py

@@ -27,6 +27,13 @@ class Conversation:
                     if Conversation.created_callback != None:
                         Conversation.created_callback()
 
+            # This reformats the new v0.5.0 announce data back to the expected format
+            # for nomadnets storage and other handling functions.
+            dn = LXMF.display_name_from_app_data(app_data)
+            app_data = b""
+            if dn != None:
+                app_data = dn.encode("utf-8")
+            
             # Add the announce to the directory announce
             # stream logger
             app.directory.lxmf_announce_received(destination_hash, app_data)
@@ -95,7 +102,7 @@ class Conversation:
                         unread = True
 
                     if display_name == None and app_data:
-                        display_name = app_data.decode("utf-8")
+                        display_name = LXMF.display_name_from_app_data(app_data)
 
                     if display_name == None:
                         sort_name = ""
@@ -209,8 +216,16 @@ class Conversation:
             if self.app.directory.preferred_delivery(dest.hash) == DirectoryEntry.PROPAGATED:
                 if self.app.message_router.get_outbound_propagation_node() != None:
                     desired_method = LXMF.LXMessage.PROPAGATED
+            else:
+                if not self.app.message_router.delivery_link_available(dest.hash) and RNS.Identity.current_ratchet_id(dest.hash) != None:
+                    RNS.log(f"Have ratchet for {RNS.prettyhexrep(dest.hash)}, requesting opportunistic delivery of message", RNS.LOG_DEBUG)
+                    desired_method = LXMF.LXMessage.OPPORTUNISTIC
 
-            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method)
+            dest_is_trusted = False
+            if self.app.directory.trust_level(dest.hash) == DirectoryEntry.TRUSTED:
+                dest_is_trusted = True
+
+            lxm = LXMF.LXMessage(dest, source, content, title=title, desired_method=desired_method, include_ticket=dest_is_trusted)
             lxm.register_delivery_callback(self.message_notification)
             lxm.register_failed_callback(self.message_notification)
 
@@ -281,9 +296,13 @@ class Conversation:
 
     def message_notification(self, message):
         if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
+            if hasattr(message, "stamp_generation_failed") and message.stamp_generation_failed == True:
+                RNS.log(f"Could not send {message} due to a stamp generation failure", RNS.LOG_ERROR)
+            else:
                 RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
                 message.try_propagation_on_fail = None
                 message.delivery_attempts = 0
+                if hasattr(message, "next_delivery_attempt"):
                     del message.next_delivery_attempt
                 message.packed = None
                 message.desired_method = LXMF.LXMessage.PROPAGATED
@@ -318,12 +337,17 @@ class ConversationMessage:
             self.timestamp = self.lxm.timestamp
             self.sort_timestamp = os.path.getmtime(self.file_path)
 
-            if self.lxm.state > LXMF.LXMessage.DRAFT and self.lxm.state < LXMF.LXMessage.SENT:
+            if self.lxm.state > LXMF.LXMessage.GENERATING and self.lxm.state < LXMF.LXMessage.SENT:
                 found = False
+
                 for pending in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_outbound:
                     if pending.hash == self.lxm.hash:
                         found = True
 
+                for pending_id in nomadnet.NomadNetworkApp.get_shared_instance().message_router.pending_deferred_stamps:
+                    if pending_id == self.lxm.hash:
+                        found = True
+
                 if not found:
                     self.lxm.state = LXMF.LXMessage.FAILED
 

nomadnet/Directory.py

@@ -257,6 +257,7 @@ class Directory:
             if announced_display_name == None:
                 return self.directory_entries[source_hash].trust_level
             else:
+                if not self.directory_entries[source_hash].trust_level == DirectoryEntry.TRUSTED:
                     for entry in self.directory_entries:
                         e = self.directory_entries[entry]
                         if e.display_name == announced_display_name:

nomadnet/NomadNetworkApp.py

@@ -125,12 +125,20 @@ class NomadNetworkApp:
         self.peer_announce_at_start  = True
         self.try_propagation_on_fail = True
         self.disable_propagation     = False
+        self.notify_on_new_message   = True
+
+        self.lxmf_max_propagation_size = None
+        self.lxmf_max_incoming_size    = None
 
         self.periodic_lxmf_sync = True
         self.lxmf_sync_interval = 360*60
         self.lxmf_sync_limit    = 8
         self.compact_stream     = False
         
+        self.required_stamp_cost   = None
+        self.accept_invalid_stamps = False
+
+
         if not os.path.isdir(self.storagepath):
             os.makedirs(self.storagepath)
 
@@ -282,14 +290,19 @@ class NomadNetworkApp:
 
         self.directory = nomadnet.Directory(self)
 
-        self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.storagepath, autopeer = True)
+        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,
+        )
+
         self.message_router.register_delivery_callback(self.lxmf_delivery)
 
         for destination_hash in self.ignored_list:
             self.message_router.ignore_destination(destination_hash)
 
-        self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"])
+        self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"], stamp_cost=self.required_stamp_cost)
-        self.lxmf_destination.set_default_app_data(self.get_display_name_bytes)
+        if not self.accept_invalid_stamps:
+            self.message_router.enforce_stamps()
 
         RNS.Identity.remember(
             packet_hash=None,
@@ -484,7 +497,9 @@ class NomadNetworkApp:
             self.message_router.cancel_propagation_node_requests()
 
     def announce_now(self):
-        self.lxmf_destination.announce()
+        self.message_router.set_inbound_stamp_cost(self.lxmf_destination.hash, self.required_stamp_cost)
+        self.lxmf_destination.display_name = self.peer_settings["display_name"]
+        self.message_router.announce(self.lxmf_destination.hash)
         self.peer_settings["last_announce"] = time.time()
         self.save_peer_settings()
 
@@ -546,6 +561,9 @@ class NomadNetworkApp:
 
         nomadnet.Conversation.ingest(message, self)
 
+        if self.notify_on_new_message:
+            self.notify_message_recieved()
+
         if self.should_print(message):
             self.print_message(message)
 
@@ -649,6 +667,11 @@ class NomadNetworkApp:
             if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
                 os.unlink(self.conversationpath + "/" + source_hash + "/unread")
 
+    def notify_message_recieved(self):
+        if self.uimode == nomadnet.ui.UI_TEXT:
+            sys.stdout.write("\a")
+            sys.stdout.flush()
+
     def clear_tmp_dir(self):
         if os.path.isdir(self.tmpfilespath):
             for file in os.listdir(self.tmpfilespath):
@@ -722,10 +745,40 @@ class NomadNetworkApp:
                     else:
                         self.lxmf_sync_limit = None
 
+                if option == "required_stamp_cost":
+                    value = self.config["client"][option]
+                    if value.lower() == "none":
+                        self.required_stamp_cost = None
+                    else:
+                        value = self.config["client"].as_int(option)
+
+                        if value > 0:
+                            if value > 255:
+                                value = 255
+                            self.required_stamp_cost = value
+                        else:
+                            self.required_stamp_cost = None
+
+                if option == "accept_invalid_stamps":
+                    value = self.config["client"].as_bool(option)
+                    self.accept_invalid_stamps = value
+
+                if option == "max_accepted_size":
+                    value = self.config["client"].as_float(option)    
+
+                    if value > 0:
+                        self.lxmf_max_incoming_size = value
+                    else:
+                        self.lxmf_max_incoming_size = 500
+
                 if option == "compact_announce_stream":
                     value = self.config["client"].as_bool(option)
                     self.compact_stream = value
 
+                if option == "notify_on_new_message":
+                    value = self.config["client"].as_bool(option)
+                    self.notify_on_new_message = value
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -816,6 +869,14 @@ class NomadNetworkApp:
             else:
                 self.disable_propagation = self.config["node"].as_bool("disable_propagation")
 
+            if not "max_transfer_size" in self.config["node"]:
+                self.lxmf_max_propagation_size = 256
+            else:
+                value = self.config["node"].as_float("max_transfer_size")
+                if value < 1:
+                    value = 1
+                self.lxmf_max_propagation_size = value
+
             if not "announce_at_start" in self.config["node"]:
                 self.node_announce_at_start = False
             else:
@@ -953,6 +1014,7 @@ destination = file
 enable_client = yes
 user_interface = text
 downloads_path = ~/Downloads
+notify_on_new_message = yes
 
 # By default, the peer is announced at startup
 # to let other peers reach it immediately.
@@ -980,6 +1042,31 @@ lxmf_sync_interval = 360
 # the limit, and download everything every time.
 lxmf_sync_limit = 8
 
+# You can specify a required stamp cost for
+# inbound messages to be accepted. Specifying
+# a stamp cost will require untrusted senders
+# that message you to include a cryptographic
+# stamp in their messages. Performing this
+# operation takes the sender an amount of time
+# proportional to the stamp cost. As a rough
+# estimate, a stamp cost of 8 will take less
+# than a second to compute, and a stamp cost
+# of 20 could take several minutes, even on
+# a fast computer.
+required_stamp_cost = None
+
+# You can signal stamp requirements to senders,
+# but still accept messages with invalid stamps
+# by setting this option to True.
+accept_invalid_stamps = False
+
+# The maximum accepted unpacked size for mes-
+# sages received directly from other peers,
+# specified in kilobytes. Messages larger than
+# this will be rejected before the transfer
+# begins.
+max_accepted_size = 500
+
 # The announce stream will only show one entry
 # per destination or node by default. You can
 # change this to show as many announces as have
@@ -1068,6 +1155,18 @@ announce_at_start = Yes
 # and defaults to 2 gigabytes.
 # message_storage_limit = 2000
 
+# The maximum accepted transfer size per in-
+# coming propagation transfer, in kilobytes.
+# This also sets the upper limit for the size
+# of single messages accepted onto this node.
+#
+# If a node wants to propagate a larger number
+# of messages to this node, than what can fit
+# within this limit, it will prioritise sending
+# the smallest, newest messages first, and try
+# with any remaining messages at a later point.
+max_transfer_size = 256
+
 # You can tell the LXMF message router to
 # prioritise storage for one or more
 # destinations. If the message store reaches

nomadnet/_version.py

@@ -1 +1 @@
-__version__ = "0.4.6"
+__version__ = "0.5.6"

nomadnet/examples/various/input_fields.py

@@ -17,6 +17,8 @@ The following section contains a simple set of fields, and a few different links
 
 -=
 
+
+>>>Text Fields
 An input field    : `B444`<username`Entered data>`b
 
 An masked field   : `B444`<!|password`Value of Field>`b
@@ -27,7 +29,24 @@ Two fields        : `B444`<8|one`One>`b `B444`<8|two`Two>`b
 
 The data can be `!`[submitted`:/page/input_fields.mu`username|two]`!.
 
-You can `!`[submit`:/page/input_fields.mu`one|password|small]`! other fields, or just `!`[a single one`:/page/input_fields.mu`username]`!
+>> Checkbox Fields
+
+`B444`<?|sign_up|1|*`>`b Sign me up 
+
+>> Radio group
+
+Select your favorite color:
+
+`B900`<^|color|Red`>`b  Red
+
+`B090`<^|color|Green`>`b Green
+
+`B009`<^|color|Blue`>`b Blue
+
+
+>>> Submitting data
+
+You can `!`[submit`:/page/input_fields.mu`one|password|small|color]`! other fields, or just `!`[a single one`:/page/input_fields.mu`username]`!
 
 Or simply `!`[submit them all`:/page/input_fields.mu`*]`!.
 

nomadnet/ui/TextUI.py

@@ -115,17 +115,17 @@ GLYPHS = {
     ("arrow_u",         "/\\",       "\u2191",      "\u2191"),
     ("arrow_d",         "\\/",       "\u2193",      "\u2193"),
     ("warning",         "!",         "\u26a0",      "\uf12a"),
-    ("info",            "i",         "\u2139",      "\ufb4d"),
+    ("info",            "i",         "\u2139",      "\U000f064e"),
     ("unread",          "[!]",       "\u2709",      ur_char),
     ("divider1",        "-",         "\u2504",      "\u2504"),
     ("peer",            "[P]",       "\u24c5 ",     "\uf415"),
-    ("node",            "[N]",       "\u24c3 ",     "\uf502"),
+    ("node",            "[N]",       "\u24c3 ",     "\U000f0002"),
     ("page",            "",          "\u25a4 ",     "\uf719 "),
-    ("speed",           "",          "\u25F7 ",     "\uf9c4"),
+    ("speed",           "",          "\u25F7 ",     "\U000f04c5 "),
-    ("decoration_menu", " +",        " +",          " \uf93a"),
+    ("decoration_menu", " +",        " +",          " \U000f043b"),
     ("unread_menu",     " !",        " \u2709",     urm_char),
     ("globe",           "",          "",            "\uf484"),
-    ("sent",            "/\\",       "\u2191",      "\ufbf4"),
+    ("sent",            "/\\",       "\u2191",      "\U000f0cd8"),
     ("papermsg",        "P",         "\u25a4",      "\uf719"),
     ("qrcode",          "QR",        "\u25a4",      "\uf029"),
 }

nomadnet/ui/textui/Browser.py

@@ -1,4 +1,5 @@
 import RNS
+import LXMF
 import os
 import time
 import urwid
@@ -180,7 +181,6 @@ class Browser:
                     link_fields.append(e)
 
                 def recurse_down(w):
-                target = None
                     if isinstance(w, list):
                         for t in w:
                             recurse_down(t)
@@ -195,7 +195,32 @@ class Browser:
                         recurse_down(w._original_widget)
                     else:
                         if hasattr(w, "field_name") and (all_fields or w.field_name in link_fields):
-                        request_data["field_"+w.field_name] = w.get_edit_text()
+                            field_key = "field_" + w.field_name
+                            if isinstance(w, urwid.Edit):
+                                request_data[field_key] = w.edit_text
+                            elif isinstance(w, urwid.RadioButton):
+                                if w.state:
+                                    user_data = getattr(w, "field_value", None)  
+                                    if user_data is not None:
+                                        request_data[field_key] = user_data
+                            elif isinstance(w, urwid.CheckBox):
+                                user_data = getattr(w, "field_value", "1")
+                                if w.state:
+                                    existing_value = request_data.get(field_key, '')
+                                    if existing_value:
+                                        # Concatenate the new value with the existing one
+                                        request_data[field_key] = existing_value + ',' + user_data
+                                    else:
+                                        # Initialize the field with the current value
+                                        request_data[field_key] = user_data
+                                else:
+                                    pass  # do nothing if checkbox is not check
+
+
+
+
+                        
+
                 
             recurse_down(self.attr_maps)
             RNS.log("Including request data: "+str(request_data), RNS.LOG_DEBUG)
@@ -252,7 +277,7 @@ class Browser:
 
             display_name = None
             if display_name_data != None:
-                display_name = display_name_data.decode("utf-8")
+                display_name = LXMF.display_name_from_app_data(display_name_data)
 
             if not source_hash_text in [c[0] for c in existing_conversations]:
                 entry = DirectoryEntry(bytes.fromhex(source_hash_text), display_name=display_name)
@@ -664,6 +689,8 @@ class Browser:
         self.delegate.columns.focus_position = 1
 
     def save_node_dialog(self):
+        if self.destination_hash != None:
+            try:
                 def dismiss_dialog(sender):
                     self.close_dialogs()
 
@@ -710,6 +737,8 @@ class Browser:
                 self.delegate.columns.contents[1] = (overlay, options)
                 self.delegate.columns.focus_position = 1
 
+            except Exception as e:
+                pass
 
     def load_page(self):
         if self.request_data == None:

nomadnet/ui/textui/Conversations.py

@@ -1056,7 +1056,7 @@ class ConversationWidget(urwid.WidgetWrap):
             else:
                 warning = urwid.AttrMap(
                     urwid.Padding(urwid.Text(
-                        "\n"+g["info"]+"\n\nYou cannot currently message this peer, since it's identity keys are not known. "
+                        "\n"+g["info"]+"\n\nYou cannot currently message this peer, since its identity keys are not known. "
                                        "The keys have been requested from the network and should arrive shortly, if available. "
                                        "Close this conversation and reopen it to try again.\n\n"
                                        "To query the network manually, select this conversation in the conversation list, "

nomadnet/ui/textui/Guide.py

@@ -300,7 +300,7 @@ To learn how to host your own node, read the `*Hosting a Node`* section of this
 
 TOPIC_HOSTING = '''>Hosting a Node
 
-To host a node on the network, you must enable it in the configuration file, by setting `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node.
+To host a node on the network, you must enable it in the configuration file, by setting the `*enable_node`* directive to `*yes`*. You should also configure the other node-related parameters such as the node name and announce interval settings. Once node hosting has been enabled in the configuration, Nomad Network will start hosting your node as soon as the program is launched, and other peers on the network will be able to connect and interact with content on your node.
 
 By default, no content is defined, apart from a short placeholder home page. To learn how to add your own content, read on.
 
@@ -310,9 +310,12 @@ All nodes on the network will automatically participate in a distributed message
 
 When Nomad Network is configured to host a node, by default it also configures itself as an LXMF Propagation Node, and automatically discovers and peers with other propagation nodes on the network. This process is completely automatic and requires no configuration from the node operator.
 
-If there is already an abundance of Propagation Nodes on the network, or the operator simply wishes to host a pageserving-only node, Propagation Node hosting can be disabled in the configuration file.
+`!However`!, if there is already an abundance of Propagation Nodes on the network, or the operator simply wishes to host a pageserving-only node, Propagation Node hosting can be disabled in the configuration file.
 
-To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!. In the list of peered Propagation Nodes, it is possible to break peering with a node by pressing `!Ctrl-X`!. It is also possible to request an immediate delivery sync of all unhandled messages for a node, by pressing `!Ctrl-R`!.
+To view LXMF Propagation nodes that are currently peered with your node, go to the `![ Network ]`! part of the program and press `!Ctrl-P`!. In the list of peered Propagation Nodes, it is possible to:
+
+ - Immediately break peering with a node by pressing `!Ctrl-X`!
+ - Request an immediate delivery sync of all unhandled messages for a node, by pressing `!Ctrl-R`!
 
 The distributed message store is resilient to intermittency, and will remain functional as long as at least one node remains on the network. Nodes that were offline for a time will automatically be synced up to date when they regain connectivity.
 
@@ -326,9 +329,9 @@ You can control how long a peer will cache your pages by including the cache hea
 
 >> Dynamic Pages
 
-You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
+You can use a preprocessor such as PHP, bash, Python (or whatever you prefer) to generate dynamic pages and fully interactive applications running over Nomad Network. To do so, just set executable permissions on the relevant page file, and be sure to include the interpreter at the beginning of the file, for example `!#!/usr/bin/python3`!.
 
-Data from fields and link variables will be passed to these scipts or programs as environment variables, and can simply be read by any method for acessing such.
+Data from fields and link variables will be passed to these scipts or programs as environment variables, and can simply be read by any method for accessing such.
 
 In the `!examples`! directory, you can find various small examples for the use of this feature. The currently included examples are:
 
@@ -482,6 +485,12 @@ Selects which interface to use. Currently, only the `!text`! interface is availa
 Sets the filesystem path to store downloaded files in.
 <
 
+>>>
+`!notify_on_new_message = yes`!
+>>>>
+Sets whether to output a notification character (bell or flash) to the terminal when a new message is received.
+<
+
 >>>
 `!announce_at_start = yes`!
 >>>>
@@ -512,6 +521,24 @@ The number of minutes between each automatic sync. The default is equal to 6 hou
 On low-bandwidth networks, it can be useful to limit the amount of messages downloaded in each sync. The default is 8. Set to 0 to download all available messages every time a sync occurs.
 <
 
+>>>
+`!required_stamp_cost = None`!
+>>>>
+You can specify a required stamp cost for inbound messages to be accepted. Specifying a stamp cost will require untrusted senders that message you to include a cryptographic stamp in their messages. Performing this operation takes the sender an amount of time proportional to the stamp cost. As a rough estimate, a stamp cost of 8 will take less than a second to compute, and a stamp cost of 20 could take several minutes, even on a fast computer.
+<
+
+>>>
+`!accept_invalid_stamps = False`!
+>>>>
+You can signal stamp requirements to senders, but still accept messages with invalid stamps by setting this option to True.
+<
+
+>>>
+`!max_accepted_size = 500`!
+>>>>
+The maximum accepted unpacked size for messages received directly from other peers, specified in kilobytes. Messages larger than this will be rejected before the transfer begins.
+<
+
 >>>
 `!compact_announce_stream = yes`!
 >>>>
@@ -650,6 +677,12 @@ By default, when Nomad Network is hosting a node, it will also run an LXMF propa
 Configures the maximum amount of storage, in megabytes, that the LXMF Propagation Node will use to store messages.
 <
 
+>>>
+`!max_transfer_size = 256`!
+>>>>
+The maximum accepted transfer size per incoming propagation transfer, in kilobytes. This also sets the upper limit for the size of single messages accepted onto this propagation node. If a node wants to propagate a larger number of messages to this node, than what can fit within this limit, it will prioritise sending the smallest, newest messages first, and try with any remaining messages at a later point.
+<
+
 >>>
 `!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`!
 >>>>
@@ -718,12 +751,11 @@ If you have Internet access, and just want to get started experimenting, you are
 The Testnet also runs the latest version of Reticulum, often even a short while before it is publicly released, which means strange behaviour might occur. If none of that scares you, add the following interface to your Reticulum configuration file to join:
 
 >>
-[[RNS Testnet Zurich]]
+[[RNS Testnet Dublin]]
   type = TCPClientInterface
-  interface_enabled = yes
+  enabled = yes
-  outgoing = True
+  target_host = dublin.connect.reticulum.network
-  target_host = zurich.connect.reticulum.network
+  target_port = 4965
-  target_port = 4242
 <
 
 If you connect to the testnet, you can leave nomadnet running for a while and wait for it to receive announces from other nodes on the network that host pages or services, or you can try connecting directly to some nodes listed here:
@@ -768,7 +800,7 @@ The following line should contain a grayscale gradient bar:
 
 Unicode Glyphs   : \u2713  \u2715  \u26a0  \u24c3  \u2193
 
-Nerd Font Glyphs : \uf484  \uf9c4 \uf719  \uf502  \uf415  \uf023  \uf06e
+Nerd Font Glyphs : \uf484  \U000f04c5  \U000f0219  \U000f0002  \uf415  \uf023  \uf06e
 '''
 
 
@@ -1049,7 +1081,7 @@ Links can contain request variables and a list of fields to submit to the node-s
 `=
 ``
 
-Note the `!*`! following the extra `!\``! at the end of the path. This `!*`! denotes `*all fields`*. You can also specify a list of fields to include:
+Note the `!*`! following the extra `!\\``! at the end of the path. This `!*`! denotes `*all fields`*. You can also specify a list of fields to include:
 
 `Faaa
 `=
@@ -1120,6 +1152,47 @@ A sized input field:  `B444`<16|with_size`>`B333
 A masked input field: `B444`<!|masked_demo`hidden text>`B333
 
 Full control: `B444`<!32|all_options`hidden text>`B333
+`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. 
+
+`Faaa
+`=
+`<?|field_name|value`>`b Label Text`
+`=
+When the checkbox is checked, it's field will be set to the provided value. If there are multiple checkboxes that share the same field name, the checked values will be concatenated when they are sent to the node by a comma.
+``
+
+`B444`<?|sign_up|1`>`b Sign me up`
+
+You can also pre-check both checkboxes and radio groups by appending a |* after the field value.
+
+`B444`<?|checkbox|1|*`>`b Pre-checked checkbox`
+
+>>> Radio groups
+
+Radio groups are another input that lets the user chose from a set of options. Unlike checkboxes, radio buttons with the same field name are mutually exclusive.
+
+Example:
+
+`=
+`B900`<^|color|Red`>`b  Red
+
+`B090`<^|color|Green`>`b Green
+
+`B009`<^|color|Blue`>`b Blue
+`=
+
+will render:
+
+`B900`<^|color|Red`>`b  Red
+
+`B090`<^|color|Green`>`b Green
+
+`B009`<^|color|Blue`>`b Blue
+
+In this example, when the data is submitted, `B444` field_color`b will be set to whichever value from the list was selected.
 
 ``
 

nomadnet/ui/textui/Log.py

@@ -1,6 +1,11 @@
+import os
+import sys
+import itertools
+import mmap
 import urwid
 import nomadnet
 
+
 class LogDisplayShortcuts():
     def __init__(self, app):
         import urwid
@@ -8,28 +13,31 @@ class LogDisplayShortcuts():
 
         self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
 
+
 class LogDisplay():
     def __init__(self, app):
         self.app = app
-        self.log_term = None
 
         self.shortcuts_display = LogDisplayShortcuts(self.app)
         self.widget = None
 
+    @property
+    def log_term(self):
+        return self.widget
+
     def show(self):
-        if self.log_term == None:
+        if self.widget is None:
-            self.log_term = LogTerminal(self.app)
+            self.widget = log_widget(self.app)
-            self.widget = urwid.LineBox(self.log_term)
 
     def kill(self):
-        if self.log_term != None:
+        if self.widget is not None:
-            self.log_term.terminate()
+            self.widget.terminate()
-            self.log_term = None
             self.widget = None
         
     def shortcuts(self):
         return self.shortcuts_display
 
+
 class LogTerminal(urwid.WidgetWrap):
     def __init__(self, app):
         self.app = app
@@ -39,7 +47,8 @@ class LogTerminal(urwid.WidgetWrap):
             escape_sequence="up",
             main_loop=self.app.ui.loop,
         )
-        super().__init__(self.log_term)
+        self.widget = urwid.LineBox(self.log_term)
+        super().__init__(self.widget)
 
     def terminate(self):
         self.log_term.terminate()
@@ -50,3 +59,69 @@ class LogTerminal(urwid.WidgetWrap):
             nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
             
         return super(LogTerminal, self).keypress(size, key)
+
+
+class LogTail(urwid.WidgetWrap):
+    def __init__(self, app):
+        self.app = app
+        self.log_tail = urwid.Text(tail(self.app.logfilepath, 50))
+        self.log = urwid.Scrollable(self.log_tail)
+        self.log.set_scrollpos(-1)
+        self.log_scrollbar = urwid.ScrollBar(self.log)
+        # We have this here because ui.textui.Main depends on this field to kill it
+        self.log_term = None
+
+        super().__init__(self.log_scrollbar)
+
+    def terminate(self):
+        pass
+
+
+def log_widget(app, platform=sys.platform):
+    if platform == "win32":
+        return LogTail(app)
+    else:
+        return LogTerminal(app)
+
+# https://stackoverflow.com/a/34029605/3713120
+def _tail(f_name, n, offset=0):
+    def skip_back_lines(mm: mmap.mmap, numlines: int, startidx: int) -> int:
+        '''Factored out to simplify handling of n and offset'''
+        for _ in itertools.repeat(None, numlines):
+            startidx = mm.rfind(b'\n', 0, startidx)
+            if startidx < 0:
+                break
+        return startidx
+
+    # Open file in binary mode
+    with open(f_name, 'rb') as binf, mmap.mmap(binf.fileno(), 0, access=mmap.ACCESS_READ) as mm:
+        # len(mm) - 1 handles files ending w/newline by getting the prior line
+        startofline = skip_back_lines(mm, offset, len(mm) - 1)
+        if startofline < 0:
+            return []  # Offset lines consumed whole file, nothing to return
+            # If using a generator function (yield-ing, see below),
+            # this should be a plain return, no empty list
+
+        endoflines = startofline + 1  # Slice end to omit offset lines
+
+        # Find start of lines to capture (add 1 to move from newline to beginning of following line)
+        startofline = skip_back_lines(mm, n, startofline) + 1
+
+        # Passing True to splitlines makes it return the list of lines without
+        # removing the trailing newline (if any), so list mimics f.readlines()
+        # return mm[startofline:endoflines].splitlines(True)
+        # If Windows style \r\n newlines need to be normalized to \n
+        return mm[startofline:endoflines].replace(os.linesep.encode(sys.getdefaultencoding()), b'\n').splitlines(True)
+
+
+def tail(f_name, n):
+    """
+    Return the last n lines of a given file name, f_name.
+    Akin to `tail -<n> <f_name>`
+    """
+    def decode(b):
+        return b.decode(encoding)
+
+    encoding = sys.getdefaultencoding()
+    lines = map(decode, _tail(f_name=f_name, n=n))
+    return ''.join(lines)

nomadnet/ui/textui/MicronParser.py

@@ -160,7 +160,6 @@ def parse_line(line, state, url_delegate):
                             tw.in_columns = True
                         else:
                             tw = urwid.Text(o, align=state["align"])
-                        
                         widgets.append((urwid.PACK, tw))
                     else:
                         if o["type"] == "field":
@@ -173,6 +172,36 @@ def parse_line(line, state, url_delegate):
                             f.field_name = fn
                             fa = urwid.AttrMap(f, fs)
                             widgets.append((fw, fa))
+                        elif o["type"] == "checkbox":
+                            fn = o["name"]
+                            fv = o["value"]
+                            flabel = o["label"]
+                            fs = o["style"]
+                            fprechecked = o.get("prechecked", False)  
+                            f = urwid.CheckBox(flabel, state=fprechecked)
+                            f.field_name = fn
+                            f.field_value = fv
+                            fa = urwid.AttrMap(f, fs)
+                            widgets.append((urwid.PACK, fa))
+                        elif o["type"] == "radio":
+                            fn = o["name"]
+                            fv = o["value"]
+                            flabel = o["label"]
+                            fs = o["style"]
+                            fprechecked = o.get("prechecked", False)  
+                            if "radio_groups" not in state:
+                                state["radio_groups"] = {}
+                            if fn not in state["radio_groups"]:
+                                state["radio_groups"][fn] = []
+                            group = state["radio_groups"][fn]
+                            f = urwid.RadioButton(group, flabel, state=fprechecked, user_data=fv)
+                            f.field_name = fn
+                            f.field_value = fv
+                            fa = urwid.AttrMap(f, fs)
+                            widgets.append((urwid.PACK, fa))
+
+
+
 
                 columns_widget = urwid.Columns(widgets, dividechars=0)
                 text_widget = columns_widget
@@ -458,43 +487,87 @@ def make_output(state, line, url_delegate):
                     elif c == "a":
                         state["align"] = state["default_align"]
 
-                    elif c == "<":
+                    elif c == '<':
+                        if len(part) > 0:
+                            output.append(make_part(state, part))
+                            part = ""
                         try:
-                            field_name = None
+                            field_start = i + 1  # position after '<'
-                            field_name_end = line[i:].find("`")
+                            backtick_pos = line.find('`', field_start)
-                            if field_name_end == -1:
+                            if backtick_pos == -1:
-                                pass
+                                pass  # No '`', invalid field
                             else:
-                                field_name = line[i+1:i+field_name_end]
+                                field_content = line[field_start:backtick_pos]
-                                field_name_skip = len(field_name)
                                 field_masked = False
                                 field_width = 24
+                                field_type = "field"
+                                field_name = field_content
+                                field_value = ""
+                                field_data = ""
+                                field_prechecked = False  
 
-                                if "|" in field_name:
+                                # check if field_content contains '|'
-                                    f_components = field_name.split("|")
+                                if '|' in field_content:
+                                    f_components = field_content.split('|')
                                     field_flags = f_components[0]
                                     field_name = f_components[1]
-                                    if "!" in field_flags:
+
+                                    # handle field type indicators
+                                    if '^' in field_flags:
+                                        field_type = "radio"
+                                        field_flags = field_flags.replace("^", "")
+                                    elif '?' in field_flags:
+                                        field_type = "checkbox"
+                                        field_flags = field_flags.replace("?", "")
+                                    elif '!' in field_flags:
                                         field_flags = field_flags.replace("!", "")
                                         field_masked = True
+
+                                    # Handle field width
                                     if len(field_flags) > 0:
+                                        try:
                                             field_width = min(int(field_flags), 256)
+                                        except ValueError:
+                                            pass  # Ignore invalid width
 
-                                def sr():
+                                    # Check for value and pre-checked flag
-                                    return "@{"+str(random.randint(1000,9999))+"}"
+                                    if len(f_components) > 2:
-                                rsg = sr()
+                                        field_value = f_components[2]
-                                while rsg in line[i+field_name_end:]:
+                                    else:
-                                    rsg = sr()
+                                        field_value = ""
-                                lr = line[i+field_name_end:].replace("\\>", rsg)
+                                    if len(f_components) > 3:
-                                endpos = lr.find(">")
+                                        if f_components[3] == '*':
-                                
+                                            field_prechecked = True
-                                if endpos == -1:
-                                    pass
 
                                 else:
-                                    field_data = lr[1:endpos].replace(rsg, "\\>")
+                                    # No '|', so field_name is field_content
-                                    skip = len(field_data)+field_name_skip+2
+                                    field_name = field_content
-                                    field_data = field_data.replace("\\>", ">")
+                                    field_type = "field"
+                                    field_masked = False
+                                    field_width = 24
+                                    field_value = ""
+                                    field_prechecked = False
+
+                                # Find the closing '>' character
+                                field_end = line.find('>', backtick_pos)
+                                if field_end == -1:
+                                    pass  # No closing '>', invalid field
+                                else:
+                                    field_data = line[backtick_pos+1:field_end]
+
+                                    # Now, we have all field data
+                                    if field_type in ["checkbox", "radio"]:
+                                        # for checkboxes and radios, field_data is the label
+                                        output.append({
+                                            "type": field_type,
+                                            "name": field_name,
+                                            "value": field_value if field_value else field_data,
+                                            "label": field_data,
+                                            "prechecked": field_prechecked,
+                                            "style": make_style(state)
+                                        })
+                                    else:
+                                        # For text fields field_data is the initial text
                                         output.append({
                                             "type": "field",
                                             "name": field_name,
@@ -503,9 +576,11 @@ def make_output(state, line, url_delegate):
                                             "data": field_data,
                                             "style": make_style(state)
                                         })
+                                    skip = field_end - i
                         except Exception as e:
                             pass
 
+                    
                     elif c == "[":
                         endpos = line[i:].find("]")
                         if endpos == -1:

setup.py

@@ -30,6 +30,6 @@ setuptools.setup(
     entry_points= {
         'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
     },
-    install_requires=["rns>=0.7.0", "lxmf>=0.3.9", "urwid>=2.4.2,!=2.4.3", "qrcode"],
+    install_requires=["rns>=0.8.8", "lxmf>=0.5.8", "urwid>=2.4.4", "qrcode"],
     python_requires=">=3.6",
 )