Compare commits

...

29 Commits
0.4.6 ... 0.5.0

Author SHA1 Message Date
Mark Qvist
77c9e6c9eb Updated version and dependencies 2024-08-29 15:35:46 +02:00
Mark Qvist
ecb6ca6553 Cleanup 2024-08-17 21:24:11 +02:00
markqvist
18cc588f93 Merge pull request #58 from eddebc/fix-windows-log
Add Windows log static tail
2024-08-17 14:59:31 +02:00
markqvist
ed64837a6c Merge pull request #56 from donuts-are-good/grammar-its-its
Fix: Grammar, it's -> its
2024-08-17 14:48:02 +02:00
edd
4a1832ae34 Add Windows log static tail 2024-08-17 01:41:51 +03:00
donuts-are-good
648242b99f Fix: Grammar, it's -> its 2024-07-03 11:47:55 -05:00
Mark Qvist
8ad19cf048 Updated readme 2024-05-29 00:38:40 +02:00
Mark Qvist
7bf577a8c5 Updated guide 2024-05-25 22:54:23 +02:00
Mark Qvist
b14d42a17c Updated versions 2024-05-18 15:15:00 +02:00
Mark Qvist
51f0048e7c Updated nerd font glyphs. Fixes #55. 2024-05-18 14:56:22 +02:00
Mark Qvist
c2fb2ca9f8 Updated version and dependencies 2024-05-05 20:13:00 +02:00
Mark Qvist
6a4f202624 Updated dependencies 2024-03-04 00:31:38 +01:00
Mark Qvist
add8b295ec Updated version 2024-03-04 00:31:25 +01:00
Mark Qvist
f1989cfc6e Fixed inadverdent trust level warning 2024-03-02 09:11:09 +01:00
Mark Qvist
d9bba6fd69 Added LXMF transfer size limit options 2024-03-02 00:11:17 +01:00
Mark Qvist
4a3c987cef Merge branch 'master' of github.com:markqvist/NomadNet 2024-03-01 17:55:26 +01:00
Mark Qvist
026ff7b5c7 Updated versions 2024-03-01 17:55:19 +01:00
Mark Qvist
bcca6be487 Updated guide text 2024-03-01 17:55:13 +01:00
markqvist
3181e2124f Merge pull request #34 from qwertyuiopzxcvbnmlkjhgfdsa1/feature/dockerize
dozkerize build
2024-03-01 17:54:22 +01:00
Mark Qvist
6026f42f34 Check browser destination before displaying save dialog. Fixes #35. 2024-02-29 18:42:47 +01:00
Mark Qvist
e695cce3ba Added issue templates 2024-02-29 18:07:34 +01:00
Mark Qvist
ff45c597f8 Updated readme 2024-02-16 17:54:07 +01:00
Mark Qvist
a4c348529e Merge branch 'master' of github.com:markqvist/NomadNet 2024-02-16 17:48:53 +01:00
Mark Qvist
641f326be7 Updated readme 2024-02-16 17:48:34 +01:00
markqvist
014b9faea6 Merge pull request #53 from neutralinsomniac/notify_on_new_message
add message notification bell for textui
2024-02-08 17:30:22 +01:00
markqvist
ac7eecbd99 Merge pull request #50 from penguinolog/docker_fix
Fix docker image build
2024-02-08 17:29:17 +01:00
Jeremy O'Brien
04376a9f96 add message notification bell for textui 2024-01-25 10:14:12 -05:00
Aleksei Stepanov
c004adfb8c Fix docker image build
* Use non-rc python
* Use `pip` for package install
  `python setup.py --install` is deprecated by setuptools
2024-01-23 08:45:58 +01:00
Petr Blaha
a5623978a2 dozkerize build 2023-09-07 10:19:38 +02:00
15 changed files with 319 additions and 79 deletions

11
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -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

View File

@@ -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.

View File

@@ -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 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 RUN pip3 install setuptools-rust pyopenssl cryptography
COPY . /app/ 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 # 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" LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"

32
Dockerfile.build Normal file
View File

@@ -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 ###########################################

6
Dockerfile.howto Normal file
View File

@@ -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

View File

@@ -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 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. 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 - Ethereum
``` ```
0x81F7B979fEa6134bA9FD5c701b3501A2e61E897a 0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73
``` ```
- Bitcoin - Bitcoin
``` ```
3CPmacGm34qYvR6XWLVEJmi2aNe3PZqUuq 35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH
``` ```
- Ko-Fi: https://ko-fi.com/markqvist - 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 - New major features
- Network-wide propagated bulletins and discussion threads - Network-wide propagated bulletins and discussion threads
- Collaborative maps and geospatial information sharing - Collaborative maps and geospatial information sharing
- Facilitation of trade and barter
- Minor improvements and fixes - Minor improvements and fixes
- Link status (RSSI and SNR) in conversation or conv list - Link status (RSSI and SNR) in conversation or conv list
- Ctrl-M shorcut for jumping to menu - Ctrl-M shorcut for jumping to menu

View File

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

View File

@@ -119,12 +119,16 @@ class NomadNetworkApp:
self.should_run_jobs = True self.should_run_jobs = True
self.job_interval = 5 self.job_interval = 5
self.defer_jobs = 90 self.defer_jobs = 90
self.page_refresh_interval = 0 self.page_refresh_interval = 0
self.file_refresh_interval = 0 self.file_refresh_interval = 0
self.peer_announce_at_start = True self.peer_announce_at_start = True
self.try_propagation_on_fail = True self.try_propagation_on_fail = True
self.disable_propagation = False 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.periodic_lxmf_sync = True
self.lxmf_sync_interval = 360*60 self.lxmf_sync_interval = 360*60
@@ -282,7 +286,11 @@ class NomadNetworkApp:
self.directory = nomadnet.Directory(self) 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) self.message_router.register_delivery_callback(self.lxmf_delivery)
for destination_hash in self.ignored_list: for destination_hash in self.ignored_list:
@@ -546,6 +554,9 @@ class NomadNetworkApp:
nomadnet.Conversation.ingest(message, self) nomadnet.Conversation.ingest(message, self)
if self.notify_on_new_message:
self.notify_message_recieved()
if self.should_print(message): if self.should_print(message):
self.print_message(message) self.print_message(message)
@@ -649,6 +660,11 @@ class NomadNetworkApp:
if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"): if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
os.unlink(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): def clear_tmp_dir(self):
if os.path.isdir(self.tmpfilespath): if os.path.isdir(self.tmpfilespath):
for file in os.listdir(self.tmpfilespath): for file in os.listdir(self.tmpfilespath):
@@ -722,10 +738,22 @@ class NomadNetworkApp:
else: else:
self.lxmf_sync_limit = None self.lxmf_sync_limit = None
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": if option == "compact_announce_stream":
value = self.config["client"].as_bool(option) value = self.config["client"].as_bool(option)
self.compact_stream = value 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": if option == "user_interface":
value = value.lower() value = value.lower()
if value == "none": if value == "none":
@@ -816,6 +844,14 @@ class NomadNetworkApp:
else: else:
self.disable_propagation = self.config["node"].as_bool("disable_propagation") 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"]: if not "announce_at_start" in self.config["node"]:
self.node_announce_at_start = False self.node_announce_at_start = False
else: else:
@@ -953,6 +989,7 @@ destination = file
enable_client = yes enable_client = yes
user_interface = text user_interface = text
downloads_path = ~/Downloads downloads_path = ~/Downloads
notify_on_new_message = yes
# By default, the peer is announced at startup # By default, the peer is announced at startup
# to let other peers reach it immediately. # to let other peers reach it immediately.
@@ -980,6 +1017,13 @@ lxmf_sync_interval = 360
# the limit, and download everything every time. # the limit, and download everything every time.
lxmf_sync_limit = 8 lxmf_sync_limit = 8
# 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 # The announce stream will only show one entry
# per destination or node by default. You can # per destination or node by default. You can
# change this to show as many announces as have # change this to show as many announces as have
@@ -1068,6 +1112,18 @@ announce_at_start = Yes
# and defaults to 2 gigabytes. # and defaults to 2 gigabytes.
# message_storage_limit = 2000 # 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 # You can tell the LXMF message router to
# prioritise storage for one or more # prioritise storage for one or more
# destinations. If the message store reaches # destinations. If the message store reaches

View File

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

View File

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

View File

@@ -664,52 +664,56 @@ class Browser:
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
def save_node_dialog(self): def save_node_dialog(self):
def dismiss_dialog(sender): if self.destination_hash != None:
self.close_dialogs() try:
def dismiss_dialog(sender):
self.close_dialogs()
display_name = RNS.Identity.recall_app_data(self.destination_hash) display_name = RNS.Identity.recall_app_data(self.destination_hash)
disp_str = "" disp_str = ""
if display_name != None: if display_name != None:
display_name = display_name.decode("utf-8") display_name = display_name.decode("utf-8")
disp_str = " \""+display_name+"\"" disp_str = " \""+display_name+"\""
def confirmed(sender): def confirmed(sender):
node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True) node_entry = DirectoryEntry(self.destination_hash, display_name=display_name, hosts_node=True)
self.app.directory.remember(node_entry) self.app.directory.remember(node_entry)
self.app.ui.main_display.sub_displays.network_display.directory_change_callback() self.app.ui.main_display.sub_displays.network_display.directory_change_callback()
self.close_dialogs() self.close_dialogs()
dialog = UrlDialogLineBox( dialog = UrlDialogLineBox(
urwid.Pile([ urwid.Pile([
urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"), urwid.Text("Save connected node"+disp_str+" "+RNS.prettyhexrep(self.destination_hash)+" to Known Nodes?\n"),
urwid.Columns([ urwid.Columns([
(urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)), (urwid.WEIGHT, 0.45, urwid.Button("Cancel", on_press=dismiss_dialog)),
(urwid.WEIGHT, 0.1, urwid.Text("")), (urwid.WEIGHT, 0.1, urwid.Text("")),
(urwid.WEIGHT, 0.45, urwid.Button("Save", on_press=confirmed)), (urwid.WEIGHT, 0.45, urwid.Button("Save", on_press=confirmed)),
]) ])
]), title="Save Node" ]), title="Save Node"
) )
dialog.confirmed = confirmed dialog.confirmed = confirmed
dialog.delegate = self dialog.delegate = self
bottom = self.display_widget bottom = self.display_widget
overlay = urwid.Overlay( overlay = urwid.Overlay(
dialog, dialog,
bottom, bottom,
align=urwid.CENTER, align=urwid.CENTER,
width=(urwid.RELATIVE, 50), width=(urwid.RELATIVE, 50),
valign=urwid.MIDDLE, valign=urwid.MIDDLE,
height=urwid.PACK, height=urwid.PACK,
left=2, left=2,
right=2, right=2,
) )
options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width) options = self.delegate.columns.options(urwid.WEIGHT, self.delegate.right_area_width)
self.delegate.columns.contents[1] = (overlay, options) self.delegate.columns.contents[1] = (overlay, options)
self.delegate.columns.focus_position = 1 self.delegate.columns.focus_position = 1
except Exception as e:
pass
def load_page(self): def load_page(self):
if self.request_data == None: if self.request_data == None:

View File

@@ -1056,7 +1056,7 @@ class ConversationWidget(urwid.WidgetWrap):
else: else:
warning = urwid.AttrMap( warning = urwid.AttrMap(
urwid.Padding(urwid.Text( 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. " "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" "Close this conversation and reopen it to try again.\n\n"
"To query the network manually, select this conversation in the conversation list, " "To query the network manually, select this conversation in the conversation list, "

View File

@@ -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 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. 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. 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. 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 >> 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: 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. 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`! `!announce_at_start = yes`!
>>>> >>>>
@@ -512,6 +521,12 @@ The number of minutes between each automatic sync. The default is equal to 6 hou
On low-bandwidth networks, it can be useful to limit the amount of messages downloaded in each sync. The default is 8. Set to 0 to download all available messages every time a sync occurs. 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.
< <
>>>
`!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`! `!compact_announce_stream = yes`!
>>>> >>>>
@@ -650,6 +665,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. 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`! `!prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf`!
>>>> >>>>
@@ -768,7 +789,7 @@ The following line should contain a grayscale gradient bar:
Unicode Glyphs : \u2713 \u2715 \u26a0 \u24c3 \u2193 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 +1070,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 `Faaa
`= `=

View File

@@ -1,6 +1,11 @@
import os
import sys
import itertools
import mmap
import urwid import urwid
import nomadnet import nomadnet
class LogDisplayShortcuts(): class LogDisplayShortcuts():
def __init__(self, app): def __init__(self, app):
import urwid import urwid
@@ -8,28 +13,31 @@ class LogDisplayShortcuts():
self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar") self.widget = urwid.AttrMap(urwid.Text(""), "shortcutbar")
class LogDisplay(): class LogDisplay():
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
self.log_term = None
self.shortcuts_display = LogDisplayShortcuts(self.app) self.shortcuts_display = LogDisplayShortcuts(self.app)
self.widget = None self.widget = None
@property
def log_term(self):
return self.widget
def show(self): 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): 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 self.widget = None
def shortcuts(self): def shortcuts(self):
return self.shortcuts_display return self.shortcuts_display
class LogTerminal(urwid.WidgetWrap): class LogTerminal(urwid.WidgetWrap):
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
@@ -39,7 +47,8 @@ class LogTerminal(urwid.WidgetWrap):
escape_sequence="up", escape_sequence="up",
main_loop=self.app.ui.loop, 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): def terminate(self):
self.log_term.terminate() self.log_term.terminate()
@@ -50,3 +59,69 @@ class LogTerminal(urwid.WidgetWrap):
nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header" nomadnet.NomadNetworkApp.get_shared_instance().ui.main_display.frame.focus_position = "header"
return super(LogTerminal, self).keypress(size, key) 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)

View File

@@ -30,6 +30,6 @@ setuptools.setup(
entry_points= { entry_points= {
'console_scripts': ['nomadnet=nomadnet.nomadnet:main'] '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.7.6", "lxmf>=0.4.5", "urwid>=2.4.4", "qrcode"],
python_requires=">=3.6", python_requires=">=3.6",
) )