spacerouter-cli 0.1.0__tar.gz → 0.2.0__tar.gz

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/.gitignore

@@ -20,6 +20,10 @@ dist/
 *.swp
 *.swo
 
+# Secrets
+.env
+.env.*
+
 # OS
 .DS_Store
 Thumbs.db

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: spacerouter-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: CLI for the Space Router residential proxy network — designed for AI agents
 License-Expression: MIT
 Requires-Python: >=3.10
 Requires-Dist: httpx<1.0,>=0.27
 Requires-Dist: rich<14.0,>=13.0
-Requires-Dist: spacerouter>=0.1.0
+Requires-Dist: spacerouter>=0.2.0
 Requires-Dist: typer<1.0,>=0.12
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == 'dev'

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "spacerouter-cli"
-version = "0.1.0"
+version = "0.2.0"
 description = "CLI for the Space Router residential proxy network — designed for AI agents"
 requires-python = ">=3.10"
 license = "MIT"
 dependencies = [
     "typer>=0.12,<1.0",
     "httpx>=0.27,<1.0",
-    "spacerouter>=0.1.0",
+    "spacerouter>=0.2.0",
     "rich>=13.0,<14.0",
 ]
 

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/src/spacerouter_cli/__init__.py

@@ -1,3 +1,3 @@
 """SpaceRouter CLI — AI-agent-friendly tool for residential proxy requests."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

spacerouter_cli-0.2.0/src/spacerouter_cli/commands/billing.py

@@ -0,0 +1,59 @@
+"""``spacerouter billing`` — billing and checkout management."""
+
+from __future__ import annotations
+
+from typing import Annotated, Optional
+
+import typer
+
+from spacerouter import SpaceRouterAdmin
+
+from spacerouter_cli.config import resolve_config
+from spacerouter_cli.output import cli_error_handler, print_json
+
+app = typer.Typer(no_args_is_help=True)
+
+CoordinationUrlOpt = Annotated[
+    Optional[str],
+    typer.Option("--coordination-url", help="Coordination API URL."),
+]
+
+
+@app.command("checkout")
+@cli_error_handler
+def checkout(
+    email: Annotated[str, typer.Option("--email", help="Email for the checkout session.")],
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Create a Stripe checkout session."""
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        session = admin.create_checkout(email)
+    print_json(session.model_dump())
+
+
+@app.command("verify")
+@cli_error_handler
+def verify(
+    token: Annotated[str, typer.Option("--token", help="Email verification token.")],
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Verify an email address."""
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        admin.verify_email(token)
+    print_json({"ok": True})
+
+
+@app.command("reissue")
+@cli_error_handler
+def reissue(
+    email: Annotated[str, typer.Option("--email", help="Account email.")],
+    token: Annotated[str, typer.Option("--token", help="Verification token.")],
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Reissue an API key using email verification."""
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        result = admin.reissue_api_key(email=email, token=token)
+    print_json(result.model_dump())

spacerouter_cli-0.2.0/src/spacerouter_cli/commands/dashboard.py

@@ -0,0 +1,55 @@
+"""``spacerouter dashboard`` — dashboard data access."""
+
+from __future__ import annotations
+
+from typing import Annotated, Optional
+
+import typer
+
+from spacerouter import SpaceRouterAdmin
+
+from spacerouter_cli.config import resolve_config
+from spacerouter_cli.output import cli_error_handler, print_json
+
+app = typer.Typer(no_args_is_help=True)
+
+CoordinationUrlOpt = Annotated[
+    Optional[str],
+    typer.Option("--coordination-url", help="Coordination API URL."),
+]
+
+
+@app.command("transfers")
+@cli_error_handler
+def transfers(
+    identity_address: Annotated[Optional[str], typer.Option("--identity-address", help="Identity address to query.")] = None,
+    wallet_address: Annotated[Optional[str], typer.Option("--wallet-address", help="[Deprecated] Use --identity-address.", hidden=True)] = None,
+    page: Annotated[Optional[int], typer.Option("--page", help="Page number.")] = None,
+    page_size: Annotated[Optional[int], typer.Option("--page-size", help="Results per page.")] = None,
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Get paginated data transfer history."""
+    addr = identity_address or wallet_address
+    if not addr:
+        raise typer.BadParameter("--identity-address is required")
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        result = admin.get_transfers(
+            identity_address=addr,
+            page=page,
+            page_size=page_size,
+        )
+    print_json(result.model_dump())
+
+
+@app.command("credit-line")
+@cli_error_handler
+def credit_line(
+    address: Annotated[str, typer.Option("--address", help="Wallet address to check credit line for.")],
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Query credit line status for an address."""
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        result = admin.get_credit_line(address)
+    print_json(result.model_dump())

spacerouter_cli-0.2.0/src/spacerouter_cli/commands/node.py

@@ -0,0 +1,116 @@
+"""``spacerouter node`` — manage proxy nodes."""
+
+from __future__ import annotations
+
+from typing import Annotated, Optional
+
+import typer
+
+from spacerouter import SpaceRouterAdmin
+
+from spacerouter_cli.config import resolve_config
+from spacerouter_cli.output import cli_error_handler, print_json
+
+app = typer.Typer(no_args_is_help=True)
+
+CoordinationUrlOpt = Annotated[
+    Optional[str],
+    typer.Option("--coordination-url", help="Coordination API URL."),
+]
+
+IdentityKeyOpt = Annotated[
+    Optional[str],
+    typer.Option("--identity-key", help="Path to node identity key file. Default: ~/.spacerouter/identity.key"),
+]
+
+
+def _load_identity(key_path: str | None = None) -> str:
+    """Load the node identity private key (auto-create if missing)."""
+    from spacerouter.identity import load_or_create_identity, DEFAULT_IDENTITY_PATH
+    path = key_path or DEFAULT_IDENTITY_PATH
+    private_key, address = load_or_create_identity(path)
+    return private_key
+
+
+@app.command("register")
+@cli_error_handler
+def register(
+    endpoint_url: Annotated[str, typer.Option("--endpoint-url", help="Node endpoint URL.")],
+    staking_address: Annotated[str, typer.Option("--staking-address", help="Staking wallet address.")],
+    collection_address: Annotated[Optional[str], typer.Option("--collection-address", help="Collection wallet. Defaults to identity address.")] = None,
+    label: Annotated[Optional[str], typer.Option("--label", help="Human-readable node label.")] = None,
+    connectivity_type: Annotated[Optional[str], typer.Option("--connectivity-type", help="direct, upnp, or external_provider.")] = None,
+    identity_key: IdentityKeyOpt = None,
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Register a new proxy node using identity key. Creates vouching signature automatically."""
+    private_key = _load_identity(identity_key)
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        node = admin.register_node_with_identity(
+            private_key=private_key,
+            endpoint_url=endpoint_url,
+            staking_address=staking_address,
+            collection_address=collection_address,
+            label=label,
+            connectivity_type=connectivity_type,
+        )
+    print_json(node.model_dump())
+
+
+@app.command("list")
+@cli_error_handler
+def list_nodes(
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """List all registered nodes (deprecated — use 'get' instead)."""
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        nodes = admin.list_nodes()
+    print_json([n.model_dump() for n in nodes])
+
+
+@app.command("update-status")
+@cli_error_handler
+def update_status(
+    node_id: Annotated[str, typer.Argument(help="Node ID.")],
+    status: Annotated[str, typer.Option("--status", help="offline or draining. To go online, use request-probe.")],
+    identity_key: IdentityKeyOpt = None,
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Update a node's operational status. Requires node identity key."""
+    private_key = _load_identity(identity_key)
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        admin.update_node_status(node_id, status=status, private_key=private_key)  # type: ignore[arg-type]
+    print_json({"ok": True})
+
+
+@app.command("request-probe")
+@cli_error_handler
+def request_probe(
+    node_id: Annotated[str, typer.Argument(help="Node ID.")],
+    identity_key: IdentityKeyOpt = None,
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Request a health probe for an offline node. Requires node identity key."""
+    private_key = _load_identity(identity_key)
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        admin.request_probe(node_id, private_key=private_key)
+    print_json({"ok": True, "message": "Probe queued. Node will go online if probe passes."})
+
+
+@app.command("delete")
+@cli_error_handler
+def delete(
+    node_id: Annotated[str, typer.Argument(help="Node ID.")],
+    identity_key: IdentityKeyOpt = None,
+    coordination_url: CoordinationUrlOpt = None,
+) -> None:
+    """Delete a registered node. Requires node identity key."""
+    private_key = _load_identity(identity_key)
+    cfg = resolve_config(coordination_api_url=coordination_url)
+    with SpaceRouterAdmin(cfg.coordination_api_url) as admin:
+        admin.delete_node(node_id, private_key=private_key)
+    print_json({"ok": True})

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/src/spacerouter_cli/commands/request.py

@@ -19,8 +19,8 @@ app = typer.Typer(no_args_is_help=True)
 ApiKeyOpt = Annotated[Optional[str], typer.Option("--api-key", help="API key for proxy auth.")]
 GatewayOpt = Annotated[Optional[str], typer.Option("--gateway-url", help="Proxy gateway URL.")]
 HeaderOpt = Annotated[Optional[list[str]], typer.Option("--header", "-H", help="Custom header (Name: Value). Repeatable.")]
+RegionOpt = Annotated[Optional[str], typer.Option("--region", help="2-letter country code (e.g. US, KR).")]
 IpTypeOpt = Annotated[Optional[str], typer.Option("--ip-type", help="IP type filter: residential, mobile, datacenter, business.")]
-RegionOpt = Annotated[Optional[str], typer.Option("--region", help="Region filter substring.")]
 TimeoutOpt = Annotated[Optional[float], typer.Option("--timeout", help="Request timeout in seconds.")]
 OutputOpt = Annotated[str, typer.Option("--output", help="Output mode: json (structured) or raw (body only).")]
 FollowOpt = Annotated[bool, typer.Option("--follow-redirects", help="Follow HTTP redirects.")]
@@ -53,8 +53,8 @@ def _do_request(
     api_key: str | None,
     gateway_url: str | None,
     header: list[str] | None,
-    ip_type: str | None,
     region: str | None,
+    ip_type: str | None = None,
     timeout: float | None,
     output: str,
     follow_redirects: bool,
@@ -78,10 +78,9 @@ def _do_request(
     with SpaceRouter(
         cfg.api_key,
         gateway_url=cfg.gateway_url,
-        ip_type=ip_type,
         region=region,
+        ip_type=ip_type,
         timeout=cfg.timeout,
-        coordination_url=cfg.coordination_api_url,
         follow_redirects=follow_redirects,
     ) as client:
         resp = client.request(method, url, **kwargs)
@@ -94,7 +93,6 @@ def _do_request(
             "headers": dict(resp.headers),
             "body": _try_parse_json(resp.text),
             "spacerouter": {
-                "node_id": resp.node_id,
                 "request_id": resp.request_id,
             },
         })
@@ -110,16 +108,16 @@ def get(
     api_key: ApiKeyOpt = None,
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a GET request through the residential proxy."""
     _do_request("GET", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects)
 
 
 @app.command()
@@ -130,16 +128,16 @@ def post(
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
     data: DataOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a POST request through the residential proxy."""
     _do_request("POST", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects, data=data)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects, data=data)
 
 
 @app.command()
@@ -150,16 +148,16 @@ def put(
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
     data: DataOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a PUT request through the residential proxy."""
     _do_request("PUT", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects, data=data)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects, data=data)
 
 
 @app.command()
@@ -170,16 +168,16 @@ def patch(
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
     data: DataOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a PATCH request through the residential proxy."""
     _do_request("PATCH", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects, data=data)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects, data=data)
 
 
 @app.command()
@@ -189,16 +187,16 @@ def delete(
     api_key: ApiKeyOpt = None,
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a DELETE request through the residential proxy."""
     _do_request("DELETE", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects)
 
 
 @app.command()
@@ -208,13 +206,13 @@ def head(
     api_key: ApiKeyOpt = None,
     gateway_url: GatewayOpt = None,
     header: HeaderOpt = None,
-    ip_type: IpTypeOpt = None,
     region: RegionOpt = None,
+    ip_type: IpTypeOpt = None,
     timeout: TimeoutOpt = None,
     output: OutputOpt = "json",
     follow_redirects: FollowOpt = False,
 ) -> None:
     """Send a HEAD request through the residential proxy."""
     _do_request("HEAD", url, api_key=api_key, gateway_url=gateway_url, header=header,
-                ip_type=ip_type, region=region, timeout=timeout, output=output,
-                follow_redirects=follow_redirects)
+                region=region, ip_type=ip_type, timeout=timeout,
+                output=output, follow_redirects=follow_redirects)

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/src/spacerouter_cli/main.py

@@ -7,7 +7,7 @@ import json
 import typer
 
 from spacerouter_cli import __version__
-from spacerouter_cli.commands import api_key, config_cmd, node, request, status
+from spacerouter_cli.commands import api_key, billing, config_cmd, dashboard, node, request, status
 
 app = typer.Typer(
     name="spacerouter",
@@ -18,7 +18,9 @@ app = typer.Typer(
 
 app.add_typer(request.app, name="request", help="Make proxied HTTP requests")
 app.add_typer(api_key.app, name="api-key", help="Manage API keys")
-app.add_typer(node.app, name="node", help="View node information")
+app.add_typer(node.app, name="node", help="Manage proxy nodes")
+app.add_typer(billing.app, name="billing", help="Billing and checkout")
+app.add_typer(dashboard.app, name="dashboard", help="Dashboard data")
 app.add_typer(config_cmd.app, name="config", help="Configuration management")
 app.command(name="status", help="Check service health")(status.status)
 

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/src/spacerouter_cli/output.py

@@ -70,7 +70,6 @@ def cli_error_handler(func):
             print_error(
                 "upstream_error",
                 str(e),
-                node_id=e.node_id,
                 status_code=e.status_code,
                 request_id=e.request_id,
             )

spacerouter_cli-0.2.0/tests/test_billing.py

@@ -0,0 +1,66 @@
+"""Tests for ``spacerouter billing`` commands."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+from spacerouter.models import BillingReissueResult, CheckoutSession
+
+from spacerouter_cli.main import app
+from tests.conftest import parse_json_output
+
+
+class TestCheckout:
+    @patch("spacerouter_cli.commands.billing.SpaceRouterAdmin")
+    def test_checkout_success(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.create_checkout.return_value = CheckoutSession(
+            checkout_url="https://checkout.stripe.com/session"
+        )
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "billing", "checkout", "--email", "user@example.com",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert "stripe.com" in data["checkout_url"]
+
+
+class TestVerifyEmail:
+    @patch("spacerouter_cli.commands.billing.SpaceRouterAdmin")
+    def test_verify_success(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "billing", "verify", "--token", "tok-123",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["ok"] is True
+
+
+class TestReissue:
+    @patch("spacerouter_cli.commands.billing.SpaceRouterAdmin")
+    def test_reissue_success(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.reissue_api_key.return_value = BillingReissueResult(
+            new_api_key="sr_live_new_key"
+        )
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "billing", "reissue",
+            "--email", "user@example.com",
+            "--token", "tok-456",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["new_api_key"] == "sr_live_new_key"

spacerouter_cli-0.2.0/tests/test_dashboard.py

@@ -0,0 +1,84 @@
+"""Tests for ``spacerouter dashboard`` commands."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+from spacerouter.models import CreditLineStatus, Transfer, TransferPage
+
+from spacerouter_cli.main import app
+from tests.conftest import parse_json_output
+
+
+class TestTransfers:
+    @patch("spacerouter_cli.commands.dashboard.SpaceRouterAdmin")
+    def test_transfers_with_identity_address(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.get_transfers.return_value = TransferPage(
+            page=1,
+            total_pages=3,
+            total_bytes=2048,
+            transfers=[
+                Transfer(
+                    request_id="req-1",
+                    bytes=512,
+                    method="GET",
+                    target_host="example.com",
+                    created_at="2025-01-01T00:00:00Z",
+                ),
+            ],
+        )
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "dashboard", "transfers",
+            "--identity-address", "0xabc",
+            "--page", "1",
+            "--page-size", "10",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["total_pages"] == 3
+        assert len(data["transfers"]) == 1
+
+    @patch("spacerouter_cli.commands.dashboard.SpaceRouterAdmin")
+    def test_transfers_legacy_wallet_address(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.get_transfers.return_value = TransferPage(
+            page=1, total_pages=1, total_bytes=0, transfers=[],
+        )
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "dashboard", "transfers", "--wallet-address", "0xabc",
+        ])
+        assert result.exit_code == 0
+
+
+class TestCreditLine:
+    @patch("spacerouter_cli.commands.dashboard.SpaceRouterAdmin")
+    def test_credit_line(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.get_credit_line.return_value = CreditLineStatus(
+            address="0xabc",
+            credit_limit=1000.0,
+            used=250.0,
+            available=750.0,
+            status="active",
+            foundation_managed=True,
+        )
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "dashboard", "credit-line", "--address", "0xabc",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["available"] == 750.0
+        assert data["foundation_managed"] is True

spacerouter_cli-0.2.0/tests/test_integration.py

@@ -0,0 +1,91 @@
+"""Integration tests for the SpaceRouter CLI.
+
+These tests hit the **live** Coordination API and proxy gateway at
+``gateway.spacerouter.org``.  They require the ``SR_API_KEY`` environment
+variable to be set to a billing-provisioned key:
+
+    SR_API_KEY=sr_live_xxx pytest tests/test_integration.py -v
+"""
+
+from __future__ import annotations
+
+import json
+import os
+
+import pytest
+from typer.testing import CliRunner
+
+from spacerouter_cli.main import app
+
+
+runner = CliRunner()
+
+COORDINATION_URL = os.environ.get(
+    "SR_COORDINATION_API_URL", "https://coordination.spacerouter.org"
+)
+GATEWAY_URL = os.environ.get(
+    "SR_GATEWAY_URL", "https://gateway.spacerouter.org:8080"
+)
+
+# A billing-provisioned API key for proxy tests.
+API_KEY = os.environ.get("SR_API_KEY")
+
+pytestmark = pytest.mark.skipif(not API_KEY, reason="SR_API_KEY not set")
+
+
+class TestCLIIntegration:
+    """End-to-end tests against the live Space Router infrastructure."""
+
+    def test_proxy_request(self):
+        """Proxy a GET request through the gateway with a billing-provisioned key."""
+        cmd = [
+            "request", "get", "https://httpbin.org/ip",
+            "--api-key", API_KEY,
+            "--gateway-url", GATEWAY_URL,
+        ]
+
+        result = runner.invoke(app, cmd)
+        assert result.exit_code == 0, f"request failed: {result.output}"
+        data = json.loads(result.output)
+        assert data["status_code"] == 200
+        assert "origin" in data["body"]
+
+    def test_api_key_crud(self):
+        """Create, list, and revoke an API key via CLI."""
+        # Create
+        result = runner.invoke(app, [
+            "api-key", "create",
+            "--name", "integration-crud-cli",
+            "--coordination-url", COORDINATION_URL,
+        ])
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        key_id = data["id"]
+
+        try:
+            # List
+            result = runner.invoke(app, [
+                "api-key", "list",
+                "--coordination-url", COORDINATION_URL,
+            ])
+            assert result.exit_code == 0
+            keys = json.loads(result.output)
+            ids = [k["id"] for k in keys]
+            assert key_id in ids
+        finally:
+            # Revoke
+            result = runner.invoke(app, [
+                "api-key", "revoke", key_id,
+                "--coordination-url", COORDINATION_URL,
+            ])
+            assert result.exit_code == 0
+
+    def test_node_list(self):
+        """List nodes via CLI."""
+        result = runner.invoke(app, [
+            "node", "list",
+            "--coordination-url", COORDINATION_URL,
+        ])
+        assert result.exit_code == 0
+        data = json.loads(result.output)
+        assert isinstance(data, list)

spacerouter_cli-0.2.0/tests/test_node.py

@@ -0,0 +1,113 @@
+"""Tests for ``spacerouter node`` commands."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+from spacerouter.models import Node
+
+from spacerouter_cli.main import app
+from tests.conftest import parse_json_output
+
+_SAMPLE_NODE = Node(
+    id="node-1",
+    endpoint_url="http://192.168.1.100:9090",
+    public_ip="73.162.1.1",
+    connectivity_type="direct",
+    node_type="residential",
+    status="online",
+    health_score=0.95,
+    region="US",
+    label=None,
+    ip_type="residential",
+    ip_region="US",
+    as_type="isp",
+    identity_address="0xabc",
+    staking_address="0xdef",
+    collection_address="0xabc",
+    created_at="2025-01-01T00:00:00Z",
+)
+
+
+class TestRegisterNode:
+    @patch("spacerouter_cli.commands.node._load_identity", return_value="0x" + "ab" * 32)
+    @patch("spacerouter_cli.commands.node.SpaceRouterAdmin")
+    def test_register(self, mock_admin_cls, mock_identity, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.register_node_with_identity.return_value = _SAMPLE_NODE
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "node", "register",
+            "--endpoint-url", "http://192.168.1.100:9090",
+            "--staking-address", "0xdef",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["id"] == "node-1"
+        assert data["identity_address"] == "0xabc"
+
+
+class TestListNodes:
+    @patch("spacerouter_cli.commands.node.SpaceRouterAdmin")
+    def test_list_success(self, mock_admin_cls, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin.list_nodes.return_value = [_SAMPLE_NODE]
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, ["node", "list"])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert len(data) == 1
+        assert data[0]["id"] == "node-1"
+
+
+class TestUpdateNodeStatus:
+    @patch("spacerouter_cli.commands.node._load_identity", return_value="0x" + "ab" * 32)
+    @patch("spacerouter_cli.commands.node.SpaceRouterAdmin")
+    def test_update_status(self, mock_admin_cls, mock_identity, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, [
+            "node", "update-status", "node-1", "--status", "draining",
+        ])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["ok"] is True
+
+
+class TestRequestProbe:
+    @patch("spacerouter_cli.commands.node._load_identity", return_value="0x" + "ab" * 32)
+    @patch("spacerouter_cli.commands.node.SpaceRouterAdmin")
+    def test_request_probe(self, mock_admin_cls, mock_identity, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, ["node", "request-probe", "node-1"])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["ok"] is True
+
+
+class TestDeleteNode:
+    @patch("spacerouter_cli.commands.node._load_identity", return_value="0x" + "ab" * 32)
+    @patch("spacerouter_cli.commands.node.SpaceRouterAdmin")
+    def test_delete(self, mock_admin_cls, mock_identity, runner, cli_env):
+        mock_admin = MagicMock()
+        mock_admin.__enter__ = MagicMock(return_value=mock_admin)
+        mock_admin.__exit__ = MagicMock(return_value=False)
+        mock_admin_cls.return_value = mock_admin
+
+        result = runner.invoke(app, ["node", "delete", "node-1"])
+        assert result.exit_code == 0
+        data = parse_json_output(result.output)
+        assert data["ok"] is True

{spacerouter_cli-0.1.0 → spacerouter_cli-0.2.0}/tests/test_request.py

@@ -13,19 +13,15 @@ def _mock_proxy_response(
     status_code: int = 200,
     text: str = '{"origin": "73.162.1.1"}',
     headers: dict | None = None,
-    node_id: str | None = "node-1",
     request_id: str | None = "req-1",
 ):
     resp = MagicMock()
     resp.status_code = status_code
     resp.text = text
     all_headers = dict(headers or {})
-    if node_id:
-        all_headers["x-spacerouter-node"] = node_id
     if request_id:
         all_headers["x-spacerouter-request-id"] = request_id
     resp.headers = all_headers
-    resp.node_id = node_id
     resp.request_id = request_id
     return resp
 
@@ -49,7 +45,6 @@ class TestGet:
         assert result.exit_code == 0
         data = parse_json_output(result.output)
         assert data["status_code"] == 200
-        assert data["spacerouter"]["node_id"] == "node-1"
         assert data["spacerouter"]["request_id"] == "req-1"
         assert data["body"]["origin"] == "73.162.1.1"
 
@@ -168,9 +163,9 @@ class TestPost:
         assert "JSON" in data["message"]
 
 
-class TestIpTypeAndRegion:
+class TestRegion:
     @patch("spacerouter_cli.commands.request.SpaceRouter")
-    def test_passes_ip_type_and_region(self, mock_sr_cls, runner, cli_env):
+    def test_passes_region(self, mock_sr_cls, runner, cli_env):
         mock_client = MagicMock()
         mock_client.__enter__ = MagicMock(return_value=mock_client)
         mock_client.__exit__ = MagicMock(return_value=False)
@@ -179,11 +174,46 @@ class TestIpTypeAndRegion:
 
         result = runner.invoke(app, [
             "request", "get", "http://example.com",
-            "--ip-type", "residential",
             "--region", "US",
         ])
         assert result.exit_code == 0
         mock_sr_cls.assert_called_once()
         call_kwargs = mock_sr_cls.call_args
+        assert call_kwargs[1]["region"] == "US"
+
+
+class TestIpType:
+    @patch("spacerouter_cli.commands.request.SpaceRouter")
+    def test_passes_ip_type(self, mock_sr_cls, runner, cli_env):
+        mock_client = MagicMock()
+        mock_client.__enter__ = MagicMock(return_value=mock_client)
+        mock_client.__exit__ = MagicMock(return_value=False)
+        mock_client.request.return_value = _mock_proxy_response()
+        mock_sr_cls.return_value = mock_client
+
+        result = runner.invoke(app, [
+            "request", "get", "http://example.com",
+            "--ip-type", "residential",
+        ])
+        assert result.exit_code == 0
+        mock_sr_cls.assert_called_once()
+        call_kwargs = mock_sr_cls.call_args
         assert call_kwargs[1]["ip_type"] == "residential"
+
+    @patch("spacerouter_cli.commands.request.SpaceRouter")
+    def test_passes_region_and_ip_type(self, mock_sr_cls, runner, cli_env):
+        mock_client = MagicMock()
+        mock_client.__enter__ = MagicMock(return_value=mock_client)
+        mock_client.__exit__ = MagicMock(return_value=False)
+        mock_client.request.return_value = _mock_proxy_response()
+        mock_sr_cls.return_value = mock_client
+
+        result = runner.invoke(app, [
+            "request", "get", "http://example.com",
+            "--region", "US",
+            "--ip-type", "mobile",
+        ])
+        assert result.exit_code == 0
+        call_kwargs = mock_sr_cls.call_args
         assert call_kwargs[1]["region"] == "US"
+        assert call_kwargs[1]["ip_type"] == "mobile"

spacerouter_cli-0.1.0/src/spacerouter_cli/commands/node.py

@@ -1,30 +0,0 @@
-"""``spacerouter node`` — view node information."""
-
-from __future__ import annotations
-
-from typing import Annotated, Optional
-
-import httpx
-import typer
-
-from spacerouter_cli.config import resolve_config
-from spacerouter_cli.output import cli_error_handler, print_json
-
-app = typer.Typer(no_args_is_help=True)
-
-CoordinationUrlOpt = Annotated[
-    Optional[str],
-    typer.Option("--coordination-url", help="Coordination API URL."),
-]
-
-
-@app.command("list")
-@cli_error_handler
-def list_nodes(
-    coordination_url: CoordinationUrlOpt = None,
-) -> None:
-    """List all registered nodes."""
-    cfg = resolve_config(coordination_api_url=coordination_url)
-    response = httpx.get(f"{cfg.coordination_api_url}/nodes", timeout=10.0)
-    response.raise_for_status()
-    print_json(response.json())

spacerouter_cli-0.1.0/tests/test_integration.py

@@ -1,98 +0,0 @@
-"""Integration tests for the SpaceRouter CLI.
-
-These tests hit the **live** Coordination API and proxy gateway at
-``gateway.spacerouter.org``.  They are gated behind the ``SR_INTEGRATION``
-environment variable so they never run in normal CI:
-
-    SR_INTEGRATION=1 pytest tests/test_integration.py -v
-"""
-
-from __future__ import annotations
-
-import json
-import os
-
-import pytest
-from typer.testing import CliRunner
-
-_RUN = os.environ.get("SR_INTEGRATION", "") == "1"
-pytestmark = pytest.mark.skipif(not _RUN, reason="SR_INTEGRATION not set")
-
-from spacerouter_cli.main import app  # noqa: E402
-
-
-runner = CliRunner()
-
-COORDINATION_URL = os.environ.get(
-    "SR_COORDINATION_API_URL", "https://coordination.spacerouter.org"
-)
-GATEWAY_URL = os.environ.get(
-    "SR_GATEWAY_URL", "http://gateway.spacerouter.org:8080"
-)
-
-
-class TestCLIIntegration:
-    """End-to-end: create key via CLI -> proxy request -> revoke."""
-
-    def test_full_lifecycle(self):
-        # 1. Create an ephemeral API key via the CLI.
-        result = runner.invoke(app, [
-            "api-key", "create",
-            "--name", "integration-test-cli",
-            "--coordination-url", COORDINATION_URL,
-        ])
-        assert result.exit_code == 0, f"create failed: {result.output}"
-        data = json.loads(result.output)
-        api_key = data["api_key"]
-        key_id = data["id"]
-        assert api_key.startswith("sr_live_")
-
-        try:
-            # 2. Proxy a GET request through the gateway.
-            result = runner.invoke(app, [
-                "request", "get", "https://httpbin.org/ip",
-                "--api-key", api_key,
-                "--gateway-url", GATEWAY_URL,
-            ])
-            assert result.exit_code == 0, f"request failed: {result.output}"
-            data = json.loads(result.output)
-            assert data["status_code"] == 200
-            assert "origin" in data["body"]
-
-        finally:
-            # 3. Cleanup: revoke the key.
-            result = runner.invoke(app, [
-                "api-key", "revoke", key_id,
-                "--coordination-url", COORDINATION_URL,
-            ])
-            assert result.exit_code == 0
-
-    def test_api_key_crud(self):
-        """Create, list, and revoke an API key via CLI."""
-        # Create
-        result = runner.invoke(app, [
-            "api-key", "create",
-            "--name", "integration-crud-cli",
-            "--coordination-url", COORDINATION_URL,
-        ])
-        assert result.exit_code == 0
-        data = json.loads(result.output)
-        key_id = data["id"]
-
-        try:
-            # List
-            result = runner.invoke(app, [
-                "api-key", "list",
-                "--coordination-url", COORDINATION_URL,
-            ])
-            assert result.exit_code == 0
-            keys = json.loads(result.output)
-            ids = [k["id"] for k in keys]
-            assert key_id in ids
-        finally:
-            # Revoke
-            result = runner.invoke(app, [
-                "api-key", "revoke", key_id,
-                "--coordination-url", COORDINATION_URL,
-            ])
-            assert result.exit_code == 0

spacerouter_cli-0.1.0/tests/test_node.py

@@ -1,70 +0,0 @@
-"""Tests for ``spacerouter node`` commands."""
-
-from __future__ import annotations
-
-import json
-from unittest.mock import patch, MagicMock
-
-import httpx
-
-from spacerouter_cli.main import app
-from tests.conftest import parse_json_output
-
-NODES_RESPONSE = [
-    {
-        "id": "node-1",
-        "endpoint_url": "http://192.168.1.100:9090",
-        "node_type": "residential",
-        "status": "online",
-        "health_score": 0.95,
-        "region": "us-west",
-    },
-    {
-        "id": "node-2",
-        "endpoint_url": "http://10.0.0.50:9090",
-        "node_type": "residential",
-        "status": "offline",
-        "health_score": 0.5,
-        "region": "eu-west",
-    },
-]
-
-
-class TestListNodes:
-    @patch("spacerouter_cli.commands.node.httpx.get")
-    def test_list_success(self, mock_get, runner, cli_env):
-        mock_resp = MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.json.return_value = NODES_RESPONSE
-        mock_resp.raise_for_status = MagicMock()
-        mock_get.return_value = mock_resp
-
-        result = runner.invoke(app, ["node", "list"])
-        assert result.exit_code == 0
-        data = parse_json_output(result.output)
-        assert len(data) == 2
-        assert data[0]["id"] == "node-1"
-        assert data[1]["status"] == "offline"
-
-    @patch("spacerouter_cli.commands.node.httpx.get")
-    def test_list_connection_error(self, mock_get, runner, cli_env):
-        mock_get.side_effect = httpx.ConnectError("Connection refused")
-
-        result = runner.invoke(app, ["node", "list"])
-        assert result.exit_code == 5
-        data = parse_json_output(result.output)
-        assert data["error"] == "connection_error"
-
-    @patch("spacerouter_cli.commands.node.httpx.get")
-    def test_custom_coordination_url(self, mock_get, runner, cli_env):
-        mock_resp = MagicMock()
-        mock_resp.status_code = 200
-        mock_resp.json.return_value = []
-        mock_resp.raise_for_status = MagicMock()
-        mock_get.return_value = mock_resp
-
-        result = runner.invoke(app, [
-            "node", "list", "--coordination-url", "http://custom:9000"
-        ])
-        assert result.exit_code == 0
-        mock_get.assert_called_once_with("http://custom:9000/nodes", timeout=10.0)