distributed-state-network 0.5.3__tar.gz → 0.5.4__tar.gz

{distributed_state_network-0.5.3 → distributed_state_network-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed-state-network
-Version: 0.5.3
+Version: 0.5.4
 Summary: A tool to distribute the state of a network device to other devices on the network
 Project-URL: Homepage, https://github.com/erinclemmer/distributed_state_network
 Project-URL: Issues, https://github.com/erinclemmer/distributed_state_network/issues

{distributed_state_network-0.5.3 → distributed_state_network-0.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "distributed-state-network"
-version = "0.5.3"
+version = "0.5.4"
 authors = [{name="Erin Clemmer", email="erin.c.clemmer@gmail.com"}]
 description = "A tool to distribute the state of a network device to other devices on the network"
 keywords = ["distributed", "networking"]

{distributed_state_network-0.5.3 → distributed_state_network-0.5.4}/src/distributed_state_network/dsnode.py

@@ -72,6 +72,12 @@ class DSNode:
     def get_aes_key(self) -> bytes:
         return bytes.fromhex(self.config.aes_key)
 
+    def write_address_book(self, node_id: str, conn: Endpoint):
+        if conn.address == "127.0.0.1":
+            return
+        self.logger.info(f"Address set: {node_id} -> {conn.address}:{conn.port}")
+        self.address_book[node_id] = conn
+
     def network_tick(self):
         time.sleep(TICK_INTERVAL)
         if self.shutting_down:
@@ -184,7 +190,7 @@ class DSNode:
             if key == self.config.node_id:
                 continue
             
-            self.address_book[key] = pkt.connections[key]
+            self.write_address_book(key, pkt.connections[key])
             
             if key not in self.node_states:
                 self.send_hello(self.address_book[key])
@@ -234,18 +240,16 @@ class DSNode:
         if pkt.detected_address:
             self.logger.info(f"Server detected our IP as: {pkt.detected_address}")
             # Update our own connection in the address book with the detected IP
-            self.address_book[self.config.node_id] = Endpoint(pkt.detected_address, self.config.port)
+            self.write_address_book(self.config.node_id, pkt.detected_address, self.config.port)
         
-        # Store the peer's connection info
-        if pkt.node_id not in self.address_book:
-            self.address_book[pkt.node_id] = pkt.connection
+        self.write_address_book(pkt.node_id, con)
 
         if pkt.node_id not in self.node_states:
             self.node_states[pkt.node_id] = StatePacket(pkt.node_id, 0, b'', { })
 
         return pkt.node_id
 
-    def handle_hello(self, data: bytes, detected_address: str = None) -> bytes | None:
+    def handle_hello(self, data: bytes, detected_address: str) -> bytes:
         pkt = HelloPacket.from_bytes(data)
         self.logger.info(f"Received HELLO from {pkt.node_id}")
         if pkt.version != self.version:
@@ -254,9 +258,7 @@ class DSNode:
             raise Exception(505)  # Version not supported
 
         self.cred_manager.ensure_public(pkt.node_id, pkt.ecdsa_public_key)
-        
-        if pkt.node_id not in self.address_book:
-            self.address_book[pkt.node_id] = pkt.connection
+        self.write_address_book(pkt.node_id, Endpoint(detected_address, pkt.connection.port))
 
         if pkt.node_id not in self.node_states:
             self.node_states[pkt.node_id] = StatePacket(pkt.node_id, 0, b'', { })
@@ -280,6 +282,8 @@ class DSNode:
 
     def send_ping(self, node_id: str):     
         try:
+            conn = self.connection_from_node(node_id)
+            self.logger.debug(f"PING => {node_id} ({conn.address}:{conn.port})")
             self.send_request_to_node(node_id, MSG_PING, b' ')
         except Exception as e:
             raise Exception(f'PING => {node_id}: {e}')
@@ -324,7 +328,6 @@ class DSNode:
 
     def bootstrap(self, con: Endpoint):
         bootstrap_id = self.send_hello(con)
-        self.address_book[bootstrap_id] = con
         content = self.send_update(bootstrap_id)
         self.handle_update(content)
         self.request_peers(bootstrap_id)

{distributed_state_network-0.5.3 → distributed_state_network-0.5.4}/src/distributed_state_network/handler.py

@@ -8,7 +8,7 @@ from distributed_state_network.objects.config import DSNodeConfig
 from distributed_state_network.util.aes import generate_aes_key
 from distributed_state_network.util import stop_thread
 
-VERSION = "0.5.3"
+VERSION = "0.5.4"
 logging.basicConfig(level=logging.INFO)
 
 # Silence Flask and Werkzeug logging