@cardelli/ambit 0.1.5 → 0.2.1

package/esm/cli/commands/doctor.js

@@ -0,0 +1,295 @@
+// =============================================================================
+// Doctor Command - Verify Environment and Infrastructure Health
+// =============================================================================
+import { parseArgs } from "../../deps/jsr.io/@std/cli/1.0.28/mod.js";
+import { bold } from "../../lib/cli.js";
+import { checkArgs } from "../../lib/args.js";
+import { createOutput } from "../../lib/output.js";
+import { runCommand } from "../../lib/command.js";
+import { registerCommand } from "../mod.js";
+import { isAcceptRoutesEnabled, isTailscaleInstalled, } from "../../util/tailscale-local.js";
+import { findRouterApp, findWorkloadApp, getRouterMachineInfo, getRouterTailscaleInfo, listRouterApps, } from "../../util/discovery.js";
+import { initSession } from "../../util/session.js";
+// =============================================================================
+// Reporter
+// =============================================================================
+const makeReporter = (results, out) => (name, ok, hint) => {
+    results.push({ name, ok, hint });
+    if (ok) {
+        out.ok(name);
+    }
+    else {
+        out.err(name);
+        if (hint)
+            out.dim(`    ${hint}`);
+    }
+};
+// =============================================================================
+// Stage 1: Local Checks
+// =============================================================================
+const stageLocalChecks = async (report) => {
+    report("Tailscale Installed", await isTailscaleInstalled(), "Install from https://tailscale.com/download");
+    const tsStatus = await runCommand(["tailscale", "status", "--json"]);
+    let tsConnected = false;
+    if (tsStatus.ok) {
+        try {
+            const parsed = JSON.parse(tsStatus.stdout);
+            tsConnected = parsed.BackendState === "Running";
+        }
+        catch { /* ignore */ }
+    }
+    report("Tailscale Connected", tsConnected, "Run: tailscale up");
+    report("Accept Routes Enabled", await isAcceptRoutesEnabled(), "Run: sudo tailscale set --accept-routes");
+};
+// =============================================================================
+// Router Health Helper (shared by network and app stages)
+// =============================================================================
+const checkRouter = async (fly, tailscale, report, app) => {
+    const { network } = app;
+    report(`Router Exists (${network})`, true);
+    const machine = await getRouterMachineInfo(fly, app.appName);
+    report(`Router Running (${network})`, machine?.state === "started", machine ? `Machine State: ${machine.state}` : "No Machine Found");
+    const ts = await getRouterTailscaleInfo(tailscale, app.appName);
+    report(`Router in Tailnet (${network})`, ts !== null, "Router May Still Be Starting, or Check Router Logs");
+    if (ts) {
+        const device = await tailscale.devices.getByHostname(app.appName);
+        if (device) {
+            const routes = await tailscale.routes.get(device.id);
+            if (routes && routes.unapproved.length > 0) {
+                await tailscale.routes.approve(device.id, routes.advertised);
+                report(`Routes Approved (${network})`, true, `Approved: ${routes.unapproved.join(", ")}`);
+            }
+            else if (routes && routes.advertised.length > 0) {
+                report(`Routes Approved (${network})`, true);
+            }
+            else {
+                report(`Routes Approved (${network})`, false, "No Routes Advertised — Router May Need Restart");
+            }
+        }
+    }
+};
+// =============================================================================
+// Stage 3a: Network Checks
+// =============================================================================
+const stageNetworkChecks = async (fly, tailscale, org, report, network) => {
+    if (network) {
+        const app = await findRouterApp(fly, org, network);
+        if (!app) {
+            report(`Router Exists (${network})`, false, `Create with: ambit create ${network}`);
+        }
+        else {
+            await checkRouter(fly, tailscale, report, app);
+        }
+    }
+    else {
+        const routerApps = await listRouterApps(fly, org);
+        if (routerApps.length === 0) {
+            report("Routers Discovered", false, "Run: ambit create <network>");
+        }
+        else {
+            for (const app of routerApps) {
+                await checkRouter(fly, tailscale, report, app);
+            }
+        }
+    }
+};
+// =============================================================================
+// Stage 3b: App Checks
+// =============================================================================
+const stageAppChecks = async (fly, tailscale, org, report, app, network) => {
+    const workload = await findWorkloadApp(fly, org, app, network);
+    if (!workload) {
+        report(`App Exists (${app}.${network})`, false, `Deploy with: ambit deploy ${app}.${network}`);
+        return;
+    }
+    report(`App Exists (${app}.${network})`, true);
+    const machines = await fly.machines.list(workload.appName);
+    const started = machines.find((m) => m.state === "started");
+    report(`App Running (${app}.${network})`, started !== undefined, machines.length > 0
+        ? `Machine State: ${machines[0].state}`
+        : "No Machines Found");
+    const router = await findRouterApp(fly, org, network);
+    if (!router) {
+        report(`Router Exists (${network})`, false, `Create with: ambit create ${network}`);
+    }
+    else {
+        await checkRouter(fly, tailscale, report, router);
+    }
+};
+// =============================================================================
+// Stage 4: Summary
+// =============================================================================
+const stageSummary = (out, results) => {
+    const issues = results.filter((r) => !r.ok).length;
+    if (issues === 0) {
+        out.done({ checks: results });
+    }
+    else {
+        out.fail(`${issues} Issue${issues > 1 ? "s" : ""} Found`, {
+            checks: results,
+        });
+    }
+    out.blank();
+    out.text(issues === 0 ? "All Checks Passed." : `${issues} Issue${issues > 1 ? "s" : ""} Found.`);
+    out.blank();
+    out.print();
+};
+// =============================================================================
+// Doctor Network
+// =============================================================================
+const doctorNetwork = async (argv) => {
+    const opts = { string: ["network", "org"], boolean: ["help", "json"] };
+    const args = parseArgs(argv, opts);
+    checkArgs(args, opts, "ambit doctor network");
+    if (args.help) {
+        console.log(`
+${bold("ambit doctor network")} - Check Router Health
+
+${bold("USAGE")}
+  ambit doctor network [<name>] [--org <org>] [--json]
+  ambit doctor [--network <name>] [--org <org>] [--json]
+
+${bold("OPTIONS")}
+  <name>             Router network to check (checks all if omitted)
+  --network <name>   Alias for positional <name>
+  --org <org>        Fly.io organization slug
+  --json             Output as JSON
+
+${bold("CHECKS")}
+  - Tailscale CLI installed and connected
+  - Accept-routes enabled
+  - Router created and running
+  - Router visible in tailnet
+  - Subnet routes approved
+`);
+        return;
+    }
+    const out = createOutput(args.json);
+    out.blank().header("ambit Doctor: Network").blank();
+    const results = [];
+    const report = makeReporter(results, out);
+    const network = (typeof args._[0] === "string" ? args._[0] : undefined) || args.network;
+    const { fly, tailscale, org } = await initSession(out, {
+        json: args.json,
+        org: args.org,
+    });
+    await stageLocalChecks(report);
+    await stageNetworkChecks(fly, tailscale, org, report, network);
+    stageSummary(out, results);
+};
+// =============================================================================
+// Doctor App
+// =============================================================================
+const doctorApp = async (argv) => {
+    const opts = { string: ["network", "org"], boolean: ["help", "json"] };
+    const args = parseArgs(argv, opts);
+    checkArgs(args, opts, "ambit doctor app");
+    if (args.help) {
+        console.log(`
+${bold("ambit doctor app")} - Check App Health
+
+${bold("USAGE")}
+  ambit doctor app <app>.<network> [--org <org>] [--json]
+  ambit doctor app <app> --network <name> [--org <org>] [--json]
+
+${bold("OPTIONS")}
+  --network <name>   Target network (if not using dot syntax)
+  --org <org>        Fly.io organization slug
+  --json             Output as JSON
+
+${bold("CHECKS")}
+  - Tailscale CLI installed and connected
+  - Accept-routes enabled
+  - App deployed and running
+  - Router exists and is healthy
+  - Subnet routes approved
+`);
+        return;
+    }
+    const out = createOutput(args.json);
+    const appArg = args._[0];
+    if (!appArg || typeof appArg !== "string") {
+        return out.die("Missing App Name. Usage: ambit doctor app <app>.<network>");
+    }
+    let app;
+    let network;
+    if (appArg.includes(".")) {
+        const parts = appArg.split(".");
+        if (parts.length !== 2 || !parts[0] || !parts[1]) {
+            return out.die(`'${appArg}' Should Have Exactly One Dot, Like my-app.my-network`);
+        }
+        app = parts[0];
+        network = parts[1];
+    }
+    else {
+        app = appArg;
+        if (!args.network) {
+            return out.die(`Missing Network. Use: ambit doctor app ${app}.<network>`);
+        }
+        network = args.network;
+    }
+    out.blank().header(`ambit Doctor: App ${app}.${network}`).blank();
+    const results = [];
+    const report = makeReporter(results, out);
+    const { fly, tailscale, org } = await initSession(out, {
+        json: args.json,
+        org: args.org,
+    });
+    await stageLocalChecks(report);
+    await stageAppChecks(fly, tailscale, org, report, app, network);
+    stageSummary(out, results);
+};
+// =============================================================================
+// Top-Level Help
+// =============================================================================
+const showDoctorHelp = () => {
+    console.log(`
+${bold("ambit doctor")} - Verify Environment and Infrastructure Health
+
+${bold("USAGE")}
+  ambit doctor [options]
+  ambit doctor network [<name>] [options]
+  ambit doctor app <app>.<network> [options]
+
+${bold("SUBCOMMANDS")}
+  network    Check router(s) health — default when no subcommand given
+  app        Check a specific app's health
+
+${bold("OPTIONS")}
+  --org <org>        Fly.io organization slug
+  --json             Output as JSON
+
+${bold("EXAMPLES")}
+  ambit doctor
+  ambit doctor network
+  ambit doctor network browsers
+  ambit doctor app my-app.browsers
+
+Run 'ambit doctor network --help' or 'ambit doctor app --help' for details.
+`);
+};
+// =============================================================================
+// Dispatcher
+// =============================================================================
+const doctor = async (argv) => {
+    const subcommand = typeof argv[0] === "string" ? argv[0] : undefined;
+    if (subcommand === "network")
+        return doctorNetwork(argv.slice(1));
+    if (subcommand === "app")
+        return doctorApp(argv.slice(1));
+    const args = parseArgs(argv, { boolean: ["help"] });
+    if (args.help) {
+        showDoctorHelp();
+        return;
+    }
+    return doctorNetwork(argv);
+};
+// =============================================================================
+// Register Command
+// =============================================================================
+registerCommand({
+    name: "doctor",
+    description: "Check that Tailscale and the router are working correctly",
+    usage: "ambit doctor [network|app] [<name>] [--org <org>] [--json]",
+    run: doctor,
+});

package/esm/{src/cli → cli}/commands/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/src/cli/commands/list.ts"],"names":[],"mappings":""}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/list.ts"],"names":[],"mappings":""}

package/esm/{src/cli → cli}/commands/list.js

@@ -1,53 +1,19 @@
 // =============================================================================
 // List Command - List All Discovered Routers
 // =============================================================================
-import { parseArgs } from "../../../deps/jsr.io/@std/cli/1.0.28/mod.js";
-import { Table } from "../../../deps/jsr.io/@cliffy/table/1.0.0/mod.js";
-import { bold } from "../../../lib/cli.js";
-import { createOutput } from "../../../lib/output.js";
+import { parseArgs } from "../../deps/jsr.io/@std/cli/1.0.28/mod.js";
+import { Table } from "../../deps/jsr.io/@cliffy/table/1.0.0/mod.js";
+import { bold } from "../../lib/cli.js";
+import { checkArgs } from "../../lib/args.js";
+import { createOutput } from "../../lib/output.js";
 import { registerCommand } from "../mod.js";
-import { createFlyProvider } from "../../providers/fly.js";
-import { createTailscaleProvider } from "../../providers/tailscale.js";
-import { checkDependencies } from "../../credentials.js";
-import { getRouterMachineInfo, getRouterTailscaleInfo, listRouterApps, } from "../../discovery.js";
-import { resolveOrg } from "../../resolve.js";
+import { discoverRouters, } from "../../util/discovery.js";
+import { initSession } from "../../util/session.js";
 // =============================================================================
-// List Command
+// Stage: Render
 // =============================================================================
-const list = async (argv) => {
-    const args = parseArgs(argv, {
-        string: ["org"],
-        boolean: ["help", "json"],
-    });
-    if (args.help) {
-        console.log(`
-${bold("ambit list")} - List All Discovered Routers
-
-${bold("USAGE")}
-  ambit list [--org <org>] [--json]
-
-${bold("OPTIONS")}
-  --org <org>   Fly.io organization slug
-  --json        Output as JSON
-`);
-        return;
-    }
-    const out = createOutput(args.json);
-    // =========================================================================
-    // Prerequisites
-    // =========================================================================
-    const { tailscaleKey } = await checkDependencies(out);
-    const fly = createFlyProvider();
-    await fly.ensureAuth({ interactive: !args.json });
-    const tailscale = createTailscaleProvider("-", tailscaleKey);
-    const org = await resolveOrg(fly, args, out);
-    // =========================================================================
-    // Discover Routers
-    // =========================================================================
-    const spinner = out.spinner("Discovering Routers");
-    const routerApps = await listRouterApps(fly, org);
-    spinner.success(`Found ${routerApps.length} Router${routerApps.length !== 1 ? "s" : ""}`);
-    if (routerApps.length === 0) {
+const stageRender = (out, routers) => {
+    if (routers.length === 0) {
         out.blank()
             .text("No Routers Found.")
             .dim("  Create one with: ambit create <network>")
@@ -56,19 +22,10 @@ ${bold("OPTIONS")}
         out.print();
         return;
     }
-    const routers = [];
-    for (const app of routerApps) {
-        const machine = await getRouterMachineInfo(fly, app.appName);
-        const ts = await getRouterTailscaleInfo(tailscale, app.appName);
-        routers.push({ ...app, machine, tailscale: ts });
-    }
-    // =========================================================================
-    // Render
-    // =========================================================================
     out.blank().header("Routers").blank();
     const rows = routers.map((r) => {
         const tsStatus = r.tailscale
-            ? r.tailscale.online ? "online" : "offline"
+            ? (r.tailscale.online ? "online" : "offline")
             : "not found";
         const tag = r.tailscale?.tags?.[0] ?? "unknown";
         return [
@@ -91,6 +48,34 @@ ${bold("OPTIONS")}
     out.print();
 };
 // =============================================================================
+// List Command
+// =============================================================================
+const list = async (argv) => {
+    const opts = { string: ["org"], boolean: ["help", "json"] };
+    const args = parseArgs(argv, opts);
+    checkArgs(args, opts, "ambit list");
+    if (args.help) {
+        console.log(`
+${bold("ambit list")} - List All Discovered Routers
+
+${bold("USAGE")}
+  ambit list [--org <org>] [--json]
+
+${bold("OPTIONS")}
+  --org <org>   Fly.io organization slug
+  --json        Output as JSON
+`);
+        return;
+    }
+    const out = createOutput(args.json);
+    const { fly, tailscale, org } = await initSession(out, {
+        json: args.json,
+        org: args.org,
+    });
+    const routers = await discoverRouters(out, fly, tailscale, org);
+    stageRender(out, routers);
+};
+// =============================================================================
 // Register Command
 // =============================================================================
 registerCommand({

package/esm/cli/commands/status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":""}