@geekity/cms 0.27.0 → 0.29.0

package/dist/plugins/site.js

@@ -4,8 +4,13 @@
  * installs. Shared by requests and the command line, so a plugin's command
  * and its federation read the same files the same way.
  */
+import path from 'node:path';
 import { listUsers, setUserActorId } from '../admin/accounts.js';
 import { readSiteSettings } from '../admin/settings.js';
+import { acceptUpload, refusedUpload } from '../admin/uploads.js';
+import { renderCommentMarkdown } from '../comments/markdown.js';
+import { commentsFile, putComments, readComments } from '../comments/records.js';
+import { slugForPermalink } from '../content/parser.js';
 import { readFileIfPresentSync } from '../files/atomic.js';
 import { actorKeyFile, loadActorKeyPairs, writeActorKeyFile } from '../federation/keys.js';
 import { addFollower, readFollowers } from '../federation/records.js';
@@ -35,6 +40,7 @@ export function pluginSite(options) {
     const { contentDir, dataDir } = config;
     return {
         baseUrl: config.baseUrl,
+        contentDir,
         users: () => listUsers(dataDir).map((user) => ({
             username: user.username,
             ...(user.actorId === undefined ? {} : { actorId: user.actorId }),
@@ -62,6 +68,56 @@ export function pluginSite(options) {
         async addFollower(username, follower) {
             await addFollower({ admin, contentDir }, username, follower);
         },
+        checkUpload(name, bytes) {
+            const outcome = acceptUpload(name, '', bytes, config);
+            return refusedUpload(outcome)
+                ? { accepted: false, why: outcome.error }
+                : { accepted: true, bytes: outcome.bytes };
+        },
+        comments(permalink) {
+            const slug = postSlug(permalink);
+            return {
+                file: path.relative(contentDir, commentsFile(contentDir, slug)).split(path.sep).join('/'),
+                comments: readComments({ contentDir, dataDir }, slug).map(pluginCommentOf),
+            };
+        },
+        async putComments(permalink, comments) {
+            await putComments({ admin, contentDir, dataDir }, postSlug(permalink), permalink, comments.map(commentRecordOf));
+        },
+    };
+}
+function postSlug(permalink) {
+    const slug = slugForPermalink(permalink);
+    if (slug === undefined)
+        throw new Error(`${permalink} names no post a comment can be on.`);
+    return slug;
+}
+function pluginCommentOf(comment) {
+    return {
+        id: comment.id,
+        source: comment.source,
+        kind: comment.kind,
+        status: comment.status,
+        author: { ...comment.author },
+        markdown: comment.content.markdown,
+        submitted: comment.submitted,
+        inReplyTo: comment.inReplyTo,
+        url: comment.url,
+    };
+}
+function commentRecordOf(comment) {
+    return {
+        id: comment.id,
+        source: comment.source,
+        kind: comment.kind,
+        status: comment.status,
+        author: { ...comment.author },
+        content: { markdown: comment.markdown, html: renderCommentMarkdown(comment.markdown) },
+        submitted: comment.submitted,
+        addressHash: null,
+        inReplyTo: comment.inReplyTo,
+        url: comment.url,
+        notify: false,
     };
 }
 //# sourceMappingURL=site.js.map

package/dist/plugins/site.js.map

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

package/dist/supervisor/control.d.ts

@@ -0,0 +1,15 @@
+import type { ReloadOutcome } from './supervision.ts';
+/**
+ * The data folder can sit on a bind mount that cannot hold a socket, or at a
+ * path longer than the Unix socket path limit, so the socket lives in tmpdir().
+ */
+export declare function controlSocketPath(dataDir: string): string;
+export declare function listenForControl(options: {
+    dataDir: string;
+    reload: () => Promise<ReloadOutcome>;
+    log: (line: string) => void;
+}): {
+    close(): void;
+};
+export declare function askToReload(dataDir: string): Promise<ReloadOutcome | undefined>;
+//# sourceMappingURL=control.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"control.d.ts","sourceRoot":"","sources":["../../src/supervisor/control.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAItD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B,GAAG;IAAE,KAAK,IAAI,IAAI,CAAA;CAAE,CAkDpB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAU/E"}

package/dist/supervisor/control.js

@@ -0,0 +1,89 @@
+import { createHash } from 'node:crypto';
+import { chmodSync, rmSync } from 'node:fs';
+import net from 'node:net';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+const RELOAD = 'reload';
+/**
+ * The data folder can sit on a bind mount that cannot hold a socket, or at a
+ * path longer than the Unix socket path limit, so the socket lives in tmpdir().
+ */
+export function controlSocketPath(dataDir) {
+    const id = createHash('sha256').update(path.resolve(dataDir)).digest('hex').slice(0, 16);
+    return path.join(tmpdir(), `geekity-${id}.sock`);
+}
+export function listenForControl(options) {
+    const socketPath = controlSocketPath(options.dataDir);
+    let owned = false;
+    const server = net.createServer((socket) => {
+        let received = '';
+        socket.setEncoding('utf8');
+        socket.on('error', () => undefined);
+        socket.on('data', (chunk) => {
+            received += chunk;
+            if (!received.includes('\n'))
+                return;
+            socket.pause();
+            const outcome = received.trim() === RELOAD
+                ? options.reload()
+                : Promise.resolve({ ok: false, error: 'Unknown request.' });
+            void outcome.then((answer) => socket.end(`${JSON.stringify(answer)}\n`));
+        });
+    });
+    function listen(retry) {
+        server.once('error', (error) => {
+            if (error.code !== 'EADDRINUSE' || !retry) {
+                options.log(`geekity plugin cannot reach this server (${error.message}).`);
+                return;
+            }
+            const probe = net.connect(socketPath);
+            probe.once('connect', () => {
+                probe.destroy();
+                options.log(`Another geekity serve for this data folder answers on ${socketPath}, so geekity plugin reaches that one.`);
+            });
+            probe.once('error', () => {
+                rmSync(socketPath, { force: true });
+                listen(false);
+            });
+        });
+        server.listen(socketPath, () => {
+            owned = true;
+            chmodSync(socketPath, 0o600);
+        });
+    }
+    listen(true);
+    return {
+        close() {
+            server.close();
+            if (owned)
+                rmSync(socketPath, { force: true });
+        },
+    };
+}
+export function askToReload(dataDir) {
+    return new Promise((resolve) => {
+        const socket = net.connect(controlSocketPath(dataDir));
+        let received = '';
+        socket.setEncoding('utf8');
+        socket.on('connect', () => socket.write(`${RELOAD}\n`));
+        socket.on('data', (chunk) => (received += chunk));
+        socket.on('error', () => resolve(undefined));
+        socket.on('close', () => resolve(parseOutcome(received)));
+    });
+}
+function parseOutcome(text) {
+    let value;
+    try {
+        value = JSON.parse(text);
+    }
+    catch {
+        return undefined;
+    }
+    if (value?.ok === true)
+        return { ok: true };
+    if (value?.ok === false && typeof value.error === 'string') {
+        return { ok: false, error: value.error };
+    }
+    return undefined;
+}
+//# sourceMappingURL=control.js.map

package/dist/supervisor/control.js.map

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

package/dist/supervisor/primary.d.ts

@@ -9,11 +9,12 @@
  * 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
+ * This module is the state machine alone. The workers, the clock, the folder
+ * 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';
+import type { ReloadOutcome } from './supervision.ts';
 /** A running worker, as the supervisor reaches it. */
 export interface WorkerHandle {
     readonly id: number;
@@ -23,25 +24,38 @@ export interface WorkerHandle {
 export interface Cancel {
     cancel(): void;
 }
+export interface PluginWatch {
+    signature(): string;
+    fingerprint(): string;
+}
 export interface SupervisorOptions {
     fork(): WorkerHandle;
     schedule(task: () => void, ms: number): Cancel;
     now(): number;
     log(line: string): void;
     exit(code: number): void;
+    watch?: PluginWatch | undefined;
 }
 export interface Supervisor {
     start(): void;
     message(worker: WorkerHandle, message: WorkerMessage): void;
     exited(worker: WorkerHandle, code: number | null): void;
+    reload(): Promise<ReloadOutcome>;
     /** SIGTERM or SIGINT: shut every worker down, then exit. */
     stop(): void;
 }
+export declare const PLUGIN_POLL_MS = 1000;
+export declare const PLUGIN_SETTLE_MS = 5000;
 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.
+ * an image's init signals. `geekity plugin` reaches it over the control
+ * socket for `dataDir`.
  */
-export declare function superviseCluster(): void;
+export declare function superviseCluster(options: {
+    dataDir: string;
+    pluginsDir: string | undefined;
+    pluginWatch: boolean;
+}): void;
 //# sourceMappingURL=primary.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"primary.d.ts","sourceRoot":"","sources":["../../src/supervisor/primary.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAOH,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,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,WAAW;IAC1B,SAAS,IAAI,MAAM,CAAC;IACpB,WAAW,IAAI,MAAM,CAAC;CACvB;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;IACzB,KAAK,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACjC;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,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IACjC,4DAA4D;IAC5D,IAAI,IAAI,IAAI,CAAC;CACd;AAED,eAAO,MAAM,cAAc,OAAQ,CAAC;AACpC,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AA6BtC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,UAAU,CAgOvE;AAUD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG,IAAI,CAsDP"}

package/dist/supervisor/primary.js

@@ -9,12 +9,16 @@
  * 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
+ * This module is the state machine alone. The workers, the clock, the folder
+ * 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 { pluginFolderSignature, pluginsFingerprint, scanPluginFolders } from '../plugins/folder.js';
+import { listenForControl } from './control.js';
 import { isWorkerMessage } from './protocol.js';
+export const PLUGIN_POLL_MS = 1_000;
+export const PLUGIN_SETTLE_MS = 5_000;
 /** The first respawn waits this long, doubling with each crash after it. */
 const RESPAWN_BASE_MS = 500;
 const RESPAWN_MAX_MS = 30_000;
@@ -30,6 +34,14 @@ export function createSupervisor(options) {
     let state = { phase: 'stopping' };
     let everServed = false;
     let crashes = 0;
+    let loaded;
+    let reloading;
+    let failed;
+    let waiting = [];
+    let queued = [];
+    let seen = { signature: undefined, since: 0 };
+    let compared;
+    let polling;
     function fork() {
         const worker = options.fork();
         live.add(worker);
@@ -46,6 +58,26 @@ export function createSupervisor(options) {
             }, delay),
         };
     }
+    function beginReload(worker, folder = fingerprint()) {
+        options.log('Reloading: the running server is draining.');
+        worker.send({ type: 'drain' });
+        state = { phase: 'draining', old: worker };
+        reloading = folder;
+        waiting = [...waiting, ...queued];
+        queued = [];
+    }
+    function settle(outcome) {
+        for (const done of waiting)
+            done(outcome);
+        waiting = [];
+    }
+    function serve(worker, plugins) {
+        state = { phase: 'serving', worker, since: options.now() };
+        if (plugins !== undefined)
+            loaded = plugins;
+        if (queued.length > 0)
+            beginReload(worker);
+    }
     /** The new worker did not boot: the old one carries on, and is told why. */
     function keepOld(old, next, error) {
         if (state.phase === 'replacing')
@@ -54,7 +86,39 @@ export function createSupervisor(options) {
         old.send({ type: 'resume', error });
         if (live.has(next))
             next.kill();
-        state = { phase: 'serving', worker: old, since: options.now() };
+        failed = reloading;
+        settle({ ok: false, error });
+        serve(old, undefined);
+    }
+    function fingerprint() {
+        const { watch } = options;
+        return watch === undefined ? undefined : attempt(() => watch.fingerprint());
+    }
+    function poll(watch) {
+        polling = options.schedule(() => {
+            look(watch);
+            poll(watch);
+        }, PLUGIN_POLL_MS);
+    }
+    function look(watch) {
+        const signature = attempt(() => watch.signature());
+        const now = options.now();
+        if (signature === undefined || signature !== seen.signature) {
+            seen = { signature, since: now };
+            return;
+        }
+        if (state.phase !== 'serving' || signature === compared)
+            return;
+        if (now - seen.since < PLUGIN_SETTLE_MS)
+            return;
+        const folder = fingerprint();
+        if (folder === undefined)
+            return;
+        compared = signature;
+        if (folder === loaded || folder === failed)
+            return;
+        options.log('The plugins folder changed and has settled.');
+        beginReload(state.worker, folder);
     }
     function bootError(worker, code) {
         return (bootErrors.get(worker) ??
@@ -63,19 +127,23 @@ export function createSupervisor(options) {
     return {
         start() {
             state = { phase: 'booting', worker: fork() };
+            if (options.watch !== undefined)
+                poll(options.watch);
         },
         message(worker, message) {
             switch (message.type) {
                 case 'ready':
                     if (state.phase === 'booting' && state.worker === worker) {
                         everServed = true;
-                        state = { phase: 'serving', worker, since: options.now() };
+                        settle({ ok: true });
+                        serve(worker, message.pluginsFingerprint);
                     }
                     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() };
+                        settle({ ok: true });
+                        serve(worker, message.pluginsFingerprint);
                     }
                     return;
                 case 'boot-failed':
@@ -85,11 +153,11 @@ export function createSupervisor(options) {
                     }
                     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 };
-                    }
+                    if (state.phase === 'serving' && state.worker === worker)
+                        beginReload(worker);
+                    return;
+                case 'closed':
+                    worker.send({ type: 'exit' });
                     return;
                 case 'drained':
                     if (state.phase === 'draining' && state.old === worker) {
@@ -129,8 +197,10 @@ export function createSupervisor(options) {
                     respawnLater(`The server exited${code === null ? '' : ` with code ${String(code)}`}`);
                     return;
                 case 'draining':
-                    if (state.old === worker)
-                        respawnLater('The server exited while it drained');
+                    if (state.old !== worker)
+                        return;
+                    respawnLater('The server exited while it drained');
+                    settle({ ok: false, error: 'The server exited while it drained.' });
                     return;
                 case 'replacing':
                     if (state.next === worker) {
@@ -145,12 +215,26 @@ export function createSupervisor(options) {
                     return;
             }
         },
+        reload() {
+            if (state.phase === 'stopping') {
+                return Promise.resolve({ ok: false, error: 'The server is shutting down.' });
+            }
+            return new Promise((resolve) => {
+                queued.push(resolve);
+                if (state.phase === 'serving')
+                    beginReload(state.worker);
+            });
+        },
         stop() {
             if (state.phase === 'waiting')
                 state.timer.cancel();
             if (state.phase === 'replacing')
                 state.deadline.cancel();
+            polling?.cancel();
             state = { phase: 'stopping' };
+            waiting = [...waiting, ...queued];
+            queued = [];
+            settle({ ok: false, error: 'The server is shutting down.' });
             if (live.size === 0) {
                 options.exit(0);
                 return;
@@ -164,12 +248,23 @@ export function createSupervisor(options) {
         },
     };
 }
+function attempt(read) {
+    try {
+        return read();
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * 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.
+ * an image's init signals. `geekity plugin` reaches it over the control
+ * socket for `dataDir`.
  */
-export function superviseCluster() {
+export function superviseCluster(options) {
+    const { pluginsDir } = options;
+    const log = (line) => process.stderr.write(`${line}\n`);
     const supervisor = createSupervisor({
         fork() {
             const worker = cluster.fork();
@@ -190,6 +285,9 @@ export function superviseCluster() {
             worker.on('exit', (code) => {
                 supervisor.exited(handle, code);
             });
+            // A message to a worker that is exiting fails with EPIPE; its exit
+            // event follows and is what the supervisor acts on.
+            worker.on('error', () => undefined);
             return handle;
         },
         schedule(task, ms) {
@@ -197,8 +295,22 @@ export function superviseCluster() {
             return { cancel: () => clearTimeout(timer) };
         },
         now: () => Date.now(),
-        log: (line) => process.stderr.write(`${line}\n`),
-        exit: (code) => process.exit(code),
+        log,
+        exit(code) {
+            control.close();
+            process.exit(code);
+        },
+        watch: pluginsDir === undefined || !options.pluginWatch
+            ? undefined
+            : {
+                signature: () => pluginFolderSignature(pluginsDir),
+                fingerprint: () => pluginsFingerprint(scanPluginFolders(pluginsDir)),
+            },
+    });
+    const control = listenForControl({
+        dataDir: options.dataDir,
+        reload: () => supervisor.reload(),
+        log,
     });
     for (const signal of ['SIGINT', 'SIGTERM']) {
         process.on(signal, () => supervisor.stop());

package/dist/supervisor/primary.js.map

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

package/dist/supervisor/protocol.d.ts

@@ -5,6 +5,13 @@
  * 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.
+ *
+ * A worker that has closed says `closed` and exits only when told `exit`.
+ * Under `node:cluster`'s round-robin the supervisor may have handed this
+ * worker a connection just before it stopped listening; the worker sends
+ * such a connection back, but only while it runs. The `exit` comes down the
+ * same channel as those connections, after them, so none is lost with the
+ * process and left unanswered.
  */
 /**
  * How a worker that cannot carry on gives up: it exits with this code, and the
@@ -14,6 +21,7 @@
 export declare const EXIT_FOR_REPLACEMENT = 1;
 export type WorkerMessage = {
     readonly type: 'ready';
+    readonly pluginsFingerprint: string;
 } | {
     readonly type: 'boot-failed';
     readonly error: string;
@@ -21,6 +29,8 @@ export type WorkerMessage = {
     readonly type: 'reload';
 } | {
     readonly type: 'drained';
+} | {
+    readonly type: 'closed';
 };
 export type SupervisorMessage = {
     readonly type: 'drain';
@@ -31,6 +41,8 @@ export type SupervisorMessage = {
     readonly type: 'retire';
 } | {
     readonly type: 'shutdown';
+} | {
+    readonly type: 'exit';
 };
 export declare function isWorkerMessage(value: unknown): value is WorkerMessage;
 export declare function isSupervisorMessage(value: unknown): value is SupervisorMessage;

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

@@ -1 +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"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/supervisor/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,MAAM,MAAM,aAAa,GACrB;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAC/D;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,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEhC,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,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAiB9B,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAEtE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAE9E"}

package/dist/supervisor/protocol.js

@@ -5,6 +5,13 @@
  * 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.
+ *
+ * A worker that has closed says `closed` and exits only when told `exit`.
+ * Under `node:cluster`'s round-robin the supervisor may have handed this
+ * worker a connection just before it stopped listening; the worker sends
+ * such a connection back, but only while it runs. The `exit` comes down the
+ * same channel as those connections, after them, so none is lost with the
+ * process and left unanswered.
  */
 /**
  * How a worker that cannot carry on gives up: it exits with this code, and the
@@ -12,8 +19,20 @@
  * worker that exits without being told to.
  */
 export const EXIT_FOR_REPLACEMENT = 1;
-const WORKER_TYPES = new Set(['ready', 'boot-failed', 'reload', 'drained']);
-const SUPERVISOR_TYPES = new Set(['drain', 'resume', 'retire', 'shutdown']);
+const WORKER_TYPES = new Set([
+    'ready',
+    'boot-failed',
+    'reload',
+    'drained',
+    'closed',
+]);
+const SUPERVISOR_TYPES = new Set([
+    'drain',
+    'resume',
+    'retire',
+    'shutdown',
+    'exit',
+]);
 export function isWorkerMessage(value) {
     return hasType(value, WORKER_TYPES);
 }

package/dist/supervisor/protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/supervisor/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AActC,MAAM,YAAY,GAAwB,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;AACjG,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;AAEjG,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,OAAO,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,OAAO,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,OAAO,CAAC,KAAc,EAAE,KAA0B;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAC;IAChD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC"}
+{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/supervisor/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAgBtC,MAAM,YAAY,GAAwB,IAAI,GAAG,CAAC;IAChD,OAAO;IACP,aAAa;IACb,QAAQ;IACR,SAAS;IACT,QAAQ;CACT,CAAC,CAAC;AACH,MAAM,gBAAgB,GAAwB,IAAI,GAAG,CAAC;IACpD,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,MAAM;CACP,CAAC,CAAC;AAEH,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,OAAO,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,OAAO,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,OAAO,CAAC,KAAc,EAAE,KAA0B;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAC;IAChD,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC"}