nomadnet - npm Package Compare versions

Comparing version 0.8.0 to 0.9.0

nomadnet.egg-info/PKG-INFO

@@ -1,4 +0,4 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nomadnet
-Version: 0.8.0
+Version: 0.9.0
 Summary: Communicate Freely
@@ -14,4 +14,4 @@ Home-page: https://github.com/markqvist/nomadnet
 License-File: LICENSE
-Requires-Dist: rns>=1.0.0
-Requires-Dist: lxmf>=0.8.0
+Requires-Dist: rns>=1.0.1
+Requires-Dist: lxmf>=0.9.0
 Requires-Dist: urwid>=2.6.16
@@ -25,2 +25,3 @@ Requires-Dist: qrcode
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
@@ -27,0 +28,0 @@ Dynamic: requires-python

nomadnet.egg-info/requires.txt

@@ -1,4 +0,4 @@
-rns>=1.0.0
-lxmf>=0.8.0
+rns>=1.0.1
+lxmf>=0.9.0
 urwid>=2.6.16
 qrcode

nomadnet/_version.py

@@ -1,1 +0,1 @@
-__version__ = "0.8.0"
+__version__ = "0.9.0"

nomadnet/Directory.py

@@ -9,2 +9,4 @@ import os
 
+from LXMF import pn_announce_data_is_valid
+
 class PNAnnounceHandler:
@@ -17,6 +19,6 @@ def __init__(self, owner):
         try:
-            if type(app_data) == bytes:
+            if pn_announce_data_is_valid(app_data):
                 data = msgpack.unpackb(app_data)
 
-                if data[0] == True:
+                if data[2] == True:
                     RNS.log("Received active propagation node announce from "+RNS.prettyhexrep(destination_hash))
@@ -198,3 +200,4 @@
 
-            if not found_node:
+            # TODO: Remove debug and rethink this (needs way to set PN when node is saved)
+            if True or not found_node:
                 if self.app.compact_stream:
@@ -201,0 +204,0 @@ try:

nomadnet/NomadNetworkApp.py

@@ -125,9 +125,12 @@ import os
 
+        self.static_peers            = []
         self.peer_announce_at_start  = True
         self.try_propagation_on_fail = True
-        self.disable_propagation     = False
+        self.disable_propagation     = True
         self.notify_on_new_message   = True
 
         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
 
@@ -306,4 +309,4 @@ self.periodic_lxmf_sync = True
             identity = self.identity, storagepath = self.storagepath, autopeer = True,
-            propagation_limit = self.lxmf_max_propagation_size, delivery_limit = self.lxmf_max_incoming_size,
-            max_peers = self.max_peers, static_peers = static_peers,
+            propagation_limit = self.lxmf_max_propagation_size, sync_limit = self.lxmf_max_sync_size, delivery_limit = self.lxmf_max_incoming_size,
+            max_peers = self.max_peers, static_peers = static_peers, propagation_cost=self.node_propagation_cost
         )
@@ -881,3 +884,3 @@
             if not "disable_propagation" in self.config["node"]:
-                self.disable_propagation = False
+                self.disable_propagation = True
             else:
@@ -894,2 +897,10 @@ self.disable_propagation = self.config["node"].as_bool("disable_propagation")
 
+            if not "max_sync_size" in self.config["node"]:
+                self.lxmf_max_sync_size = 256*40
+            else:
+                value = self.config["node"].as_float("max_sync_size")
+                if value < self.lxmf_max_propagation_size:
+                    value = self.lxmf_max_propagation_size
+                self.lxmf_max_sync_size = value
+
             if not "announce_at_start" in self.config["node"]:
@@ -908,2 +919,9 @@ self.node_announce_at_start = False
                 self.node_announce_interval = value
+
+            if not "propagation_cost" in self.config["node"]:
+                self.node_propagation_cost = 16
+            else:
+                value = self.config["node"].as_int("propagation_cost")
+                if value < 13: value = 13
+                self.node_propagation_cost = value
                 
@@ -1170,10 +1188,51 @@ if "pages_path" in self.config["node"]:
 # node, it can also act as an LXMF propagation
-# node. If there is already a large amount of
+# node. This is a convenient feature that lets
+# you easily set up and run a propagation node
+# on the network, but it is not as fully
+# featured as using the lxmd program to host a
+# propagation node. For complete control and
+# flexibility, use lxmd to run a PN. For a
+# small local system or network, the built-in
+# PN functionality will suffice for most cases.
+#
+# If there is already a large amount of
 # propagation nodes on the network, or you
 # simply want to run a pageserving-only node,
-# you can disable running a propagation node.
+# you should disable running a propagation node.
 # Due to lots of propagation nodes being
 # available, this is currently the default.
+
 disable_propagation = Yes
 
+# For clients and other propagation nodes
+# delivering messages via this node, you can
+# configure the minimum required propagation
+# stamp costs. All messages delivered to the
+# propagation node network must have a valid
+# propagation stamp, or they will be rejected.
+# Clients automatically detect the stamp cost
+# for the node they are delivering to, and
+# compute a corresponding stamp before trying
+# to deliver the message to the propagation
+# node.
+#
+# Propagation stamps are easier to verify in
+# large batches, and therefore also somewhat
+# easier to compute for the senders. As such,
+# a reasonable propagation stamp cost should
+# be a bit higher than the normal peer-to-peer
+# stamp costs.
+#
+# Propagation stamps does not incur any extra
+# load for propagation nodes processing them,
+# since they are only required to verify that
+# they are correct, and only the generation
+# is computationally costly. Setting a sensible
+# propagation stamp cost (and periodically
+# checking the average network consensus) helps
+# keep spam and misuse out of the propagation
+# node network.
+
+propagation_cost = 16
+
 # The maximum amount of storage to use for
@@ -1188,8 +1247,14 @@ # the LXMF Propagation Node message store,
 # 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.
+# coming propagation message, in kilobytes.
+# This sets the upper limit for the size of
+# single messages accepted onto this node.
+
+max_transfer_size = 256
+
+# The maximum accepted transfer size per in-
+# coming propagation node sync.
 #
@@ -1199,6 +1264,7 @@ # If a node wants to propagate a larger number
 # within this limit, it will prioritise sending
-# the smallest, newest messages first, and try
+# the smallest messages first, and try again
 # with any remaining messages at a later point.
-max_transfer_size = 256
 
+max_sync_size = 10240
+
 # You can tell the LXMF message router to
@@ -1211,2 +1277,3 @@ # prioritise storage for one or more
 # and generally you do not need to use it.
+
 # prioritise_destinations = 41d20c727598a3fbbdf9106133a3a0ed, d924b81822ca24e68e2effea99bcb8cf
@@ -1216,5 +1283,6 @@
 # propagation nodes that this node will peer
-# with automatically. The default is 50.
-# max_peers = 25
+# with automatically. The default is 20.
 
+# max_peers = 20
+
 # You can configure a list of static propagation
@@ -1224,2 +1292,3 @@ # node peers, that this node will always be
 # destination hashes.
+
 # static_peers = e17f833c4ddf8890dd3a79a6fea8161d, 5a2d0029b6e5ec87020abaea0d746da4
@@ -1231,2 +1300,3 @@
 # will only be scanned on startup.
+
 # page_refresh_interval = 0
@@ -1238,2 +1308,3 @@
 # will only be scanned on startup.
+
 # file_refresh_interval = 0
@@ -1247,2 +1318,3 @@
 # Printing messages is disabled by default
+
 print_messages = No
@@ -1255,2 +1327,3 @@
 # will be created that you can edit.
+
 # message_template = ~/.nomadnetwork/print_template_msg.txt
@@ -1260,2 +1333,3 @@
 # print messages from trusted destinations.
+
 # print_from = trusted
@@ -1266,2 +1340,3 @@
 # on arrival.
+
 # print_from = 76fe5751a56067d1e84eef3e88eab85b, 0e70b5848eb57c13154154feaeeb89b7
@@ -1271,2 +1346,3 @@
 # are feeling brave and adventurous.
+
 # print_from = everywhere
@@ -1277,2 +1353,3 @@
 # your system.
+
 print_command = lp
@@ -1279,0 +1356,0 @@

PKG-INFO

@@ -1,4 +0,4 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nomadnet
-Version: 0.8.0
+Version: 0.9.0
 Summary: Communicate Freely
@@ -14,4 +14,4 @@ Home-page: https://github.com/markqvist/nomadnet
 License-File: LICENSE
-Requires-Dist: rns>=1.0.0
-Requires-Dist: lxmf>=0.8.0
+Requires-Dist: rns>=1.0.1
+Requires-Dist: lxmf>=0.9.0
 Requires-Dist: urwid>=2.6.16
@@ -25,2 +25,3 @@ Requires-Dist: qrcode
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
@@ -27,0 +28,0 @@ Dynamic: requires-python

setup.py

@@ -33,4 +33,4 @@ import setuptools
     },
-    install_requires=["rns>=1.0.0", "lxmf>=0.8.0", "urwid>=2.6.16", "qrcode"],
+    install_requires=["rns>=1.0.1", "lxmf>=0.9.0", "urwid>=2.6.16", "qrcode"],
     python_requires=">=3.7",
 )

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

1133468

0.29%

Lines of code

13013

0.49%