portacode 1.4.12.dev8__tar.gz → 1.4.12.dev9__tar.gz

{portacode-1.4.12.dev8 → portacode-1.4.12.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.12.dev8
+Version: 1.4.12.dev9
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.12.dev8 → portacode-1.4.12.dev9}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.12.dev8'
-__version_tuple__ = version_tuple = (1, 4, 12, 'dev8')
+__version__ = version = '1.4.12.dev9'
+__version_tuple__ = version_tuple = (1, 4, 12, 'dev9')
 
 __commit_id__ = commit_id = None

{portacode-1.4.12.dev8 → portacode-1.4.12.dev9}/portacode/connection/handlers/proxmox_infra.py

@@ -704,9 +704,12 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     stable = 0
     history: List[Dict[str, Any]] = []
 
+    process_exited = False
+    exit_out = exit_err = ""
     while time.time() - start < timeout_s:
         if proc.poll() is not None:
-            out, err = proc.communicate(timeout=1)
+            process_exited = True
+            exit_out, exit_err = proc.communicate(timeout=1)
             history.append(
                 {
                     "timestamp_s": round(time.time() - start, 2),
@@ -714,13 +717,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
                     "returncode": proc.returncode,
                 }
             )
-            return {
-                "ok": False,
-                "error": "portacode connect exited before keys were created",
-                "stdout": (out or "").strip(),
-                "stderr": (err or "").strip(),
-                "history": history,
-            }
+            break
         pub_size = file_size(pub_path)
         priv_size = file_size(priv_path)
         if pub_size and priv_size:
@@ -749,13 +746,29 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
         )
         time.sleep(1)
 
-    if stable < 1:
+    final_pub = file_size(pub_path)
+    final_priv = file_size(priv_path)
+    if final_pub and final_priv:
+        key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+        if not process_exited:
+            proc.terminate()
+            try:
+                proc.wait(timeout=3)
+            except subprocess.TimeoutExpired:
+                proc.kill()
+        return {
+            "ok": True,
+            "public_key": key_res["stdout"].strip(),
+            "history": history,
+        }
+
+    if not process_exited:
         proc.terminate()
         try:
             proc.wait(timeout=3)
         except subprocess.TimeoutExpired:
             proc.kill()
-        out, err = proc.communicate(timeout=1)
+        exit_out, exit_err = proc.communicate(timeout=1)
         history.append(
             {
                 "timestamp_s": round(time.time() - start, 2),
@@ -765,8 +778,8 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
         return {
             "ok": False,
             "error": "timed out waiting for portacode key files",
-            "stdout": (out or "").strip(),
-            "stderr": (err or "").strip(),
+            "stdout": (exit_out or "").strip(),
+            "stderr": (exit_err or "").strip(),
             "history": history,
         }
 

{portacode-1.4.12.dev8 → portacode-1.4.12.dev9}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.12.dev8
+Version: 1.4.12.dev9
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian