@canner-ca/cli 0.5.4 → 0.5.6

package/README.md

@@ -69,19 +69,24 @@ canner deploy --follow
 | `canner token create <name>` | Mint a new token. The secret is printed once — copy it immediately. |
 | `canner token revoke <id\|name>` | Revoke a token. |
 | `canner env [list] [--reveal] [--slug X]` | List a project's environment variables. Values marked sensitive are redacted (`••••••`, or `null` in `--json`) unless `--reveal` is passed. |
-| `canner env set KEY=VALUE [--env production\|preview] [--sensitive] [--slug X]` | Add an environment variable. |
+| `canner env set KEY=VALUE [KEY=VALUE ...] [--env production\|preview] [--sensitive] [--slug X]` | Add one or more environment variables. |
 | `canner env rm <KEY\|id> [--env ...] [--slug X]` | Delete an environment variable. |
 | `canner domains [list] [--slug X]` | List a project's custom domains. |
 | `canner domains add <hostname> [--slug X]` | Attach a custom domain (starts `pending`). |
 | `canner domains verify <hostname\|id> [--slug X]` | Re-check DNS and provision TLS. |
 | `canner domains rm <hostname\|id> [--slug X]` | Detach a custom domain. |
+| `canner jobs [list] [--slug X]` | List scheduled jobs, with the header names each sends (never a value). |
+| `canner jobs create <name> (--path /api/cron [--branch BRANCH] \| --url URL) --schedule "CRON" [--header name=value] [--header-env name=VARIABLE] [--bearer-env VARIABLE] [--slug X]` | Create a job. `--path` calls a path in the project itself (its address is built from the project's own host each time, in production or, with `--branch`, on that preview); `--url` is for anything else. `--header-env x-cron-key=CRON_KEY` sends the project variable's value, read each time the job runs, so the secret is never copied. `--bearer-env CRON_SECRET` sends `Authorization: Bearer …`. With a `CRON_SECRET` variable and no Authorization header, Canner sends it automatically. |
+| `canner jobs run <id>` / `canner jobs runs <id>` | Run a job now and show the result, or list recent runs with what to check on a failure. |
+| `canner jobs delete <id> --yes` | Delete a job and its run history. |
 
 ### Databases
 
 | 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.4",
+  "version": "0.5.6",
   "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.4';
+const VERSION = '0.5.6';
 const DEFAULT_API_BASE = 'https://api.canner.ca';
 const CONFIG_DIR = join(homedir(), '.canner');
 const CREDENTIALS_PATH = join(CONFIG_DIR, 'credentials');
@@ -726,23 +726,31 @@ async function cmdEnv(args) {
   }
 
   if (sub === 'set') {
-    const kv = args._[1];
-    if (!kv || !kv.includes('=')) die('usage: canner env set KEY=VALUE', 2);
-    const eq = kv.indexOf('=');
-    const key = kv.slice(0, eq);
-    const value = kv.slice(eq + 1);
+    const pairs = args._.slice(1);
+    if (pairs.length === 0 || pairs.some((kv) => !kv.includes('='))) die('usage: canner env set KEY=VALUE [KEY=VALUE ...]', 2);
     const environment = normalizeEnvScope(args.env);
     const isSensitive = args.sensitive === true;
-    const result = await apiJSON(creds, 'POST', base, {
-      key, value, environment, is_sensitive: isSensitive,
-    });
-    if (JSON_MODE) return emitJSON(result);
-    if ((result?.created ?? []).length > 0) {
-      info(`${green('set')} ${bold(key)}${environment ? dim(` (${environment})`) : ''}`);
-    } else {
-      // A duplicate (same key+scope) is skipped, not overwritten — surface that
-      // so the user isn't surprised the value didn't change.
-      die(`${key} already exists for that environment. Delete it first (canner env rm ${key}), then set again.`);
+    const results = [];
+    const skipped = [];
+    for (const kv of pairs) {
+      const eq = kv.indexOf('=');
+      const key = kv.slice(0, eq);
+      const value = kv.slice(eq + 1);
+      const result = await apiJSON(creds, 'POST', base, {
+        key, value, environment, is_sensitive: isSensitive,
+      });
+      results.push(result);
+      if ((result?.created ?? []).length > 0) {
+        if (!JSON_MODE) info(`${green('set')} ${bold(key)}${environment ? dim(` (${environment})`) : ''}`);
+      } else {
+        // A duplicate (same key+scope) is skipped, not overwritten — surface that
+        // so the user isn't surprised the value didn't change.
+        skipped.push(key);
+      }
+    }
+    if (JSON_MODE) return emitJSON(results.length === 1 ? results[0] : results);
+    if (skipped.length > 0) {
+      die(`${skipped.join(', ')} already exist${skipped.length === 1 ? 's' : ''} for that environment. Delete ${skipped.length === 1 ? 'it' : 'them'} first (canner env rm ${skipped[0]}), then set again.`);
     }
     return;
   }
@@ -1120,7 +1128,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);
@@ -1166,7 +1174,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
@@ -1223,6 +1232,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);
@@ -1291,6 +1306,203 @@ 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);
+}
+
+// ---------------------------------------------------------------------------
+// canner jobs ...                                        - scheduled jobs (webhook cron)
+//
+//   canner jobs [list] [--slug X]                        the jobs (all of them, or one project's)
+//   canner jobs create <name> (--path /api/cron [--branch B] | --url U) --schedule "*/15 * * * *" [--slug X] [--description D]
+//         [--header "name=value" ...] [--header-env name=VARIABLE ...] [--bearer-env VARIABLE]
+//   (--path calls a path in the project itself: its address is built from the project's own host each time, in
+//    production or, with --branch, on that preview; --url is for anything else)
+//   canner jobs run <id>                                 run it now and show what came back
+//   canner jobs runs <id>                                recent runs, with what to check on a failure
+//   canner jobs delete <id> --yes
+//
+// A header's value can read a project environment variable when the job fires, so the secret is never
+// copied: --header-env x-cron-key=CRON_KEY sends x-cron-key with the value of CRON_KEY; --bearer-env
+// CRON_SECRET sends Authorization: Bearer <CRON_SECRET>. (Same as --header 'x-cron-key=${CRON_KEY}', without
+// the shell-quoting.) With a CRON_SECRET variable and no Authorization header, Canner sends it automatically.
+// ---------------------------------------------------------------------------
+const asList = (v) => (v === undefined || v === true ? [] : Array.isArray(v) ? v : [v]);
+
+function jobHeadersFromArgs(args) {
+  const headers = {};
+  const put = (name, value) => {
+    if (!name || value === undefined || value === '') die(`bad header: "${name}" needs a name and a value.`, 2);
+    headers[name] = value;
+  };
+  for (const h of asList(args.header)) {
+    const eq = String(h).indexOf('=');
+    if (eq < 1) die(`bad --header "${h}": use name=value.`, 2);
+    put(String(h).slice(0, eq), String(h).slice(eq + 1));
+  }
+  for (const h of asList(args['header-env'])) {
+    const eq = String(h).indexOf('=');
+    if (eq < 1) die(`bad --header-env "${h}": use header-name=VARIABLE.`, 2);
+    put(String(h).slice(0, eq), `\${${String(h).slice(eq + 1)}}`);
+  }
+  for (const v of asList(args['bearer-env'])) put('Authorization', `Bearer \${${v}}`);
+  return headers;
+}
+
+const describeJobHeaders = (headers) => {
+  const entries = Object.entries(headers ?? {});
+  if (entries.length === 0) return dim('none');
+  return entries.map(([n, v]) => (/\$\{/.test(v) ? `${n} ${dim(`(${v})`)}` : `${n} ${dim('(hidden)')}`)).join(', ');
+};
+
+async function findJob(creds, ref) {
+  const body = await apiJSON(creds, 'GET', '/jobs');
+  const hits = (body?.jobs ?? []).filter((j) => j.id === ref || j.id.startsWith(ref));
+  if (hits.length === 0) die(`no job with id "${ref}". List them with: canner jobs`);
+  if (hits.length > 1) die(`"${ref}" matches more than one job; use more of the id.`);
+  return hits[0];
+}
+
+function printRun(r) {
+  const color = r.status === 'succeeded' ? green : r.status === 'running' ? yellow : red;
+  info(`  ${pad(r.started_at.replace('T', ' ').slice(0, 19), 21)}${pad(color(r.status), 20)}${pad(String(r.http_status ?? '-'), 6)}${r.duration_ms != null ? `${r.duration_ms} ms` : ''}`);
+  if (r.error_message) info(`    ${dim(String(r.error_message).slice(0, 200))}`);
+  if (r.hint) info(`    ${yellow('check')} ${r.hint}`);
+}
+
+async function cmdJobs(args) {
+  const creds = await loadCredentials();
+  if (!creds.token) die("not signed in. Run `canner login`.");
+  const sub = args._[0] ?? 'list';
+
+  if (sub === 'list' || sub === 'ls') {
+    const body = await apiJSON(creds, 'GET', args.slug ? `/projects/${encodeURIComponent(args.slug)}/jobs` : '/jobs');
+    if (JSON_MODE) return emitJSON(body);
+    const jobs = body?.jobs ?? [];
+    if (jobs.length === 0) { muted('no scheduled jobs. Create one with `canner jobs create`.'); return; }
+    info(`${pad(bold('ID'), 10)}${pad(bold('NAME'), 26)}${pad(bold('PROJECT'), 20)}${pad(bold('SCHEDULE'), 16)}${bold('HEADERS')}`);
+    for (const j of jobs) {
+      info(`${pad(dim(j.id.slice(0, 8)), 10)}${pad(j.is_active ? j.name : `${j.name} ${dim('(paused)')}`, 26)}${pad(j.project_slug, 20)}${pad(j.schedule, 16)}${describeJobHeaders(j.headers)}`);
+    }
+    return;
+  }
+
+  if (sub === 'create' || sub === 'add') {
+    const name = args._[1];
+    if (!name || !args.schedule || Boolean(args.url) === Boolean(args.path)) {
+      die('usage: canner jobs create <name> (--path /api/cron [--branch BRANCH] | --url URL) --schedule "CRON" [--header name=value] [--header-env name=VARIABLE] [--bearer-env VARIABLE]', 2);
+    }
+    if (args.branch && !args.path) die('--branch goes with --path.', 2);
+    const slug = await resolveSlug(args);
+    const headers = jobHeadersFromArgs(args);
+    const body = await apiJSON(creds, 'POST', `/projects/${encodeURIComponent(slug)}/jobs`, {
+      name, schedule: String(args.schedule),
+      ...(args.path ? { path: String(args.path), ...(args.branch ? { branch: String(args.branch) } : {}) } : { url: String(args.url) }),
+      ...(args.description ? { description: String(args.description) } : {}),
+      ...(Object.keys(headers).length > 0 ? { headers } : {}),
+    });
+    if (JSON_MODE) return emitJSON(body);
+    info(`${green('created')} ${bold(name)} ${dim(body.job.id)}`);
+    for (const w of body.warnings ?? []) info(`${yellow('warning')} ${w.message}`);
+    return;
+  }
+
+  if (sub === 'run' || sub === 'trigger') {
+    if (!args._[1]) die('usage: canner jobs run <id>', 2);
+    const job = await findJob(creds, args._[1]);
+    await apiJSON(creds, 'POST', `/projects/${encodeURIComponent(job.project_slug)}/jobs/${job.id}/trigger`);
+    let run = null;
+    for (let i = 0; i < 20; i++) {
+      await new Promise((r) => setTimeout(r, 750));
+      const body = await apiJSON(creds, 'GET', `/projects/${encodeURIComponent(job.project_slug)}/jobs/${job.id}/runs?limit=1`);
+      run = body?.runs?.[0] ?? null;
+      if (run && run.status !== 'running') break;
+    }
+    if (JSON_MODE) return emitJSON(run);
+    if (!run) { muted('started; check `canner jobs runs ' + job.id.slice(0, 8) + '` in a moment.'); return; }
+    info(`${bold(job.name)}`);
+    printRun(run);
+    if (run.status !== 'succeeded' && run.response_body) info(`    ${dim(String(run.response_body).slice(0, 300))}`);
+    if (run.status !== 'succeeded') process.exitCode = 1;
+    return;
+  }
+
+  if (sub === 'runs' || sub === 'history') {
+    if (!args._[1]) die('usage: canner jobs runs <id>', 2);
+    const job = await findJob(creds, args._[1]);
+    const body = await apiJSON(creds, 'GET', `/projects/${encodeURIComponent(job.project_slug)}/jobs/${job.id}/runs?limit=10`);
+    if (JSON_MODE) return emitJSON(body);
+    info(`${bold(job.name)} ${dim(`${job.project_slug} · ${job.schedule}`)}  headers: ${describeJobHeaders(job.headers)}`);
+    if ((body?.runs ?? []).length === 0) { muted('no runs yet.'); return; }
+    for (const r of body.runs) printRun(r);
+    return;
+  }
+
+  if (sub === 'delete' || sub === 'rm') {
+    if (!args._[1]) die('usage: canner jobs delete <id> --yes', 2);
+    const job = await findJob(creds, args._[1]);
+    requireYes(args, `This deletes the job "${job.name}" and its run history.`);
+    await apiJSON(creds, 'DELETE', `/projects/${encodeURIComponent(job.project_slug)}/jobs/${job.id}`);
+    if (JSON_MODE) return emitJSON({ ok: true });
+    info(`${green('deleted')} ${bold(job.name)}`);
+    return;
+  }
+
+  die('usage: canner jobs [list] | create <name> ... | run <id> | runs <id> | delete <id> --yes', 2);
+}
+
 async function cmdDb(args) {
   const creds = await loadCredentials();
   if (!creds.token) die("not signed in. Run `canner login`.");
@@ -1315,10 +1527,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;
   }
@@ -2587,6 +2817,18 @@ ${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('jobs')} [list] | create <name> (--path /p [--branch B] | --url U) --schedule "CRON" | run <id> | runs <id> | delete <id> --yes
+                       Scheduled jobs. --path calls a path in the project itself
+                       (production, or a preview with --branch). A header can read a
+                       project variable: --header-env x-cron-key=CRON_KEY or
+                       --bearer-env CRON_SECRET.
+  ${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]
@@ -2766,6 +3008,9 @@ const dispatch = {
   tokens: cmdToken,
   env: cmdEnv,
   domains: cmdDomains,
+  billing: cmdBilling,
+  jobs: cmdJobs,
+  job: cmdJobs,
   db: cmdDb,
   database: cmdDb,
   databases: cmdDb,