@canner-ca/cli 0.5.3 → 0.5.5

package/README.md

@@ -81,7 +81,8 @@ canner deploy --follow
 | Command | What it does |
 |---|---|
 | `canner db [list] [--slug X]` | List the project's databases (the primary is injected as `DATABASE_URL`). |
-| `canner db init [--pg 17\|18]` | Provision the project's primary database. |
+| `canner db init [--pg 17\|18] [--dedicated [--pitr-days N] [--yes]]` | Provision the project's primary database. `--dedicated` puts it on its own instance with point-in-time recovery; if the project has no dedicated-instance unit, that adds one to your plan, so the CLI shows the price and needs `--yes`. |
+| `canner billing addons` / `canner billing preview <addon> <quantity>` | Read-only: the add-ons your organization owns and where they are assigned, and the monthly change a quantity would cause. Nothing is charged. |
 | `canner db create <name> [--pg 17\|18]` | Add another database (paid plans). Injected as `DATABASE_URL_<NAME>`. |
 | `canner db info [<name>] [--reveal]` / `canner db url [<name>]` | Connection details. The password is hidden unless `--reveal` (and is `null` in `--json`). |
 | `canner db export [<name>] [--format custom\|plain] [--out FILE]` | Dump a database and download it. `custom` restores with `pg_restore`, `plain` is gzipped SQL. Every plan. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canner-ca/cli",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Canner deploy CLI — git push from any terminal, no GitHub required",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -28,7 +28,7 @@ import { randomUUID } from 'node:crypto';
 import { stdin as input, stdout as output } from 'node:process';
 import { create as tarCreate } from 'tar';
 
-const VERSION = '0.5.3';
+const VERSION = '0.5.5';
 const DEFAULT_API_BASE = 'https://api.canner.ca';
 const CONFIG_DIR = join(homedir(), '.canner');
 const CREDENTIALS_PATH = join(CONFIG_DIR, 'credentials');
@@ -692,7 +692,7 @@ async function resolveTokenId(creds, ref) {
 // ---------------------------------------------------------------------------
 // canner env [--reveal] [--slug X]                      — list env vars
 //   (sensitive values redacted by default, in text AND --json; --reveal opts out)
-// canner env set KEY=VALUE [--env production|preview] [--sensitive] [--slug X]
+// canner env set KEY=VALUE [--env production|preview|runtime] [--sensitive] [--slug X]
 // canner env rm <KEY|id> [--env ...] [--slug X]         — delete an env var
 // ---------------------------------------------------------------------------
 async function cmdEnv(args) {
@@ -760,10 +760,11 @@ async function cmdEnv(args) {
   die(`unknown env subcommand "${sub}". Use: list | set | rm.`, 2);
 }
 
-// Map a --env flag to the API's environment field. Accepts production/preview;
+// Map a --env flag to the API's environment field. Accepts production / preview / runtime
+// (runtime = the running app on production deploys only: never builds, the release command or previews);
 // anything else (or absent) means "all environments" (null).
 function normalizeEnvScope(flag) {
-  if (flag === 'production' || flag === 'preview') return flag;
+  if (flag === 'production' || flag === 'preview' || flag === 'runtime') return flag;
   return null;
 }
 
@@ -1119,7 +1120,7 @@ function sluggify(s) {
 const BOOLEAN_FLAGS = new Set([
   'json', 'reveal', 'sensitive', 'follow', 'dashboard', 'version', 'help',
   'replace', 'yes', 'no-wait', 'enable', 'disable', 'restore', 'download', 'rm', 'delete', 'instance', 'pitr',
-  'read-only', 'read-write', 'replication', 'group', 'login', 'adopt', 'strict',
+  'read-only', 'read-write', 'replication', 'group', 'login', 'adopt', 'strict', 'dedicated',
 ]);
 
 const splitList = (v) => String(v).split(',').map((x) => x.trim()).filter(Boolean);
@@ -1165,7 +1166,8 @@ function parseArgs(argv) {
 // canner db …                                            — project databases
 //
 //   canner db [list] [--slug X]                          list the project's databases
-//   canner db init [--pg 17|18] [--slug X]               provision the primary database
+//   canner db init [--pg 17|18] [--dedicated [--pitr-days N] [--yes]] [--slug X]
+//                                                        provision the primary database (--dedicated: on its own instance)
 //   canner db create <name> [--pg 17|18]                 add another database (paid plans)
 //   canner db info [<name>] [--reveal]                   connection details (password hidden by default)
 //   canner db url [<name>]                               print just the connection string
@@ -1222,6 +1224,12 @@ async function readSecretArg(args, urlFlag, envFlag, what) {
   die(`give the ${what} with --${urlFlag} <url>, --${envFlag} <VAR>, or --${urlFlag} - to type it.`, 2);
 }
 
+// Cents to "$9" / "$9.50". No currency marker: prices are shown as bare dollars everywhere but invoices.
+function fmtDollars(cents) {
+  const n = (Number(cents) || 0) / 100;
+  return `$${Number.isInteger(n) ? n : n.toFixed(2)}`;
+}
+
 function requireYes(args, message) {
   if (args.yes === true || args.y === true) return;
   die(`${message} Re-run with --yes to confirm.`, 2);
@@ -1290,6 +1298,62 @@ async function startAndWait(creds, base, args, method, path, body, verb) {
   return waitForOperation(creds, base, op.id, args);
 }
 
+// ---------------------------------------------------------------------------
+// canner billing ...                                     - add-ons, read-only
+//
+//   canner billing addons                                what the organization owns, what is assigned where
+//   canner billing preview <addon> <quantity>            the monthly change a quantity would cause (no charge)
+//
+// Nothing here buys or changes anything. Buying is `canner db init --dedicated --yes`
+// (dedicated instance) or the dashboard's Billing page.
+// ---------------------------------------------------------------------------
+async function cmdBilling(args) {
+  const creds = await loadCredentials();
+  if (!creds.token) die("not signed in. Run `canner login`.");
+  const sub = args._[0] ?? 'addons';
+
+  if (sub === 'addons' || sub === 'addon') {
+    const body = await apiJSON(creds, 'GET', '/billing/addons');
+    if (JSON_MODE) return emitJSON(body);
+    info(`${pad(bold('ID'), 20)}${pad(bold('ADD-ON'), 46)}${pad(bold('PRICE'), 10)}${pad(bold('OWNED'), 7)}${bold('ASSIGNED')}`);
+    for (const a of body?.catalog ?? []) {
+      const assigned = a.assigned == null ? dim('pooled') : `${a.assigned} of ${a.owned}${a.unassigned > 0 ? yellow(`  (${a.unassigned} unassigned)`) : ''}`;
+      info(`${pad(dim(a.id), 20)}${pad(a.display_name, 46)}${pad(`${fmtDollars(a.price_monthly_cents)}/mo`, 10)}${pad(String(a.owned), 7)}${a.owned > 0 ? assigned : dim('-')}`);
+    }
+    const held = (body?.projects ?? []).filter((p) => Object.keys(p.allocations ?? {}).length > 0);
+    if (held.length > 0) {
+      info('');
+      info(bold('Assigned to projects'));
+      for (const p of held) {
+        info(`  ${pad(p.slug, 30)}${Object.entries(p.allocations).map(([id, q]) => `${id} x${q}`).join(', ')}`);
+      }
+    }
+    info('');
+    muted(`Add-ons cost ${fmtDollars(body?.addons_monthly_cents)}/month in total. Preview a change with: canner billing preview <addon> <quantity>`);
+    return;
+  }
+
+  if (sub === 'preview') {
+    const addon = args._[1];
+    const qty = Number(args._[2]);
+    if (!addon || !Number.isInteger(qty) || qty < 0) die('usage: canner billing preview <addon> <quantity>   (the quantity you would own in total, e.g. dedicated_instance 3)', 2);
+    const body = await apiJSON(creds, 'POST', '/billing/addons/preview', { addon_id: addon, quantity: qty });
+    if (JSON_MODE) return emitJSON(body);
+    const p = body?.preview;
+    if (!p) die('the platform did not return a preview.');
+    info(`${bold(p.display_name)}: ${p.current_quantity} owned -> ${p.new_quantity}`);
+    const delta = p.monthly_delta_cents;
+    info(`  monthly change   ${delta === 0 ? 'none' : `${delta > 0 ? '+' : '-'}${fmtDollars(Math.abs(delta))}`}   ${dim(`(${fmtDollars(p.unit_price_cents)} each; add-ons would total ${fmtDollars(p.new_addons_monthly_cents)}/month)`)}`);
+    if (p.blocked) info(`  ${red('blocked')}          ${p.blocked.message}`);
+    if (p.needs_payment_method) info(`  ${yellow('needs a card')}      add a payment method before buying`);
+    if (p.needs_subscription) info(`  ${yellow('needs a plan')}      a paid plan is required first`);
+    muted('Nothing was charged or changed.');
+    return;
+  }
+
+  die('usage: canner billing addons | preview <addon> <quantity>', 2);
+}
+
 async function cmdDb(args) {
   const creds = await loadCredentials();
   if (!creds.token) die("not signed in. Run `canner login`.");
@@ -1314,10 +1378,28 @@ async function cmdDb(args) {
   }
 
   if (sub === 'init' || sub === 'provision') {
-    const body = await apiJSON(creds, 'POST', `${base}/database`, args.pg ? { pg_version: String(args.pg) } : {});
+    const req = args.pg ? { pg_version: String(args.pg) } : {};
+    if (args.dedicated === true) {
+      // A dedicated instance is a paid add-on. If the project has no unit assigned, creating one buys one,
+      // so say the price and require --yes before anything is charged.
+      const inst = await apiJSON(creds, 'GET', `${base}/instance`);
+      if (!inst?.offered) die('a dedicated instance is not available on this plan.');
+      const dedicated = { pitr: true };
+      if (args['pitr-days'] !== undefined) {
+        const days = Number(args['pitr-days']);
+        if (!Number.isInteger(days) || days < 1 || days > 35) die('--pitr-days must be a whole number from 1 to 35.', 2);
+        dedicated.window_days = days;
+      }
+      if (!inst.allowed) {
+        requireYes(args, `This project has no dedicated-instance add-on assigned. Creating the database on a dedicated instance adds one to your plan at ${fmtDollars(inst.price_monthly_cents)}/month, billed to your organization.`);
+        dedicated.confirm_addon_purchase = true;
+      }
+      req.dedicated = dedicated;
+    }
+    const body = await apiJSON(creds, 'POST', `${base}/database`, req);
     if (JSON_MODE) return emitJSON(body);
     const d = body?.database;
-    info(`${green('provisioned')} ${bold('primary')} ${dim(`(Postgres ${d?.pg_version_full ?? d?.pg_version})`)}`);
+    info(`${green('provisioned')} ${bold('primary')} ${dim(`(Postgres ${d?.pg_version_full ?? d?.pg_version}${args.dedicated === true ? ', dedicated instance' : ''})`)}`);
     muted('The connection string is injected as DATABASE_URL on your next deploy.');
     return;
   }
@@ -2075,9 +2157,9 @@ async function cmdDb(args) {
 
   if (sub === 'least-privilege') {
     // One step to the usual safe arrangement: the app logs in as a limited role, the owner (which can change the schema) is
-    // given to the BUILD only, as DATABASE_URL_MIGRATE, and every migration ledger stays read-only for the app's role.
+    // given to the release command only, as DATABASE_URL_MIGRATE, and every migration ledger stays read-only for the app's role.
     const label = args._[1] ?? 'primary';
-    requireYes(args, 'The app will run as a limited role (it can read and write data but cannot change the schema) from its next deploy, and the database owner will be given to the build only, as DATABASE_URL_MIGRATE: run your migrations there.');
+    requireYes(args, 'The app will run as a limited role (it can read and write data but cannot change the schema) from its next deploy, and the database owner will be given to the release command only, as DATABASE_URL_MIGRATE: run your migrations there.');
     const r = await apiJSON(creds, 'POST', `${base}/databases/${encodeURIComponent(label)}/least-privilege`, {
       confirm: true,
       ...(typeof args.label === 'string' ? { label: args.label } : {}),
@@ -2586,6 +2668,13 @@ ${bold('Databases:')}
   ${bold('db')} [list] [--slug X]           List the project's databases.
   ${bold('db')} init | create <name> [--pg 17|18]
                        Provision the primary database, or add another (paid).
+  ${bold('db')} init --dedicated [--pitr-days N] [--yes]
+                       Create the primary on its own dedicated instance with
+                       point-in-time recovery. If the project has no unit, this
+                       buys one: it shows the price and needs --yes.
+  ${bold('billing')} addons | preview <addon> <quantity>
+                       See the add-ons you own and where they are assigned, and
+                       preview a quantity change. Read-only; nothing is charged.
   ${bold('db')} info [<name>] [--reveal] | url [<name>]
                        Connection details (password hidden unless --reveal).
   ${bold('db')} export [<name>] [--format custom|plain] [--out FILE]
@@ -2765,6 +2854,7 @@ const dispatch = {
   tokens: cmdToken,
   env: cmdEnv,
   domains: cmdDomains,
+  billing: cmdBilling,
   db: cmdDb,
   database: cmdDb,
   databases: cmdDb,