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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed-state-network
-Version: 0.5.2
+Version: 0.5.3
 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.2 → distributed_state_network-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "distributed-state-network"
-version = "0.5.2"
+version = "0.5.3"
 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.2 → distributed_state_network-0.5.3}/src/distributed_state_network/dsnode.py

@@ -56,10 +56,8 @@ class DSNode:
             self.config.node_id: StatePacket.create(self.config.node_id, time.time(), self.cred_manager.my_private(), { })
         }
 
-        # Determine initial IP - use 127.0.0.1 for localhost, will be updated when connecting to remote nodes
-        initial_ip = "127.0.0.1"
         self.address_book = {
-            self.config.node_id: Endpoint(initial_ip, config.port)
+            self.config.node_id: Endpoint(self.config.network_ip, config.port)
         }
         
         self.logger = logging.getLogger("DSN: " + config.node_id)
@@ -96,6 +94,7 @@ class DSNode:
                     return
                 self.send_ping(node_id)
             except Exception:
+                self.logger.error(f"PING Failure for {node_id}")
                 if node_id in self.node_states:  # double check if something has changed since the ping request started
                     remove(node_id)
                     if self.disconnect_cb is not None:
@@ -189,7 +188,7 @@ class DSNode:
             
             if key not in self.node_states:
                 self.send_hello(self.address_book[key])
-            
+                
             node_state = self.send_update(key)
             self.handle_update(node_state)
 
@@ -203,6 +202,8 @@ class DSNode:
 
         peers = { }
         for key in self.address_book.keys():
+            if key == self.config.node_id:
+                continue
             peers[key] = self.address_book[key]
         
         pkt = PeersPacket(self.config.node_id, None, peers)
@@ -213,7 +214,6 @@ class DSNode:
         self.logger.info(f"HELLO => {con.to_string()}")
 
         pkt = self.my_hello_packet()
-        pkt.detected_address = con.address
         payload = pkt.to_bytes()
         content = self.send_http_request(con, MSG_HELLO, payload)
         
@@ -306,7 +306,6 @@ class DSNode:
         
         if pkt.node_id not in self.node_states:
             self.node_states[pkt.node_id] = pkt
-            return
 
         if get_dict_hash(self.node_states[pkt.node_id].state_data) != get_dict_hash(pkt.state_data):
             self.node_states[pkt.node_id] = pkt

{distributed_state_network-0.5.2 → distributed_state_network-0.5.3}/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.2"
+VERSION = "0.5.3"
 logging.basicConfig(level=logging.INFO)
 
 # Silence Flask and Werkzeug logging

{distributed_state_network-0.5.2 → distributed_state_network-0.5.3}/src/distributed_state_network/objects/config.py

@@ -8,6 +8,7 @@ class DSNodeConfig:
     node_id: str
     credential_dir: str
     port: int
+    network_ip: str
     aes_key: str | None
     bootstrap_nodes: List[Endpoint]
 
@@ -16,7 +17,8 @@ class DSNodeConfig:
         return DSNodeConfig(
             data["node_id"], 
             data["credential_dir"] if "credential_dir" in data else "credentials",
-            data["port"], 
+            data["port"],
+            data["network_ip"] if "network_ip" in data else "127.0.0.1", 
             data["aes_key"] if "aes_key" in data else None, 
             [Endpoint.from_json(e) for e in data["bootstrap_nodes"]]
         )

{distributed_state_network-0.5.2 → distributed_state_network-0.5.3}/tests/connections.py

@@ -20,6 +20,7 @@ def start_node(node_id: str, bootstrap_port: int = None, disconnect_cb: Optional
         "node_id": node_id,
         "port": current_port,
         "aes_key": aes_key,
+        "network_ip": "127.0.0.1",
         "credential_dir": "credentials"
     }
     current_port += 1