@geekity/cms 0.29.0 → 0.31.0

package/dist/store/sessions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/store/sessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;GAGG;AACH,MAAM,WAAW,OAAO;IACtB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,yDAAyD;IACzD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,wCAAwC;AACxC,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wDAAwD;AACxD,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,8CAA8C;IAC9C,eAAe,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACxB;AAED,6EAA6E;AAC7E,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,MAAM,WAAW,YAAY;IAC3B,2DAA2D;IAC3D,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC;IAClD;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACxD,0EAA0E;IAC1E,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC;;;;;;OAMG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAE7E,2DAA2D;IAC3D,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAClC;;;OAGG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACxD;;;;OAIG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;CAC9C;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,YAAY,EAChB,UAAU,EAAE,MAAM,OAAO,EACzB,KAAK,EAAE,KAAK,GACX,YAAY,CA0Fd;AAsBD;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAEpC"}

package/dist/store/sessions.js

@@ -0,0 +1,107 @@
+import { randomBytes } from 'node:crypto';
+/** How long a session id is, in bytes. 32 is the 256 bits doc-5 asks for. */
+export const SESSION_ID_BYTES = 32;
+export function openSessionStore(db, isReadOnly, clock) {
+    const statements = {
+        deleteSessionsForUser: db.prepare('DELETE FROM sessions WHERE user_id = ? AND id IS NOT ?'),
+        insertSession: db.prepare(`
+      INSERT INTO sessions (id, user_id, csrf_token, created_at, expires_at)
+      VALUES (?, ?, ?, ?, ?)
+    `),
+        sessionById: db.prepare('SELECT * FROM sessions WHERE id = ?'),
+        deleteSession: db.prepare('DELETE FROM sessions WHERE id = ?'),
+        pruneSessions: db.prepare('DELETE FROM sessions WHERE expires_at <= ?'),
+        readFlash: db.prepare('SELECT flash FROM sessions WHERE id = ?'),
+        writeFlash: db.prepare('UPDATE sessions SET flash = ? WHERE id = ?'),
+    };
+    /**
+     * The messages queued on a session. A column that will not parse is treated
+     * as empty: a flash is a convenience, and losing one is better than a 500 on
+     * every admin page until the row is cleaned up by hand.
+     */
+    function readFlash(sessionId) {
+        const row = statements.readFlash.get(sessionId);
+        const raw = row?.['flash'];
+        if (typeof raw !== 'string' || raw === '')
+            return [];
+        try {
+            const parsed = JSON.parse(raw);
+            return Array.isArray(parsed) ? parsed.filter(isFlashMessage) : [];
+        }
+        catch {
+            return [];
+        }
+    }
+    return {
+        createSession(input) {
+            const now = input.now ?? clock();
+            const session = {
+                id: randomToken(),
+                userId: input.userId,
+                csrfToken: randomToken(),
+                createdAt: now.toISOString(),
+                expiresAt: new Date(now.getTime() + input.lifetimeSeconds * 1000).toISOString(),
+            };
+            statements.insertSession.run(session.id, session.userId, session.csrfToken, session.createdAt, session.expiresAt);
+            return session;
+        },
+        getSession(id, now = clock()) {
+            const row = statements.sessionById.get(id);
+            if (row === undefined)
+                return undefined;
+            const session = toSession(row);
+            // ISO 8601 in UTC sorts the way time runs, so string order is time order.
+            if (session.expiresAt <= now.toISOString()) {
+                statements.deleteSession.run(id);
+                return undefined;
+            }
+            return session;
+        },
+        deleteSession(id) {
+            return statements.deleteSession.run(id).changes > 0;
+        },
+        deleteSessionsForUser(userId, options = {}) {
+            // `IS NOT` rather than `<>`, so a missing `except` compares against NULL
+            // and spares nothing instead of matching nothing.
+            return Number(statements.deleteSessionsForUser.run(userId, options.except ?? null).changes);
+        },
+        pruneSessions(now = clock()) {
+            return Number(statements.pruneSessions.run(now.toISOString()).changes);
+        },
+        pushFlash(sessionId, entry) {
+            const queued = [...readFlash(sessionId), entry];
+            statements.writeFlash.run(JSON.stringify(queued), sessionId);
+        },
+        takeFlash(sessionId) {
+            const queued = readFlash(sessionId);
+            if (!isReadOnly())
+                statements.writeFlash.run(null, sessionId);
+            return queued;
+        },
+    };
+}
+function isFlashMessage(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const entry = value;
+    return ((entry['kind'] === 'notice' || entry['kind'] === 'warning' || entry['kind'] === 'error') &&
+        typeof entry['message'] === 'string');
+}
+function toSession(row) {
+    const userId = row['user_id'];
+    return {
+        id: String(row['id']),
+        userId: userId === null || userId === undefined ? null : Number(userId),
+        csrfToken: String(row['csrf_token']),
+        createdAt: String(row['created_at']),
+        expiresAt: String(row['expires_at']),
+    };
+}
+/**
+ * 256 unguessable bits, hex encoded. Session ids, CSRF tokens and password
+ * reset tokens are all this.
+ */
+export function randomToken() {
+    return randomBytes(SESSION_ID_BYTES).toString('hex');
+}
+//# sourceMappingURL=sessions.js.map

package/dist/store/sessions.js.map

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

package/dist/store/state.d.ts

@@ -0,0 +1,18 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { Clock } from '../util/clock.ts';
+export interface StateStore {
+    /**
+     * One piece of the CMS's own operational state, or `undefined`.
+     *
+     * Not a setting: nothing here is a site's choice and nothing here belongs in
+     * `content/_data/site.json`, which is where a setting lives. It is a cache
+     * like the rest of the database, and losing it costs a site nothing it
+     * cannot work out again. The scheduler's watermark — how far through the
+     * calendar it has got — lives here.
+     */
+    getState(key: string): string | undefined;
+    /** Write one piece of that state. */
+    setState(key: string, value: string): void;
+}
+export declare function openStateStore(db: DatabaseSync, clock: Clock): StateStore;
+//# sourceMappingURL=state.d.ts.map

package/dist/store/state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/store/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB;;;;;;;;OAQG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC1C,qCAAqC;IACrC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,UAAU,CAkBzE"}

package/dist/store/state.js

@@ -0,0 +1,19 @@
+export function openStateStore(db, clock) {
+    const statements = {
+        getState: db.prepare('SELECT value FROM cms_state WHERE key = ?'),
+        putState: db.prepare(`
+      INSERT INTO cms_state (key, value, updated_at) VALUES (?, ?, ?)
+      ON CONFLICT (key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at
+    `),
+    };
+    return {
+        getState(key) {
+            const row = statements.getState.get(key);
+            return row === undefined ? undefined : String(row['value']);
+        },
+        setState(key, value) {
+            statements.putState.run(key, value, clock().toISOString());
+        },
+    };
+}
+//# sourceMappingURL=state.js.map

package/dist/store/state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/store/state.ts"],"names":[],"mappings":"AAmBA,MAAM,UAAU,cAAc,CAAC,EAAgB,EAAE,KAAY;IAC3D,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,2CAA2C,CAAC;QACjE,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC;;;KAGpB,CAAC;KACH,CAAC;IACF,OAAO;QACL,QAAQ,CAAC,GAAG;YACV,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAwC,CAAC;YAChF,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,QAAQ,CAAC,GAAG,EAAE,KAAK;YACjB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7D,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/store/tokens.d.ts

@@ -0,0 +1,75 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { Clock } from '../util/clock.ts';
+/**
+ * One outstanding password reset: the right to set one user's password once,
+ * until it is used or it expires.
+ *
+ * The token is only ever in hand at the moment it is made, because the link is
+ * the only copy: the database keeps its SHA-256, so reading the table tells
+ * somebody that a reset was asked for and nothing more.
+ */
+export interface PasswordReset {
+    /** Whose password this sets. */
+    readonly userId: number;
+    /** When it was asked for, as an ISO 8601 instant. */
+    readonly createdAt: string;
+    /** When it stops working, as an ISO 8601 instant. */
+    readonly expiresAt: string;
+}
+/** A {@link PasswordReset} with the one thing the database never keeps. */
+export interface IssuedPasswordReset extends PasswordReset {
+    /**
+     * The token itself, 256 random bits hex encoded, handed back exactly once.
+     * It goes in the link and nowhere else.
+     */
+    readonly token: string;
+}
+/** What {@link TokenStore.createPasswordReset} is given. */
+export interface CreatePasswordResetInput {
+    /** Whose password the link will set. */
+    userId: number;
+    /** How long the link lasts, in seconds. */
+    lifetimeSeconds: number;
+    /** The clock, injectable so expiry is testable. Defaults to now. */
+    now?: Date | undefined;
+}
+export interface TokenStore {
+    /**
+     * Issue a password reset link and hand back its token, which is the only
+     * time the token exists outside the link.
+     */
+    createPasswordReset(input: CreatePasswordResetInput): IssuedPasswordReset;
+    /**
+     * What a token entitles its holder to, or `undefined` when it entitles them
+     * to nothing: no such token, or one that has expired. An expired row is
+     * deleted on the way past, as an expired session's is.
+     */
+    getPasswordReset(token: string, now?: Date): PasswordReset | undefined;
+    /** Spend a token. Returns `false` when there was nothing to spend. */
+    deletePasswordReset(token: string): boolean;
+    /**
+     * Cancel every reset a user has outstanding, and say how many went.
+     *
+     * What a finished reset calls: the link that was used is spent, and so is
+     * every other one asked for in the meantime, because whoever set the
+     * password now owns the account and the others are only ways back in for
+     * somebody who does not.
+     */
+    deletePasswordResetsForUser(userId: number): number;
+    /** Delete every expired reset. Returns how many went. */
+    prunePasswordResets(now?: Date): number;
+    /**
+     * Spend a one-click link's token, and say whether it had anything left.
+     *
+     * `true` the first time and `false` for ever after, which is what makes a
+     * link in an email single use (TASK-55). Only the token's SHA-256 is kept,
+     * as a password reset's is, so a copy of this file is not a list of the
+     * links a site has sent. `expiresAt` is the moment the token's own signature
+     * stops meaning anything, and is only there so the row can be swept.
+     */
+    spendToken(token: string, expiresAt: string, now?: Date): boolean;
+    /** Delete every spent token that has expired. Returns how many went. */
+    pruneSpentTokens(now?: Date): number;
+}
+export declare function openTokenStore(db: DatabaseSync, clock: Clock): TokenStore;
+//# sourceMappingURL=tokens.d.ts.map

package/dist/store/tokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/store/tokens.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,gCAAgC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,2EAA2E;AAC3E,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,4DAA4D;AAC5D,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,GAAG,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,mBAAmB,CAAC;IAC1E;;;;OAIG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,aAAa,GAAG,SAAS,CAAC;IACvE,sEAAsE;IACtE,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5C;;;;;;;OAOG;IACH,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACpD,yDAAyD;IACzD,mBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IACxC;;;;;;;;OAQG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC;IAClE,wEAAwE;IACxE,gBAAgB,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;CACtC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,UAAU,CA8EzE"}

package/dist/store/tokens.js

@@ -0,0 +1,82 @@
+import { createHash } from 'node:crypto';
+import { randomToken } from './sessions.js';
+export function openTokenStore(db, clock) {
+    const statements = {
+        insertPasswordReset: db.prepare(`
+      INSERT INTO password_resets (token_hash, user_id, created_at, expires_at)
+      VALUES (?, ?, ?, ?)
+    `),
+        passwordResetByHash: db.prepare('SELECT * FROM password_resets WHERE token_hash = ?'),
+        deletePasswordReset: db.prepare('DELETE FROM password_resets WHERE token_hash = ?'),
+        deletePasswordResetsForUser: db.prepare('DELETE FROM password_resets WHERE user_id = ?'),
+        prunePasswordResets: db.prepare('DELETE FROM password_resets WHERE expires_at <= ?'),
+        spendToken: db.prepare(`
+      INSERT OR IGNORE INTO spent_tokens (token_hash, spent_at, expires_at) VALUES (?, ?, ?)
+    `),
+        pruneSpentTokens: db.prepare('DELETE FROM spent_tokens WHERE expires_at <= ?'),
+    };
+    return {
+        createPasswordReset(input) {
+            const now = input.now ?? clock();
+            const token = randomToken();
+            const reset = {
+                token,
+                userId: input.userId,
+                createdAt: now.toISOString(),
+                expiresAt: new Date(now.getTime() + input.lifetimeSeconds * 1000).toISOString(),
+            };
+            statements.insertPasswordReset.run(hashToken(token), reset.userId, reset.createdAt, reset.expiresAt);
+            return reset;
+        },
+        getPasswordReset(token, now = clock()) {
+            const hash = hashToken(token);
+            const row = statements.passwordResetByHash.get(hash);
+            if (row === undefined)
+                return undefined;
+            const reset = {
+                userId: Number(row['user_id']),
+                createdAt: String(row['created_at']),
+                expiresAt: String(row['expires_at']),
+            };
+            // The same rule the sessions follow: an expired row is deleted rather
+            // than ignored, so a clock that goes backwards cannot revive a link.
+            if (reset.expiresAt <= now.toISOString()) {
+                statements.deletePasswordReset.run(hash);
+                return undefined;
+            }
+            return reset;
+        },
+        deletePasswordReset(token) {
+            return statements.deletePasswordReset.run(hashToken(token)).changes > 0;
+        },
+        deletePasswordResetsForUser(userId) {
+            return Number(statements.deletePasswordResetsForUser.run(userId).changes);
+        },
+        prunePasswordResets(now = clock()) {
+            return Number(statements.prunePasswordResets.run(now.toISOString()).changes);
+        },
+        spendToken(token, expiresAt, now = clock()) {
+            // `INSERT OR IGNORE` rather than a read then a write: two clicks on the
+            // same link arriving together must not both find nothing and both act.
+            const written = statements.spendToken.run(hashToken(token), now.toISOString(), expiresAt);
+            return Number(written.changes) > 0;
+        },
+        pruneSpentTokens(now = clock()) {
+            return Number(statements.pruneSpentTokens.run(now.toISOString()).changes);
+        },
+    };
+}
+/**
+ * A reset token as the database keeps it: its SHA-256, hex encoded.
+ *
+ * Plain SHA-256 rather than argon2 on purpose. What argon2 buys is time
+ * against somebody guessing a password people chose, and there is nothing to
+ * guess here: the token is 256 bits out of `randomBytes`, so the only way to
+ * hold a valid one is to have been sent it. What the hash is for is that a
+ * copy of `geekity.db` — a backup, a stray file — is not a stack of working
+ * reset links.
+ */
+function hashToken(token) {
+    return createHash('sha256').update(token, 'utf8').digest('hex');
+}
+//# sourceMappingURL=tokens.js.map

package/dist/store/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/store/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKzC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA6E5C,MAAM,UAAU,cAAc,CAAC,EAAgB,EAAE,KAAY;IAC3D,MAAM,UAAU,GAAG;QACjB,mBAAmB,EAAE,EAAE,CAAC,OAAO,CAAC;;;KAG/B,CAAC;QACF,mBAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,oDAAoD,CAAC;QACrF,mBAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,kDAAkD,CAAC;QACnF,2BAA2B,EAAE,EAAE,CAAC,OAAO,CAAC,+CAA+C,CAAC;QACxF,mBAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC;QACpF,UAAU,EAAE,EAAE,CAAC,OAAO,CAAC;;KAEtB,CAAC;QACF,gBAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,gDAAgD,CAAC;KAC/E,CAAC;IACF,OAAO;QACL,mBAAmB,CAAC,KAAK;YACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,KAAK,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAwB;gBACjC,KAAK;gBACL,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE;gBAC5B,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;aAChF,CAAC;YAEF,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAChC,SAAS,CAAC,KAAK,CAAC,EAChB,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,SAAS,CAChB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,EAAE;YACnC,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,GAAG,GAAG,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAwC,CAAC;YAC5F,IAAI,GAAG,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YAExC,MAAM,KAAK,GAAkB;gBAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC9B,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACpC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aACrC,CAAC;YAEF,sEAAsE;YACtE,qEAAqE;YACrE,IAAI,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;gBACzC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzC,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,mBAAmB,CAAC,KAAK;YACvB,OAAO,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;QAC1E,CAAC;QAED,2BAA2B,CAAC,MAAM;YAChC,OAAO,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5E,CAAC;QAED,mBAAmB,CAAC,GAAG,GAAG,KAAK,EAAE;YAC/B,OAAO,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC/E,CAAC;QAED,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,GAAG,KAAK,EAAE;YACxC,wEAAwE;YACxE,uEAAuE;YACvE,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAC;YAC1F,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QAED,gBAAgB,CAAC,GAAG,GAAG,KAAK,EAAE;YAC5B,OAAO,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5E,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAClE,CAAC"}

package/dist/store/webmentions.d.ts

@@ -0,0 +1,66 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { Clock } from '../util/clock.ts';
+/** How one webmention this site sent to one page ended. */
+export declare const WEBMENTION_SEND_STATUSES: readonly ['sent', 'none', 'failed'];
+/**
+ * One of {@link WEBMENTION_SEND_STATUSES}.
+ *
+ * `sent` is an endpoint that accepted the notification. `none` is a page that
+ * advertises no endpoint, which is most of the web and is not a failure —
+ * recording it is what stops the sender asking the same page again on every
+ * edit and what tells a person why nothing went. `failed` is an endpoint that
+ * was there and refused, with the reason in the row.
+ */
+export type WebmentionSendStatus = (typeof WEBMENTION_SEND_STATUSES)[number];
+/**
+ * How one attempt to tell one page that a post links to it ended.
+ *
+ * The whole of what SQLite keeps about the webmentions a site has sent, and a
+ * cache like every other outcome here (decision-9): the links are in the
+ * post's file, so a database thrown away costs the record of how yesterday's
+ * notification went and nothing else. One row per (post, target), because the
+ * question it answers is "where does this post stand with that page" and a
+ * resend moves that answer rather than adding a second one.
+ */
+export interface SentWebmention {
+    /** The post the links were in. */
+    readonly slug: string;
+    /** The post's absolute URL, which is the `source` that was sent. */
+    readonly source: string;
+    /** The page that was linked to, which is the `target` that was sent. */
+    readonly target: string;
+    /** The endpoint it was sent to, or `null` when the target advertised none. */
+    readonly endpoint: string | null;
+    /** How it went. */
+    readonly status: WebmentionSendStatus;
+    /** Why it failed, or `null`. */
+    readonly error: string | null;
+    /** When the attempt was made, as an ISO 8601 instant. */
+    readonly attemptedAt: string;
+}
+/** A {@link SentWebmention} before the store has timed it. */
+export type NewSentWebmention = Omit<SentWebmention, 'attemptedAt'> & {
+    attemptedAt?: string | undefined;
+};
+export interface WebmentionStore {
+    /**
+     * Record how one webmention to one page ended, replacing the previous
+     * outcome for that (post, target): the table answers "where does this post
+     * stand with that page", which a resend moves rather than adds to.
+     */
+    recordSentWebmention(sent: NewSentWebmention): SentWebmention;
+    /** What one post's links came to, target by target, in target order. */
+    listSentWebmentions(slug: string): SentWebmention[];
+    /** How many of one post's targets stand at each status. */
+    countSentWebmentionsByStatus(slug: string): Record<WebmentionSendStatus, number>;
+    /** Every (post, source) the sent webmentions are recorded under. */
+    listSentWebmentionSources(): Pick<SentWebmention, 'slug' | 'source'>[];
+    /**
+     * File what one post sent from one source under another post, as a post
+     * whose slug changed is (TASK-332). Where both hold an outcome for one
+     * target, the later attempt is the one kept.
+     */
+    moveSentWebmentions(from: Pick<SentWebmention, 'slug' | 'source'>, to: string): void;
+}
+export declare function openWebmentionStore(db: DatabaseSync, clock: Clock): WebmentionStore;
+//# sourceMappingURL=webmentions.d.ts.map

package/dist/store/webmentions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webmentions.d.ts","sourceRoot":"","sources":["../../src/store/webmentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C,2DAA2D;AAC3D,eAAO,MAAM,wBAAwB,YAAI,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAE5E;;;;;;;;GAQG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7E;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB;IACnB,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,gCAAgC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,8DAA8D;AAC9D,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG;IACpE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC;IAC9D,wEAAwE;IACxE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;IACpD,2DAA2D;IAC3D,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjF,oEAAoE;IACpE,yBAAyB,IAAI,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;IACvE;;;;OAIG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACtF;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,eAAe,CAiFnF"}

package/dist/store/webmentions.js

@@ -0,0 +1,84 @@
+import { countByStatus, inTransaction, nullableText, oneOf } from './rows.js';
+/** How one webmention this site sent to one page ended. */
+export const WEBMENTION_SEND_STATUSES = ['sent', 'none', 'failed'];
+export function openWebmentionStore(db, clock) {
+    const statements = {
+        recordSentWebmention: db.prepare(`
+      INSERT INTO webmentions_sent (
+        slug, source, target, endpoint, status, error, attempted_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?)
+      ON CONFLICT (slug, target) DO UPDATE SET
+        source = excluded.source,
+        endpoint = excluded.endpoint,
+        status = excluded.status,
+        error = excluded.error,
+        attempted_at = excluded.attempted_at
+      RETURNING *
+    `),
+        listSentWebmentions: db.prepare('SELECT * FROM webmentions_sent WHERE slug = ? ORDER BY target'),
+        listSentWebmentionSources: db.prepare('SELECT DISTINCT slug, source FROM webmentions_sent ORDER BY slug, source'),
+        copySentWebmentions: db.prepare(`
+      INSERT INTO webmentions_sent (
+        slug, source, target, endpoint, status, error, attempted_at
+      )
+      SELECT :to, source, target, endpoint, status, error, attempted_at
+      FROM webmentions_sent WHERE slug = :slug AND source = :source
+      ON CONFLICT (slug, target) DO UPDATE SET
+        source = excluded.source,
+        endpoint = excluded.endpoint,
+        status = excluded.status,
+        error = excluded.error,
+        attempted_at = excluded.attempted_at
+      WHERE excluded.attempted_at > webmentions_sent.attempted_at
+    `),
+        deleteSentWebmentions: db.prepare('DELETE FROM webmentions_sent WHERE slug = :slug AND source = :source'),
+        countSentWebmentionsByStatus: db.prepare(`
+      SELECT status, COUNT(*) AS count FROM webmentions_sent WHERE slug = ? GROUP BY status
+    `),
+    };
+    return {
+        recordSentWebmention(sent) {
+            const row = statements.recordSentWebmention.get(sent.slug, sent.source, sent.target, sent.endpoint, sent.status, sent.error, sent.attemptedAt ?? clock().toISOString());
+            if (row === undefined) {
+                throw new Error(`The webmention to ${sent.target} could not be recorded.`);
+            }
+            return toSentWebmention(row);
+        },
+        listSentWebmentions(slug) {
+            const rows = statements.listSentWebmentions.all(slug);
+            return rows.map(toSentWebmention);
+        },
+        listSentWebmentionSources() {
+            const rows = statements.listSentWebmentionSources.all();
+            return rows.map((row) => ({ slug: String(row['slug']), source: String(row['source']) }));
+        },
+        moveSentWebmentions(from, to) {
+            if (from.slug === to)
+                return;
+            inTransaction(db, () => {
+                statements.copySentWebmentions.run({ ...from, to });
+                statements.deleteSentWebmentions.run(from);
+            });
+        },
+        countSentWebmentionsByStatus(slug) {
+            const rows = statements.countSentWebmentionsByStatus.all(slug);
+            return countByStatus(rows, WEBMENTION_SEND_STATUSES, webmentionSendStatus);
+        },
+    };
+}
+function toSentWebmention(row) {
+    return {
+        slug: String(row['slug']),
+        source: String(row['source']),
+        target: String(row['target']),
+        endpoint: nullableText(row['endpoint']),
+        status: webmentionSendStatus(row['status']),
+        error: nullableText(row['error']),
+        attemptedAt: String(row['attempted_at']),
+    };
+}
+/** A stored send status, or `failed` for one this version does not know. */
+function webmentionSendStatus(value) {
+    return oneOf(value, WEBMENTION_SEND_STATUSES, 'failed');
+}
+//# sourceMappingURL=webmentions.js.map

package/dist/store/webmentions.js.map

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

package/dist/supervisor/primary.d.ts

@@ -34,7 +34,7 @@ export interface SupervisorOptions {
     now(): number;
     log(line: string): void;
     exit(code: number): void;
-    watch?: PluginWatch | undefined;
+    watch?: PluginWatch | 'off' | undefined;
 }
 export interface Supervisor {
     start(): void;

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;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"}
+{"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,KAAK,GAAG,SAAS,CAAC;CACzC;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,CAwPvE;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,CAwDP"}

package/dist/supervisor/primary.js

@@ -41,7 +41,9 @@ export function createSupervisor(options) {
     let queued = [];
     let seen = { signature: undefined, since: 0 };
     let compared;
+    let changing = false;
     let polling;
+    const watch = options.watch === 'off' ? undefined : options.watch;
     function fork() {
         const worker = options.fork();
         live.add(worker);
@@ -87,11 +89,11 @@ export function createSupervisor(options) {
         if (live.has(next))
             next.kill();
         failed = reloading;
+        compared = undefined;
         settle({ ok: false, error });
         serve(old, undefined);
     }
     function fingerprint() {
-        const { watch } = options;
         return watch === undefined ? undefined : attempt(() => watch.fingerprint());
     }
     function poll(watch) {
@@ -103,20 +105,31 @@ export function createSupervisor(options) {
     function look(watch) {
         const signature = attempt(() => watch.signature());
         const now = options.now();
-        if (signature === undefined || signature !== seen.signature) {
+        if (signature !== seen.signature) {
+            if (!changing) {
+                changing = true;
+                options.log(`The plugins folder is changing; it loads once it has stood still for ${String(PLUGIN_SETTLE_MS / 1000)} s.`);
+            }
             seen = { signature, since: now };
             return;
         }
-        if (state.phase !== 'serving' || signature === compared)
+        if (signature === undefined)
             return;
         if (now - seen.since < PLUGIN_SETTLE_MS)
             return;
+        changing = false;
+        if (state.phase !== 'serving' || signature === compared)
+            return;
         const folder = fingerprint();
         if (folder === undefined)
             return;
         compared = signature;
-        if (folder === loaded || folder === failed)
+        if (folder === loaded)
+            return;
+        if (folder === failed) {
+            options.log('The plugins folder is as it was when its reload failed, so it is left alone until it changes.');
             return;
+        }
         options.log('The plugins folder changed and has settled.');
         beginReload(state.worker, folder);
     }
@@ -126,9 +139,14 @@ export function createSupervisor(options) {
     }
     return {
         start() {
+            if (options.watch === 'off') {
+                options.log('The plugins folder is not watched: press Reload on the Plugins screen to load a change.');
+            }
             state = { phase: 'booting', worker: fork() };
-            if (options.watch !== undefined)
-                poll(options.watch);
+            if (watch !== undefined) {
+                seen = { signature: attempt(() => watch.signature()), since: options.now() };
+                poll(watch);
+            }
         },
         message(worker, message) {
             switch (message.type) {
@@ -300,12 +318,14 @@ export function superviseCluster(options) {
             control.close();
             process.exit(code);
         },
-        watch: pluginsDir === undefined || !options.pluginWatch
+        watch: pluginsDir === undefined
             ? undefined
-            : {
-                signature: () => pluginFolderSignature(pluginsDir),
-                fingerprint: () => pluginsFingerprint(scanPluginFolders(pluginsDir)),
-            },
+            : !options.pluginWatch
+                ? 'off'
+                : {
+                    signature: () => pluginFolderSignature(pluginsDir),
+                    fingerprint: () => pluginsFingerprint(scanPluginFolders(pluginsDir)),
+                },
     });
     const control = listenForControl({
         dataDir: options.dataDir,