fix: handle deferred tunnel import failures

Author: d42me

packages/prime/src/prime_cli/commands/tunnel.py

@@ -18,15 +18,11 @@
 app = PlainTyper(help="Manage tunnels for exposing local services", no_args_is_help=True)
 console = get_console()
 
-TunnelClient: Any = None
 
+def _create_tunnel_client() -> Any:
+    from prime_tunnel.core.client import TunnelClient
 
-def _tunnel_client_class() -> Any:
-    if TunnelClient is not None:
-        return TunnelClient
-    from prime_tunnel.core.client import TunnelClient as loaded_tunnel_client
-
-    return loaded_tunnel_client
+    return TunnelClient()
 
 
 def _format_tunnel_for_output(tunnel) -> dict:
@@ -133,6 +129,11 @@ def signal_handler():
         asyncio.run(run_tunnel())
     except KeyboardInterrupt:
         pass
+    except typer.Exit:
+        raise
+    except Exception as e:
+        console.print(f"[red]Error:[/red] {e}", style="bold")
+        raise typer.Exit(1)
 
 
 @app.command("list")
@@ -167,7 +168,7 @@ def list_tunnels(
     validate_output_format(output, console)
 
     async def fetch_tunnels():
-        client = _tunnel_client_class()()
+        client = _create_tunnel_client()
         try:
             return await client.list_tunnels_page(
                 team_id=team_id,
@@ -256,7 +257,7 @@ def tunnel_status(
     """Get status of a specific tunnel."""
 
     async def fetch_status():
-        client = _tunnel_client_class()()
+        client = _create_tunnel_client()
         try:
             return await client.get_tunnel(tunnel_id)
         finally:
@@ -342,7 +343,7 @@ def stop_tunnel(
     if all:
 
         async def fetch_tunnel_ids() -> List[str]:
-            client = _tunnel_client_class()()
+            client = _create_tunnel_client()
             try:
                 scoped_team_id = team_id
                 if scoped_team_id is None:
@@ -404,7 +405,7 @@ async def fetch_tunnel_ids() -> List[str]:
     if labels:
 
         async def validate_label_scope() -> None:
-            client = _tunnel_client_class()()
+            client = _create_tunnel_client()
             try:
                 scoped_user_id = client.config.user_id if only_mine else None
                 scoped_team_id = team_id if team_id is not None else client.config.team_id
@@ -456,7 +457,7 @@ async def validate_label_scope() -> None:
         return
 
     async def delete_tunnels() -> tuple[List[str], List[dict], List[dict]]:
-        client = _tunnel_client_class()()
+        client = _create_tunnel_client()
         succeeded: List[str] = []
         not_found: List[dict] = []
         failed: List[dict] = []

packages/prime/tests/test_tunnel_cli.py

@@ -1,4 +1,5 @@
 import json
+import sys
 from datetime import datetime, timezone
 from types import SimpleNamespace
 from typing import Any
@@ -33,6 +34,17 @@ def test_format_tunnel_does_not_derive_created_from_expiration() -> None:
     assert tunnel_data["expires_at"] is not None
 
 
+def test_tunnel_start_import_failure_exits_cleanly(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("PRIME_DISABLE_VERSION_CHECK", "1")
+    monkeypatch.setitem(sys.modules, "prime_tunnel", None)
+
+    result = runner.invoke(app, ["tunnel", "start"])
+
+    assert result.exit_code == 1
+    assert "Error:" in result.output
+    assert "Traceback" not in result.output
+
+
 def test_tunnel_list_passes_label_filters(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("PRIME_DISABLE_VERSION_CHECK", "1")
     captured: dict[str, Any] = {}
@@ -65,7 +77,7 @@ async def list_tunnels_page(self, **kwargs: Any) -> Any:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(
         app,
@@ -89,7 +101,7 @@ async def list_tunnels_page(self, **kwargs: Any) -> Any:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "list", "--output", "json"])
 
@@ -117,7 +129,7 @@ async def bulk_delete_tunnels(self, **kwargs: Any) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--label", "dev", "--yes"])
 
@@ -141,7 +153,7 @@ async def bulk_delete_tunnels(self, **kwargs: Any) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     # No --yes: if the scope check ran after the prompt we'd see the confirmation
     # text; instead it must fail fast with a clean error and never prompt.
@@ -179,7 +191,7 @@ async def bulk_delete_tunnels(self, tunnel_ids: list[str]) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--all", "--yes"])
 
@@ -216,7 +228,7 @@ async def bulk_delete_tunnels(self, tunnel_ids: list[str]) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--all", "--all-users", "--yes"])
 
@@ -252,7 +264,7 @@ async def bulk_delete_tunnels(self, tunnel_ids: list[str]) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--all", "--yes"])
 
@@ -278,7 +290,7 @@ async def bulk_delete_tunnels(self, tunnel_ids: list[str]) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--all", "--yes"])
 
@@ -301,7 +313,7 @@ async def bulk_delete_tunnels(self, **kwargs: Any) -> dict[str, Any]:
         async def close(self) -> None:
             return None
 
-    monkeypatch.setattr("prime_cli.commands.tunnel.TunnelClient", FakeTunnelClient)
+    monkeypatch.setattr("prime_cli.commands.tunnel._create_tunnel_client", FakeTunnelClient)
 
     result = runner.invoke(app, ["tunnel", "stop", "--all", "--yes"])