@yadurajfleetos/cli 0.1.9 → 0.2.0

package/dist/api.js

@@ -28,9 +28,13 @@ export async function request(method, path, opts = {}) {
         method,
         headers: {
             ...(token ? { authorization: `Bearer ${token}` } : {}),
-            ...(opts.body ? { 'content-type': 'application/json' } : {}),
+            ...(opts.raw
+                ? { 'content-type': opts.raw.contentType }
+                : opts.body
+                    ? { 'content-type': 'application/json' }
+                    : {}),
         },
-        body: opts.body ? JSON.stringify(opts.body) : undefined,
+        body: opts.raw ? opts.raw.data : opts.body ? JSON.stringify(opts.body) : undefined,
         signal: AbortSignal.timeout(20 * 60_000),
     });
     let res;

package/dist/archive.js

@@ -0,0 +1,115 @@
+/**
+ * Packing a build context.
+ *
+ * `build:` used to mean "only via a git push", because a checkout on the
+ * control plane was the one context a build could run against. This sends the
+ * directory instead, so a deploy from a laptop builds the same way a pushed
+ * commit does — and Fleet, which can see the fleet's architectures, builds for
+ * all of them rather than leaving you to notice that the image you made on an
+ * Apple laptop will not start on an amd64 node.
+ */
+import { spawn } from 'node:child_process';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { CliError, EXIT } from './api.js';
+/**
+ * Excluded even when no .dockerignore says so.
+ *
+ * These are never part of an image and are the difference between an upload of
+ * a few hundred kilobytes and one of several hundred megabytes. A Dockerfile
+ * that genuinely needs .git is rare enough to be worth an explicit exception
+ * later rather than a slow upload for everybody now.
+ */
+const ALWAYS_EXCLUDE = ['.git', 'node_modules', '.DS_Store'];
+/**
+ * Read .dockerignore into tar exclusion patterns.
+ *
+ * The two formats are close but not identical: .dockerignore has negations
+ * (`!keep-this`) and anchors paths at the context root. Negations are dropped
+ * rather than half-implemented — including a file that should have been
+ * excluded is a slow upload, whereas excluding one that should have been kept
+ * is a broken build, and silently doing the second would be worse.
+ */
+export async function ignorePatterns(dir) {
+    let text = '';
+    try {
+        text = await readFile(join(dir, '.dockerignore'), 'utf8');
+    }
+    catch {
+        return [...ALWAYS_EXCLUDE];
+    }
+    const patterns = text
+        .split('\n')
+        .map((line) => line.trim())
+        .filter((line) => line && !line.startsWith('#') && !line.startsWith('!'))
+        .map((line) => line.replace(/^\/+/, '').replace(/\/+$/, ''))
+        .filter(Boolean);
+    return [...new Set([...ALWAYS_EXCLUDE, ...patterns])];
+}
+/**
+ * Pack `dir` into a gzipped tar in memory.
+ *
+ * Buffered rather than streamed because the whole thing is POSTed as one body,
+ * and the control plane rejects anything over its limit anyway — a stream would
+ * only defer discovering that until after the upload.
+ */
+export async function packContext(dir) {
+    const excludes = await ignorePatterns(dir);
+    const args = [
+        '-czf',
+        '-',
+        '-C',
+        dir,
+        // Ownership and timestamps vary per machine and would make two packs of the
+        // same tree differ for no reason.
+        '--no-xattrs',
+        ...excludes.flatMap((p) => ['--exclude', p]),
+        '.',
+    ];
+    return new Promise((resolve, reject) => {
+        const child = spawn('tar', args, { stdio: ['ignore', 'pipe', 'pipe'] });
+        const chunks = [];
+        let stderr = '';
+        let settled = false;
+        const fail = (message) => {
+            if (settled)
+                return;
+            settled = true;
+            reject(new CliError(message, EXIT.failure));
+        };
+        child.stdout.on('data', (c) => chunks.push(c));
+        child.stderr.on('data', (c) => (stderr += c.toString()));
+        child.on('error', (err) => fail(`Could not run tar to package the build context: ${err.message}`));
+        child.on('close', (code) => {
+            if (settled)
+                return;
+            settled = true;
+            if (code !== 0) {
+                const detail = stderr.trim().split('\n').slice(-2).join(' ');
+                return reject(new CliError(`Could not package the build context${detail ? `: ${detail}` : ''}`, EXIT.failure));
+            }
+            resolve(Buffer.concat(chunks));
+        });
+    });
+}
+/** For the "uploading 4.2MB" line, so a slow upload says why it is slow. */
+export function humanBytes(bytes) {
+    if (bytes < 1024)
+        return `${bytes}B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(0)}kB`;
+    return `${(bytes / 1024 / 1024).toFixed(1)}MB`;
+}
+/**
+ * Pack the directory and hand it to the control plane.
+ *
+ * Returns the id the deploy quotes back, or null when there is nothing to
+ * send — a service deploying a prebuilt `image:` has no context, and uploading
+ * one would be pure waste.
+ */
+export async function uploadContext(serviceId, dir) {
+    const { request } = await import('./api.js');
+    const archive = await packContext(dir);
+    const { body } = await request('POST', `/services/${serviceId}/build-context`, { raw: { data: archive, contentType: 'application/gzip' } });
+    return body;
+}

package/dist/commands/services.js

@@ -6,6 +6,8 @@ import { task, glyph } from '../ui.js';
 import { withLadder } from '../ladder.js';
 import { ask, canPrompt, confirm, selectOrThrow } from '../prompt.js';
 import { DEPLOY_STEPS, follow, phaseWalker, } from '../progress.js';
+import { planFromManifest } from '../plan.js';
+import { uploadContext, humanBytes } from '../archive.js';
 const manifestPath = (given) => given ?? 'fleet.yaml';
 async function readManifest(path) {
     try {
@@ -154,6 +156,22 @@ async function waitUntilRunning(fleetId, name, timeoutMs = 180_000) {
         throw new CliError(`"${name}" was scheduled but has not reported running. \`fleet deployments ${name}\` has the detail.`, EXIT.healthCheckFailed);
     }, { done: () => `${c.bold(name)} is running` });
 }
+/**
+ * The build context a service declares, if any, read from the local manifest.
+ *
+ * Absent when there is no fleet.yaml here — deploying from outside the
+ * repository is legitimate for a prebuilt `image:` service, and should not
+ * become an error about a file the operator never needed.
+ */
+async function buildContextFor(serviceName) {
+    try {
+        const source = await readFile('fleet.yaml', 'utf8');
+        return planFromManifest(source).find((s) => s.name === serviceName)?.build;
+    }
+    catch {
+        return undefined;
+    }
+}
 export const deployCommand = {
     async run(args, flags) {
         const fleetId = await requireFleet(typeof flags.fleet === 'string' ? flags.fleet : undefined);
@@ -182,13 +200,23 @@ export const deployCommand = {
             console.log(c.dim('Deployment cancelled. Re-run with --yes to skip confirmation.'));
             return;
         }
+        // A service that builds from source needs its directory sent, or the
+        // control plane has nothing to build and says the context does not exist.
+        // Read from the manifest here rather than from the service row, because
+        // the build path is relative to the file the operator is standing in.
+        let contextId;
+        const buildContext = await buildContextFor(service.name);
+        if (buildContext) {
+            const uploaded = await task(`packaging ${c.bold(service.name)}`, async () => uploadContext(service.id, join(process.cwd(), buildContext)), { done: (r) => `uploaded ${humanBytes(r.bytes)} of build context` });
+            contextId = uploaded.contextId;
+        }
         const body = await withLadder(DEPLOY_STEPS, async (ladder) => {
             const walker = phaseWalker(ladder);
             const progress = follow(service.id, (p) => walker.apply(p), {
                 onUnavailable: () => ladder.note(c.dim('live progress unavailable; continuing with the deploy request')),
             });
             try {
-                const result = (await request('POST', `/services/${service.id}/deploy`, { body: { gitSha } })).body;
+                const result = (await request('POST', `/services/${service.id}/deploy`, { body: { gitSha, contextId } })).body;
                 walker.finish(`scheduled onto ${result.placedOn.name}`);
                 return result;
             }

package/dist/commands/up.js

@@ -14,6 +14,8 @@ import { c } from '../render.js';
 import { task, glyph } from '../ui.js';
 import { withLadder } from '../ladder.js';
 import { DEPLOY_STEPS, follow, phaseWalker } from '../progress.js';
+import { planFromManifest, deployOrder } from '../plan.js';
+import { uploadContext, humanBytes } from '../archive.js';
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export const upCommand = {
     async run(args, flags) {
@@ -52,70 +54,115 @@ export const upCommand = {
         for (const w of applyResult.warnings) {
             console.log(`${glyph.warn} ${c.yellow('warning')}  ${w}`);
         }
-        // ── Step 3: pick the target service ───────────────────────────────
-        const serviceName = args[0] || applyResult.created[0] || applyResult.updated[0];
-        if (!serviceName) {
-            throw new CliError('Could not determine which service to deploy. Pass the name: fleet up <service>', EXIT.usage);
+        // ── Step 3: decide what to deploy, and in what order ──────────────
+        const planned = planFromManifest(manifest);
+        const buildContexts = new Map(planned.map((p) => [p.name, p.build]));
+        // No argument means the whole stack. A manifest describes a system, and
+        // deploying one service of it and leaving the rest was never what anybody
+        // wanted — it just meant typing the command again in the right order.
+        const targets = args[0] ? [args[0]] : deployOrder(planned);
+        if (!targets.length) {
+            throw new CliError('The manifest declares no services to deploy.', EXIT.usage);
         }
-        // Look it up
         const { body: listBody } = await request('GET', `/fleets/${fleetId}/services`);
-        const service = listBody.services.find((s) => s.name === serviceName || s.id === serviceName);
-        if (!service) {
-            throw new CliError(`Service "${serviceName}" not found after apply. Known: ${listBody.services.map((s) => s.name).join(', ')}`, EXIT.usage);
-        }
-        // ── Step 4: deploy ────────────────────────────────────────────────
-        const gitSha = typeof flags.sha === 'string' ? flags.sha : undefined;
-        const deployResult = await withLadder(DEPLOY_STEPS, async (ladder) => {
-            const walker = phaseWalker(ladder);
-            const progress = follow(service.id, (p) => walker.apply(p), {
-                onUnavailable: () => ladder.note(c.dim('live progress unavailable; continuing with the deploy request')),
-            });
-            try {
-                const result = (await request('POST', `/services/${service.id}/deploy`, { body: { gitSha } })).body;
-                walker.finish(`scheduled onto ${result.placedOn.name}`);
-                return result;
+        const resolved = targets.map((name) => {
+            const service = listBody.services.find((s) => s.name === name || s.id === name);
+            if (!service) {
+                throw new CliError(`Service "${name}" not found after apply. Known: ${listBody.services.map((s) => s.name).join(', ')}`, EXIT.usage);
             }
-            finally {
-                await progress.stop();
-            }
-        }, {
-            mark: true,
-            title: `deploying ${service.name}`,
-            onCancel: `deploy is still running on the control plane; inspect with fleet deployments ${service.name}`,
+            return service;
         });
-        for (const w of deployResult.warnings ?? []) {
-            console.log(`${glyph.warn} ${c.yellow('warning')}  ${w}`);
+        if (resolved.length > 1) {
+            console.log(`\n  ${c.dim('deploying')} ${resolved.map((s) => c.bold(s.name)).join(c.dim(' → '))}\n`);
         }
-        // ── Step 5: wait for healthy ──────────────────────────────────────
-        if (!flags['no-wait']) {
-            await task(`waiting for ${c.bold(service.name)} to come up`, async (s) => {
-                s.hints([
-                    'the agent picks up desired state on its next poll',
-                    "a cold image pull takes as long as the node's uplink does",
-                    'this clears once the agent reports the container running',
-                ]);
-                const deadline = Date.now() + 180_000;
-                while (Date.now() < deadline) {
-                    const { body } = await request('GET', `/fleets/${fleetId}/services`);
-                    const current = body.services.find((s) => s.id === service.id)?.current;
-                    if (current?.status === 'running')
-                        return;
-                    if (current?.status === 'failed') {
-                        throw new CliError(`"${service.name}" did not start. \`fleet deployments ${service.name}\` has the reason.`, EXIT.healthCheckFailed);
-                    }
-                    await sleep(2000);
-                }
-                throw new CliError(`"${service.name}" was scheduled but has not reported running.`, EXIT.healthCheckFailed);
-            }, { done: () => `${c.bold(service.name)} is running` });
+        const gitSha = typeof flags.sha === 'string' ? flags.sha : undefined;
+        const deployed = [];
+        for (const service of resolved) {
+            const url = await deployOne(service, {
+                fleetId,
+                gitSha,
+                buildContext: buildContexts.get(service.name),
+                wait: !flags['no-wait'],
+            });
+            deployed.push({ service, url });
         }
-        // ── Step 6: print the URL ─────────────────────────────────────────
-        const url = deployResult.url ?? service.domain ?? service.hostname;
-        if (url) {
-            const fullUrl = url.startsWith('http') ? url : `https://${url}`;
+        // ── Step 6: print the URLs ────────────────────────────────────────
+        for (const { service, url } of deployed) {
+            const target = url ?? service.domain ?? service.hostname;
+            if (!target)
+                continue;
+            const fullUrl = target.startsWith('http') ? target : `https://${target}`;
             console.log(`\n${glyph.ok} ${c.green('live')}  ${c.bold(c.cyan(fullUrl))}`);
         }
-        console.log(c.dim(`\n  fleet open ${service.name}   open in browser`));
-        console.log(c.dim(`  fleet logs ${service.name}   follow logs`));
-        console.log(c.dim(`  fleet down ${service.name}   tear down`));
+        const last = deployed[deployed.length - 1]?.service;
+        if (last) {
+            console.log(c.dim(`\n  fleet open ${last.name}   open in browser`));
+            console.log(c.dim(`  fleet logs ${last.name}   follow logs`));
+            console.log(c.dim(`  fleet down ${last.name}   tear down`));
+        }
     },
 };
+/**
+ * Deploy one service: upload its build context if it has one, run the deploy,
+ * and wait for it to report running.
+ *
+ * Returns the URL the control plane handed back, or null for a service that
+ * has none — an internal one, which is reached by name from its neighbours
+ * rather than from outside.
+ */
+async function deployOne(service, opts) {
+    // A service that builds from source sends its directory first. The control
+    // plane then builds it for every architecture the fleet has, which is the
+    // part that is easy to get wrong by hand and silent when you do.
+    let contextId;
+    if (opts.buildContext) {
+        const dir = join(process.cwd(), opts.buildContext);
+        const uploaded = await task(`packaging ${c.bold(service.name)}`, async () => uploadContext(service.id, dir), { done: (r) => `uploaded ${humanBytes(r.bytes)} of build context` });
+        contextId = uploaded.contextId;
+    }
+    const deployResult = await withLadder(DEPLOY_STEPS, async (ladder) => {
+        const walker = phaseWalker(ladder);
+        const progress = follow(service.id, (p) => walker.apply(p), {
+            onUnavailable: () => ladder.note(c.dim('live progress unavailable; continuing with the deploy request')),
+        });
+        try {
+            const result = (await request('POST', `/services/${service.id}/deploy`, {
+                body: { gitSha: opts.gitSha, contextId },
+            })).body;
+            walker.finish(`scheduled onto ${result.placedOn.name}`);
+            return result;
+        }
+        finally {
+            await progress.stop();
+        }
+    }, {
+        mark: true,
+        title: `deploying ${service.name}`,
+        onCancel: `deploy is still running on the control plane; inspect with fleet deployments ${service.name}`,
+    });
+    for (const w of deployResult.warnings ?? []) {
+        console.log(`${glyph.warn} ${c.yellow('warning')}  ${w}`);
+    }
+    if (opts.wait) {
+        await task(`waiting for ${c.bold(service.name)} to come up`, async (s) => {
+            s.hints([
+                'the agent picks up desired state on its next poll',
+                "a cold image pull takes as long as the node's uplink does",
+                'a service with a health check goes running once it passes, not before',
+            ]);
+            const deadline = Date.now() + 180_000;
+            while (Date.now() < deadline) {
+                const { body } = await request('GET', `/fleets/${opts.fleetId}/services`);
+                const current = body.services.find((s) => s.id === service.id)?.current;
+                if (current?.status === 'running')
+                    return;
+                if (current?.status === 'failed') {
+                    throw new CliError(`"${service.name}" did not start. \`fleet deployments ${service.name}\` has the reason.`, EXIT.healthCheckFailed);
+                }
+                await sleep(2000);
+            }
+            throw new CliError(`"${service.name}" was scheduled but has not reported running.`, EXIT.healthCheckFailed);
+        }, { done: () => `${c.bold(service.name)} is running` });
+    }
+    return deployResult.url;
+}

package/dist/index.js

@@ -15,7 +15,7 @@ const GROUPS = [
     [
         'getting started',
         [
-            ['up [service]', 'Detect, scaffold, apply, and deploy in one command'],
+            ['up [service]', 'Deploy the whole fleet.yaml, in dependency order'],
             ['init', 'Scaffold a fleet.yaml and Dockerfile from this repository'],
             ['config show', 'Show the saved control plane and selected fleet'],
             ['use <fleet>', 'Select the default fleet for later commands'],

package/dist/plan.js

@@ -0,0 +1,69 @@
+/**
+ * What to deploy, and in what order.
+ *
+ * `fleet up` used to deploy exactly one service, which meant a stack was four
+ * invocations typed in the right order — and getting the order wrong looked
+ * like a broken application rather than a sequencing mistake, because an API
+ * whose database is not up yet fails its health check like any other outage.
+ */
+import { parse as parseYaml } from 'yaml';
+/**
+ * Read the manifest the way the control plane will.
+ *
+ * Deliberately forgiving: the server validates, and this only needs enough
+ * structure to decide what to send and when. A manifest that is wrong will be
+ * rejected by apply with a proper message before any of this matters.
+ */
+export function planFromManifest(source) {
+    const doc = parseYaml(source);
+    const services = doc?.services;
+    if (!services || typeof services !== 'object')
+        return [];
+    return Object.entries(services).map(([name, raw]) => {
+        const body = (raw ?? {});
+        return {
+            name,
+            build: typeof body.build === 'string' ? body.build : undefined,
+            affinity: Array.isArray(body.affinity) ? body.affinity.filter((a) => typeof a === 'string') : [],
+        };
+    });
+}
+/**
+ * Order services so a dependency is deployed before whatever depends on it.
+ *
+ * `affinity` is the signal. It means "co-locate", not "depends on", but in
+ * practice the two coincide: a service is pinned next to the database it talks
+ * to, and it cannot become healthy until that database answers. Using it for
+ * ordering is a heuristic, and the cost of it being wrong is one slow retry
+ * rather than a failure — the agent's restart policy brings up a container that
+ * started too early anyway.
+ *
+ * Ties keep manifest order, so the file stays the explanation for what happens.
+ * A cycle is not an error here: the services involved are emitted in manifest
+ * order rather than dropped, because refusing to deploy is a worse answer than
+ * deploying in an imperfect order.
+ */
+export function deployOrder(services) {
+    const byName = new Map(services.map((s) => [s.name, s]));
+    const ordered = [];
+    const state = new Map();
+    const visit = (name) => {
+        if (state.get(name) === 'done')
+            return;
+        // Already on the stack: a cycle. Stop rather than recurse forever; the
+        // caller still gets every service, just not in a perfect order.
+        if (state.get(name) === 'visiting')
+            return;
+        const service = byName.get(name);
+        if (!service)
+            return; // affinity on something not in this manifest
+        state.set(name, 'visiting');
+        for (const dependency of service.affinity)
+            visit(dependency);
+        state.set(name, 'done');
+        ordered.push(name);
+    };
+    for (const service of services)
+        visit(service.name);
+    return ordered;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yadurajfleetos/cli",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "Fleet OS command-line interface for deploying and orchestrating services on user-owned hardware",
   "type": "module",
   "license": "MIT",