uplink-cli 0.1.38 → 0.2.0

package/cli/src/registrars/types.ts

@@ -0,0 +1,42 @@
+export const PROVIDER_IDS = ["godaddy", "cloudflare", "hostinger", "namecheap", "dreamhost"] as const;
+export type ProviderId = (typeof PROVIDER_IDS)[number];
+
+export function isProviderId(value: string): value is ProviderId {
+  return (PROVIDER_IDS as readonly string[]).includes(value);
+}
+
+export type RegistrarCredentials = {
+  token?: string;
+  apiUser?: string;
+  apiKey?: string;
+  accountId?: string;
+  /** Additional API keys for providers with multiple accounts (e.g. DreamHost). */
+  extraTokens?: string[];
+};
+
+export type InventoryDomain = {
+  domain: string;
+  provider: ProviderId;
+  status: "owned";
+  expiresAt?: string;
+};
+
+export type DomainQuote = {
+  domain: string;
+  provider: ProviderId;
+  status: "owned" | "available" | "taken" | "not_for_sale" | "unknown";
+  buyable?: boolean;
+  priceUsd?: number;
+  premium?: boolean;
+  error?: string;
+};
+
+export type RegistrarAdapter = {
+  id: ProviderId;
+  label: string;
+  /** What an agent must pass to connect. */
+  connectHelp: string;
+  verify(creds: RegistrarCredentials): Promise<RegistrarCredentials>;
+  listDomains(creds: RegistrarCredentials): Promise<InventoryDomain[]>;
+  check(creds: RegistrarCredentials, domain: string): Promise<DomainQuote>;
+};

package/cli/src/subcommands/admin.ts

@@ -1,6 +1,7 @@
 import { Command } from "commander";
 import { apiRequest } from "../http";
 import { getResolvedApiBase } from "../utils/api-base";
+import { handleError } from "../utils/machine";
 
 export const adminCommand = new Command("admin")
   .description("Admin commands for system management");
@@ -63,10 +64,8 @@ adminCommand
         console.log(`  Created 24h: ${stats.databases.createdLast24h}`);
         console.log();
       }
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error getting status:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -118,10 +117,8 @@ adminCommand
         }
         console.log();
       }
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error listing tunnels:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -176,10 +173,8 @@ adminCommand
         }
         console.log();
       }
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error listing databases:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -222,10 +217,8 @@ tokensCommand
       console.log("\nIMPORTANT: This token is shown only once. Store it securely.\n");
       console.log(result.token);
       console.log();
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error creating token:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -287,10 +280,8 @@ tokensCommand
         );
       }
       console.log();
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error listing tokens:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -306,7 +297,7 @@ tokensCommand
       const token = opts.token ? String(opts.token) : "";
       if (!id && !token) {
         console.error("Provide --id or --token");
-        process.exit(1);
+        process.exit(2);
       }
 
       const result = await apiRequest("POST", "/v1/admin/tokens/revoke", {
@@ -319,10 +310,8 @@ tokensCommand
       } else {
         console.log(`✅ Revoked token${id ? ` ${id}` : ""} at ${result.revokedAt || ""}`);
       }
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error revoking token:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -344,12 +333,10 @@ adminCommand
         }
       } else {
         console.error("Specify what to cleanup: --dev-user-tunnels");
-        process.exit(1);
+        process.exit(2);
       }
-    } catch (error: any) {
-      const errorMsg = error.message || error.toString() || JSON.stringify(error);
-      console.error("Error during cleanup:", errorMsg);
-      process.exit(1);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 

package/cli/src/subcommands/db.ts

@@ -1,5 +1,6 @@
 import { Command } from "commander";
 import { apiRequest } from "../http";
+import { handleError, printJson } from "../utils/machine";
 
 export const dbCommand = new Command("db").description("Manage databases");
 
@@ -13,19 +14,20 @@ dbCommand
   .option("--plan <plan>", "Plan", "dev")
   .option("--json", "Output JSON", false)
   .action(async (opts) => {
-    const body = {
-      name: opts.name,
-      project: opts.project,
-      provider: opts.provider,
-      region: opts.region,
-      plan: opts.plan,
-    };
+    try {
+      const body = {
+        name: opts.name,
+        project: opts.project,
+        provider: opts.provider,
+        region: opts.region,
+        plan: opts.plan,
+      };
 
-    const result = await apiRequest("POST", "/v1/dbs", body);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(`Created DB ${result.name} (${result.id}) in ${result.region}`);
+      const result = await apiRequest("POST", "/v1/dbs", body);
+      if (opts.json) printJson(result);
+      else console.log(`Created DB ${result.name} (${result.id}) in ${result.region}`);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -35,16 +37,20 @@ dbCommand
   .option("--project <project>", "Project name")
   .option("--json", "Output JSON", false)
   .action(async (opts) => {
-    const query = opts.project ? `?project=${encodeURIComponent(opts.project)}` : "";
-    const result = await apiRequest("GET", `/v1/dbs${query}`);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      for (const db of result.items) {
-        console.log(
-          `${db.id}  ${db.name}  ${db.region}  ${db.status}  ready=${db.ready}`
-        );
+    try {
+      const query = opts.project ? `?project=${encodeURIComponent(opts.project)}` : "";
+      const result = await apiRequest("GET", `/v1/dbs${query}`);
+      if (opts.json) {
+        printJson(result);
+      } else {
+        for (const db of result.items || []) {
+          console.log(
+            `${db.id}  ${db.name}  ${db.region}  ${db.status}  ready=${db.ready}`
+          );
+        }
       }
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -54,14 +60,18 @@ dbCommand
   .requiredOption("--id <id>", "Database id")
   .option("--json", "Output JSON", false)
   .action(async (opts) => {
-    const result = await apiRequest("GET", `/v1/dbs/${opts.id}`);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(`DB ${result.name} (${result.id})`);
-      console.log(`  region: ${result.region}`);
-      console.log(`  status: ${result.status}`);
-      console.log(`  engine: ${result.engine} ${result.version}`);
+    try {
+      const result = await apiRequest("GET", `/v1/dbs/${opts.id}`);
+      if (opts.json) {
+        printJson(result);
+      } else {
+        console.log(`DB ${result.name} (${result.id})`);
+        console.log(`  region: ${result.region}`);
+        console.log(`  status: ${result.status}`);
+        console.log(`  engine: ${result.engine} ${result.version}`);
+      }
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -72,14 +82,15 @@ dbCommand
   .option("--yes", "Confirm deletion", false)
   .option("--json", "Output JSON", false)
   .action(async (opts) => {
-    if (!opts.yes) {
-      throw new Error("Refusing to delete without --yes");
-    }
-    const result = await apiRequest("DELETE", `/v1/dbs/${opts.id}`);
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(`Deleted DB ${result.id}`);
+    try {
+      if (!opts.yes) {
+        throw new Error("Refusing to delete without --yes");
+      }
+      const result = await apiRequest("DELETE", `/v1/dbs/${opts.id}`);
+      if (opts.json) printJson(result);
+      else console.log(`Deleted DB ${result.id}`);
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
 
@@ -91,27 +102,22 @@ dbCommand
   .requiredOption("--env-var <envVar>", "Environment variable name")
   .option("--json", "Output JSON", false)
   .action(async (opts) => {
-    const body = {
-      service: opts.service,
-      envVar: opts["env-var"],
-    };
+    try {
+      const body = {
+        service: opts.service,
+        envVar: opts.envVar,
+      };
 
-    const result = await apiRequest(
-      "POST",
-      `/v1/dbs/${opts["db-id"]}/link-service`,
-      body
-    );
+      const result = await apiRequest("POST", `/v1/dbs/${opts.dbId}/link-service`, body);
 
-    if (opts.json) {
-      console.log(JSON.stringify(result, null, 2));
-    } else {
-      console.log(
-        `Linked DB ${result.dbId} to service ${result.service} as ${result.envVar}`
-      );
+      if (opts.json) {
+        printJson(result);
+      } else {
+        console.log(
+          `Linked DB ${result.dbId} to service ${result.service} as ${result.envVar}`
+        );
+      }
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
-
-
-
-
-

package/cli/src/subcommands/dev.ts

@@ -1,26 +1,33 @@
 import { Command } from "commander";
 import { spawn } from "child_process";
 import { apiRequest } from "../http";
-import path from "path";
+import { handleError, printJson } from "../utils/machine";
+import { resolveTunnelClientPath } from "./menu/effects/tunnel-clients";
 
 export const devCommand = new Command("dev")
-  .description("Run local dev with optional tunnel")
-  .option("--tunnel", "Enable tunnel")
+  .description("Run local tunnel client against a new tunnel (foreground)")
+  .option("--tunnel", "Enable tunnel", false)
   .option("--port <port>", "Local port to expose", "3000")
   .option("--json", "Output JSON", false)
-  .option("--improved", "Use improved client with auto-reconnect and better error handling", false)
   .action(async (opts) => {
     const port = Number(opts.port);
-    if (opts.tunnel) {
-      // Request tunnel from control plane
+    if (!Number.isFinite(port) || port <= 0) {
+      console.error("Invalid port. Provide a positive integer.");
+      process.exit(2);
+    }
+
+    if (!opts.tunnel) {
+      console.log("Tunnel not enabled. Provide --tunnel to expose localhost.");
+      console.log("Prefer: uplink tunnel create --port <port> --json");
+      return;
+    }
+
+    try {
       const result = await apiRequest("POST", "/v1/tunnels", { port });
       if (opts.json) {
-        console.log(JSON.stringify(result, null, 2));
+        printJson(result);
       } else {
         console.log(`Tunnel URL: ${result.url}`);
-        // If the control-plane returns an https URL for the dev.uplink.spot domain,
-        // it may not actually be reachable unless TLS is configured on the relay.
-        // Print an HTTP fallback to reduce confusion during development.
         if (
           typeof result.url === "string" &&
           result.url.startsWith("https://") &&
@@ -30,14 +37,7 @@ export const devCommand = new Command("dev")
         }
       }
 
-      // Spawn tunnel client (use improved version if requested)
-      const clientFile = opts.improved ? "client-improved.js" : "client.js";
-      const clientPath = path.join(
-        process.cwd(),
-        "scripts",
-        "tunnel",
-        clientFile
-      );
+      const clientPath = resolveTunnelClientPath();
       const ctrlHost = process.env.TUNNEL_CTRL ?? "tunnel.uplink.spot:7071";
       const args = [
         clientPath,
@@ -48,10 +48,11 @@ export const devCommand = new Command("dev")
         "--ctrl",
         ctrlHost,
       ];
-      console.log(`Starting tunnel client: node ${args.join(" ")}`);
+      if (!opts.json) {
+        console.log(`Starting tunnel client: node ${args.join(" ")}`);
+      }
       const child = spawn("node", args, { stdio: "inherit" });
 
-      // Forward Ctrl+C / termination to the child so the tunnel shuts down cleanly.
       const shutdown = () => {
         try {
           child.kill("SIGINT");
@@ -62,7 +63,6 @@ export const devCommand = new Command("dev")
       process.on("SIGINT", shutdown);
       process.on("SIGTERM", shutdown);
 
-      // Keep the CLI process alive while the tunnel client is running.
       await new Promise<void>((resolve) => {
         child.on("exit", (code, signal) => {
           process.off("SIGINT", shutdown);
@@ -78,9 +78,7 @@ export const devCommand = new Command("dev")
           resolve();
         });
       });
-    } else {
-      console.log("Tunnel not enabled. Provide --tunnel to expose localhost.");
+    } catch (error) {
+      handleError(error, { json: opts.json });
     }
   });
-
-