ninedeploy 0.18.25 → 0.18.27

package/dist/commands/importVolumes.js

@@ -0,0 +1,161 @@
+/**
+ * `ninedeploy import data <plan> --volume <service>=<file.tar.gz>` (A1 step 3).
+ *
+ * Moves the contents of a service's data volume: the volume mounted at the
+ * path the service was created with (`create.volumeMount`), which NineDeploy
+ * keeps in `nd-svc-<slug>-data`.
+ *
+ * - The command printed for the source host mounts a named volume by its
+ *   name, read-only (no container needed: a Swarm service scaled to 0 has
+ *   none); a bind mount is read through the source container instead. It
+ *   writes a gzipped tar with numeric owners, the format the panel restores.
+ * - The archive goes through the panel's chunked volume import with its
+ *   sha256, which the panel checks before the volume is touched. The panel
+ *   snapshots a volume that already exists, then swaps the archive in.
+ * - The receipt records the import id, sha256 and size. A stopped upload
+ *   resumes, a volume already imported is not imported again.
+ */
+import path from 'node:path';
+import { fileBase, flagArg, isPlainName, shellQuote, sourceTarget } from '../lib/importers/shell.js';
+/** The helper image the panel itself tars volumes with (server lib/inventory.ts HELPER_IMAGE). */
+const TAR_IMAGE = 'alpine:3.21';
+/**
+ * The source-host command that archives a service's data volume, or why it
+ * cannot be printed. Null when the service has no data volume.
+ */
+export function volumeCommand(s) {
+    const mount = s.create.volumeMount;
+    if (!mount)
+        return null;
+    const v = s.volumes.find((x) => x.mountPath === mount);
+    if (v?.source === 'file')
+        return { manual: `${mount} is a file mount on the source; recreate it under Service → File mounts` };
+    const notes = [];
+    const others = s.volumes.filter((x) => x.mountPath !== mount && x.source !== 'file');
+    if (others.length)
+        notes.push(`Only ${mount} moves; copy ${others.map((x) => x.mountPath).join(', ')} by hand.`);
+    const file = `${fileBase(s.name)}.volume.tar.gz`;
+    // A named volume is mounted by its name: that needs no container, and a
+    // Swarm service scaled to 0 has none left (checked live on CapRover 1.16,
+    // which names the Docker volume exactly as the app's volumeName).
+    if (v?.source === 'volume' && v.name && isPlainName(v.name)) {
+        return { command: `docker run --rm -v ${v.name}:/v:ro ${TAR_IMAGE} tar -czf - --numeric-owner -C /v . > ${file}`, file, notes };
+    }
+    // A bind mount, or a volume whose name the plan does not hold: borrow the
+    // source container's mounts, which works only while it still exists.
+    const { target, note } = sourceTarget(s.runtime, `${s.name}'s container`, true);
+    if (note)
+        notes.push(note);
+    notes.push('This reads the mount through the source container, so stop the app without removing its container (a Swarm service scaled to 0 has none left); or archive the host directory yourself with tar -czf - --numeric-owner -C <dir> .');
+    return {
+        command: `docker run --rm --volumes-from ${target}:ro ${TAR_IMAGE} tar -czf - --numeric-owner -C ${shellQuote(mount)} . > ${file}`,
+        file,
+        notes,
+    };
+}
+/** The preview lines for every service with a data volume. */
+export function renderVolumePreview(plan, receipt) {
+    const out = [];
+    for (const s of plan.services) {
+        const cmd = volumeCommand(s);
+        if (!cmd)
+            continue;
+        if (out.length === 0)
+            out.push('', 'Volumes (the data volume of each service; stop the service on the source first):');
+        const created = receipt?.items[`service:${s.ref}`];
+        const done = receipt?.items[`volume:${s.ref}`];
+        if (!created || created.state !== 'done')
+            out.push(`  – ${s.name}: not created yet (run import apply first)`);
+        else if (done?.state === 'done')
+            out.push(`  ✓ ${s.name}: imported (#${done.importId}, sha256 ${done.sha256?.slice(0, 12)}…)`);
+        else if ('manual' in cmd)
+            out.push(`  – ${s.name}: ${cmd.manual}`);
+        else {
+            out.push(`  + ${s.name} (${s.create.volumeMount}, NineDeploy service #${created.id}):`);
+            out.push(`      ${cmd.command}`);
+            for (const n of cmd.notes)
+                out.push(`      ${n}`);
+            out.push(`      then: --volume ${flagArg(s.name, cmd.file)}`);
+        }
+    }
+    return out;
+}
+/** Check every archive, then import each, recording every step in the receipt. */
+export async function importVolumes(plan, archives, deps) {
+    const now = deps.now ?? (() => new Date());
+    const { receipt } = deps;
+    const jobs = [];
+    for (const [name, file] of Object.entries(archives)) {
+        const s = plan.services.find((x) => x.name === name);
+        if (!s)
+            throw new Error(`--volume names no service in the plan: ${name}.`);
+        const created = receipt.items[`service:${s.ref}`];
+        if (created?.state !== 'done' || created.id === undefined)
+            throw new Error(`${name} has not been created yet: run \`ninedeploy import apply\` first.`);
+        if (!s.create.volumeMount)
+            throw new Error(`${name} has no data volume in the plan (no volume mount), so there is nothing to import into.`);
+        const { sha256, bytes } = await deps.hashFile(file);
+        if (bytes === 0)
+            throw new Error(`${file} is empty.`);
+        const prior = receipt.items[`volume:${s.ref}`];
+        if (prior?.sha256 !== undefined && prior.sha256 !== sha256 && (prior.state === 'done' || prior.importId !== undefined)) {
+            throw new Error(`${name} already has volume import #${prior.importId} recorded for a different archive. import data does not import twice; restore its pre-import snapshot or use the panel if you mean to.`);
+        }
+        jobs.push({ s, serviceId: created.id, file, sha256, bytes });
+    }
+    for (const job of jobs) {
+        const key = `volume:${job.s.ref}`;
+        const prior = receipt.items[key];
+        if (prior?.state === 'done')
+            continue;
+        const base = { kind: 'volume', ref: job.s.ref, name: job.s.name, id: job.serviceId, sha256: job.sha256, bytes: job.bytes };
+        const put = (state, notes, importId) => {
+            receipt.items[key] = { ...base, state, notes, ...(importId !== undefined ? { importId } : {}), at: now().toISOString() };
+            deps.save(receipt);
+        };
+        let resumeImportId = prior?.sha256 === job.sha256 ? prior.importId : undefined;
+        put('pending', [], resumeImportId);
+        let row;
+        try {
+            const existing = resumeImportId === undefined ? undefined : await deps.client.volumeImports.get(job.serviceId, resumeImportId);
+            if (existing?.status === 'completed')
+                row = existing;
+            else if (existing?.status === 'running')
+                row = await deps.client.volumeImports.wait(job.serviceId, existing.id);
+            else {
+                if (existing && ['failed', 'cancelled', 'expired'].includes(existing.status)) {
+                    resumeImportId = undefined;
+                    put('pending', []);
+                }
+                row = await deps.client.volumeImports.importFile(job.serviceId, deps.open(job.file), {
+                    sizeBytes: job.bytes,
+                    sha256: job.sha256,
+                    filename: path.basename(job.file),
+                    ...(resumeImportId !== undefined ? { resumeImportId } : {}),
+                    onCreated: (r) => put('pending', [], r.id),
+                });
+                row = await deps.client.volumeImports.wait(job.serviceId, row.id);
+            }
+        }
+        catch (err) {
+            const status = err.status;
+            const message = status === 404 && receipt.items[key]?.importId === undefined
+                ? 'This panel has no volume import yet: update it, or copy the files by hand.'
+                : err instanceof Error ? err.message : String(err);
+            put('failed', [message], receipt.items[key]?.importId);
+            continue;
+        }
+        if (row.status === 'completed') {
+            put('done', [
+                `Imported into ${row.volumeName}: ${job.bytes} bytes, sha256 checked by the panel.`,
+                ...(row.safetyBackupId ? [`The volume's earlier contents are in volume backup #${row.safetyBackupId} (pre-import).`] : []),
+            ], row.id);
+        }
+        else {
+            // The panel's message can quote file names from the archive, so the receipt keeps the status only.
+            put('failed', [`Volume import #${row.id} ended ${row.status}. Details: the service's volume imports on the panel.`], row.id);
+        }
+    }
+    return receipt;
+}
+//# sourceMappingURL=importVolumes.js.map

package/dist/commands/importVolumes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importVolumes.js","sourceRoot":"","sources":["../../src/commands/importVolumes.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -13,6 +13,7 @@ import { activityList, alertsCreate, alertsList, alertsRemove, backupsCreate, ba
 import { notificationsCreateFcm as _notifCreateFcm, notificationsCreateWebhook as _notifCreateWebhook, notificationsList as _notifList, notificationsRemove as _notifRemove, notificationsTest as _notifTest, } from './commands/notifications.js';
 import { databasePgbouncer } from './commands/pgbouncer.js';
 import { pitrBaseBackup, pitrDisable, pitrEnable, pitrRecover, pitrRecoveries, pitrStatus } from './commands/pitr.js';
+import { upgradeFinalize, upgradeRollback, upgradeStart, upgradeStatus } from './commands/databaseUpgrade.js';
 import { backupPolicyGet, backupPolicySet } from './commands/backupPolicy.js';
 import { logsSearch } from './commands/logs.js';
 import { emailTemplatesList, emailTemplatesPreview, emailTemplatesReset, emailTemplatesSet, } from './commands/emailTemplates.js';
@@ -45,6 +46,10 @@ import { logDrainQueueAction, logDrainRetryAction, logDrainDiscardAction } from
 import { buildCacheStatsAction, } from './commands/buildCache.js';
 import { brandingGetAction, brandingSetAction, } from './commands/branding.js';
 import { egressClearAction, egressListAction, egressSetAction, } from './commands/egress.js';
+import { importPlanAction } from './commands/importPlan.js';
+import { importApplyAction } from './commands/importApply.js';
+import { importDataAction } from './commands/importData.js';
+import { importCutoverAction } from './commands/importCutover.js';
 import { ipsForgetAction, ipsListAction, ipsSetAction } from './commands/hostIps.js';
 import { ssoAddAction, ssoListAction, ssoRemoveAction, } from './commands/sso.js';
 import { panelBackupDecryptAction, panelBackupListAction, panelBackupNowAction, panelBackupSetAction, panelBackupStatusAction, } from './commands/panelBackup.js';
@@ -235,6 +240,23 @@ databases
     .description('Manage the PgBouncer sidecar: enable | disable | status (postgres only)')
     .option('--port <port>', 'Override the listen port (enable only)', (v) => Number(v))
     .action((dbId, action, opts) => databasePgbouncer(getClient(), dbId, action, opts));
+// ── Major-version upgrades (O2) ──────────────────────────────────────────
+const upgradeCmd = databases
+    .command('upgrade')
+    .description('Move a PostgreSQL database to a newer major: dump, restore into a new volume, compare, switch (previous volume kept)');
+upgradeCmd.command('status <dbId>').description('The running major, the majors it can move to, and the upgrade history')
+    .action((dbId) => upgradeStatus(getClient(), dbId));
+upgradeCmd.command('start <dbId>').description('Upgrade to a newer major; the database stops until it is done (database admin)')
+    .requiredOption('--to <major>', 'Target PostgreSQL major, e.g. 18')
+    .option('-y, --yes', 'Skip the confirmation')
+    .option('--no-wait', 'Return once the upgrade is admitted')
+    .action((dbId, o) => upgradeStart(getClient(), dbId, o));
+upgradeCmd.command('rollback <dbId> <upgradeId>').description('Point the database back at the previous volume (database admin)')
+    .option('-y, --yes', 'Skip the confirmation')
+    .action((dbId, upgradeId, o) => upgradeRollback(getClient(), dbId, upgradeId, o));
+upgradeCmd.command('finalize <dbId> <upgradeId>').description('Delete the volume the database no longer uses; no rollback after this (database admin)')
+    .option('-y, --yes', 'Skip the confirmation')
+    .action((dbId, upgradeId, o) => upgradeFinalize(getClient(), dbId, upgradeId, o));
 // ── PostgreSQL point-in-time recovery (R3) ───────────────────────────────
 const pitrCmd = databases
     .command('pitr')
@@ -529,6 +551,43 @@ egressCmd
     .description('Detach the egress rule for a project')
     .option('--driver <name>', 'Target a specific driver (default: first registered)')
     .action((projectId, opts) => egressClearAction(getClient(), projectId, opts));
+// ── Import from another platform (A1 step 1: read-only plan) ─────────────
+const importCmd = program.command('import').description('Move from Coolify, Dokploy, CapRover or Heroku: plan (read-only), apply, data, cutover');
+importCmd
+    .command('plan <source>')
+    .description('Read a coolify | dokploy | caprover panel, or a Heroku app\'s app.json and Procfile, and print what NineDeploy would create. Nothing is created or changed. The credential comes from NINEDEPLOY_IMPORT_TOKEN (Coolify, Dokploy) or NINEDEPLOY_IMPORT_PASSWORD (CapRover, plus NINEDEPLOY_IMPORT_OTP), or a hidden prompt; Heroku needs none.')
+    .requiredOption('--url <url>', 'The source panel (e.g. https://coolify.example.com), or for heroku the app\'s git repository')
+    .option('--dir <path>', 'heroku: a checkout of the repository holding app.json / Procfile (default: .)')
+    .option('--branch <branch>', 'heroku: the branch NineDeploy deploys (default: main)')
+    .option('--app <name>', 'heroku: the Heroku app name, for the pg:backups command')
+    .option('--json', 'Print the plan as JSON')
+    .option('--out <file>', 'Also write the plan (JSON, names only) to a file')
+    .action((source, opts) => importPlanAction(source, opts));
+importCmd
+    .command('apply <plan>')
+    .description('Create the services and databases of a saved plan (import plan --out) on this panel. Without --yes it only shows what it would create. Never deploys and never adds a domain; keeps a resumable receipt next to the plan.')
+    .option('--yes', 'Create them')
+    .option('--project <id>', 'Tag every created service and database with this project')
+    .option('--dotenv <service=path>', 'Environment values for a service, from a .env file (repeatable)', (v, prev) => [...prev, v], [])
+    .option('--receipt <file>', 'Receipt file (default: <plan>.receipt.json)')
+    .action((plan, opts) => importApplyAction(plan, opts));
+importCmd
+    .command('data <plan>')
+    .description('Move database contents into the databases import apply created. Without --yes it prints the cutover order and the dump command to run on the source host for each database.')
+    .option('--dump <database=file>', 'A dump to import into that database (repeatable); its sha256 is checked by the panel', (v, prev) => [...prev, v], [])
+    .option('--volume <service=file>', 'A gzipped tar of that service\'s data volume (repeatable); restored after a snapshot of what is there', (v, prev) => [...prev, v], [])
+    .option('--yes', 'Import the dumps and archives')
+    .option('--receipt <file>', 'Receipt file (default: <plan>.receipt.json)')
+    .action((plan, opts) => importDataAction(plan, opts));
+importCmd
+    .command('cutover <plan>')
+    .description('Add the planned domains once each service runs a successful deploy and the hostname\'s DNS already points at this panel. Without --yes it only reports what is ready.')
+    .option('--yes', 'Add (or verify) the domains that pass')
+    .option('--expect <address>', 'The address DNS must point at (repeatable; default: Settings → DNS records)', (v, prev) => [...prev, v], [])
+    .option('--resolver <ip>', 'DNS server to query (default: the system\'s)')
+    .option('--skip-dns-check <host>', 'Skip the DNS check for a proxied host (repeatable; refused while the Cloudflare integration is on)', (v, prev) => [...prev, v], [])
+    .option('--receipt <file>', 'Receipt file (default: <plan>.receipt.json)')
+    .action((plan, opts) => importCutoverAction(plan, opts));
 // ── SSO (G-22) ───────────────────────────────────────────────────────────
 const ssoCmd = program.command('sso').description('Manage OIDC / SAML SSO providers (G-22)');
 ssoCmd.command('list').description('List every configured provider').action(() => ssoListAction(getClient()));