naro-cli 0.25.0 → 0.26.0

package/dist/deploy.js

@@ -11,7 +11,7 @@ import {
   readProjectEnv,
   slugify,
   workingTreeNotices
-} from "./chunk-X5TUBMEU.js";
+} from "./chunk-RQJTCRKY.js";
 import "./chunk-K3NQKI34.js";
 export {
   assertFunctionsNode,

package/dist/index.js

@@ -4,6 +4,7 @@ import {
   BACKEND_STEPS,
   BOOKMARK_FORMAT_MESSAGE,
   BUNDLE_MESSAGES,
+  CAPABILITIES,
   DATA_ENV_MESSAGES,
   FUNCTION_INVOKE_MAX_RESPONSE_BYTES,
   FUNCTION_INVOKE_METHODS,
@@ -36,6 +37,9 @@ import {
   controlPlaneUrl,
   createAuthClient,
   createPrompter,
+  dashboardCapability,
+  dashboardLink,
+  dashboardNeeds,
   dataClient,
   dataEnvironment,
   dataError,
@@ -125,7 +129,7 @@ import {
   warningLines,
   withFunctionRetries,
   writeProjectLink
-} from "./chunk-X5TUBMEU.js";
+} from "./chunk-RQJTCRKY.js";
 import "./chunk-K3NQKI34.js";
 
 // src/args.ts
@@ -4754,7 +4758,7 @@ async function zoneNamed(context, usage) {
   if (!zone)
     throw new NaroError(
       "NOT_FOUND",
-      `${domain} is not on naro DNS for team ${team}. \`naro dns\` lists the zones.`
+      `${domain} is not on Naro DNS for team ${team}. \`naro dns\` lists the zones.`
     );
   return { client, team, zone };
 }
@@ -4769,7 +4773,7 @@ async function runDns(context) {
   const { client, team } = await teamAndClient(context);
   const state = await client.dns.state(team);
   context.output.result({ team, ...state }, [
-    `naro DNS for ${team}${state.enabled ? "" : " (not enabled on this server)"}:`,
+    `Naro DNS for ${team}${state.enabled ? "" : " (not enabled on this server)"}:`,
     ...state.zones.length === 0 ? ["  No zones. `naro dns add <domain>` starts a move."] : state.zones.flatMap((zone) => zoneLines(zone).map((l) => `  ${l}`))
   ]);
 }
@@ -4778,7 +4782,7 @@ async function runDnsAdd(context) {
   const { client, team } = await teamAndClient(context);
   const zone = await client.dns.addZone(team, domain);
   context.output.result({ team, zone }, [
-    `\u2705 Started moving ${zone.name} to naro DNS`,
+    `\u2705 Started moving ${zone.name} to Naro DNS`,
     `   Set these name servers at your registrar: ${zone.nameServers.join(", ")}`,
     "   `naro dns mail` shows the mail records to keep, `naro dns check` asks whether the move is done."
   ]);
@@ -4790,11 +4794,11 @@ async function runDnsRemove(context) {
   );
   await confirmOrAbort(
     context,
-    `Remove ${zone.name} from naro DNS (${zone.status})?`
+    `Remove ${zone.name} from Naro DNS (${zone.status})?`
   );
   await client.dns.removeZone(team, zone.id);
   context.output.result({ team, removed: zone.name }, [
-    `\u2705 Removed ${zone.name} from naro DNS`
+    `\u2705 Removed ${zone.name} from Naro DNS`
   ]);
 }
 async function runDnsCheck(context) {
@@ -5269,6 +5273,15 @@ async function accessJwtFor(config, jwtStore) {
   }
   return { error: invalidSession() };
 }
+async function freshAccessJwt(config) {
+  const jwtStore = config.accessJwt;
+  if (jwtStore === void 0 || config.service) return;
+  const jwt = await jwtStore.get();
+  if (jwt === null) return;
+  const expiry = localExpiry(config, jwt);
+  if (expiry === null || expiry - ACCESS_JWT_MARGIN_MS > Date.now()) return;
+  await accessJwtFor(config, jwtStore);
+}
 async function bearerFor(config, path, withToken) {
   if (!withToken) return { token: null, session: null };
   const store = storeFor(config, path);
@@ -6205,6 +6218,7 @@ var AuthClient = class {
     const renewed = tokenFrom(result.answer);
     if (renewed !== null && token !== null && renewed !== token)
       await tokens.replaceIf(token, renewed);
+    await freshAccessJwt(this.#http);
     return { data: { session: body.session, user }, error: null };
   }
   /** `{ data: { user } }`; `user` is null when signed out. */
@@ -9002,7 +9016,7 @@ var RealtimeChannel = class {
       payload: isRecord(payload.payload) ? payload.payload : {}
     };
     for (const binding of this.#bindings)
-      if (binding.type === "broadcast" && binding.event === event)
+      if (binding.type === "broadcast" && (binding.event === event || binding.event === "*"))
         safely(() => binding.callback(message));
   }
   #system(payload) {
@@ -11823,6 +11837,47 @@ async function runFunctionsInvoke(context) {
   );
 }
 
+// src/commands/dashboard.ts
+var WITH_PAGE = CAPABILITIES.filter(
+  (capability) => typeof capability.dashboard === "string"
+);
+async function runDashboard(context) {
+  const [id] = context.positionals;
+  if (id === void 0) {
+    const rows = WITH_PAGE.map((capability2) => ({
+      capability: capability2.id,
+      title: capability2.title,
+      cli: capability2.cli.kind === "built" ? capability2.cli.commands ?? [] : []
+    }));
+    const width = Math.max(...rows.map((row) => row.capability.length));
+    context.output.result({ capabilities: rows }, [
+      "Pages in the dashboard (naro dashboard <capability> prints the URL):",
+      ...rows.map(
+        (row) => `  ${row.capability.padEnd(width)}  ${row.title}${row.cli.length === 0 ? "  (dashboard only)" : ""}`
+      )
+    ]);
+    return;
+  }
+  const capability = dashboardCapability(id);
+  const needs = dashboardNeeds(capability.dashboard);
+  const client = await context.client();
+  const target = needs.project ? { projectId: await context.resolveProjectId() } : needs.team ? {
+    teamSlug: (await resolveTeam(context, await client.teams.list(), {
+      intent: "read"
+    })).slug
+  } : {};
+  const link = await dashboardLink(client, capability, target, {
+    baseUrl: controlPlaneUrl(),
+    client: "cli"
+  });
+  context.output.result({ link }, [
+    link.url,
+    `  ${link.title}`,
+    ...link.reason ? [`  Not in the CLI: ${link.reason.why}`] : [],
+    ...link.cli.length > 0 ? [`  Or: ${link.cli.join(", ")}`] : []
+  ]);
+}
+
 // src/commands/readouts.ts
 function money(cents) {
   return `$${(cents / 100).toFixed(2)}`;
@@ -11841,7 +11896,9 @@ function billingLines(billing) {
     ...overage ? [
       `  overage ${overage.month}: ${money(overage.totalCents)} (requests ${money(overage.requestsCents)}, builds ${money(overage.buildsCents)}, domains ${money(overage.domainsCents)})`
     ] : [],
-    ...billing.canManage ? ["  Change the plan in the dashboard: Settings \u2192 Billing."] : []
+    ...billing.canManage ? [
+      "  Change the plan in the dashboard: naro dashboard billing-checkout prints the page."
+    ] : []
   ];
 }
 async function runBilling(context) {
@@ -12176,61 +12233,6 @@ async function runFlagRemove(context) {
     `\u2705 Removed flag ${flag.name}`
   ]);
 }
-function bindingLine(binding) {
-  return `${binding.bindingName.padEnd(16)} ${binding.type.padEnd(3)} ${binding.resourceName}${binding.provisioned ? "" : "  (not provisioned)"}${binding.managed ? "  (managed by naro)" : ""}`;
-}
-async function runBindings(context) {
-  const { client, projectId } = await projectAndClient(context);
-  const bindings = await client.bindings.list(projectId);
-  context.output.result({ projectId, bindings }, [
-    `Bindings (${String(bindings.length)}):`,
-    ...bindings.length === 0 ? [
-      "  None. `naro bindings add --type <r2|kv|d1> --name <BINDING>` creates one."
-    ] : bindings.map((binding) => `  ${bindingLine(binding)}`)
-  ]);
-}
-async function runBindingAdd(context) {
-  const { type, name } = context.flags;
-  if (!type || !name)
-    throw new NaroError(
-      "VALIDATION_FAILED",
-      "Usage: naro bindings add --type <r2|kv|d1> --name <BINDING>"
-    );
-  const { client, projectId } = await projectAndClient(context);
-  const binding = await client.bindings.add(projectId, type, name);
-  context.output.result({ projectId, binding }, [
-    `\u2705 Added ${bindingLine(binding)}`,
-    "   The worker sees it from the next deploy."
-  ]);
-}
-async function runBindingRemove(context) {
-  const [name] = context.positionalOrThrow(
-    1,
-    "Usage: naro bindings remove <BINDING>"
-  );
-  const { client, projectId } = await projectAndClient(context);
-  const binding = (await client.bindings.list(projectId)).find(
-    (candidate) => candidate.bindingName === name
-  );
-  if (!binding)
-    throw new NaroError(
-      "NOT_FOUND",
-      `No binding named ${name}. \`naro bindings\` lists them.`
-    );
-  if (binding.managed)
-    throw new NaroError(
-      "STORAGE_MANAGED",
-      "The Naro database is removed when the project is deleted. Set the project's database to None to unbind it."
-    );
-  await confirmOrAbort(
-    context,
-    `Remove the binding ${binding.bindingName}? This deletes the ${binding.type} resource ${binding.resourceName} and everything in it.`
-  );
-  await client.bindings.remove(projectId, binding.id);
-  context.output.result({ projectId, removed: binding.bindingName }, [
-    `\u2705 Removed ${binding.bindingName} and its ${binding.type} resource`
-  ]);
-}
 
 // src/commands/teams.ts
 async function teamScope(context) {
@@ -14152,6 +14154,7 @@ Usage:
   naro usage [--month YYYY-MM] [--team <slug>]
                                      Team usage: requests, builds and custom domains against the plan, then by project
   naro billing [--team <slug>]      The team's plan, subscription and this month's overage; the plan changes in the dashboard
+  naro dashboard [<capability>]      The dashboard URL for what the CLI leaves there (payments, GitHub App, \u2026); no argument lists them
 
   naro deploy [--prod]               Build locally and deploy (preview by default)
        [--root <dir>] [--name <name>]  --root points at the app in a monorepo
@@ -14211,9 +14214,9 @@ Usage:
   naro domains verify [host] [--wait]  Re-check DNS and print what is missing
        exits non-zero while a domain is not live yet
 
-  naro dns [list] [--team <slug>]    naro DNS: the team's zones, their status and name servers
-  naro dns add <domain>              Start moving a domain onto naro DNS; prints the name servers to set
-  naro dns remove <domain>           Cancel the move, or take the domain off naro DNS (asks first; --yes in CI)
+  naro dns [list] [--team <slug>]    Naro DNS: the team's zones, their status and name servers
+  naro dns add <domain>              Start moving a domain onto Naro DNS; prints the name servers to set
+  naro dns remove <domain>           Cancel the move, or take the domain off Naro DNS (asks first; --yes in CI)
   naro dns check <domain>            Read the zone's status and ask Cloudflare whether the move is done
   naro dns mail <domain>             The mail records (MX, SPF, DMARC, DKIM) to keep before the move
   naro dns scan <domain>             The records Cloudflare found in the current DNS
@@ -14238,10 +14241,6 @@ Usage:
   naro flags on <name>               Turn a flag on; the live app follows within about a minute
   naro flags off <name>              Turn a flag off
   naro flags remove <name>           Remove a flag; code still reading it sees it off (asks first)
-  naro bindings [list]               The R2, KV and D1 resources bound to the worker
-  naro bindings add --type <r2|kv|d1> --name <BINDING>
-                                     Create a resource and bind it as env.<BINDING> from the next deploy
-  naro bindings remove <BINDING>     Delete the resource and everything in it (asks first; --yes in CI)
 
   The data commands below (db, migration, gen, backend, policy, storage, realtime) take --env <name>:
        a named environment's data instead of production's, which preview shares
@@ -14833,6 +14832,8 @@ function routeCommand(parsed) {
       if (sub === void 0 || sub === "list")
         return positionals.length <= 1 ? { handler: runSupabase, positionals: [] } : null;
       return sub === "disconnect" && positionals.length <= 2 ? { handler: runSupabaseDisconnect, positionals: positionals.slice(1) } : null;
+    case "dashboard":
+      return positionals.length <= 1 ? { handler: runDashboard, positionals } : null;
     case "billing":
       return positionals.length === 0 ? { handler: runBilling, positionals: [] } : null;
     case "observability":
@@ -15029,16 +15030,6 @@ function routeCommand(parsed) {
       const command2 = commands[sub];
       return command2 ? { handler: command2, positionals: positionals.slice(1) } : null;
     }
-    case "bindings": {
-      if (sub === void 0 || sub === "list")
-        return positionals.length <= 1 ? { handler: runBindings, positionals: [] } : null;
-      const commands = {
-        add: runBindingAdd,
-        remove: runBindingRemove
-      };
-      const command2 = commands[sub];
-      return command2 ? { handler: command2, positionals: positionals.slice(1) } : null;
-    }
     case "dns": {
       if (sub === void 0 || sub === "list")
         return positionals.length <= 1 ? { handler: runDns, positionals: [] } : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naro-cli",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "type": "module",
   "bin": {
     "naro": "./dist/index.js"
@@ -37,14 +37,14 @@
     "tsx": "4.23.12",
     "typescript": "7.0.2",
     "vitest": "3.2.7",
-    "naro-js": "0.7.1",
     "@next-deploy/build": "0.1.0",
+    "@next-deploy/data-core": "0.1.0",
     "@next-deploy/config": "0.1.0",
-    "@next-deploy/functions-bundler": "0.1.0",
     "@next-deploy/functions-runtime": "0.1.0",
+    "naro-js": "0.9.0",
     "@next-deploy/sdk": "0.1.0",
     "@next-deploy/core": "0.1.0",
-    "@next-deploy/data-core": "0.1.0"
+    "@next-deploy/functions-bundler": "0.1.0"
   },
   "scripts": {
     "build": "tsup && pnpm build:types",