portacode 1.4.15.dev1__tar.gz → 1.4.15.dev2__tar.gz

{portacode-1.4.15.dev1 → portacode-1.4.15.dev2}/PKG-INFO

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

{portacode-1.4.15.dev1 → portacode-1.4.15.dev2}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.15.dev1'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev1')
+__version__ = version = '1.4.15.dev2'
+__version_tuple__ = version_tuple = (1, 4, 15, 'dev2')
 
 __commit_id__ = commit_id = None

{portacode-1.4.15.dev1 → portacode-1.4.15.dev2}/portacode/connection/handlers/WEBSOCKET_PROTOCOL.md

@@ -420,7 +420,7 @@ Creates or updates a Cloudflare tunnel in front of a managed container. The cont
 
 *   `ctid` (string, required): Identifier of the container.
 *   `container_port` (integer, required): Port inside the container to expose through Cloudflare.
-*   `cloudflare_url` (string, required): Hostname (e.g., `app.example.com`) that the tunnel should serve.
+*   `cloudflare_url` (string, optional): Hostname (e.g., `app.example.com`) that the tunnel should serve. Leave blank to let Cloudflare create a quick tunnel (`*.cfargotunnel.com`) automatically.
 *   `protocol` (string, optional): One of `http`, `https`, or `tcp` (defaults to `http`).
 
 **Responses:**
@@ -436,7 +436,7 @@ Refreshes the tunnel configuration for an existing tunnel (different port, URL,
 
 *   `ctid` (string, required): Identifier of the container.
 *   `container_port` (integer, optional): New container port.
-*   `cloudflare_url` (string, optional): New hostname.
+*   `cloudflare_url` (string, optional): New hostname (leave blank to keep the current hostname or let Cloudflare assign a quick tunnel).
 *   `protocol` (string, optional): New protocol (`http`, `https`, or `tcp`).
 
 **Responses:**
@@ -1273,7 +1273,7 @@ Submitted after a successful `create_cloudflare_tunnel` action.
 *   `ctid` (string): Container ID associated with the tunnel.
 *   `success` (boolean): True when the tunnel is running.
 *   `message` (string): Summary text.
-*   `tunnel` (object): Tunnel metadata matching the manager view.
+*   `tunnel` (object): Tunnel metadata matching the manager view. When using Cloudflare Quick Tunnel (no hostname supplied), `tunnel.url` holds the autogenerated `*.cfargotunnel.com` hostname.
 
 ### `cloudflare_tunnel_updated`
 

{portacode-1.4.15.dev1 → portacode-1.4.15.dev2}/portacode/connection/handlers/proxmox_infra.py

@@ -8,6 +8,8 @@ import logging
 import os
 import secrets
 import shlex
+import re
+import select
 import shutil
 import stat
 import subprocess
@@ -637,19 +639,19 @@ def _launch_container_tunnel(proxmox: Any, node: str, vmid: int, tunnel: Dict[st
     port = int(tunnel.get("container_port") or 0)
     if not port:
         raise ValueError("container_port is required to create a tunnel.")
-    hostname = tunnel.get("url")
-    if not hostname:
-        raise ValueError("cloudflare_url is required to expose the tunnel.")
+    requested_hostname = tunnel.get("url") or None
     protocol = (tunnel.get("protocol") or "http").lower()
     ip_address = _resolve_container_ip(proxmox, node, vmid)
     target_url = f"{protocol}://{ip_address}:{port}"
     name = tunnel.get("name") or _build_tunnel_name(vmid, port)
     _stop_cloudflare_process(name)
-    proc = _start_cloudflare_process(name, hostname, target_url)
+    proc, assigned_url = _start_cloudflare_process(name, target_url, hostname=requested_hostname)
+    if not assigned_url:
+        raise RuntimeError("Failed to determine Cloudflare hostname for the tunnel.")
     updated = {
         "name": name,
         "container_port": port,
-        "url": hostname,
+        "url": assigned_url,
         "protocol": protocol,
         "status": "running",
         "pid": proc.pid,
@@ -671,13 +673,14 @@ def _stop_container_tunnel(vmid: int) -> None:
         return
     name = tunnel.get("name") or _build_tunnel_name(vmid, int(tunnel.get("container_port") or 0))
     stopped = _stop_cloudflare_process(name)
-    if stopped or tunnel.get("status") != "stopped":
-        tunnel_update = {
-            **tunnel,
-            "status": "stopped",
-            "pid": None,
-            "last_updated": datetime.utcnow().isoformat() + "Z",
-        }
+    if not stopped and tunnel.get("status") == "stopped":
+        return
+    tunnel_update = {
+        **tunnel,
+        "status": "stopped",
+        "pid": None,
+        "last_updated": datetime.utcnow().isoformat() + "Z",
+    }
     _update_container_tunnel(vmid, tunnel_update)
 
 
@@ -827,25 +830,67 @@ def _get_cloudflared_binary() -> str:
     return binary
 
 
-def _start_cloudflare_process(name: str, hostname: str, target_url: str) -> subprocess.Popen:
+def _drain_stream(stream: Optional[Any]) -> None:
+    if stream is None:
+        return
+    try:
+        for _ in iter(stream.readline, ""):
+            continue
+    except Exception:
+        pass
+    finally:
+        try:
+            stream.close()
+        except Exception:
+            pass
+
+
+def _await_quick_tunnel_url(proc: subprocess.Popen, timeout: float = 15.0) -> Optional[str]:
+    if not proc.stdout:
+        return None
+    cf_re = re.compile(r"https://[A-Za-z0-9\-.]+\.cfargotunnel\.com")
+    deadline = time.time() + timeout
+    while time.time() < deadline:
+        ready, _, _ = select.select([proc.stdout], [], [], 1)
+        if not ready:
+            continue
+        line = proc.stdout.readline()
+        if not line:
+            continue
+        match = cf_re.search(line)
+        if match:
+            return match.group(0)
+    return None
+
+
+def _start_cloudflare_process(name: str, target_url: str, hostname: Optional[str] = None) -> Tuple[subprocess.Popen, Optional[str]]:
     binary = _get_cloudflared_binary()
     cmd = [
         binary,
         "tunnel",
-        "--hostname",
-        hostname,
         "--url",
         target_url,
         "--no-autoupdate",
     ]
+    if hostname:
+        cmd.extend(["--hostname", hostname])
+        stdout_target = subprocess.DEVNULL
+    else:
+        stdout_target = subprocess.PIPE
     proc = subprocess.Popen(
         cmd,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
+        stdout=stdout_target,
+        stderr=subprocess.PIPE,
+        text=True,
     )
     with _CLOUDFLARE_TUNNELS_LOCK:
         _CLOUDFLARE_TUNNEL_PROCESSES[name] = proc
-    return proc
+    assigned_url = hostname
+    if not hostname:
+        assigned_url = _await_quick_tunnel_url(proc)
+        threading.Thread(target=_drain_stream, args=(proc.stdout,), daemon=True).start()
+    threading.Thread(target=_drain_stream, args=(proc.stderr,), daemon=True).start()
+    return proc, assigned_url
 
 
 def _stop_cloudflare_process(name: str) -> bool:
@@ -1884,8 +1929,7 @@ class CreateCloudflareTunnelHandler(SyncHandler):
         if container_port <= 0:
             raise ValueError("container_port is required and must be greater than zero.")
         hostname = (message.get("cloudflare_url") or message.get("hostname") or "").strip()
-        if not hostname:
-            raise ValueError("cloudflare_url is required.")
+        hostname = hostname or None
         protocol = (message.get("protocol") or "http").strip().lower()
         if protocol not in {"http", "https", "tcp"}:
             raise ValueError("protocol must be one of http, https, or tcp.")
@@ -1899,9 +1943,10 @@ class CreateCloudflareTunnelHandler(SyncHandler):
             raise RuntimeError("Container must be running to create a tunnel.")
         tunnel = {
             "container_port": container_port,
-            "url": hostname,
             "protocol": protocol,
         }
+        if hostname:
+            tunnel["url"] = hostname
         created = _launch_container_tunnel(proxmox, node, vmid, tunnel)
         return {
             "event": "cloudflare_tunnel_created",
@@ -1934,16 +1979,16 @@ class UpdateCloudflareTunnelHandler(SyncHandler):
         if container_port <= 0:
             raise ValueError("container_port must be greater than zero.")
         hostname = (message.get("cloudflare_url") or tunnel.get("url") or "").strip()
-        if not hostname:
-            raise ValueError("cloudflare_url is required.")
+        hostname = hostname or None
         protocol = (message.get("protocol") or tunnel.get("protocol") or "http").strip().lower()
         if protocol not in {"http", "https", "tcp"}:
             raise ValueError("protocol must be one of http, https, or tcp.")
         updated_tunnel = {
             "container_port": container_port,
-            "url": hostname,
             "protocol": protocol,
         }
+        if hostname:
+            updated_tunnel["url"] = hostname
         result = _launch_container_tunnel(proxmox, node, vmid, updated_tunnel)
         return {
             "event": "cloudflare_tunnel_updated",

{portacode-1.4.15.dev1 → portacode-1.4.15.dev2}/portacode.egg-info/PKG-INFO

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