@cardelli/ambit 0.2.1 → 0.2.2

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

@@ -12,7 +12,7 @@ import { isPublicTld } from "../../../util/guard.js";
 import { createFlyProvider, } from "../../../providers/fly.js";
 import { createTailscaleProvider, } from "../../../providers/tailscale.js";
 import { getCredentialStore } from "../../../util/credentials.js";
-import { FLY_PRIVATE_SUBNET, SOCKS_PROXY_PORT, TAILSCALE_API_KEY_PREFIX, } from "../../../util/constants.js";
+import { FLY_PRIVATE_SUBNET, TAILSCALE_API_KEY_PREFIX, } from "../../../util/constants.js";
 import { resolveOrg } from "../../../util/resolve.js";
 import { isAutoApproverConfigured, isTagOwnerConfigured } from "../../../util/tailscale-local.js";
 import { createTransition, hydrateCreate, reportSkipped, } from "./machine.js";
@@ -43,7 +43,7 @@ const stageTailscaleConfig = async (out, opts) => {
             return out.die("--api-key Is Required in JSON Mode");
         }
         out.dim("Ambit Needs an API Access Token (Not an Auth Key) to Manage Your Tailnet.")
-            .dim("Create One at: https://login.tailscale.com/admin/settings/keys")
+            .dim("Create One at:").link("  https://login.tailscale.com/admin/settings/keys")
             .blank();
         apiKey = await readSecret("API access token (tskey-api-...): ");
         if (!apiKey) {
@@ -66,35 +66,39 @@ const stageTailscaleConfig = async (out, opts) => {
     const policy = await tailscale.acl.getPolicy();
     const hasTagOwner = isTagOwnerConfigured(policy, opts.tag);
     if (!hasTagOwner) {
-        tagOwnerSpinner.fail(`Tag ${opts.tag} Not Configured in tagOwners`);
+        tagOwnerSpinner.fail(`${opts.tag} Not Set Up Yet`);
         out.blank()
-            .text(`  The Tag ${opts.tag} Does Not Exist in Your Tailscale ACL tagOwners.`)
-            .text("  Tailscale Will Reject Auth Keys for Undefined Tags.")
+            .text(`  You need to grant yourself permission to create the "${opts.network}"`)
+            .text(`  network by setting up ${opts.tag} in Tailscale.`)
             .blank()
-            .text("  Add This Tag in Your Tailscale ACL Settings:")
-            .dim("  https://login.tailscale.com/admin/acls/visual/tags")
+            .text(`  You can create the tag and assign it to yourself or a group`)
+            .text(`  you're a part of in the Tailscale dashboard:`)
+            .link("  https://login.tailscale.com/admin/acls/visual/tags")
             .blank()
+            .dim("  Or you can do it manually in the JSON editor:")
+            .link("  https://login.tailscale.com/admin/acls/file")
             .dim(`    "tagOwners": { "${opts.tag}": ["autogroup:admin"] }`)
             .blank();
-        return out.die(`Add ${opts.tag} to tagOwners Before Creating Router`);
+        return out.die(`Set Up ${opts.tag} in Tailscale, Then Try Again`);
     }
-    tagOwnerSpinner.success(`Tag ${opts.tag} Configured in tagOwners`);
+    tagOwnerSpinner.success(`${opts.tag} Found in Tailscale ACL`);
     if (opts.json) {
         const approverSpinner = out.spinner(`Checking autoApprovers for ${opts.tag}`);
         const hasApprover = isAutoApproverConfigured(policy, opts.tag);
         if (!hasApprover) {
-            approverSpinner.fail(`autoApprovers Not Configured for ${opts.tag}`);
+            approverSpinner.fail(`Auto-approve Not Configured for ${opts.tag}`);
             out.blank()
-                .text("  JSON mode skips interactive route approval.")
-                .text(`  Configure autoApprovers for ${opts.tag} so routes are approved on deploy.`)
+                .text("  In JSON mode, ambit can't interactively approve subnet routes.")
+                .text(`  Add an autoApprovers rule so Tailscale automatically trusts`)
+                .text(`  routes advertised by ${opts.tag}:`)
                 .blank()
-                .dim("  Add to your ACL at: https://login.tailscale.com/admin/acls/file")
+                .dim("  https://login.tailscale.com/admin/acls/file")
                 .blank()
                 .dim(`    "autoApprovers": { "routes": { "${FLY_PRIVATE_SUBNET}": ["${opts.tag}"] } }`)
                 .blank();
-            return out.die(`Configure autoApprovers for ${opts.tag} Before Using --json`);
+            return out.die(`Add autoApprovers for ${opts.tag} to Use --json`);
         }
-        approverSpinner.success(`autoApprovers Configured for ${opts.tag}`);
+        approverSpinner.success(`Auto-approve Configured for ${opts.tag}`);
     }
     out.blank();
     return tailscale;
@@ -157,52 +161,52 @@ const stageSummary = async (out, fly, tailscale, ctx, opts) => {
         .header("  Router Created!")
         .header("=".repeat(50))
         .blank()
-        .text(`Any Flycast App on the "${opts.network}" Network Is Reachable as:`)
-        .text(`  <app-name>.${opts.network}`)
-        .blank();
-    if (ctx.subnet) {
-        const machines = await fly.machines.list(ctx.appName);
-        const routerMachine = machines.find((m) => m.private_ip);
-        if (routerMachine?.private_ip) {
-            out.text("SOCKS5 Proxy Available at:")
-                .text(`  socks5://[${routerMachine.private_ip}]:${SOCKS_PROXY_PORT}`)
-                .dim("Containers on This Network Can Use It to Reach Your Tailnet.")
-                .blank();
-        }
-    }
-    out.dim("Deploy an App to This Network:")
-        .dim(`  ambit deploy my-app --network ${opts.network}`)
+        .text(`The "${opts.network}" Network Is Ready.`)
         .blank()
-        .dim("Invite People to Your Tailnet:")
-        .dim("  https://login.tailscale.com/admin/users")
-        .dim("Control Their Access:")
-        .dim("  https://login.tailscale.com/admin/acls/visual/general-access-rules")
+        .text(`You Can Deploy Apps to It With:`)
+        .text(`  npx @cardelli/ambit deploy <app-name>.${opts.network}`)
+        .blank();
+    out.dim("Invite People to Your Tailnet:")
+        .link("  https://login.tailscale.com/admin/users")
         .blank();
-    if (ctx.subnet && !hasAutoApprover) {
-        out.header("Recommended: Configure autoApprovers")
-            .blank()
-            .dim("  Add to Your Tailnet Policy File at:")
-            .dim("  https://login.tailscale.com/admin/acls/file")
-            .blank()
-            .text(`  "autoApprovers": { "routes": { "${ctx.subnet}": ["${opts.tag}"] } }`)
-            .blank()
-            .dim("  Routes Were Approved via API for This Session.")
-            .dim("  autoApprovers Will Auto-Approve on Future Restarts.")
-            .blank();
-    }
     if (ctx.subnet) {
-        out.header("Recommended ACL Rules:")
+        out.header("Next: Allow Traffic Through the Router")
+            .blank()
+            .text("  You must configure Tailscale so that traffic can flow from your")
+            .text(`  devices through the router and into the "${opts.network}" network.`);
+        if (!hasAutoApprover) {
+            out.blank()
+                .text("  1. Automatically Allow Traffic Through the Router:")
+                .dim("     Tailscale needs to trust the router's network connections.")
+                .blank()
+                .dim("     You can do this from the Tailscale dashboard:")
+                .link("     https://login.tailscale.com/admin/acls/visual/auto-approvers")
+                .dim(`     Route: ${ctx.subnet}  Owner: ${opts.tag}`)
+                .blank()
+                .dim("     Or you can do it manually with this JSON config:")
+                .link("     https://login.tailscale.com/admin/acls/file")
+                .dim(`     "autoApprovers": { "routes": { "${ctx.subnet}": ["${opts.tag}"] } }`);
+            if (opts.shouldApprove) {
+                out.blank().dim("     Traffic Was Allowed via API for This Session.");
+            }
+        }
+        out.blank()
+            .text(`  ${hasAutoApprover ? "1" : "2"}. Control Who Can Reach Apps on This Network:`)
+            .dim("     This lets you restrict which users or devices can access your apps.")
             .blank()
-            .dim("  To Restrict Access, Add ACL Rules to Your Policy File:")
-            .dim("  https://login.tailscale.com/admin/acls/file")
+            .dim("     You can do this from the Tailscale dashboard:")
+            .link("     https://login.tailscale.com/admin/acls/visual/general-access-rules")
+            .dim(`     Source: group:YOUR_GROUP  Destination: ${opts.tag}:*`)
             .blank()
-            .dim(`    {"action": "accept", "src": ["group:YOUR_GROUP"], "dst": ["${opts.tag}:53"]}`)
-            .dim(`    {"action": "accept", "src": ["group:YOUR_GROUP"], "dst": ["${ctx.subnet}:*"]}`)
+            .dim("     Or you can do it manually with this JSON config:")
+            .link("     https://login.tailscale.com/admin/acls/file")
+            .dim(`     {"action": "accept", "src": ["group:YOUR_GROUP"], "dst": ["${opts.tag}:53"]}`)
+            .dim(`     {"action": "accept", "src": ["group:YOUR_GROUP"], "dst": ["${ctx.subnet}:*"]}`)
             .blank();
     }
     if (!opts.shouldApprove) {
         out.dim("Route Approval Was Skipped. To Complete Setup:")
-            .dim(`  ambit doctor --network ${opts.network}`)
+            .dim(`  ambit doctor network ${opts.network}`)
             .blank();
     }
     out.print();

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "@cardelli/ambit",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Deploy apps to the cloud that only you and your AI agents can reach",
     "license": "MIT",
     "tasks": {

package/esm/lib/output.d.ts

@@ -19,6 +19,7 @@ export declare class Output<T extends Record<string, unknown>> {
     warn(text: string): this;
     text(text: string): this;
     dim(text: string): this;
+    link(text: string): this;
     header(text: string): this;
     blank(): this;
     spinner(message: string): {

package/esm/lib/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAkBA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG,CAAC,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAMvD,qBAAa,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACnD,OAAO,CAAC,MAAM,CAGE;IAChB,OAAO,CAAC,QAAQ,CAAU;gBAEd,QAAQ,EAAE,OAAO;IAS7B,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAMnB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKzD,KAAK,IAAI,IAAI;IAUb,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK,IAAI,IAAI;IAKb,OAAO,CACL,OAAO,EAAE,MAAM,GACd;QAAE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,IAAI,IAAI,CAAA;KAAE;IAiBlE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAgB9D,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;IAS3B,MAAM,IAAI,OAAO;CAGlB;AAMD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,OAAO,GAChB,MAAM,CAAC,CAAC,CAAC,CAEX"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/lib/output.ts"],"names":[],"mappings":"AAmBA,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG,CAAC,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAMvD,qBAAa,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACnD,OAAO,CAAC,MAAM,CAGE;IAChB,OAAO,CAAC,QAAQ,CAAU;gBAEd,QAAQ,EAAE,OAAO;IAS7B,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAMnB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKzD,KAAK,IAAI,IAAI;IAUb,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKvB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAKxB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK1B,KAAK,IAAI,IAAI;IAKb,OAAO,CACL,OAAO,EAAE,MAAM,GACd;QAAE,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,IAAI,IAAI,IAAI,CAAA;KAAE;IAiBlE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAgB9D,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK;IAS3B,MAAM,IAAI,OAAO;CAGlB;AAMD,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,OAAO,GAChB,MAAM,CAAC,CAAC,CAAC,CAEX"}

package/esm/lib/output.js

@@ -1,7 +1,7 @@
 // =============================================================================
 // Output - Unified Output Handling for CLI Commands
 // =============================================================================
-import { bold, dim, Spinner, statusErr, statusInfo, statusOk, statusWarn, } from "./cli.js";
+import { blue, bold, dim, Spinner, statusErr, statusInfo, statusOk, statusWarn, } from "./cli.js";
 // =============================================================================
 // Output Class
 // =============================================================================
@@ -67,6 +67,11 @@ export class Output {
             console.log(dim(text));
         return this;
     }
+    link(text) {
+        if (!this.jsonMode)
+            console.log(blue(text));
+        return this;
+    }
     header(text) {
         if (!this.jsonMode)
             console.log(bold(text));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardelli/ambit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Deploy apps to the cloud that only you and your AI agents can reach",
   "license": "MIT",
   "scripts": {},