@geekity/cms 0.31.0 → 0.32.1

package/dist/cms/services.d.ts.map

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

package/dist/cms/services.js

@@ -6,10 +6,19 @@ import { createReplyNotices } from '../comments/reply-notices.js';
 import { createContentSync, createScheduler } from '../content/index.js';
 import { createReplyBackfill, signedRepliesLoader } from '../federation/backfill.js';
 import { citedPostReader } from '../federation/cited-post.js';
+import { mintMissingIndexNowKey, SITE } from '../site/namespace.js';
+import { messageOf } from '../util/errors.js';
 import { handleLearner } from '../federation/handles.js';
 import { createActorProfileService, createDeliveryService, createRelayService, createSiteFederation, signedProfileLoader, } from '../federation/index.js';
-import { createSettlingQueue } from '../federation/queue.js';
+import { createFederationQueue } from '../federation/queue.js';
 import { settleImageVariants } from '../images/variants.js';
+import { stripMetadataJob } from '../content/metadata/strip-job.js';
+import { siteExportJob } from '../export/export-job.js';
+import { resendJob } from '../federation/resend-job.js';
+import { JOBS, dataPath } from '../files/data-files.js';
+import { createFileRecords } from '../jobs/file-records.js';
+import { createInProcessTransport } from '../jobs/in-process.js';
+import { createJobQueue } from '../jobs/queue.js';
 import { createIndexNowNotifier } from '../indexnow.js';
 import { activityLogSettled } from '../web/indieauth-activity-log.js';
 import { createIndieAuthState } from '../indieauth/grants.js';
@@ -30,8 +39,8 @@ import { siteRecords } from './site-records.js';
 export const SCHEDULE_WATERMARK_KEY = 'schedule.watermark';
 /** Where the instant the scheduler first ran on this site lives in {@link AdminStore.getState}. */
 export const SCHEDULE_FIRST_RUN_KEY = 'schedule.firstRun';
-export function createServices({ resolved, plugins, store, admin, commentRecords, }) {
-    const site = { admin, store, config: resolved };
+export function createServices({ resolved, plugins, store, admin, commentRecords, settings, }) {
+    const site = { admin, store, config: resolved, settings };
     // Which theme this site renders through (decision-15). One source for the
     // whole CMS: the pages, the `/theme/` assets and the site's email all read
     // it, so they cannot disagree about which theme is in use and a choice that
@@ -67,7 +76,7 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
     // read per send, so a key pasted into the settings screen sends the next
     // message and one removed stops the message after it, neither needing a
     // restart. With nothing configured, sending is a line in the log.
-    const mail = createMailService({ config: resolved, themes, ...resolved.mail });
+    const mail = createMailService({ config: resolved, settings, themes, ...resolved.mail });
     // The one reader of the two indexes a conversation is made of. The page, the
     // per-post comments feed, `/comments/feed/` and the `source:comments` count
     // on a post feed are all drawn from it, so a reader cannot be shown one
@@ -84,31 +93,35 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
         config: resolved,
         lookup: resolved.hostLookup,
         fediverse: citedPostReader(() => federationContext()),
-        held: (target) => {
-            const found = conversation.heldAt(target);
-            return found === undefined ? undefined : heldReplyContext(target, found);
+        held: {
+            settings,
+            at: (target, site) => {
+                const found = conversation.heldAt(target, site);
+                return found === undefined ? undefined : heldReplyContext(target, found);
+            },
         },
         onStored: (target, previous) => {
             delivery.citedPageStored(target, previous);
-            const original = replyContexts.read(target)?.original;
+            const original = replyContexts.stored(target)?.original;
             if (original !== undefined && original !== previous?.original) {
                 webmentions.originalFound(target, original);
             }
         },
     });
-    const cited = (url) => replyContexts.read(url);
+    const citedWith = (site) => (url) => replyContexts.read(url, site);
+    const cited = async () => citedWith(await settings.values(SITE));
     // The faces in a conversation, fetched here and served from here so a
     // reader's address never reaches the servers they live on (TASK-134).
     const avatars = createAvatarService({ admin, config: resolved });
     // What keeps a site from holding its readers' personal data for longer than
     // its settings say (TASK-135).
-    const retention = createRetentionService({ admin, config: resolved });
+    const retention = createRetentionService({ admin, config: resolved, settings });
     const renderer = createRenderer({
         config: resolved,
         themes,
         // The stored context of a reply's target: a file read, never a fetch, so
         // a page is drawn without waiting on anybody's server (TASK-123).
-        replyContext: cited,
+        replyContext: (target, site) => replyContexts.read(target, site),
         // What has been said about a post, from the very reader the comments
         // feeds are published from, so the page and the feed cannot disagree.
         conversation: conversation.thread,
@@ -117,16 +130,16 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
             store,
             redirects,
             siteData,
-            mailConfigured: () => mail.configured(),
         }),
     });
     const federationKv = resolved.federation.kv ?? new MemoryKvStore();
-    const federationQueue = resolved.federation.queue === undefined ? createSettlingQueue() : undefined;
+    const federationQueue = createFederationQueue(resolved.federation.queue, site);
     const federation = createSiteFederation({
         baseUrl: resolved.baseUrl,
         ...resolved.federation,
-        ...(federationQueue === undefined ? {} : { queue: federationQueue }),
+        queue: federationQueue ?? null,
         kv: federationKv,
+        federationOptions: { manuallyStartQueue: true },
     });
     // The names and faces of the actors who are not followers (TASK-184),
     // fetched in the background when one is heard from and on a sweep.
@@ -135,8 +148,12 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
         config: resolved,
         load: signedProfileLoader(() => federationContext()),
     });
-    const federated = { ...site, actorProfiles, cited };
-    const federationContext = () => federation.createContext(new URL(resolved.baseUrl), federated);
+    const federated = { ...site, actorProfiles, cited: citedWith };
+    const federationData = async () => {
+        const settled = await settings.values(SITE);
+        return { ...federated, site: settled, cited: citedWith(settled) };
+    };
+    const federationContext = async () => federation.createContext(new URL(resolved.baseUrl), await federationData());
     const learnHandles = handleLearner(federationContext);
     const replyBackfill = createReplyBackfill({
         ...site,
@@ -170,15 +187,18 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
     const webmentions = createWebmentionService({
         ...site,
         notifications,
-        originalOf: (url) => replyContexts.read(url)?.original,
+        originalOf: (url) => replyContexts.stored(url)?.original,
         conversation,
     });
     // The notify server listens to the index for the same reason: a post edited
     // on disk changed the same feeds as one saved through the editor.
-    const notifier = createFeedNotifier({ config: resolved });
+    const notifier = createFeedNotifier({ config: resolved, settings });
     // IndexNow listens for the same reason, and wants the pages as well as the
     // posts: a search engine indexes both (TASK-151).
-    const indexNow = createIndexNowNotifier({ config: resolved });
+    const indexNow = createIndexNowNotifier({ config: resolved, settings });
+    mintMissingIndexNowKey(settings, 'boot').catch((thrown) => {
+        console.error(`No IndexNow key was minted: ${messageOf(thrown)}`);
+    });
     // A post whose date is in the future is held back (TASK-44), and nothing
     // watches a clock: this is what notices that one has come due and reports it
     // as the publish it is, so delivery, the notifier and a site's `onPublish`
@@ -203,7 +223,23 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
     // database has never heard of is followed here, which is what makes a
     // rebuilt database catch up rather than silently stop federating to it.
     const relays = createRelayService({ ...federated, federation });
-    relays.sync();
+    relays.sync().catch((thrown) => {
+        console.warn(`The relays could not be read: ${messageOf(thrown)}`);
+    });
+    settings.watch(SITE.relays, async () => {
+        await relays.sync();
+    });
+    const jobs = createJobQueue({
+        transport: resolved.jobs.transport ?? createInProcessTransport(),
+        records: resolved.jobs.records ?? createFileRecords(dataPath(resolved.dataDir, JOBS)),
+        jobs: [
+            stripMetadataJob(resolved.contentDir),
+            resendJob({ store, delivery, webmentions }),
+            siteExportJob({ config: resolved, settings, plugins }, resolved.now),
+            ...(resolved.jobs.definitions ?? []),
+        ],
+        now: resolved.now,
+    });
     const changeSubscribers = [
         // A watched change waits for its burst to settle, as a scan does: a git
         // pull that moves a post and adds another at its old URL must not hand the
@@ -242,7 +278,7 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
     // (a salmention, TASK-320).
     const conversationWriteSubscribers = [
         (written) => {
-            replyNotices.heard(written);
+            replyNotices.queueNoticesFor(written);
         },
         (written) => {
             webmentions.heard(written);
@@ -268,9 +304,31 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
             },
             settled: () => scheduler.settled(),
         },
+        // After the scan, so a job reads an index that is up to date. Settled
+        // before delivery, so what a job queued there is waited for after it.
+        {
+            start: () => jobs.start(),
+            stop: () => {
+                jobs.stop();
+            },
+            settled: () => jobs.close(),
+        },
         { settled: () => delivery.settled() },
         { settled: () => relays.settled() },
         {
+            start: async () => {
+                if (federationQueue === undefined)
+                    return;
+                if (federationQueue.kind === 'pausing')
+                    federationQueue.resume();
+                federation.startQueue(await federationData()).catch((error) => {
+                    console.error(`The federation queue stopped: ${messageOf(error)}`);
+                });
+            },
+            stop: () => {
+                if (federationQueue?.kind === 'pausing')
+                    federationQueue.pause();
+            },
             settled: async () => {
                 await federationQueue?.settled();
             },
@@ -304,6 +362,8 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
             start: () => plugins.reconcile(readEnabledPlugins(resolved.contentDir)),
             stop: (ending) => stopPlugins(plugins, ending),
         },
+        { settled: () => replyNotices.settled() },
+        { settled: () => notifications.settled() },
         { settled: () => mail.settled() },
         // A page render derives an upload's variants in the background; the
         // encode finishes before the directories it writes into can be removed.
@@ -333,12 +393,9 @@ export function createServices({ resolved, plugins, store, admin, commentRecords
         scheduler,
         learnHandles,
         siteRecords: siteRecords(resolved),
-        maintenance: createMaintenanceSwitch({
-            dataDir: resolved.dataDir,
-            forced: resolved.maintenance,
-            now: resolved.now,
-        }),
+        maintenance: createMaintenanceSwitch({ settings, now: resolved.now }),
         indieauth: createIndieAuthState(resolved.now),
+        jobs,
         lifecycle,
     };
 }

package/dist/cms/services.js.map

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

package/dist/cms/site-records.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"site-records.d.ts","sourceRoot":"","sources":["../../src/cms/site-records.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKvD,wBAAgB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG,WAAW,CAQ/F"}
+{"version":3,"file":"site-records.d.ts","sourceRoot":"","sources":["../../src/cms/site-records.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD,wBAAgB,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG,WAAW,CAO/F"}

package/dist/cms/site-records.js

@@ -1,13 +1,11 @@
 import { existsSync } from 'node:fs';
 import { commentsFile } from '../comments/records.js';
-import { readSiteSettings } from '../site/site-json.js';
 import { listUsers } from '../site/users.js';
 import { syndicationTargetsReader } from '../webmention/syndication.js';
 export function siteRecords(config) {
     const syndicationTargets = syndicationTargetsReader(config.contentDir);
     return {
         users: () => listUsers(config.dataDir),
-        timezone: () => readSiteSettings(config.contentDir).timezone,
         syndicationTargets: () => syndicationTargets(),
         hasComments: (slug) => existsSync(commentsFile(config.contentDir, slug)),
     };

package/dist/cms/site-records.js.map

@@ -1 +1 @@
-{"version":3,"file":"site-records.js","sourceRoot":"","sources":["../../src/cms/site-records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,UAAU,WAAW,CAAC,MAAsD;IAChF,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvE,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,QAAQ,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ;QAC5D,kBAAkB,EAAE,GAAG,EAAE,CAAC,kBAAkB,EAAE;QAC9C,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;KACzE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"site-records.js","sourceRoot":"","sources":["../../src/cms/site-records.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAExE,MAAM,UAAU,WAAW,CAAC,MAAsD;IAChF,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvE,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC;QACtC,kBAAkB,EAAE,GAAG,EAAE,CAAC,kBAAkB,EAAE;QAC9C,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;KACzE,CAAC;AACJ,CAAC"}

package/dist/comments/akismet.d.ts

@@ -1,3 +1,5 @@
+import type { AkismetKeyStatus } from '../settings/akismet.ts';
+import type { ChangedBy, SettingsRegistry } from '../settings/types.ts';
 import type { CommentChecker } from '../forms/checker.ts';
 /**
  * Akismet, as the one {@link CommentChecker} this package ships.
@@ -8,18 +10,16 @@ import type { CommentChecker } from '../forms/checker.ts';
  *
  * Two things make it optional at runtime rather than at build time:
  *
- * - **The key is a credential**, so it lives in `data/akismet.json` at mode
- *   `0600` beside the password hashes and the actor's private keys, and never
- *   in `content/_data/site.json`, which is public, in git and published with
- *   the site.
- * - **The key file is read on every call**, so a key pasted into the settings
+ * - **The key is a credential**, so it is the secret `akismet.key` setting,
+ *   kept in `data/akismet.json` at mode `0600` or set by
+ *   `GEEKITY_AKISMET__KEY`, and never in `content/_data/site.json`, which is
+ *   public, in git and published with the site.
+ * - **The key is read on every call**, so a key pasted into the settings
  *   screen starts filtering the next comment and a key removed stops filtering
  *   at once. Without one, nothing is sent anywhere and the verdict is
  *   `unknown` — the site's own rules decide, exactly as they did before
  *   anybody had heard of Akismet.
  */
-/** Where the key lives, under `dataDir`. */
-export declare const AKISMET_KEY_FILE = "akismet.json";
 /** The API this speaks. */
 export declare const AKISMET_ENDPOINT = "https://rest.akismet.com/1.1";
 /**
@@ -36,60 +36,27 @@ export declare const AKISMET_USER_AGENT = "Geekity CMS/1.0 | Akismet/1.1";
  * logged failure and no opinion, and the comment goes to the queue.
  */
 export declare const AKISMET_TIMEOUT_MS = 10000;
-/** What the last {@link verifyAkismetKey} of a key came to. */
-export type AkismetKeyStatus = 
-/** Akismet said `valid`. */
-'valid'
-/** Akismet said `invalid`: the key is not one of theirs, or not any more. */
- | 'invalid'
-/** Akismet could not be reached, so nothing is known either way. */
- | 'unchecked';
-/** The key as `data/akismet.json` holds it. */
-export interface AkismetKeyRecord {
-    /** The key itself. */
-    key: string;
-    /** What Akismet said about it when it was last checked. */
-    status: AkismetKeyStatus;
-    /** When that was, as an instant. */
-    checkedAt: string;
-}
-/**
- * The stored key, or `undefined` when the site has none.
- *
- * Read tolerantly and synchronously, like every other file this CMS treats as
- * truth: a file that will not parse, or one with no key in it, is a site with
- * no Akismet rather than a site that will not boot.
- */
-export declare function readAkismetKey(dataDir: string): AkismetKeyRecord | undefined;
-/** Write the key, private to the account the site runs as. */
-export declare function writeAkismetKey(dataDir: string, record: AkismetKeyRecord): Promise<void>;
-/** Forget the key, which is how a site turns Akismet off. */
-export declare function removeAkismetKey(dataDir: string): Promise<void>;
-/** Where one site's key file is. */
-export declare function akismetKeyPath(dataDir: string): string;
 /** What {@link verifyAkismetKey} needs. */
 export interface VerifyAkismetKeyOptions {
-    /** The key to check. */
-    key: string;
+    settings: SettingsRegistry;
     /** The site's public origin, which Akismet calls the blog. */
     blog: string;
+    at: Date;
+    by: ChangedBy;
     /** The HTTP client. Defaults to the global `fetch`; a test hands in its own. */
     fetch?: typeof fetch | undefined;
     /** How long to wait. */
     timeoutMs?: number | undefined;
 }
 /**
- * Ask Akismet whether a key is one of theirs.
- *
  * Three answers rather than two, because "we could not ask" is not "no": a key
  * typed while the machine is offline should not be reported as a bad key, and
  * the settings screen says which of the two happened.
  */
-export declare function verifyAkismetKey(options: VerifyAkismetKeyOptions): Promise<AkismetKeyStatus>;
+export declare function verifyAkismetKey(options: VerifyAkismetKeyOptions): Promise<AkismetKeyStatus | undefined>;
 /** What {@link createAkismetChecker} needs around it. */
 export interface AkismetCheckerOptions {
-    /** Where the key file lives. Read on every call, so a new key needs no restart. */
-    dataDir: string;
+    settings: SettingsRegistry;
     /**
      * The site's language, as `blog_lang` wants it.
      *
@@ -97,7 +64,7 @@ export interface AkismetCheckerOptions {
      * rewrites: reading it when a comment arrives is what makes a change to it
      * take effect at once, the way every other setting does (decision-9).
      */
-    language: () => string;
+    language: () => Promise<string>;
     /** The HTTP client. Defaults to the global `fetch`; a test hands in its own. */
     fetch?: typeof fetch | undefined;
     /** Where a failure is reported. Defaults to the console. */

package/dist/comments/akismet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"akismet.d.ts","sourceRoot":"","sources":["../../src/comments/akismet.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAoC,MAAM,qBAAqB,CAAC;AAE5F;;;;;;;;;;;;;;;;;;GAkBG;AAEH,4CAA4C;AAC5C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,2BAA2B;AAC3B,eAAO,MAAM,gBAAgB,iCAAiC,CAAC;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,kCAAkC,CAAC;AAElE;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC,+DAA+D;AAC/D,MAAM,MAAM,gBAAgB;AAC1B,4BAA4B;AAC1B,OAAO;AACT,6EAA6E;GAC3E,SAAS;AACX,oEAAoE;GAClE,WAAW,CAAC;AAEhB,+CAA+C;AAC/C,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,2DAA2D;IAC3D,MAAM,EAAE,gBAAgB,CAAC;IACzB,oCAAoC;IACpC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAsB5E;AAED,8DAA8D;AAC9D,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9F;AAED,6DAA6D;AAC7D,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED,oCAAoC;AACpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,2CAA2C;AAC3C,MAAM,WAAW,uBAAuB;IACtC,wBAAwB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;IACjC,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAY3B;AAED,yDAAyD;AACzD,MAAM,WAAW,qBAAqB;IACpC,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,MAAM,CAAC;IACvB,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;IACrD,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CA+DnF"}
+{"version":3,"file":"akismet.d.ts","sourceRoot":"","sources":["../../src/comments/akismet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxE,OAAO,KAAK,EAAE,cAAc,EAAoC,MAAM,qBAAqB,CAAC;AAE5F;;;;;;;;;;;;;;;;;;GAkBG;AAEH,2BAA2B;AAC3B,eAAO,MAAM,gBAAgB,iCAAiC,CAAC;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,kCAAkC,CAAC;AAElE;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC,2CAA2C;AAC3C,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,IAAI,CAAC;IACT,EAAE,EAAE,SAAS,CAAC;IACd,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;IACjC,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAcvC;AAmBD,yDAAyD;AACzD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;;;;;OAMG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,gFAAgF;IAChF,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;IACjC,4DAA4D;IAC5D,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;IACrD,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,cAAc,CAkEnF"}

package/dist/comments/akismet.js

@@ -1,6 +1,4 @@
-import { rm } from 'node:fs/promises';
-import path from 'node:path';
-import { readFileIfPresentSync, writeFileAtomically } from '../files/atomic.js';
+import { AKISMET } from '../settings/akismet.js';
 import { messageOf } from '../util/errors.js';
 import { COMMENT_FIELDS } from './submission.js';
 /**
@@ -12,18 +10,16 @@ import { COMMENT_FIELDS } from './submission.js';
  *
  * Two things make it optional at runtime rather than at build time:
  *
- * - **The key is a credential**, so it lives in `data/akismet.json` at mode
- *   `0600` beside the password hashes and the actor's private keys, and never
- *   in `content/_data/site.json`, which is public, in git and published with
- *   the site.
- * - **The key file is read on every call**, so a key pasted into the settings
+ * - **The key is a credential**, so it is the secret `akismet.key` setting,
+ *   kept in `data/akismet.json` at mode `0600` or set by
+ *   `GEEKITY_AKISMET__KEY`, and never in `content/_data/site.json`, which is
+ *   public, in git and published with the site.
+ * - **The key is read on every call**, so a key pasted into the settings
  *   screen starts filtering the next comment and a key removed stops filtering
  *   at once. Without one, nothing is sent anywhere and the verdict is
  *   `unknown` — the site's own rules decide, exactly as they did before
  *   anybody had heard of Akismet.
  */
-/** Where the key lives, under `dataDir`. */
-export const AKISMET_KEY_FILE = 'akismet.json';
 /** The API this speaks. */
 export const AKISMET_ENDPOINT = 'https://rest.akismet.com/1.1';
 /**
@@ -41,59 +37,23 @@ export const AKISMET_USER_AGENT = 'Geekity CMS/1.0 | Akismet/1.1';
  */
 export const AKISMET_TIMEOUT_MS = 10_000;
 /**
- * The stored key, or `undefined` when the site has none.
- *
- * Read tolerantly and synchronously, like every other file this CMS treats as
- * truth: a file that will not parse, or one with no key in it, is a site with
- * no Akismet rather than a site that will not boot.
- */
-export function readAkismetKey(dataDir) {
-    const raw = readFileIfPresentSync(akismetKeyPath(dataDir));
-    if (raw === undefined)
-        return undefined;
-    let parsed;
-    try {
-        parsed = JSON.parse(raw);
-    }
-    catch {
-        return undefined;
-    }
-    if (typeof parsed !== 'object' || parsed === null)
-        return undefined;
-    const file = parsed;
-    const key = typeof file['key'] === 'string' ? file['key'].trim() : '';
-    if (key === '')
-        return undefined;
-    const status = file['status'];
-    return {
-        key,
-        status: status === 'valid' || status === 'invalid' ? status : 'unchecked',
-        checkedAt: typeof file['checkedAt'] === 'string' ? file['checkedAt'] : '',
-    };
-}
-/** Write the key, private to the account the site runs as. */
-export async function writeAkismetKey(dataDir, record) {
-    await writeFileAtomically(akismetKeyPath(dataDir), `${JSON.stringify(record, null, 2)}\n`, {
-        mode: 0o600,
-    });
-}
-/** Forget the key, which is how a site turns Akismet off. */
-export async function removeAkismetKey(dataDir) {
-    await rm(akismetKeyPath(dataDir), { force: true });
-}
-/** Where one site's key file is. */
-export function akismetKeyPath(dataDir) {
-    return path.join(dataDir, AKISMET_KEY_FILE);
-}
-/**
- * Ask Akismet whether a key is one of theirs.
- *
  * Three answers rather than two, because "we could not ask" is not "no": a key
  * typed while the machine is offline should not be reported as a bad key, and
  * the settings screen says which of the two happened.
  */
 export async function verifyAkismetKey(options) {
-    const body = new URLSearchParams({ api_key: options.key, blog: options.blog });
+    const key = await options.settings.get(AKISMET.key);
+    if (key === '')
+        return undefined;
+    const status = await askAboutKey(key, options);
+    await options.settings.set('akismet', new Map([
+        ['status', status],
+        ['checked_at', options.at.toISOString()],
+    ]), options.by);
+    return status;
+}
+async function askAboutKey(key, options) {
+    const body = new URLSearchParams({ api_key: key, blog: options.blog });
     let answer;
     try {
         answer = await post(`${AKISMET_ENDPOINT}/verify-key`, body, options.fetch, options.timeoutMs);
@@ -124,11 +84,12 @@ export function createAkismetChecker(options) {
     };
     /** Send one call, or nothing at all when the site has no key. */
     async function send(method, fields) {
-        const stored = readAkismetKey(options.dataDir);
-        if (stored === undefined)
+        const key = await options.settings.get(AKISMET.key);
+        if (key === '')
             return undefined;
+        const language = await options.language();
         try {
-            const answer = await post(`${AKISMET_ENDPOINT}/${method}`, fields(stored.key), options.fetch, options.timeoutMs);
+            const answer = await post(`${AKISMET_ENDPOINT}/${method}`, fields(key, language), options.fetch, options.timeoutMs);
             if (!answer.ok) {
                 warn(`Akismet answered ${method} with ${String(answer.status)}.${help(answer)}`);
                 return undefined;
@@ -142,7 +103,7 @@ export function createAkismetChecker(options) {
     }
     return {
         async check(submission) {
-            const answer = await send('comment-check', (key) => checkFields(key, submission, options));
+            const answer = await send('comment-check', (key, language) => checkFields(key, language, submission, options));
             if (answer === undefined)
                 return 'unknown';
             const said = answer.body.trim();
@@ -161,15 +122,15 @@ export function createAkismetChecker(options) {
             return 'unknown';
         },
         async reportSpam(report) {
-            await send('submit-spam', (key) => reportFields(key, report, options));
+            await send('submit-spam', (key, language) => reportFields(key, language, report, options));
         },
         async reportHam(report) {
-            await send('submit-ham', (key) => reportFields(key, report, options));
+            await send('submit-ham', (key, language) => reportFields(key, language, report, options));
         },
     };
 }
 /** The fields one `comment-check` carries. */
-function checkFields(key, submission, options) {
+function checkFields(key, language, submission, options) {
     const { comment } = submission;
     // A webmention is a page linking here rather than a form somebody filled in,
     // so it has no honeypot to name; a contact message is a form like a
@@ -179,7 +140,7 @@ function checkFields(key, submission, options) {
         api_key: key,
         blog: submission.baseUrl,
         blog_charset: 'UTF-8',
-        blog_lang: blogLang(options.language()),
+        blog_lang: blogLang(language),
         user_ip: submission.address,
         user_agent: submission.userAgent,
         referrer: submission.referrer,
@@ -210,13 +171,13 @@ function checkFields(key, submission, options) {
  * The content, the author and the permalink are what is left, and they are
  * what a correction is mostly about.
  */
-function reportFields(key, report, options) {
+function reportFields(key, language, report, options) {
     const { comment } = report;
     return fields({
         api_key: key,
         blog: report.baseUrl,
         blog_charset: 'UTF-8',
-        blog_lang: blogLang(options.language()),
+        blog_lang: blogLang(language),
         permalink: report.url,
         comment_type: comment.source === 'webmention' ? 'webmention' : 'comment',
         comment_author: comment.author.name,