diff --git a/README.md b/README.md index b306b86..5d53d01 100755 --- a/README.md +++ b/README.md @@ -1,19 +1,10 @@ # Nomad Network - Communicate Freely -> [!WARNING] -> Several hastily launched, incorrect, and in most cases entirely LLM-generated fakes of Nomad Network and associated tools are currently being circulated and marketed. Most of these "projects" violate the open source GPLv3 license that Nomad Network was published under, but claim independent ownership and license grants. Such claims or grants are **not** legally valid, and **not** recognized by the Nomad Network authors and copyright holders. -> -> Any claimed assertion of copyright or grant of license that such projects are making are [void grants](https://reticulum.network/manual/brandolinis.html#void-grants-legal-foundations-of-machine-generated-code). Both the violators themselves, and **all** downstream projects using the infringing derivatives, are **directly** and **personally** liable for the legal consequences. -> -> For more detailed information, see the relevant sections of the [Brandolini's Reference](https://reticulum.network/manual/brandolinis.html) chapter of the Reticulum Manual. For software and projects recognized by the Reticulum community, see the [Programs Using Reticulum](https://reticulum.network/manual/software.html) chapter. -> -> Do **not** use these "projects", they are a hazard to the entire ecosystem we have been carefully building over the last ten years. - *This repository is [a public mirror](./MIRROR.md). All development is happening elsewhere.* Off-grid, resilient mesh communication with strong encryption, forward secrecy and extreme privacy. -![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1a.png) +![Screenshot](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png) Nomad Network allows you to build private and resilient communications platforms that are in complete control and ownership of the people that use them. No signups, no agreements, no handover of any data, no permissions and gatekeepers. @@ -21,23 +12,15 @@ Nomad Network is build on [LXMF](https://github.com/markqvist/LXMF) and [Reticul 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, Windows and macOS. - -Other Nomad Network clients include: - -- [MeshChatX](https://meshchatx.com/) -- [Columba (mobile)](https://github.com/torlando-tech/columba) -- [Ren Browser](https://github.com/Quad4-Software/Ren-Browser) +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. ## Notable Features - Encrypted messaging over packet-radio, LoRa, WiFi or anything else [Reticulum](https://github.com/markqvist/Reticulum) supports. - Zero-configuration, minimal-infrastructure mesh communication - Distributed and encrypted message store holds messages for offline users - Connectable nodes that can host pages and files - - Image rendering support in terminals that support it - Node-side generated pages with PHP, Python, bash or others - Built-in text-based browser for interacting with contents on nodes - - Built-in RRC client for live, many-to-many chat - An easy to use and bandwidth efficient markup language for writing pages - Page caching in browser @@ -93,10 +76,10 @@ The first time the program is running, you will be presented with the **Guide se To use Nomad Network on packet radio or LoRa, you will need to configure your Reticulum installation to use any relevant packet radio TNCs or LoRa devices on your system. See the [Reticulum documentation](https://markqvist.github.io/Reticulum/manual/interfaces.html) for info. For a general introduction on how to set up such a system, take a look at [this post](https://unsigned.io/private-messaging-over-lora/). -If you want to try Nomad Network without building your own physical network, you can connect to the [distributed backbone](https://reticulum.network/manual/gettingstartedfast.html#bootstrapping-connectivity) over the Internet, where there is already quite a bit of Nomad Network and LXMF activity. 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: +If you want to try Nomad Network without building your own physical network, you can connect to the [Unsigned.io RNS Testnet](https://github.com/markqvist/Reticulum#public-testnet) over the Internet, where there is already some Nomad Network and LXMF activity. 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: - - `9ce92808be498e9e05590ff27cbfdfe4` The rns.recipes forum - - `a4a5e861626ce97c9aa544d9ecdf6d22` rmap.world + - `abb3ebcd03cb2388a838e70c001291f9` Dublin Hub Testnet Node + - `ea6a715f814bdc37e56f80c34da6ad51` Frankfurt Hub Testnet Node To browse pages on a node that is not currently known, open the URL dialog in the `Network` section of the program by pressing `Ctrl+U`, paste or enter the address and select `Go` or press enter. Nomadnet will attempt to discover and connect to the requested node. @@ -105,12 +88,42 @@ You can install Nomad Network on Android using Termux, but there's a few more co For a native Android application with a graphical user interface, have a look at [Sideband](https://github.com/markqvist/Sideband). +### Docker Images + +Nomad Network is automatically published as a docker image on Github Packages. Image tags are one of either `master` (for the very latest commit) or the version number (eg `0.2.0`) for a specific release. + +```sh +$ docker pull ghcr.io/markqvist/nomadnet:master + +# Run nomadnet interactively in a container +$ docker run -it ghcr.io/markqvist/nomadnet:master --textui + +# Run nomadnet as a daemon, using config stored on the host machine in specified +# directories, and connect the containers network to the host network (which will +# allow the default AutoInterface to automatically peer with other discovered +# Reticulum instances). +$ docker run -d \ + -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \ + -v /local/path/reticulumconfigdir/:/root/.reticulum/ \ + --network host + ghcr.io/markqvist/nomadnet:master + +# You can also keep the network of the container isolated from the host, but you +# will need to manually configure one or more Reticulum interfaces to reach other +# nodes in a network, by editing the Reticulum configuration file. +$ docker run -d \ + -v /local/path/nomadnetconfigdir/:/root/.nomadnetwork/ \ + -v /local/path/reticulumconfigdir/:/root/.reticulum/ \ + ghcr.io/markqvist/nomadnet:master + +# Send daemon log output to console instead of file +$ docker run -i ghcr.io/markqvist/nomadnet:master --daemon --console +``` ## Tools & Extensions Nomad Network is a very flexible and extensible platform, and a variety of community-provided tools, utilities and node-side extensions exist: -- [Retipedia](https://github.com/RFnexus/Retipedia) - [NomadForum](https://codeberg.org/AutumnSpark1226/nomadForum) ([GitHub mirror](https://github.com/AutumnSpark1226/nomadForum)) - [NomadForecast](https://github.com/faragher/NomadForecast) - [micron-blog](https://github.com/randogoth/micron-blog) @@ -124,6 +137,9 @@ Nomad Network is a very flexible and extensible platform, and a variety of commu - [POPR](https://github.com/faragher/POPR) - [LXMF Tools](https://github.com/SebastianObi/LXMF-Tools) +## Help & Discussion + +For help requests, discussion, sharing ideas or anything else related to Nomad Network, please have a look at the [Nomad Network discussions pages](https://github.com/markqvist/Reticulum/discussions/categories/nomad-network). ## Support Nomad Network You can help support the continued development of open, free and private communications systems by donating via one of the following channels: @@ -145,12 +161,32 @@ You can help support the continued development of open, free and private communi - Ko-Fi: https://ko-fi.com/markqvist +## Development Roadmap + +- New major features + - Network-wide propagated bulletins and discussion threads + - Collaborative maps and geospatial information sharing +- Minor improvements and fixes + - Link status (RSSI and SNR) in conversation or conv list + - Ctrl-M shorcut for jumping to menu + - Share node with other users / send node info to user + - Fix internal editor failing on some OSes with no "editor" alias + - Possibly add a required-width header + - Improve browser handling of remote link close + - Better navigation handling when requests fail (also because of closed links) + - Retry failed messages mechanism + - Re-arrange buttons to be more consistent + - Term compatibility notice in readme + - Selected icon in conversation list + - Possibly a Search Local Nodes function + - Possibly add via entry in node info box, next to distance + ## Caveat Emptor -Nomad Network is beta software, and should be considered as such. Use at your own risk and responsibility. +Nomad Network is beta software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it _has not_ been externally security audited, and there could very well be privacy-breaking bugs. If you want to help out, or help sponsor an audit, please do get in touch. ## Screenshots -![Screenshot 1](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1a.png) +![Screenshot 1](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/1.png) ![Screenshot 2](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/2.png) @@ -158,6 +194,4 @@ Nomad Network is beta software, and should be considered as such. Use at your ow ![Screenshot 4](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/4.png) -![Screenshot 5](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/5.png) - -![Screenshot 6](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/6.png) +![Screenshot 5](https://github.com/markqvist/NomadNet/raw/master/docs/screenshots/5.png) \ No newline at end of file diff --git a/README.mu b/README.mu index 2c95bf1..332b95a 100644 --- a/README.mu +++ b/README.mu @@ -16,7 +16,6 @@ If you'd rather want to use an LXMF client with a graphical user interface, you • Zero-configuration, minimal-infrastructure mesh communication • Distributed and encrypted message store holds messages for offline users • Connectable nodes that can host pages and files - • Image rendering support in terminals that support it • Node-side generated pages with PHP, Python, bash or others • Built-in text-based browser for interacting with contents on nodes • Built-in RRC client for live, many-to-many chat @@ -120,4 +119,4 @@ For this to be possible, I need your help. Please support the continued developm >> Caveat Emptor -Nomad Network is experimental software, and should be considered as such. Use at your own risk and responsibility. +Nomad Network is experimental software, and should be considered as such. While it has been built with cryptography best-practices very foremost in mind, it `!has not`! been externally security audited, and there could very well be privacy-breaking bugs. Use at your own risk and responsibility. diff --git a/docs/screenshots/6.png b/docs/screenshots/1.png similarity index 100% rename from docs/screenshots/6.png rename to docs/screenshots/1.png diff --git a/docs/screenshots/1a.png b/docs/screenshots/1a.png deleted file mode 100644 index 3df866e..0000000 Binary files a/docs/screenshots/1a.png and /dev/null differ diff --git a/nomadnet/Directory.py b/nomadnet/Directory.py index 8727b7d..65ab3a7 100644 --- a/nomadnet/Directory.py +++ b/nomadnet/Directory.py @@ -6,7 +6,7 @@ import nomadnet import threading import RNS.vendor.umsgpack as msgpack -from LXMF import pn_announce_data_is_valid, PN_META_IMPL_NAME, PN_META_VERSION +from LXMF import pn_announce_data_is_valid from nomadnet.util import strip_modifiers from nomadnet.util import sanitize_name @@ -21,10 +21,7 @@ class PNAnnounceHandler: data = msgpack.unpackb(app_data) if data[2] == True: - metadata = data[6] - if not PN_META_IMPL_NAME in metadata or not PN_META_VERSION in metadata: impl_str = "" - else: impl_str = f" running {metadata[PN_META_IMPL_NAME]} {metadata[PN_META_VERSION]}" - RNS.log(f"Received active propagation node announce from {RNS.prettyhexrep(destination_hash)}{impl_str}", RNS.LOG_DEBUG) + RNS.log("Received active propagation node announce from "+RNS.prettyhexrep(destination_hash), RNS.LOG_DEBUG) associated_peer = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", announced_identity) associated_node = RNS.Destination.hash_from_name_and_identity("nomadnetwork.node", announced_identity) diff --git a/nomadnet/Node.py b/nomadnet/Node.py index 44a9978..31d4a26 100644 --- a/nomadnet/Node.py +++ b/nomadnet/Node.py @@ -21,8 +21,6 @@ class Node: self.app = app self.identity = self.app.identity self.destination = RNS.Destination(self.identity, RNS.Destination.IN, RNS.Destination.SINGLE, "nomadnetwork", "node") - self.destination.set_link_cost(self.app.node_link_cost) - if self.app.node_stamp_value: self.destination.set_value(self.app.node_stamp_value) self.last_announce = time.time() self.last_file_refresh = time.time() self.last_page_refresh = time.time() diff --git a/nomadnet/NomadNetworkApp.py b/nomadnet/NomadNetworkApp.py index cb379da..b32a4e2 100644 --- a/nomadnet/NomadNetworkApp.py +++ b/nomadnet/NomadNetworkApp.py @@ -36,9 +36,6 @@ class NomadNetworkApp: START_ANNOUNCE_DELAY = 3 - REQUIRED_DESTINATION_TYPES = ["nomadnetwork.node", "rrc.hub"] - DEFAULT_LINK_COST = 17.8 - def exit_handler(self): self.should_run_jobs = False @@ -106,9 +103,6 @@ class NomadNetworkApp: NomadNetworkApp._shared_instance = self self.rns = RNS.Reticulum(configdir = rnsconfigdir) - # self.rns.required_announces_only(True) - for full_name in self.REQUIRED_DESTINATION_TYPES: - self.rns.wants_destination_type(full_name) self.configpath = self.configdir+"/config" self.ignoredpath = self.configdir+"/ignored" @@ -150,13 +144,10 @@ class NomadNetworkApp: self.notify_on_new_message = True self.compose_markdown = True - self.lxmf_stamp_value = None self.lxmf_max_propagation_size = None self.lxmf_max_sync_size = None self.lxmf_max_incoming_size = None self.node_propagation_cost = LXMF.LXMRouter.PROPAGATION_COST - self.node_link_cost = self.DEFAULT_LINK_COST - self.node_stamp_value = None self.periodic_lxmf_sync = True self.lxmf_sync_interval = 360*60 @@ -390,7 +381,7 @@ class NomadNetworkApp: 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"], stamp_cost=self.required_stamp_cost, stamp_value=self.lxmf_stamp_value) + self.lxmf_destination = self.message_router.register_delivery_identity(self.identity, display_name=self.peer_settings["display_name"], stamp_cost=self.required_stamp_cost) if not self.accept_invalid_stamps: self.message_router.enforce_stamps() @@ -871,11 +862,6 @@ class NomadNetworkApp: value = self.config["client"].as_bool(option) self.enable_client = value - if option == "stamp_value": - value = self.config["client"].as_float("stamp_value") - if value < 1: value = 1 - self.lxmf_stamp_value = RNS.Stamps.quantize_cost(value) - if option == "downloads_path": value = self.config["client"]["downloads_path"] self.downloads_path = os.path.expanduser(value) @@ -1154,16 +1140,6 @@ class NomadNetworkApp: else: self.node_name = self.config["node"]["node_name"] - if "link_cost" in self.config["node"]: - value = self.config["node"].as_float("link_cost") - if value < 1: value = 1 - self.node_link_cost = RNS.Stamps.quantize_cost(value) - - if "stamp_value" in self.config["node"]: - value = self.config["node"].as_float("stamp_value") - if value < 1: value = 1 - self.node_stamp_value = RNS.Stamps.quantize_cost(value) - if not "disable_propagation" in self.config["node"]: self.disable_propagation = True else: diff --git a/nomadnet/RRC.py b/nomadnet/RRC.py index 3fefcca..5ca4bfe 100644 --- a/nomadnet/RRC.py +++ b/nomadnet/RRC.py @@ -223,9 +223,6 @@ class RRCHub: self.dest_name = dest_name or DEFAULT_DEST_NAME self.name = name or RNS.prettyhexrep(hub_hash) - if not self.dest_name == DEFAULT_DEST_NAME: - RNS.Reticulum.get_instance().wants_destination_type(self.dest_name) - self.link = None self.status = RRCHub.STATUS_DISCONNECTED self.status_text = "Disconnected" @@ -1249,7 +1246,7 @@ class RRCHub: # for it's purpose. My future work in chat-related # protocols on Reticulum will be focused on a better # architecture, incorporating everything we learned - # from RRC, and making it Reticulum-native from the + # from RRC, and makeing it Reticulum-native from the # start, instead of mirroring IRC too closely. # - Mark was_parsed = self._process_notice_text(body) diff --git a/nomadnet/_version.py b/nomadnet/_version.py index 0f228f2..aa56ed4 100644 --- a/nomadnet/_version.py +++ b/nomadnet/_version.py @@ -1 +1 @@ -__version__ = "1.5.1" +__version__ = "1.4.3" diff --git a/nomadnet/ui/textui/Guide.py b/nomadnet/ui/textui/Guide.py index 3dc0a56..a204272 100644 --- a/nomadnet/ui/textui/Guide.py +++ b/nomadnet/ui/textui/Guide.py @@ -1018,12 +1018,6 @@ 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. < ->>> -`!stamp_value = 25.0`! ->>>> -The target stamp value for your LXMF destination can be configured with this option. Defaults to 25.0. Each increase of 1.0 doubles the generation difficulty. Destination stamps are one-time generations, so it can be worth targeting a high value here, to ensure that other transport nodes will accept your announces. The default should be sufficient for most cases, though. -< - >>> `!required_stamp_cost = None`! >>>> @@ -1221,18 +1215,6 @@ Determines whether the node server should be started on launch. Must be a boolea Defines what the announced name of the node should be. < ->>> -`!stamp_value = 25.0`! ->>>> -The target stamp value for your node destination can be configured with this option. Defaults to 25.0. Each increase of 1.0 doubles the generation difficulty. Destination stamps are one-time generations, so it can be worth targeting a high value here, to ensure that other transport nodes will accept your announces. The default should be sufficient for most cases, though. -< - ->>> -`!link_cost = 17.8`! ->>>> -The link stamp cost required for other peers to connect to your node. The default is a relatively high value, that should deter most automated scraping and misuse, but you can set it even higher, if you wish, or lower it to allow connecting more easily. -< - >>> `!announce_at_start = yes`! >>>> diff --git a/nomadnet/ui/textui/MicronParser.py b/nomadnet/ui/textui/MicronParser.py index d4ac77d..ae0e5e1 100644 --- a/nomadnet/ui/textui/MicronParser.py +++ b/nomadnet/ui/textui/MicronParser.py @@ -603,14 +603,14 @@ def parse_line(line, state, url_delegate): if len(line) == 2: divider_char = line[1] # Control characters don't make sense here and otherwise crash nomadnet - if ord(divider_char) < 32: divider_char = "\u2500" - # Check if the divider char is renderable - try: urwid.Divider(divider_char).render((30,)) - except Exception as e: divider_char = "\u2500" - else: divider_char = "\u2500" - - if state["depth"] == 0: return [urwid.Divider(divider_char)] - else: return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))] + if ord(divider_char) < 32: + divider_char = "\u2500" + else: + divider_char = "\u2500" + if state["depth"] == 0: + return [urwid.Divider(divider_char)] + else: + return [urwid.Padding(urwid.Divider(divider_char), left=left_indent(state), right=right_indent(state))] output = make_output(state, line, url_delegate, pre_escape) diff --git a/nomadnet/ui/textui/Network.py b/nomadnet/ui/textui/Network.py index 39852a3..11c4e54 100644 --- a/nomadnet/ui/textui/Network.py +++ b/nomadnet/ui/textui/Network.py @@ -8,7 +8,6 @@ from nomadnet.Directory import DirectoryEntry from nomadnet.vendor.additional_urwid_widgets import IndicativeListBox, MODIFIER_KEY from nomadnet.util import strip_modifiers from nomadnet.util import sanitize_name -from LXMF import pn_stamp_cost_from_app_data from .Browser import Browser from .ReadlineEdit import ReadlineEdit @@ -242,25 +241,13 @@ class AnnounceInfo(urwid.WidgetWrap): type_button, ]) - dst_value = RNS.Identity.recall_stamp_value(source_hash) - link_cost = RNS.Identity.recall_link_cost(source_hash) - dst_val_str = f"{RNS.prettycost(dst_value)}" if dst_value else "None" - link_cost_str = f"{RNS.prettycost(link_cost)}" if link_cost else "None" - - pile_widgets = [] + pile_widgets = [] if is_pn: - pn_app_data = RNS.Identity.recall_app_data(source_hash) - prop_cost = pn_stamp_cost_from_app_data(pn_app_data) - - prop_cost_str = f"{RNS.prettycost(prop_cost)}" if prop_cost else "None" pile_widgets = [ urwid.Text("Time : "+ts_string, align=urwid.LEFT), urwid.Text("Addr : "+addr_str, align=urwid.LEFT), urwid.Text("Type : "+type_string, align=urwid.LEFT), - urwid.Text("D.Val : "+dst_val_str, align=urwid.LEFT), - urwid.Text("L.Cst : "+link_cost_str, align=urwid.LEFT), - urwid.Text("P.Cst : "+prop_cost_str, align=urwid.LEFT), urwid.Divider(g["divider1"]), button_columns ] @@ -271,8 +258,6 @@ class AnnounceInfo(urwid.WidgetWrap): urwid.Text("Addr : "+addr_str, align=urwid.LEFT), urwid.Text("Type : "+type_string, align=urwid.LEFT), urwid.Text("Name : "+display_str, align=urwid.LEFT), - urwid.Text("D.Val : "+dst_val_str, align=urwid.LEFT), - urwid.Text("L.Cst : "+link_cost_str, align=urwid.LEFT), urwid.Text(["Trust : ", (style, trust_str)], align=urwid.LEFT), urwid.Divider(g["divider1"]), urwid.Text(["Announce Data: \n", (data_style, data_str)], align=urwid.LEFT), @@ -641,8 +626,6 @@ class KnownNodeInfo(urwid.WidgetWrap): source_hash = node_hash node_ident = RNS.Identity.recall(node_hash) - dst_value = RNS.Identity.recall_stamp_value(node_hash) - link_cost = RNS.Identity.recall_link_cost(node_hash) time_format = self.app.time_format trust_level = self.app.directory.trust_level(source_hash) trust_str = "" @@ -658,9 +641,7 @@ class KnownNodeInfo(urwid.WidgetWrap): else: display_str = strip_modifiers(node_entry.display_name) - addr_str = "<"+RNS.hexrep(source_hash, delimit=False)+">" - dst_val_str = f"{RNS.prettycost(dst_value)}" if dst_value else "None" - link_cost_str = f"{RNS.prettycost(link_cost)}" if link_cost else "None" + addr_str = "<"+RNS.hexrep(source_hash, delimit=False)+">" if display_str == None: display_str = addr_str @@ -810,8 +791,6 @@ class KnownNodeInfo(urwid.WidgetWrap): urwid.Text("Type : "+type_string, align=urwid.LEFT), e_name, urwid.Text("Node Addr : "+addr_str, align=urwid.LEFT), - urwid.Text("Dst Value : "+dst_val_str, align=urwid.LEFT), - urwid.Text("Link Cost : "+link_cost_str, align=urwid.LEFT), e_sort, urwid.Divider(g["divider1"]), urwid.Text(lxmf_addr_str, align=urwid.CENTER), diff --git a/nomadnet/ui/textui/images/_termlib.py b/nomadnet/ui/textui/images/_termlib.py index a974e84..abe7575 100644 --- a/nomadnet/ui/textui/images/_termlib.py +++ b/nomadnet/ui/textui/images/_termlib.py @@ -10,11 +10,9 @@ import os import select import shutil import sys +import termios import time -try: import termios -except: termios = None - from . import _ctlseqs QUERY_TIMEOUT = 0.3 @@ -45,7 +43,7 @@ def _open_tty(): def query_tty(request, timeout=QUERY_TIMEOUT): # Sends a query to the terminal and returns the raw response. global _query_failed - if _query_failed or not termios: return b"" + if _query_failed: return b"" fd = _open_tty() if fd == -1: @@ -123,7 +121,6 @@ def _cell_size_from_winsize(buf): def _query_cell_size(): # Determines the current cell size in pixels, or None if unknown. - if not termios: return None fd = _open_tty() if fd != -1: # First, try the TIOCGWINSZ pixel fields (fast, no query) diff --git a/setup.py b/setup.py index d06c3e5..4770e3c 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,6 @@ setuptools.setup( entry_points= { 'console_scripts': ['nomadnet=nomadnet.nomadnet:main'] }, - install_requires=["rns>=1.6.1", "lxmf>=1.3.1", "urwid>=3.0.5", "qrcode"], + install_requires=["rns>=1.5.4", "lxmf>=1.1.1", "urwid>=3.0.5", "qrcode"], python_requires=">=3.8", )