Merge pull request #31 from BlockScience/dev

patch: v2.0.3

Author: lukvmil

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "koi-net"
-version = "2.0.2"
+version = "2.0.3"
 description = "Implementation of KOI-net framework in Python"
 maintainers = [
     { name = "Luke Miller", email = "luke@block.science" }

src/koi_net/components/config_provider.py

@@ -121,7 +121,7 @@ def wipe(self):
             pass
 
         try:
-            os.remove(self._root_dir / self.private_key_pem_path)
+            os.remove(self._root_dir / self.koi_net.private_key_pem_path)
         except FileNotFoundError:
             pass
 

src/koi_net/components/port_manager.py

@@ -1,5 +1,5 @@
-from dataclasses import dataclass
 import socket
+from dataclasses import dataclass
 from logging import Logger
 
 from ..infra import depends_on
@@ -22,15 +22,16 @@ def acquire_port(self):
         base_url_is_derived = (self.config.koi_net.node_profile.base_url == self.config.server.url)
 
         changed_port: bool = False
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            address = (self.config.server.host, self.config.server.port)
-            while s.connect_ex(address) == 0:
-                self.log.debug(f"Port {address[1]} in use")
+        while True:
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+                if s.connect_ex((self.config.server.host, self.config.server.port)) != 0:
+                    break
+                
+                self.log.debug(f"Port {self.config.server.port} in use")
                 self.config.server.port += 1
-                address = (address[0], self.config.server.port)
                 changed_port = True
 
-        self.log.debug(f"Acquired port {address[1]}")
+        self.log.debug(f"Acquired port {self.config.server.port}")
 
         if base_url_is_derived and changed_port:
             self.log.debug("Updating node profile")