golem-vm-provider 0.1.22__tar.gz → 0.1.24__tar.gz

{golem_vm_provider-0.1.22 → golem_vm_provider-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.22
+Version: 0.1.24
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen

{golem_vm_provider-0.1.22 → golem_vm_provider-0.1.24}/provider/main.py

@@ -35,27 +35,26 @@ async def setup_provider() -> None:
             app.state.provider = provider
             app.state.proxy_manager = provider.proxy_manager
             
-            # Restore proxy configurations first
-            logger.process("🔄 Restoring proxy configurations...")
-            await app.state.proxy_manager._load_state()
-            
-            # Now initialize port manager with knowledge of restored proxies
+            # Initialize port manager first to verify all ports
             logger.process("🔄 Initializing port manager...")
             port_manager = PortManager(
                 start_port=settings.PORT_RANGE_START,
                 end_port=settings.PORT_RANGE_END,
-                discovery_port=settings.PORT,
-                existing_ports=app.state.proxy_manager.get_active_ports()
+                discovery_port=settings.PORT
             )
             
             if not await port_manager.initialize():
                 raise RuntimeError("Port verification failed")
             
-            # Update provider and proxy manager with verified port manager
+            # Store port manager references
             app.state.port_manager = port_manager
             provider.port_manager = port_manager
             app.state.proxy_manager.port_manager = port_manager
             
+            # Now restore proxy configurations using only verified ports
+            logger.process("🔄 Restoring proxy configurations...")
+            await app.state.proxy_manager._load_state()
+            
         except asyncio.TimeoutError:
             logger.error("Provider initialization timed out")
             raise

{golem_vm_provider-0.1.22 → golem_vm_provider-0.1.24}/provider/vm/port_manager.py

@@ -80,14 +80,15 @@ class PortManager:
         )
         display.print_header()
 
-        # Only verify ports that aren't already marked as in use
-        available_ports = set(range(self.start_port, self.end_port)) - self._existing_ports
-        ssh_ports = list(available_ports)
+        # Verify all ports in range, including existing ones
+        ssh_ports = list(range(self.start_port, self.end_port))
         logger.info(f"Starting port verification...")
         logger.info(f"SSH ports range: {self.start_port}-{self.end_port}")
         logger.info(
             f"Using port check servers: {', '.join(self.port_check_servers)}")
 
+        # Clear existing verified ports before verification
+        self.verified_ports.clear()
         results = await self.port_verifier.verify_ports(ssh_ports)
 
         # Add provider port as verified since we already checked it

{golem_vm_provider-0.1.22 → golem_vm_provider-0.1.24}/provider/vm/proxy_manager.py

@@ -243,6 +243,13 @@ class PythonProxyManager:
                     await asyncio.sleep(delay)
                     delay *= 2  # Exponential backoff
 
+                # Check if port is verified before restoring
+                if not self.port_manager or port not in self.port_manager.verified_ports:
+                    logger.warning(f"Port {port} is not verified, skipping proxy restoration for {multipass_name}")
+                    # Remove from active ports since we can't restore it
+                    self._active_ports.pop(multipass_name, None)
+                    return False
+
                 # Attempt to create proxy
                 proxy = ProxyServer(port, vm_ip)
                 await proxy.start()

{golem_vm_provider-0.1.22 → golem_vm_provider-0.1.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "golem-vm-provider"
-version = "0.1.22"
+version = "0.1.24"
 description = "VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"