distributed-state-network 0.4.0__tar.gz → 0.4.2__tar.gz

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: distributed-state-network
-Version: 0.4.0
+Version: 0.4.2
 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
@@ -54,14 +54,10 @@ The simplest DSN network is a single node:
 ```python
 from distributed_state_network import DSNodeServer, DSNodeConfig
 
-# Generate a network key (do this once for your entire network)
-DSNodeServer.generate_key("network.key")
-
 # Start a node
 node = DSNodeServer.start(DSNodeConfig(
     node_id="my_first_node",
     port=8000,
-    aes_key_file="network.key",
     bootstrap_nodes=[]  # Empty for the first node
 ))
 
@@ -89,7 +85,6 @@ Create a network of temperature sensors that share readings:
 sensor_node = DSNodeServer.start(DSNodeConfig(
     node_id=f"sensor_{location}",
     port=8000,
-    aes_key_file="network.key",
     bootstrap_nodes=[{"address": "coordinator.local", "port": 8000}]
 ))
 

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/README.md

@@ -28,14 +28,10 @@ The simplest DSN network is a single node:
 ```python
 from distributed_state_network import DSNodeServer, DSNodeConfig
 
-# Generate a network key (do this once for your entire network)
-DSNodeServer.generate_key("network.key")
-
 # Start a node
 node = DSNodeServer.start(DSNodeConfig(
     node_id="my_first_node",
     port=8000,
-    aes_key_file="network.key",
     bootstrap_nodes=[]  # Empty for the first node
 ))
 
@@ -63,7 +59,6 @@ Create a network of temperature sensors that share readings:
 sensor_node = DSNodeServer.start(DSNodeConfig(
     node_id=f"sensor_{location}",
     port=8000,
-    aes_key_file="network.key",
     bootstrap_nodes=[{"address": "coordinator.local", "port": 8000}]
 ))
 

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/pyproject.toml

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

@@ -6,5 +6,5 @@ if len(sys.argv) < 2:
 
 location = sys.argv[1]
 
-with open(location, 'wb') as f:
-    f.write(generate_aes_key())
+with open(location, 'w') as f:
+    f.write(generate_aes_key().hex())

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/src/distributed_state_network/dsnode.py

@@ -65,7 +65,7 @@ class DSNode:
         self.logger = logging.getLogger("DSN: " + config.node_id)
         self.disconnect_cb = disconnect_callback
         self.update_cb = update_callback
-        if not os.path.exists(config.aes_key_file):
+        if config.aes_key_file is not None and not os.path.exists(config.aes_key_file):
             raise Exception(f"Could not find aes key file in {config.aes_key_file}")
         
         threading.Thread(target=self.network_tick, daemon=True).start()
@@ -75,8 +75,11 @@ class DSNode:
         self.server = server
 
     def get_aes_key(self):
-        with open(self.config.aes_key_file, 'rb') as f:
-            return f.read()
+        if not os.path.exists(self.config.aes_key_file):
+            raise Exception("Could not find aes key file")
+        with open(self.config.aes_key_file, 'r') as f:
+            key_hex = f.read()
+            return bytes.fromhex(key_hex)
 
     def network_tick(self):
         time.sleep(TICK_INTERVAL)
@@ -109,8 +112,9 @@ class DSNode:
         """Send HTTP request and wait for response"""
         try:
             # Prepend message type to payload
-            data_with_type = bytes([msg_type]) + payload
-            encrypted_data = self.encrypt_data(data_with_type)
+            data = bytes([msg_type]) + payload
+            if self.config.aes_key_file is not None:
+                data = self.encrypt_data(data)
             
             # Determine the URL path based on message type
             path = MSG_TYPE_TO_PATH.get(msg_type, '/unknown')
@@ -119,7 +123,7 @@ class DSNode:
             # Send HTTP POST request
             response = requests.post(
                 url,
-                data=encrypted_data,
+                data=data,
                 headers={'Content-Type': 'application/octet-stream'},
                 timeout=HTTP_TIMEOUT
             )
@@ -131,19 +135,21 @@ class DSNode:
             elif response.status_code != 200:
                 raise Exception(f"HTTP error: {response.status_code}")
             
+            response_data = response.content
             # Decrypt the response
-            decrypted = self.decrypt_data(response.content)
+            if self.config.aes_key_file is not None:
+                response_data = self.decrypt_data(response_data)
             
-            if len(decrypted) < 1:
+            if len(response_data) < 1:
                 raise Exception("Empty response")
             
             # First byte is message type
-            response_msg_type = decrypted[0]
+            response_msg_type = response_data[0]
             if response_msg_type != msg_type:
                 raise Exception(f"Response message type mismatch: expected {msg_type}, got {response_msg_type}")
             
             # Return the body (everything after the message type byte)
-            return decrypted[1:]
+            return response_data[1:]
             
         except requests.exceptions.Timeout:
             if retries < 2:

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/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.4.0"
+VERSION = "0.4.2"
 logging.basicConfig(level=logging.INFO)
 
 # Silence Flask and Werkzeug logging
@@ -66,14 +66,15 @@ class DSNodeServer:
         """Handle incoming HTTP request"""
         try:
             # Decrypt the data
-            decrypted = self.node.decrypt_data(data)
+            if self.config.aes_key_file is not None:
+                data = self.node.decrypt_data(data)
             
-            if len(decrypted) < 1:
+            if len(data) < 1:
                 return Response(status=400)
             
             # First byte should be message type (for verification)
-            received_msg_type = decrypted[0]
-            body = decrypted[1:]
+            received_msg_type = data[0]
+            body = data[1:]
             
             if received_msg_type != msg_type:
                 self.node.logger.error(f"Message type mismatch: expected {msg_type}, got {received_msg_type}")
@@ -98,8 +99,9 @@ class DSNodeServer:
             if response_data is not None:
                 # Prepend message type to response
                 response_with_type = bytes([msg_type]) + response_data
-                encrypted_response = self.node.encrypt_data(response_with_type)
-                return Response(encrypted_response, status=200, mimetype='application/octet-stream')
+                if self.config.aes_key_file is not None:
+                    response_with_type = self.node.encrypt_data(response_with_type)
+                return Response(response_with_type, status=200, mimetype='application/octet-stream')
             else:
                 return Response(status=204)  # No content
                 
@@ -132,8 +134,8 @@ class DSNodeServer:
     @staticmethod
     def generate_key(out_file_path: str):
         key = generate_aes_key()
-        with open(out_file_path, 'wb') as f:
-            f.write(key)
+        with open(out_file_path, 'w', encoding='utf-8') as f:
+            f.write(key.hex())
 
     @staticmethod 
     def start(

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2}/src/distributed_state_network/objects/config.py

@@ -7,7 +7,7 @@ from distributed_state_network.objects.endpoint import Endpoint
 class DSNodeConfig:
     node_id: str
     port: int
-    aes_key_file: str
+    aes_key_file: str | None
     bootstrap_nodes: List[Endpoint]
 
     @staticmethod
@@ -15,6 +15,6 @@ class DSNodeConfig:
         return DSNodeConfig(
             data["node_id"], 
             data["port"], 
-            data["aes_key_file"], 
+            data["aes_key_file"] if "aes_key_file" in data else None, 
             [Endpoint.from_json(e) for e in data["bootstrap_nodes"]]
         )

{distributed_state_network-0.4.0 → distributed_state_network-0.4.2/tests}/test.py

@@ -7,7 +7,7 @@ import unittest
 import requests
 from typing import List, Dict
 
-sys.path.append(os.path.join(os.path.dirname(__file__), './src'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '../src'))
 
 from distributed_state_network import DSNodeServer, Endpoint, DSNodeConfig
 
@@ -311,7 +311,7 @@ class TestNode(unittest.TestCase):
         DSNodeServer.generate_key(test_key_file)
         with open(test_key_file, 'rb') as f:
             key = f.read()
-        self.assertEqual(32, len(key))
+        self.assertEqual(64, len(key))
         os.remove(test_key_file)
 
     def test_write_cert(self):