@cardelli/ambit 0.1.1 → 0.1.2

package/esm/src/cli/commands/create.js

@@ -7,7 +7,7 @@ import { createOutput } from "../../../lib/output.js";
 import { registerCommand } from "../mod.js";
 import { extractSubnet, getRouterTag } from "../../schemas/config.js";
 import { isPublicTld } from "../../guard.js";
-import { createFlyProvider, FlyDeployError, getRouterAppName } from "../../providers/fly.js";
+import { createFlyProvider, FlyDeployError, getRouterAppName, } from "../../providers/fly.js";
 import { createTailscaleProvider, enableAcceptRoutes, isAcceptRoutesEnabled, isTailscaleInstalled, waitForDevice, } from "../../providers/tailscale.js";
 import { getCredentialStore } from "../../credentials.js";
 import { resolveOrg } from "../../resolve.js";
@@ -50,10 +50,11 @@ ${bold("EXAMPLES")}
         return;
     }
     const out = createOutput(args.json);
-    const network = args._[0];
-    if (!network) {
+    const networkArg = args._[0];
+    if (!networkArg || typeof networkArg !== "string") {
         return out.die("Network Name Required. Usage: ambit create <network>");
     }
+    const network = networkArg;
     if (isPublicTld(network)) {
         return out.die(`"${network}" Is a Public TLD and Cannot Be Used as a Network Name`);
     }

package/esm/src/cli/commands/deploy.js

@@ -3,6 +3,7 @@
 // =============================================================================
 import * as dntShim from "../../../_dnt.shims.js";
 import { parseArgs } from "../../../deps/jsr.io/@std/cli/1.0.27/mod.js";
+import { join } from "../../../deps/jsr.io/@std/path/1.1.4/mod.js";
 import { bold, confirm, fileExists } from "../../../lib/cli.js";
 import { createOutput } from "../../../lib/output.js";
 import { registerCommand } from "../mod.js";
@@ -11,13 +12,93 @@ import { findRouterApp } from "../../discovery.js";
 import { resolveOrg } from "../../resolve.js";
 import { assertNotRouter, auditDeploy, scanFlyToml } from "../../guard.js";
 // =============================================================================
+// Image Mode
+// =============================================================================
+/**
+ * Generate a minimal fly.toml with http_service config for auto start/stop.
+ * Written to a temp directory and cleaned up after deploy.
+ */
+const generateServiceToml = (port) => `[http_service]\n` +
+    `  internal_port = ${port}\n` +
+    `  auto_stop_machines = "stop"\n` +
+    `  auto_start_machines = true\n` +
+    `  min_machines_running = 0\n`;
+/**
+ * Parse --main-port value. Returns the port number, or null if "none".
+ * Dies on invalid input.
+ */
+const parseMainPort = (raw, out) => {
+    if (raw === "none")
+        return null;
+    const port = Number(raw);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        out.die(`Invalid --main-port: "${raw}". Use a port number (1-65535) or "none".`);
+        return "error";
+    }
+    return port;
+};
+/** Resolve deploy config for image mode (--image). */
+const resolveImageMode = (image, mainPortRaw, out) => {
+    const mainPort = parseMainPort(mainPortRaw, out);
+    if (mainPort === "error")
+        return null;
+    const preflight = { scanned: false, warnings: [] };
+    if (mainPort !== null) {
+        const tempDir = dntShim.Deno.makeTempDirSync();
+        const configPath = join(tempDir, "fly.toml");
+        dntShim.Deno.writeTextFileSync(configPath, generateServiceToml(mainPort));
+        out.ok(`HTTP Service on Port ${mainPort} (auto start/stop)`);
+        return { image, configPath, preflight, tempDir };
+    }
+    out.info("Image Mode — No Service Config");
+    return { image, preflight };
+};
+// =============================================================================
+// Config Mode
+// =============================================================================
+/** Resolve deploy config for config mode (default — uses fly.toml). */
+const resolveConfigMode = async (explicitConfig, out) => {
+    // Determine config path: explicit --config, or auto-detect ./fly.toml
+    let configPath = explicitConfig;
+    if (!configPath && await fileExists("./fly.toml")) {
+        configPath = "./fly.toml";
+    }
+    if (!configPath) {
+        out.info("No fly.toml Found — Deploying Without Config Scan");
+        return { preflight: { scanned: false, warnings: [] } };
+    }
+    if (!(await fileExists(configPath))) {
+        out.die(`Config File Not Found: ${configPath}`);
+        return null;
+    }
+    // Pre-flight scan
+    const tomlContent = await dntShim.Deno.readTextFile(configPath);
+    const scan = scanFlyToml(tomlContent);
+    if (scan.errors.length > 0) {
+        for (const err of scan.errors) {
+            out.err(err);
+        }
+        out.die("Pre-flight Check Failed. Fix fly.toml Before Deploying.");
+        return null;
+    }
+    for (const warn of scan.warnings) {
+        out.warn(warn);
+    }
+    out.ok(`Scanned ${configPath}`);
+    return {
+        configPath,
+        preflight: { scanned: scan.scanned, warnings: scan.warnings },
+    };
+};
+// =============================================================================
 // Deploy Command
 // =============================================================================
 const deploy = async (argv) => {
     const args = parseArgs(argv, {
-        string: ["network", "org", "region", "image", "config"],
+        string: ["network", "org", "region", "image", "config", "main-port"],
         boolean: ["help", "yes", "json"],
         alias: { y: "yes" },
+        default: { "main-port": "80" },
     });
     if (args.help) {
         console.log(`
@@ -35,13 +116,14 @@ ${bold("MODES")}
     ambit deploy <app> --network <name> --image <img>   Docker image, no toml
 
 ${bold("OPTIONS")}
-  --network <name>   Custom 6PN network to target (required)
-  --org <org>        Fly.io organization slug
-  --region <region>  Primary deployment region
-  --image <img>      Docker image (mutually exclusive with --config)
-  --config <path>    fly.toml path (mutually exclusive with --image)
-  -y, --yes          Skip confirmation prompts
-  --json             Output as JSON
+  --network <name>       Custom 6PN network to target (required)
+  --org <org>            Fly.io organization slug
+  --region <region>      Primary deployment region
+  --image <img>          Docker image (mutually exclusive with --config)
+  --config <path>        fly.toml path (mutually exclusive with --image)
+  --main-port <port>     Internal port for HTTP service in image mode (default: 80, "none" to skip)
+  -y, --yes              Skip confirmation prompts
+  --json                 Output as JSON
 
 ${bold("SAFETY")}
   Always deploys with --no-public-ips and --flycast.
@@ -59,10 +141,11 @@ ${bold("EXAMPLES")}
     // ==========================================================================
     // Phase 0: Parse & Validate
     // ==========================================================================
-    const app = args._[0];
-    if (!app) {
+    const appArg = args._[0];
+    if (!appArg || typeof appArg !== "string") {
         return out.die("App Name Required. Usage: ambit deploy <app> --network <name>");
     }
+    const app = appArg;
     if (!args.network) {
         return out.die("--network Is Required");
     }
@@ -70,7 +153,7 @@ ${bold("EXAMPLES")}
         assertNotRouter(app);
     }
     catch (e) {
-        return out.die(e.message);
+        return out.die(e instanceof Error ? e.message : String(e));
     }
     if (args.image && args.config) {
         return out.die("--image and --config Are Mutually Exclusive");
@@ -128,44 +211,14 @@ ${bold("EXAMPLES")}
     }
     out.blank();
     // ==========================================================================
-    // Phase 4: Pre-flight TOML Scan
+    // Phase 4: Resolve Deploy Mode
     // ==========================================================================
     out.header("Step 4: Pre-flight Check").blank();
-    let preflight = { scanned: false, warnings: [] };
-    // Determine config path for config mode (not image mode)
-    let configPath = args.config;
-    if (!args.image) {
-        if (!configPath) {
-            // Auto-detect ./fly.toml
-            if (await fileExists("./fly.toml")) {
-                configPath = "./fly.toml";
-            }
-        }
-        if (configPath) {
-            if (!(await fileExists(configPath))) {
-                return out.die(`Config File Not Found: ${configPath}`);
-            }
-            const tomlContent = await dntShim.Deno.readTextFile(configPath);
-            const scan = scanFlyToml(tomlContent);
-            preflight = { scanned: scan.scanned, warnings: scan.warnings };
-            if (scan.errors.length > 0) {
-                for (const err of scan.errors) {
-                    out.err(err);
-                }
-                return out.die("Pre-flight Check Failed. Fix fly.toml Before Deploying.");
-            }
-            for (const warn of scan.warnings) {
-                out.warn(warn);
-            }
-            out.ok(`Scanned ${configPath}`);
-        }
-        else {
-            out.info("No fly.toml Found — Deploying Without Config Scan");
-        }
-    }
-    else {
-        out.info("Image Mode — Skipping TOML Scan");
-    }
+    const deployConfig = args.image
+        ? resolveImageMode(args.image, String(args["main-port"]), out)
+        : await resolveConfigMode(args.config, out);
+    if (!deployConfig)
+        return; // mode resolver already called out.die()
     out.blank();
     // ==========================================================================
     // Phase 5: Deploy with Enforced Flags
@@ -174,8 +227,8 @@ ${bold("EXAMPLES")}
     out.dim("Deploying with --no-public-ips --flycast ...");
     try {
         await fly.deploySafe(app, {
-            image: args.image,
-            config: configPath,
+            image: deployConfig.image,
+            config: deployConfig.configPath,
             region: args.region,
         });
     }
@@ -186,6 +239,14 @@ ${bold("EXAMPLES")}
         }
         throw e;
     }
+    finally {
+        if (deployConfig.tempDir) {
+            try {
+                dntShim.Deno.removeSync(deployConfig.tempDir, { recursive: true });
+            }
+            catch { /* ignore */ }
+        }
+    }
     out.ok("Deploy Succeeded");
     out.blank();
     // ==========================================================================
@@ -211,33 +272,23 @@ ${bold("EXAMPLES")}
     // Phase 7: Result
     // ==========================================================================
     const hasIssues = audit.public_ips_released > 0 || audit.warnings.length > 0;
+    const result = {
+        app,
+        network,
+        created,
+        audit: {
+            public_ips_released: audit.public_ips_released,
+            certs_removed: audit.certs_removed,
+            flycast_allocations: audit.flycast_allocations,
+            warnings: audit.warnings,
+        },
+        preflight: deployConfig.preflight,
+    };
     if (hasIssues) {
-        out.fail("Deploy Completed with Issues", {
-            app,
-            network,
-            created,
-            audit: {
-                public_ips_released: audit.public_ips_released,
-                certs_removed: audit.certs_removed,
-                flycast_allocations: audit.flycast_allocations,
-                warnings: audit.warnings,
-            },
-            preflight,
-        });
+        out.fail("Deploy Completed with Issues", result);
     }
     else {
-        out.done({
-            app,
-            network,
-            created,
-            audit: {
-                public_ips_released: audit.public_ips_released,
-                certs_removed: audit.certs_removed,
-                flycast_allocations: audit.flycast_allocations,
-                warnings: audit.warnings,
-            },
-            preflight,
-        });
+        out.done(result);
     }
     out.blank()
         .header("=".repeat(50))

package/esm/src/cli/commands/status.js

@@ -78,9 +78,7 @@ const showNetworkStatus = async (fly, tailscale, args) => {
         .text(`  Region:        ${machine?.region ?? "unknown"}`)
         .text(`  Machine State: ${machine?.state ?? "unknown"}`)
         .text(`  Private IP:    ${machine?.privateIp ?? "unknown"}`)
-        .text(`  SOCKS Proxy:   ${machine?.privateIp
-        ? `socks5://[${machine.privateIp}]:1080`
-        : "unknown"}`);
+        .text(`  SOCKS Proxy:   ${machine?.privateIp ? `socks5://[${machine.privateIp}]:1080` : "unknown"}`);
     if (machine?.subnet) {
         out.text(`  Subnet:        ${machine.subnet}`);
     }

package/esm/src/cli/mod.js

@@ -65,7 +65,7 @@ export const runCli = async (argv) => {
         showVersion();
         return;
     }
-    const commandName = args._[0];
+    const commandName = typeof args._[0] === "string" ? args._[0] : undefined;
     if (!commandName || args.help) {
         if (commandName) {
             const command = getCommand(commandName);

package/esm/src/schemas/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/src/schemas/config.ts"],"names":[],"mappings":"AAOA,OAAO,yBAAyB,CAAC;AAKjC,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,KAAG,MACvB,CAAC;AAEzB,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,KAAG,MAKjD,CAAC;AAMF,eAAO,MAAM,YAAY,QAAO,MAG/B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/src/schemas/config.ts"],"names":[],"mappings":"AAOA,OAAO,yBAAyB,CAAC;AAKjC,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,KAAG,MAAgC,CAAC;AAEhF,eAAO,MAAM,aAAa,GAAI,WAAW,MAAM,KAAG,MAKjD,CAAC;AAMF,eAAO,MAAM,YAAY,QAAO,MAG/B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardelli/ambit",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Tailscale subnet router manager for Fly.io custom networks",
   "license": "MIT",
   "module": "./esm/src/providers/fly.js",