@geekity/cms 0.24.0 → 0.26.0

package/dist/plugins/settings.js

@@ -0,0 +1,219 @@
+/**
+ * A plugin's settings (decision-33): the fields it declares, where each value
+ * lives, and what a save writes.
+ *
+ * Public values sit under the plugin's key in `content/_data/site.json`,
+ * beside `enabled`. Secrets sit in `secrets.json` in the plugin's data folder,
+ * mode 0600, and an environment variable named by the package wins over the
+ * file, so a Docker operator can keep a key in `.env`. Every value is read
+ * from the files and the environment when it is asked for, so a save or a
+ * hand edit takes effect on the next request.
+ */
+import path from 'node:path';
+import { readFileIfPresentSync, updateFileAtomically } from '../files/atomic.js';
+import { readPluginEntry, updatePluginEntry } from './enabled.js';
+export const SECRETS_FILE = 'secrets.json';
+/** `data/plugins/<package name>/`. */
+export function pluginFolderPath(dataDir, name) {
+    return path.join(dataDir, 'plugins', ...name.split('/'));
+}
+function upperSnake(text) {
+    return text
+        .toUpperCase()
+        .replace(/[^A-Z0-9]+/g, '_')
+        .replace(/^_+|_+$/g, '');
+}
+/**
+ * What every environment variable of a package starts with, before `__`:
+ * `GEEKITY_PLUGIN_LLM` for `@geekity/plugin-llm`. It never contains `__`, so
+ * no plugin variable can shadow a core one.
+ */
+export function pluginEnvPrefix(name) {
+    return upperSnake(name);
+}
+/** The environment variable that sets one setting, such as `GEEKITY_PLUGIN_LLM__API_KEY`. */
+export function pluginVariable(name, key) {
+    return `${pluginEnvPrefix(name)}__${upperSnake(key)}`;
+}
+const SETTING_KEY = /^[a-z][a-z0-9]*(?:_[a-z0-9]+)*$/;
+/** Why these fields cannot be stored, or `undefined` when they can. */
+export function settingFieldsProblem(fields) {
+    const seen = new Set();
+    for (const field of fields) {
+        const key = JSON.stringify(field.key);
+        if (!SETTING_KEY.test(field.key)) {
+            return `The setting ${key} is not lower case words joined by "_".`;
+        }
+        if (field.key === 'enabled')
+            return `The setting ${key} is the key that enables the plugin.`;
+        if (seen.has(field.key))
+            return `The setting ${key} is declared twice.`;
+        seen.add(field.key);
+        if (field.type === 'select' &&
+            !field.options.some((option) => option.value === field.default)) {
+            return `The setting ${key} has a default that is not one of its options.`;
+        }
+        if (field.type === 'url' && field.default !== undefined && !isWebUrl(field.default)) {
+            return `The setting ${key} has a default that is not an http or https URL.`;
+        }
+    }
+    return undefined;
+}
+/** Every field with its value now, in the order declared. */
+export function resolvePluginSettings(place) {
+    const stored = readPluginEntry(place.contentDir, place.name);
+    const secrets = readSecrets(place.dataDir, place.name);
+    return place.fields.map((field) => {
+        if (field.type === 'secret') {
+            const variable = pluginVariable(place.name, field.key);
+            const fromEnv = place.env[variable];
+            if (fromEnv !== undefined && fromEnv !== '') {
+                return { field, value: fromEnv, source: 'environment', problem: undefined, variable };
+            }
+            const fromFile = secrets[field.key];
+            return typeof fromFile === 'string' && fromFile !== ''
+                ? { field, value: fromFile, source: 'file', problem: undefined, variable }
+                : { field, value: undefined, source: 'default', problem: undefined, variable };
+        }
+        const fallback = { field, value: defaultOf(field), variable: undefined };
+        const raw = stored[field.key];
+        if (raw === undefined)
+            return { ...fallback, source: 'default', problem: undefined };
+        if (accepts(field, raw)) {
+            return { field, value: raw, source: 'site', problem: undefined, variable: undefined };
+        }
+        return {
+            ...fallback,
+            source: 'default',
+            problem: `The value in site.json is not ${EXPECTED[field.type]}, so the default is in use.`,
+        };
+    });
+}
+/** The values a plugin is handed, keyed by field key. */
+export function settingValues(resolved) {
+    return Object.fromEntries(resolved.map((entry) => [entry.field.key, entry.value]));
+}
+/**
+ * Save a submitted form. A field with a value it does not accept refuses the
+ * whole save, named in `problems`, and nothing is written. An empty public
+ * box removes the key, so the default applies; an empty secret box keeps the
+ * stored secret; a secret the environment sets is never written.
+ */
+export async function savePluginSettings(options) {
+    const { fields, values, forget } = options;
+    const problems = {};
+    for (const field of fields) {
+        const submitted = values[field.key]?.trim();
+        if (submitted === undefined || submitted === '')
+            continue;
+        if (field.type === 'url' && !isWebUrl(submitted)) {
+            problems[field.key] = `${field.label} must be an http:// or https:// URL.`;
+        }
+        if (field.type === 'select' && !field.options.some((option) => option.value === submitted)) {
+            problems[field.key] = `${field.label} must be one of its choices.`;
+        }
+    }
+    if (Object.keys(problems).length > 0)
+        return { problems };
+    const publicFields = fields.filter((field) => field.type !== 'secret');
+    if (publicFields.length > 0) {
+        await updatePluginEntry(options.contentDir, options.name, (entry) => {
+            const next = { ...entry };
+            for (const field of publicFields) {
+                const submitted = values[field.key];
+                if (field.type === 'checkbox') {
+                    next[field.key] = submitted !== undefined;
+                    continue;
+                }
+                if (submitted === undefined)
+                    continue;
+                const trimmed = submitted.trim();
+                if (trimmed === '')
+                    delete next[field.key];
+                else
+                    next[field.key] = trimmed;
+            }
+            return next;
+        });
+    }
+    const changes = new Map();
+    for (const field of fields) {
+        if (field.type !== 'secret')
+            continue;
+        if (options.env[pluginVariable(options.name, field.key)])
+            continue;
+        const submitted = values[field.key]?.trim() ?? '';
+        if (forget.has(field.key))
+            changes.set(field.key, undefined);
+        else if (submitted !== '')
+            changes.set(field.key, submitted);
+    }
+    if (changes.size > 0) {
+        await updateFileAtomically(secretsPath(options.dataDir, options.name), (current) => {
+            const next = parseRecord(current);
+            for (const [key, value] of changes) {
+                if (value === undefined)
+                    delete next[key];
+                else
+                    next[key] = value;
+            }
+            return `${JSON.stringify(next, null, 2)}\n`;
+        }, { mode: 0o600 });
+    }
+    return { problems };
+}
+const EXPECTED = {
+    text: 'text',
+    url: 'an http or https URL',
+    select: 'one of its choices',
+    checkbox: 'true or false',
+};
+function defaultOf(field) {
+    switch (field.type) {
+        case 'checkbox':
+            return field.default ?? false;
+        case 'select':
+            return field.default;
+        case 'text':
+        case 'url':
+            return field.default ?? '';
+    }
+}
+function accepts(field, raw) {
+    switch (field.type) {
+        case 'checkbox':
+            return typeof raw === 'boolean';
+        case 'select':
+            return field.options.some((option) => option.value === raw);
+        case 'text':
+            return typeof raw === 'string';
+        case 'url':
+            return typeof raw === 'string' && isWebUrl(raw);
+    }
+}
+function isWebUrl(text) {
+    if (!URL.canParse(text))
+        return false;
+    const { protocol } = new URL(text);
+    return protocol === 'http:' || protocol === 'https:';
+}
+function secretsPath(dataDir, name) {
+    return path.join(pluginFolderPath(dataDir, name), SECRETS_FILE);
+}
+function readSecrets(dataDir, name) {
+    return parseRecord(readFileIfPresentSync(secretsPath(dataDir, name)));
+}
+function parseRecord(text) {
+    if (text === undefined)
+        return {};
+    try {
+        const parsed = JSON.parse(text);
+        return typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)
+            ? parsed
+            : {};
+    }
+    catch {
+        return {};
+    }
+}
+//# sourceMappingURL=settings.js.map

package/dist/plugins/settings.js.map

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

package/dist/plugins/site.d.ts

@@ -0,0 +1,17 @@
+/**
+ * The site as a plugin reaches it (decision-33): the accounts, keys and
+ * followers behind {@link PluginSite}, and the registry a site's config
+ * installs. Shared by requests and the command line, so a plugin's command
+ * and its federation read the same files the same way.
+ */
+import type { AdminStore } from '../admin/store.ts';
+import type { ResolvedConfig } from '../config.ts';
+import type { PluginSite } from '../plugin.ts';
+import type { InstalledPlugin, PluginRegistry } from './registry.ts';
+/** Every plugin the site config installs, and those from the plugins folder, registered. */
+export declare function sitePluginRegistry(config: ResolvedConfig, folderPlugins?: readonly InstalledPlugin[]): PluginRegistry;
+export declare function pluginSite(options: {
+    admin: AdminStore;
+    config: ResolvedConfig;
+}): PluginSite;
+//# sourceMappingURL=site.d.ts.map

package/dist/plugins/site.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../src/plugins/site.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAInD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAErE,4FAA4F;AAC5F,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,cAAc,EACtB,aAAa,GAAE,SAAS,eAAe,EAAO,GAC7C,cAAc,CAqBhB;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,cAAc,CAAA;CAAE,GAAG,UAAU,CA2C7F"}

package/dist/plugins/site.js

@@ -0,0 +1,67 @@
+/**
+ * The site as a plugin reaches it (decision-33): the accounts, keys and
+ * followers behind {@link PluginSite}, and the registry a site's config
+ * installs. Shared by requests and the command line, so a plugin's command
+ * and its federation read the same files the same way.
+ */
+import { listUsers, setUserActorId } from '../admin/accounts.js';
+import { readSiteSettings } from '../admin/settings.js';
+import { readFileIfPresentSync } from '../files/atomic.js';
+import { actorKeyFile, loadActorKeyPairs, writeActorKeyFile } from '../federation/keys.js';
+import { addFollower, readFollowers } from '../federation/records.js';
+import { createPluginRegistry } from './registry.js';
+/** Every plugin the site config installs, and those from the plugins folder, registered. */
+export function sitePluginRegistry(config, folderPlugins = []) {
+    return createPluginRegistry([
+        ...config.plugins.map((plugin, index) => ({
+            plugin,
+            source: `the site config, plugins[${String(index)}]`,
+        })),
+        ...folderPlugins,
+    ], {
+        dataDir: config.dataDir,
+        contentDir: config.contentDir,
+        env: process.env,
+        allowPrivateAddress: config.federation.allowPrivateAddress ?? false,
+        lookup: config.hostLookup,
+        siteInfo: () => ({
+            baseUrl: config.baseUrl,
+            title: readSiteSettings(config.contentDir).title,
+        }),
+    });
+}
+export function pluginSite(options) {
+    const { admin, config } = options;
+    const { contentDir, dataDir } = config;
+    return {
+        baseUrl: config.baseUrl,
+        users: () => listUsers(dataDir).map((user) => ({
+            username: user.username,
+            ...(user.actorId === undefined ? {} : { actorId: user.actorId }),
+        })),
+        setActorId: (username, actorId) => setUserActorId({ dataDir, username, actorId }),
+        actorKey(username, algorithm) {
+            const file = actorKeyFile(dataDir, username, algorithm);
+            return { file, jwk: readFileIfPresentSync(file) };
+        },
+        writeActorKey(username, algorithm, jwk) {
+            writeActorKeyFile(dataDir, username, algorithm, jwk);
+        },
+        async loadActorKeys(username) {
+            await loadActorKeyPairs(dataDir, username);
+        },
+        followers: (username) => readFollowers(contentDir, username).map((follower) => ({
+            actorId: follower.actorId,
+            inboxId: follower.inboxId,
+            sharedInboxId: follower.sharedInboxId,
+            handle: follower.handle,
+            name: follower.name,
+            iconUrl: follower.iconUrl,
+            url: follower.url,
+        })),
+        async addFollower(username, follower) {
+            await addFollower({ admin, contentDir }, username, follower);
+        },
+    };
+}
+//# sourceMappingURL=site.js.map

package/dist/plugins/site.js.map

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

package/dist/supervisor/primary.d.ts

@@ -0,0 +1,47 @@
+/**
+ * `geekity serve`'s supervisor (TASK-288, decision-33): the primary process
+ * that owns the port and runs the CMS in one worker, replacing it on a reload
+ * and respawning it when it crashes.
+ *
+ * The port stays open only while some worker listens on it, so a reload
+ * starts the new worker before it retires the old one. And only one worker
+ * writes at a time: the old one drains (refuses writes, stops its timers,
+ * empties its queues, goes read-only) before the new one is forked, so the
+ * new worker's boot migrations run alone.
+ *
+ * This module is the state machine alone. The workers, the clock and the
+ * process are handed in, so the order of a reload is tested without
+ * starting a process; {@link superviseCluster} binds it to `node:cluster`.
+ */
+import type { SupervisorMessage, WorkerMessage } from './protocol.ts';
+/** A running worker, as the supervisor reaches it. */
+export interface WorkerHandle {
+    readonly id: number;
+    send(message: SupervisorMessage): void;
+    kill(): void;
+}
+export interface Cancel {
+    cancel(): void;
+}
+export interface SupervisorOptions {
+    fork(): WorkerHandle;
+    schedule(task: () => void, ms: number): Cancel;
+    now(): number;
+    log(line: string): void;
+    exit(code: number): void;
+}
+export interface Supervisor {
+    start(): void;
+    message(worker: WorkerHandle, message: WorkerMessage): void;
+    exited(worker: WorkerHandle, code: number | null): void;
+    /** SIGTERM or SIGINT: shut every worker down, then exit. */
+    stop(): void;
+}
+export declare function createSupervisor(options: SupervisorOptions): Supervisor;
+/**
+ * Run the supervisor over `node:cluster` workers, each of which runs this
+ * same command. SIGTERM and SIGINT reach the supervisor, which is the process
+ * an image's init signals.
+ */
+export declare function superviseCluster(): void;
+//# sourceMappingURL=primary.d.ts.map

package/dist/supervisor/primary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"primary.d.ts","sourceRoot":"","sources":["../../src/supervisor/primary.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEtE,sDAAsD;AACtD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACvC,IAAI,IAAI,IAAI,CAAC;CACd;AAED,MAAM,WAAW,MAAM;IACrB,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,IAAI,YAAY,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/C,GAAG,IAAI,MAAM,CAAC;IACd,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,IAAI,IAAI,CAAC;IACd,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5D,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IACxD,4DAA4D;IAC5D,IAAI,IAAI,IAAI,CAAC;CACd;AA6BD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,UAAU,CAiJvE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAkCvC"}

package/dist/supervisor/primary.js

@@ -0,0 +1,208 @@
+/**
+ * `geekity serve`'s supervisor (TASK-288, decision-33): the primary process
+ * that owns the port and runs the CMS in one worker, replacing it on a reload
+ * and respawning it when it crashes.
+ *
+ * The port stays open only while some worker listens on it, so a reload
+ * starts the new worker before it retires the old one. And only one worker
+ * writes at a time: the old one drains (refuses writes, stops its timers,
+ * empties its queues, goes read-only) before the new one is forked, so the
+ * new worker's boot migrations run alone.
+ *
+ * This module is the state machine alone. The workers, the clock and the
+ * process are handed in, so the order of a reload is tested without
+ * starting a process; {@link superviseCluster} binds it to `node:cluster`.
+ */
+import cluster from 'node:cluster';
+import { isWorkerMessage } from './protocol.js';
+/** The first respawn waits this long, doubling with each crash after it. */
+const RESPAWN_BASE_MS = 500;
+const RESPAWN_MAX_MS = 30_000;
+/** A worker that served this long resets the backoff. */
+const STABLE_MS = 60_000;
+/** How long a new worker may take to boot during a reload: a large site's scan, at most. */
+const RELOAD_BOOT_MS = 5 * 60_000;
+/** How long the workers may take to close on a signal before they are killed. */
+const SHUTDOWN_MS = 60_000;
+export function createSupervisor(options) {
+    const live = new Set();
+    const bootErrors = new Map();
+    let state = { phase: 'stopping' };
+    let everServed = false;
+    let crashes = 0;
+    function fork() {
+        const worker = options.fork();
+        live.add(worker);
+        return worker;
+    }
+    function respawnLater(reason) {
+        const delay = Math.min(RESPAWN_BASE_MS * 2 ** crashes, RESPAWN_MAX_MS);
+        crashes += 1;
+        options.log(`${reason}; starting another in ${(delay / 1000).toFixed(1)} s.`);
+        state = {
+            phase: 'waiting',
+            timer: options.schedule(() => {
+                state = { phase: 'booting', worker: fork() };
+            }, delay),
+        };
+    }
+    /** The new worker did not boot: the old one carries on, and is told why. */
+    function keepOld(old, next, error) {
+        if (state.phase === 'replacing')
+            state.deadline.cancel();
+        options.log(`Reload failed, so the running server carries on: ${error}`);
+        old.send({ type: 'resume', error });
+        if (live.has(next))
+            next.kill();
+        state = { phase: 'serving', worker: old, since: options.now() };
+    }
+    function bootError(worker, code) {
+        return (bootErrors.get(worker) ??
+            `The new server exited${code === null ? '' : ` with code ${String(code)}`} before it was ready.`);
+    }
+    return {
+        start() {
+            state = { phase: 'booting', worker: fork() };
+        },
+        message(worker, message) {
+            switch (message.type) {
+                case 'ready':
+                    if (state.phase === 'booting' && state.worker === worker) {
+                        everServed = true;
+                        state = { phase: 'serving', worker, since: options.now() };
+                    }
+                    else if (state.phase === 'replacing' && state.next === worker) {
+                        state.deadline.cancel();
+                        state.old.send({ type: 'retire' });
+                        options.log('Reloaded: the new server is serving and the old one is retiring.');
+                        state = { phase: 'serving', worker, since: options.now() };
+                    }
+                    return;
+                case 'boot-failed':
+                    bootErrors.set(worker, message.error);
+                    if (state.phase === 'replacing' && state.next === worker) {
+                        keepOld(state.old, worker, message.error);
+                    }
+                    return;
+                case 'reload':
+                    if (state.phase === 'serving' && state.worker === worker) {
+                        options.log('Reloading: the running server is draining.');
+                        worker.send({ type: 'drain' });
+                        state = { phase: 'draining', old: worker };
+                    }
+                    return;
+                case 'drained':
+                    if (state.phase === 'draining' && state.old === worker) {
+                        const next = fork();
+                        const deadline = options.schedule(() => {
+                            keepOld(worker, next, 'The new server did not start in time.');
+                        }, RELOAD_BOOT_MS);
+                        state = { phase: 'replacing', old: worker, next, deadline };
+                    }
+                    return;
+            }
+        },
+        exited(worker, code) {
+            live.delete(worker);
+            const error = bootError(worker, code);
+            bootErrors.delete(worker);
+            switch (state.phase) {
+                case 'stopping':
+                    if (live.size === 0)
+                        options.exit(0);
+                    return;
+                case 'booting':
+                    if (state.worker !== worker)
+                        return;
+                    if (!everServed) {
+                        options.log(error);
+                        options.exit(1);
+                        return;
+                    }
+                    respawnLater(`The server did not start: ${error}`);
+                    return;
+                case 'serving':
+                    if (state.worker !== worker)
+                        return;
+                    if (options.now() - state.since >= STABLE_MS)
+                        crashes = 0;
+                    respawnLater(`The server exited${code === null ? '' : ` with code ${String(code)}`}`);
+                    return;
+                case 'draining':
+                    if (state.old === worker)
+                        respawnLater('The server exited while it drained');
+                    return;
+                case 'replacing':
+                    if (state.next === worker) {
+                        keepOld(state.old, worker, error);
+                    }
+                    else if (state.old === worker) {
+                        state.deadline.cancel();
+                        state = { phase: 'booting', worker: state.next };
+                    }
+                    return;
+                case 'waiting':
+                    return;
+            }
+        },
+        stop() {
+            if (state.phase === 'waiting')
+                state.timer.cancel();
+            if (state.phase === 'replacing')
+                state.deadline.cancel();
+            state = { phase: 'stopping' };
+            if (live.size === 0) {
+                options.exit(0);
+                return;
+            }
+            for (const worker of live)
+                worker.send({ type: 'shutdown' });
+            options.schedule(() => {
+                for (const worker of live)
+                    worker.kill();
+            }, SHUTDOWN_MS);
+        },
+    };
+}
+/**
+ * Run the supervisor over `node:cluster` workers, each of which runs this
+ * same command. SIGTERM and SIGINT reach the supervisor, which is the process
+ * an image's init signals.
+ */
+export function superviseCluster() {
+    const supervisor = createSupervisor({
+        fork() {
+            const worker = cluster.fork();
+            const handle = {
+                id: worker.id,
+                send(message) {
+                    if (worker.isConnected())
+                        worker.send(message);
+                },
+                kill() {
+                    worker.process.kill('SIGKILL');
+                },
+            };
+            worker.on('message', (message) => {
+                if (isWorkerMessage(message))
+                    supervisor.message(handle, message);
+            });
+            worker.on('exit', (code) => {
+                supervisor.exited(handle, code);
+            });
+            return handle;
+        },
+        schedule(task, ms) {
+            const timer = setTimeout(task, ms);
+            return { cancel: () => clearTimeout(timer) };
+        },
+        now: () => Date.now(),
+        log: (line) => process.stderr.write(`${line}\n`),
+        exit: (code) => process.exit(code),
+    });
+    for (const signal of ['SIGINT', 'SIGTERM']) {
+        process.on(signal, () => supervisor.stop());
+    }
+    supervisor.start();
+}
+//# sourceMappingURL=primary.js.map

package/dist/supervisor/primary.js.map

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

package/dist/supervisor/protocol.d.ts

@@ -0,0 +1,37 @@
+/**
+ * The messages between `geekity serve`'s supervisor and the worker that runs
+ * the CMS (TASK-288). A reload is: the serving worker asks (`reload`); the
+ * supervisor tells it to `drain`; it answers `drained` once it writes
+ * nothing more; a new worker boots and says `ready`; the old one is told to
+ * `retire`. A new worker that does not boot says `boot-failed`, and the old
+ * one is told to `resume`, with the reason.
+ */
+/**
+ * How a worker that cannot carry on gives up: it exits with this code, and the
+ * supervisor boots a replacement, as it does for any serving or draining
+ * worker that exits without being told to.
+ */
+export declare const EXIT_FOR_REPLACEMENT = 1;
+export type WorkerMessage = {
+    readonly type: 'ready';
+} | {
+    readonly type: 'boot-failed';
+    readonly error: string;
+} | {
+    readonly type: 'reload';
+} | {
+    readonly type: 'drained';
+};
+export type SupervisorMessage = {
+    readonly type: 'drain';
+} | {
+    readonly type: 'resume';
+    readonly error: string;
+} | {
+    readonly type: 'retire';
+} | {
+    readonly type: 'shutdown';
+};
+export declare function isWorkerMessage(value: unknown): value is WorkerMessage;
+export declare function isSupervisorMessage(value: unknown): value is SupervisorMessage;
+//# sourceMappingURL=protocol.d.ts.map

package/dist/supervisor/protocol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/supervisor/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAEjC,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;AAKlC,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAEtE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAE9E"}