xenfra 0.1.8__tar.gz → 0.2.0__tar.gz

{xenfra-0.1.8 → xenfra-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xenfra
-Version: 0.1.8
+Version: 0.2.0
 Summary: A 'Zen Mode' infrastructure engine for Python developers.
 Author: xenfra-cloud
 Author-email: xenfra-cloud <xenfracloud@gmail.com>

{xenfra-0.1.8 → xenfra-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xenfra"
-version = "0.1.8"
+version = "0.2.0"
 description = "A 'Zen Mode' infrastructure engine for Python developers."
 readme = "README.md"
 authors = [

{xenfra-0.1.8 → xenfra-0.2.0}/src/xenfra/engine.py

@@ -44,7 +44,15 @@ class InfraEngine:
 
     def _get_connection(self, ip_address: str):
         """Establishes a Fabric connection to the server."""
-        return fabric.Connection(host=ip_address, user="root", connect_kwargs={"password": None}) # Assumes SSH key auth
+        private_key_path = str(Path.home() / ".ssh" / "id_rsa")
+        if not Path(private_key_path).exists():
+            raise DeploymentError("No private SSH key found at ~/.ssh/id_rsa.", stage="Setup")
+
+        return fabric.Connection(
+            host=ip_address,
+            user="root",
+            connect_kwargs={"key_filename": [private_key_path]},
+        )
 
     def get_user_info(self):
         """Retrieves user account information."""
@@ -189,12 +197,33 @@ class InfraEngine:
             while True:
                 droplet.load()
                 if droplet.status == 'active':
-                    logger("   - Droplet is active. Waiting for cloud-init to complete...")
+                    logger("   - Droplet is active. Waiting for SSH to be available...")
                     break
                 time.sleep(10)
-            
+
             ip_address = droplet.ip_address
-            with self._get_connection(ip_address) as conn:
+
+            # Retry SSH connection
+            conn = None
+            max_retries = 12 # 2-minute timeout for SSH
+            for i in range(max_retries):
+                try:
+                    logger(f"   - Attempting SSH connection ({i+1}/{max_retries})...")
+                    conn = self._get_connection(ip_address)
+                    conn.open() # Explicitly open the connection
+                    logger("   - SSH connection established.")
+                    break
+                except Exception as e:
+                    if i < max_retries - 1:
+                        logger(f"   - SSH connection failed. Retrying in 10s...")
+                        time.sleep(10)
+                    else:
+                        raise DeploymentError(f"Failed to establish SSH connection: {e}", stage="Polling")
+
+            if not conn or not conn.is_connected:
+                raise DeploymentError("Could not establish SSH connection.", stage="Polling")
+
+            with conn:
                 for i in range(30): # 5-minute timeout for cloud-init
                     if conn.run("test -f /root/setup_complete", warn=True).ok:
                         logger("   - Cloud-init setup complete.")

{xenfra-0.1.8 → xenfra-0.2.0}/src/xenfra/templates/cloud-init.sh.j2

@@ -27,18 +27,18 @@ dpkg --configure -a || true
 # -----------------------------------------------
 
 # 1. System Updates
-echo "🔄 [1/6] Refreshing Package Lists..." >> $LOG
+echo "🔄 [1/5] Refreshing Package Lists..." >> $LOG
 apt-get update
 apt-get install -y python3-pip git curl
 
 # 2. Install Docker & Compose
-echo "🐳 [2/6] Installing Docker..." >> $LOG
+echo "🐳 [2/5] Installing Docker..." >> $LOG
 apt-get install -y docker.io || (curl -fsSL https://get.docker.com | sh)
-echo "🎶 [3/6] Installing Docker Compose..." >> $LOG
+echo "🎶 [3/5] Installing Docker Compose..." >> $LOG
 apt-get install -y docker-compose-v2
 
 # --- DOCKERIZED DEPLOYMENT ---
-echo "📦 [4/6] Installing Caddy..." >> $LOG
+echo "📦 [4/5] Installing Caddy..." >> $LOG
 apt-get install -y debian-keyring debian-archive-keyring apt-transport-https
 curl -LsSf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg
 curl -LsSf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
@@ -56,15 +56,11 @@ cat << EOF > /etc/caddy/Caddyfile
 EOF
 {% endif %}
 
-echo "🚀 [5/6] Starting application with Docker Compose..." >> $LOG
-cd /root/app
-docker-compose -f /root/app/docker-compose.yml up -d
-
 {% if domain %}
-echo "🔒 [6/6] Starting Caddy..." >> $LOG
+echo "🚀 [5/5] Starting Caddy..." >> $LOG
 systemctl restart caddy
 {% else %}
-echo "✅ [6/6] Skipping Caddy start (no domain specified)." >> $LOG
+echo "✅ [5/5] Skipping Caddy start (no domain specified)." >> $LOG
 {% endif %}
 
 # Finish