@geekity/cms 0.30.0 → 0.32.0

package/dist/{mail/service.js → notifications/mail-service.js}

@@ -1,10 +1,14 @@
-import { readSiteSettings } from '../admin/settings.js';
 import { holdOutbound } from '../dev-mode.js';
-import { createThemeSource } from '../web/themes.js';
-import { createBrevoProvider } from './brevo.js';
-import { readMailCredentials } from './credentials.js';
-import { createSmtpProvider } from './smtp.js';
-import { createMailTemplates } from './templates.js';
+import { MAIL } from '../settings/mail.js';
+import { SITE } from '../site/namespace.js';
+import { createSiteDataSource, themeName } from '../theme/site-data.js';
+import { messageOf } from '../util/errors.js';
+import { createSerialQueue } from '../util/queue.js';
+import { retry } from '../util/retry.js';
+import { createThemeSource } from '../theme/themes.js';
+import { createBrevoProvider } from '../mail/brevo.js';
+import { createSmtpProvider } from '../mail/smtp.js';
+import { createMailTemplates } from './mail-templates.js';
 /**
  * The one door out of this CMS for email.
  *
@@ -19,7 +23,7 @@ import { createMailTemplates } from './templates.js';
  * - **A site with no mail configuration still works.** `send` resolves
  *   successfully, having sent nothing and said so in the log. A feature that
  *   emails is not a feature that breaks without a mail account.
- * - **Nothing is decided at boot.** The settings and `data/mail.json` are read
+ * - **Nothing is decided at boot.** The settings and the `mail` namespace are read
  *   per send, so a key pasted into the settings screen sends the next message
  *   and a provider switched there takes effect at once, neither needing a
  *   restart — the same way every other setting behaves under decision-9.
@@ -36,30 +40,23 @@ export function defaultMailBackoffMs(attempt) {
 }
 /** Build the mail service for one site. */
 export function createMailService(options) {
-    const { config } = options;
+    const { config, settings } = options;
     const logger = options.logger ?? console;
+    const siteData = createSiteDataSource(config);
     const attempts = Math.max(1, options.attempts ?? DEFAULT_MAIL_ATTEMPTS);
     const backoffMs = options.backoffMs ?? defaultMailBackoffMs;
-    const wait = options.wait ??
-        ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
     const templates = options.templates ??
         createMailTemplates({
             themes: options.themes ??
                 createThemeSource({
                     themesDir: config.themesDir,
-                    chosen: () => readSiteSettings(config.contentDir).theme,
+                    chosen: () => themeName(siteData.read()),
                 }),
             baseUrl: config.baseUrl,
+            now: config.now,
             noCache: config.watch,
         });
-    // Messages are chained rather than sent at once, and the chain never
-    // rejects: one provider that hangs delays the next message and nothing else.
-    let chain = Promise.resolve();
-    function enqueue(task) {
-        const result = chain.then(task);
-        chain = result.then(ignore, ignore);
-        return result;
-    }
+    const messages = createSerialQueue();
     /**
      * The provider that would carry the next message, built from the file as it
      * reads now, or `undefined` when the site sends no mail.
@@ -68,29 +65,35 @@ export function createMailService(options) {
      * settings screen reaches the very next message, and how one removed stops
      * the one after it.
      */
-    function provider() {
+    async function provider() {
         if (options.provider !== undefined)
             return options.provider;
-        const settings = readSiteSettings(config.contentDir);
-        const credentials = readMailCredentials(config.dataDir);
-        if (settings.mailProvider === 'brevo' && credentials.brevo !== undefined) {
-            return createBrevoProvider({ apiKey: credentials.brevo.apiKey });
+        const mailProvider = await settings.get(SITE.mail_provider);
+        const credentials = await settings.values(MAIL);
+        if (mailProvider === 'brevo' && credentials.brevo_api_key !== '') {
+            return createBrevoProvider({ apiKey: credentials.brevo_api_key });
         }
-        if (settings.mailProvider === 'smtp' && credentials.smtp !== undefined) {
-            return createSmtpProvider(credentials.smtp);
+        if (mailProvider === 'smtp' && credentials.smtp_host !== '') {
+            return createSmtpProvider({
+                host: credentials.smtp_host,
+                port: credentials.smtp_port,
+                secure: credentials.smtp_secure,
+                user: credentials.smtp_user,
+                password: credentials.smtp_password,
+            });
         }
         return undefined;
     }
     /** The From line, as the settings say it now. */
-    function from(settings) {
-        const address = settings.mailFromAddress === '' ? fallbackAddress(config.baseUrl) : settings.mailFromAddress;
-        const name = settings.mailFromName === '' ? settings.title : settings.mailFromName;
+    function from(site) {
+        const address = site.mail_from_address === '' ? fallbackAddress(config.baseUrl) : site.mail_from_address;
+        const name = site.mail_from_name === '' ? site.title : site.mail_from_name;
         return name === '' ? { address } : { name, address };
     }
     /** Try one message until it goes or the site runs out of patience. */
     async function deliver(carrier, message) {
         const to = message.to.map((recipient) => recipient.address);
-        if (holdOutbound(config, { kind: 'mail', what: message.subject, to })) {
+        if (await holdOutbound(settings, config, { kind: 'mail', what: message.subject, to })) {
             logger.info(`Dev mode held "${message.subject}" to ${to.join(', ')}.`);
             return {
                 ok: true,
@@ -103,53 +106,38 @@ export function createMailService(options) {
             };
         }
         const where = `"${message.subject}" to ${to.join(', ')} via ${carrier.name}`;
-        let lastError = '';
-        for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        const result = await retry({ attempts, backoffMs, wait: options.wait }, async (attempt) => {
             const which = `attempt ${String(attempt)} of ${String(attempts)}`;
+            const sent = {
+                skipped: false,
+                held: false,
+                provider: carrier.name,
+                to,
+                subject: message.subject,
+                attempts: attempt,
+            };
             try {
                 const delivery = await carrier.deliver(message);
                 logger.info(`Sent ${where} (${which}): ${delivery.messageId ?? 'no message id'}`);
-                return {
-                    ok: true,
-                    skipped: false,
-                    held: false,
-                    provider: carrier.name,
-                    to,
-                    subject: message.subject,
-                    attempts: attempt,
-                    ...(delivery.messageId === undefined ? {} : { messageId: delivery.messageId }),
-                };
+                const messageId = delivery.messageId === undefined ? {} : { messageId: delivery.messageId };
+                return { value: { ok: true, ...sent, ...messageId }, retry: false };
             }
             catch (thrown) {
-                lastError = messageOf(thrown);
-                logger.warn(`Could not send ${where} (${which}): ${lastError}`);
-                if (attempt < attempts)
-                    await wait(backoffMs(attempt));
+                const error = messageOf(thrown);
+                logger.warn(`Could not send ${where} (${which}): ${error}`);
+                return { value: { ok: false, ...sent, error }, retry: true };
             }
+        });
+        if (!result.ok) {
+            logger.warn(`Gave up sending ${where} after ${String(attempts)} attempts: ${result.error ?? ''}`);
         }
-        logger.warn(`Gave up sending ${where} after ${String(attempts)} attempts: ${lastError}`);
-        return {
-            ok: false,
-            skipped: false,
-            held: false,
-            provider: carrier.name,
-            to,
-            subject: message.subject,
-            attempts,
-            error: lastError,
-        };
+        return result;
     }
-    /**
-     * The one path both `send` and `sendRaw` take: settle the provider, build
-     * the message, and queue it.
-     *
-     * `build` runs inside the queue rather than before it, so a template read is
-     * one of the things that is serialised — and so a template edited while a
-     * message is waiting is the one that goes out.
-     */
     function queue(to, replyTo, build) {
-        const recipients = addressesOf(to);
-        const carrier = provider();
+        return messages.run(() => send(addressesOf(to), replyTo, build));
+    }
+    async function send(recipients, replyTo, build) {
+        const carrier = await provider();
         if (carrier === undefined) {
             // Not a failure. A site with no mail account is a site whose password
             // resets are done from the shell and whose moderation happens on the
@@ -157,7 +145,7 @@ export function createMailService(options) {
             logger.info(`No mail is configured, so a message to ${recipients
                 .map((recipient) => recipient.address)
                 .join(', ')} was not sent.`);
-            return Promise.resolve({
+            return {
                 ok: true,
                 skipped: true,
                 held: false,
@@ -165,56 +153,54 @@ export function createMailService(options) {
                 to: recipients.map((recipient) => recipient.address),
                 subject: '',
                 attempts: 0,
-            });
+            };
         }
-        return enqueue(async () => {
-            const settings = readSiteSettings(config.contentDir);
-            let body;
-            try {
-                body = build(settings);
-            }
-            catch (thrown) {
-                // A template that will not render is a mistake in this site's own
-                // files, not a provider that refused: there is nothing to retry, and
-                // the message names the file to fix.
-                const error = messageOf(thrown);
-                logger.warn(`Could not build a message for ${recipients.map((r) => r.address).join(', ')}: ${error}`);
-                return {
-                    ok: false,
-                    skipped: false,
-                    held: false,
-                    provider: carrier.name,
-                    to: recipients.map((recipient) => recipient.address),
-                    subject: '',
-                    attempts: 0,
-                    error,
-                };
-            }
-            const answerTo = replyTo === undefined ? replyToIn(settings) : addressOf(replyTo);
-            return await deliver(carrier, {
-                from: from(settings),
-                to: recipients,
-                ...(answerTo === undefined ? {} : { replyTo: answerTo }),
-                subject: body.subject,
-                text: body.text,
-                ...(body.html === undefined ? {} : { html: body.html }),
-            });
+        const site = await settings.values(SITE);
+        let body;
+        try {
+            body = build(siteData.read());
+        }
+        catch (thrown) {
+            // A template that will not render is a mistake in this site's own
+            // files, not a provider that refused: there is nothing to retry, and
+            // the message names the file to fix.
+            const error = messageOf(thrown);
+            logger.warn(`Could not build a message for ${recipients.map((r) => r.address).join(', ')}: ${error}`);
+            return {
+                ok: false,
+                skipped: false,
+                held: false,
+                provider: carrier.name,
+                to: recipients.map((recipient) => recipient.address),
+                subject: '',
+                attempts: 0,
+                error,
+            };
+        }
+        const answerTo = replyTo === undefined ? replyToIn(site) : addressOf(replyTo);
+        return await deliver(carrier, {
+            from: from(site),
+            to: recipients,
+            ...(answerTo === undefined ? {} : { replyTo: answerTo }),
+            subject: body.subject,
+            text: body.text,
+            ...(body.html === undefined ? {} : { html: body.html }),
         });
     }
     return {
-        configured() {
-            return provider() !== undefined;
+        async configured() {
+            return (await provider()) !== undefined;
         },
-        providerName() {
-            return provider()?.name ?? 'none';
+        async providerName() {
+            return (await provider())?.name ?? 'none';
         },
-        from() {
-            return from(readSiteSettings(config.contentDir));
+        async from() {
+            return from(await settings.values(SITE));
         },
         send(message) {
-            return queue(message.to, message.replyTo, (settings) => {
+            return queue(message.to, message.replyTo, (site) => {
                 const rendered = templates.render(message.template, {
-                    site: settings,
+                    site,
                     baseUrl: config.baseUrl,
                     ...message.data,
                 });
@@ -234,14 +220,14 @@ export function createMailService(options) {
                 ...(message.html === undefined ? {} : { html: message.html }),
             }));
         },
-        async settled() {
-            await chain;
+        settled() {
+            return messages.settled();
         },
     };
 }
 /** Where a reply goes, as the settings say it, or nowhere in particular. */
-function replyToIn(settings) {
-    return settings.mailReplyTo === '' ? undefined : { address: settings.mailReplyTo };
+function replyToIn(site) {
+    return site.mail_reply_to === '' ? undefined : { address: site.mail_reply_to };
 }
 /**
  * The address a site sends as when its settings name none: `no-reply@` at the
@@ -272,11 +258,4 @@ function addressesOf(to) {
         return to.map(addressOf);
     return [addressOf(to)];
 }
-/** What a thrown value has to say for itself. */
-function messageOf(thrown) {
-    return thrown instanceof Error ? thrown.message : String(thrown);
-}
-function ignore() {
-    // A failed send is already logged; the queue carries on regardless.
-}
-//# sourceMappingURL=service.js.map
+//# sourceMappingURL=mail-service.js.map

package/dist/notifications/mail-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail-service.js","sourceRoot":"","sources":["../../src/notifications/mail-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,qEAAqE;AACrE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC,sEAAsE;AACtE,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,OAAO,GAAG,OAAO,GAAG,IAAI,CAAC;AAClC,CAAC;AAkID,2CAA2C;AAC3C,MAAM,UAAU,iBAAiB,CAAC,OAAiC;IACjE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IACzC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,IAAI,qBAAqB,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,oBAAoB,CAAC;IAE5D,MAAM,SAAS,GACb,OAAO,CAAC,SAAS;QACjB,mBAAmB,CAAC;YAClB,MAAM,EACJ,OAAO,CAAC,MAAM;gBACd,iBAAiB,CAAC;oBAChB,SAAS,EAAE,MAAM,CAAC,SAAS;oBAC3B,MAAM,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACzC,CAAC;YACJ,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,OAAO,EAAE,MAAM,CAAC,KAAK;SACtB,CAAC,CAAC;IAEL,MAAM,QAAQ,GAAG,iBAAiB,EAAE,CAAC;IAErC;;;;;;;OAOG;IACH,KAAK,UAAU,QAAQ;QACrB,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,QAAQ,CAAC;QAE5D,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,YAAY,KAAK,OAAO,IAAI,WAAW,CAAC,aAAa,KAAK,EAAE,EAAE,CAAC;YACjE,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,YAAY,KAAK,MAAM,IAAI,WAAW,CAAC,SAAS,KAAK,EAAE,EAAE,CAAC;YAC5D,OAAO,kBAAkB,CAAC;gBACxB,IAAI,EAAE,WAAW,CAAC,SAAS;gBAC3B,IAAI,EAAE,WAAW,CAAC,SAAS;gBAC3B,MAAM,EAAE,WAAW,CAAC,WAAW;gBAC/B,IAAI,EAAE,WAAW,CAAC,SAAS;gBAC3B,QAAQ,EAAE,WAAW,CAAC,aAAa;aACpC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,iDAAiD;IACjD,SAAS,IAAI,CAAC,IAAkB;QAC9B,MAAM,OAAO,GACX,IAAI,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC3F,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;QAC3E,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACvD,CAAC;IAED,sEAAsE;IACtE,KAAK,UAAU,OAAO,CAAC,OAAqB,EAAE,OAAqB;QACjE,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YACtF,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvE,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,OAAO,CAAC,IAAI;gBACtB,EAAE;gBACF,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,CAAC;aACZ,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,OAAO,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QAE7E,MAAM,MAAM,GAAG,MAAM,KAAK,CACxB,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAC3C,KAAK,EAAE,OAAO,EAA8B,EAAE;YAC5C,MAAM,KAAK,GAAG,WAAW,MAAM,CAAC,OAAO,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE,OAAO,CAAC,IAAI;gBACtB,EAAE;gBACF,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,OAAO;aAClB,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAChD,MAAM,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,KAAK,MAAM,QAAQ,CAAC,SAAS,IAAI,eAAe,EAAE,CAAC,CAAC;gBAClF,MAAM,SAAS,GACb,QAAQ,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAC5E,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACtE,CAAC;YAAC,OAAO,MAAM,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,kBAAkB,KAAK,KAAK,KAAK,MAAM,KAAK,EAAE,CAAC,CAAC;gBAC5D,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YAC/D,CAAC;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CACT,mBAAmB,KAAK,UAAU,MAAM,CAAC,QAAQ,CAAC,cAAc,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CACrF,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,SAAS,KAAK,CACZ,EAA4C,EAC5C,OAAkC,EAClC,KAAuF;QAEvF,OAAO,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,UAAU,IAAI,CACjB,UAAyB,EACzB,OAAkC,EAClC,KAAuF;QAEvF,MAAM,OAAO,GAAG,MAAM,QAAQ,EAAE,CAAC;QAEjC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,sEAAsE;YACtE,qEAAqE;YACrE,2DAA2D;YAC3D,MAAM,CAAC,IAAI,CACT,0CAA0C,UAAU;iBACjD,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;iBACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAC9B,CAAC;YACF,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE,MAAM;gBAChB,EAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;gBACpD,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,CAAC;aACZ,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,IAAkE,CAAC;QACvE,IAAI,CAAC;YACH,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,kEAAkE;YAClE,qEAAqE;YACrE,qCAAqC;YACrC,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CACT,iCAAiC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CACzF,CAAC;YACF,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,KAAK;gBACX,QAAQ,EAAE,OAAO,CAAC,IAAI;gBACtB,EAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;gBACpD,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,CAAC;gBACX,KAAK;aACN,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE9E,OAAO,MAAM,OAAO,CAAC,OAAO,EAAE;YAC5B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;YAChB,EAAE,EAAE,UAAU;YACd,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;YACxD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,KAAK,CAAC,UAAU;YACd,OAAO,CAAC,MAAM,QAAQ,EAAE,CAAC,KAAK,SAAS,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC,YAAY;YAChB,OAAO,CAAC,MAAM,QAAQ,EAAE,CAAC,EAAE,IAAI,IAAI,MAAM,CAAC;QAC5C,CAAC;QAED,KAAK,CAAC,IAAI;YACR,OAAO,IAAI,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,OAAO;YACV,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACjD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAClD,IAAI;oBACJ,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,GAAG,OAAO,CAAC,IAAI;iBAChB,CAAC,CAAC;gBACH,OAAO;oBACL,+DAA+D;oBAC/D,oEAAoE;oBACpE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACzF,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;iBAChE,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,OAAO;YACb,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC/C,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;aAC9D,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO;YACL,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,SAAS,SAAS,CAAC,IAAkB;IACnC,OAAO,IAAI,CAAC,aAAa,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;AACjF,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC;QACH,OAAO,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,oBAAoB,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,mCAAmC;AACnC,SAAS,SAAS,CAAC,SAAwB;IACzC,OAAO,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC;AAED,yEAAyE;AACzE,SAAS,WAAW,CAAC,EAA4C;IAC/D,IAAI,OAAO,EAAE,KAAK,QAAQ;QAAE,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAAE,OAAQ,EAA+B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9E,OAAO,CAAC,SAAS,CAAC,EAAmB,CAAC,CAAC,CAAC;AAC1C,CAAC"}

package/dist/{mail/templates.d.ts → notifications/mail-templates.d.ts}

@@ -1,5 +1,6 @@
 import type { Environment } from 'nunjucks';
-import type { ThemeSource } from '../web/themes.ts';
+import type { ThemeSource } from '../theme/themes.ts';
+import type { Clock } from '../util/clock.ts';
 /**
  * What a message looks like before it is addressed: a subject, a plain text
  * body, and an HTML twin when the theme wrote one.
@@ -53,6 +54,7 @@ export interface CreateMailTemplatesOptions {
     themes: ThemeSource;
     /** Public origin, for the `url` and `absoluteUrl` filters. */
     baseUrl: string;
+    now: Clock;
     /**
      * Recompile a template on every render instead of caching it. On while the
      * content watcher is on, so editing a message in development shows up
@@ -88,4 +90,4 @@ export interface MailTemplates {
 }
 /** Build the mail templates for one site. */
 export declare function createMailTemplates(options: CreateMailTemplatesOptions): MailTemplates;
-//# sourceMappingURL=templates.d.ts.map
+//# sourceMappingURL=mail-templates.d.ts.map

package/dist/notifications/mail-templates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail-templates.d.ts","sourceRoot":"","sources":["../../src/notifications/mail-templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAI5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;;;;;;;;;;;;GAgBG;AAEH,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAED,qDAAqD;AACrD,MAAM,WAAW,iBAAiB;IAChC,kCAAkC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAMjE;AAED,8CAA8C;AAC9C,MAAM,WAAW,0BAA0B;IACzC;;;;;;;OAOG;IACH,MAAM,EAAE,WAAW,CAAC;IACpB,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC;IACX;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED,4EAA4E;AAC5E,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC;IACtE;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC;;;;;;;;OAQG;IACH,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC;CACxC;AAED,6CAA6C;AAC7C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa,CAoEtF"}

package/dist/{mail/templates.js → notifications/mail-templates.js}

@@ -1,5 +1,5 @@
-import { createTemplateEnvironment, useThemeDirs } from '../web/templates.js';
-import { findThemeFile } from '../web/themes.js';
+import { createTemplateEnvironment, useThemeDirs } from '../theme/templates.js';
+import { findThemeFile } from '../theme/themes.js';
 /** Which files a named message is built from, relative to a theme directory. */
 export function mailTemplateFiles(name) {
     return {
@@ -16,6 +16,7 @@ export function createMailTemplates(options) {
     const environment = createTemplateEnvironment({
         themeDirs: options.themes.current().dirs,
         baseUrl: options.baseUrl,
+        now: options.now,
         ...(options.noCache === undefined ? {} : { noCache: options.noCache }),
     });
     // The same again with autoescaping off, for the two halves of a message that
@@ -24,6 +25,7 @@ export function createMailTemplates(options) {
     const plainEnvironment = createTemplateEnvironment({
         themeDirs: options.themes.current().dirs,
         baseUrl: options.baseUrl,
+        now: options.now,
         autoescape: false,
         ...(options.noCache === undefined ? {} : { noCache: options.noCache }),
     });
@@ -66,4 +68,4 @@ export function createMailTemplates(options) {
         },
     };
 }
-//# sourceMappingURL=templates.js.map
+//# sourceMappingURL=mail-templates.js.map

package/dist/notifications/mail-templates.js.map

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

package/dist/notifications/optouts.d.ts

@@ -21,8 +21,6 @@
  * moment of sending, so the list is the one thing that has to be right, and
  * nothing has to go back and rewrite comment files somebody may have in git.
  */
-/** The file, relative to `dataDir`. */
-export declare const COMMENT_OPTOUTS_FILE = "comment-optouts.json";
 /** Nobody but the site's own user reads it. */
 export declare const COMMENT_OPTOUTS_FILE_MODE = 384;
 /** Where the list lives for a given data directory. */

package/dist/notifications/optouts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optouts.d.ts","sourceRoot":"","sources":["../../src/notifications/optouts.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,uCAAuC;AACvC,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,+CAA+C;AAC/C,eAAO,MAAM,yBAAyB,MAAQ,CAAC;AAE/C,uDAAuD;AACvD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAE/D;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAGtF;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBvF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB1F"}
+{"version":3,"file":"optouts.d.ts","sourceRoot":"","sources":["../../src/notifications/optouts.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,+CAA+C;AAC/C,eAAO,MAAM,yBAAyB,MAAQ,CAAC;AAE/C,uDAAuD;AACvD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAE/D;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAGtF;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBvF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB1F"}

package/dist/notifications/optouts.js

@@ -1,5 +1,5 @@
-import path from 'node:path';
 import { readFileIfPresentSync, updateFileAtomically } from '../files/atomic.js';
+import { COMMENT_OPTOUTS, dataPath } from '../files/data-files.js';
 /**
  * The addresses this site has been told to stop writing to.
  *
@@ -23,13 +23,11 @@ import { readFileIfPresentSync, updateFileAtomically } from '../files/atomic.js'
  * moment of sending, so the list is the one thing that has to be right, and
  * nothing has to go back and rewrite comment files somebody may have in git.
  */
-/** The file, relative to `dataDir`. */
-export const COMMENT_OPTOUTS_FILE = 'comment-optouts.json';
 /** Nobody but the site's own user reads it. */
 export const COMMENT_OPTOUTS_FILE_MODE = 0o600;
 /** Where the list lives for a given data directory. */
 export function commentOptOutsFile(dataDir) {
-    return path.join(dataDir, COMMENT_OPTOUTS_FILE);
+    return dataPath(dataDir, COMMENT_OPTOUTS);
 }
 /**
  * Every address that has asked not to hear any more, folded to lower case.

package/dist/notifications/optouts.js.map

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

package/dist/notifications/tokens.d.ts

@@ -22,8 +22,6 @@
  * deleting one that is gone — whereas forgetting the secret would break every
  * link a site had sent.
  */
-/** Where the signing secret lives, under `dataDir`. */
-export declare const NOTIFICATION_SECRET_FILE = "notification-secret";
 /** What a link is allowed to do, once its signature checks out. */
 export interface NotificationClaim {
     /** Which one-click action this link performs. */
@@ -40,7 +38,7 @@ export interface NewNotificationToken extends NotificationClaim {
     lifetimeSeconds: number;
 }
 /** Mint a signed link token. It is the whole of what the link carries. */
-export declare function signNotificationToken(dataDir: string, claim: NewNotificationToken, now?: Date): string;
+export declare function signNotificationToken(dataDir: string, claim: NewNotificationToken, now: Date): string;
 /**
  * What a token entitles its holder to, or `undefined` when it entitles them to
  * nothing: not a token at all, edited, signed by somebody else, or expired.
@@ -48,7 +46,7 @@ export declare function signNotificationToken(dataDir: string, claim: NewNotific
  * The signature is checked before the payload is believed, so nothing here
  * ever acts on bytes a stranger chose.
  */
-export declare function readNotificationToken(dataDir: string, token: string, now?: Date): NotificationClaim | undefined;
+export declare function readNotificationToken(dataDir: string, token: string, now: Date): NotificationClaim | undefined;
 /**
  * When a token stops working, as an ISO 8601 instant, or `undefined` when it
  * never worked.

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

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/notifications/tokens.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,uDAAuD;AACvD,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAE9D,mEAAmE;AACnE,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,0EAA0E;AAC1E,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,yCAAyC;IACzC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,0EAA0E;AAC1E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,oBAAoB,EAC3B,GAAG,GAAE,IAAiB,GACrB,MAAM,CAOR;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,GAAG,GAAE,IAAiB,GACrB,iBAAiB,GAAG,SAAS,CAwB/B;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAc1F"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/notifications/tokens.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,mEAAmE;AACnE,MAAM,WAAW,iBAAiB;IAChC,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,0EAA0E;AAC1E,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,yCAAyC;IACzC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,0EAA0E;AAC1E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,oBAAoB,EAC3B,GAAG,EAAE,IAAI,GACR,MAAM,CAOR;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,IAAI,GACR,iBAAiB,GAAG,SAAS,CAwB/B;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAc1F"}

package/dist/notifications/tokens.js

@@ -1,34 +1,8 @@
 import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
-import path from 'node:path';
 import { readFileIfPresentSync, writeFileAtomicallySync } from '../files/atomic.js';
-/**
- * The thing that makes a link in an email work without a login.
- *
- * A notification is only worth sending if acting on it is one click. That
- * means the link itself has to carry the authority, and the two ways of doing
- * that are a random string written down somewhere and a signed claim that
- * needs nothing written down. This is the second, for one reason: a link lives
- * in an inbox for a week, and `data/geekity.db` is a cache that a site may
- * legitimately delete, rebuild or restore from a backup at any moment
- * (decision-9). A stack of rows would take every link in flight with it.
- *
- * So the token says what it is for — approve *this* comment, unsubscribe
- * *this* address — and carries an HMAC over exactly that, taken with a secret
- * in `data/notification-secret`. Nothing but the secret is needed to check
- * one, the claim cannot be edited without breaking the signature, and a token
- * signed by one site means nothing to another.
- *
- * What is *not* in the token is the right to be used twice. That is a row in
- * the cache (`spent_tokens`), and it is deliberately the half that a lost
- * database forgets: forgetting that a link was spent re-enables an action that
- * has already happened and is idempotent — approving an approved comment, or
- * deleting one that is gone — whereas forgetting the secret would break every
- * link a site had sent.
- */
-/** Where the signing secret lives, under `dataDir`. */
-export const NOTIFICATION_SECRET_FILE = 'notification-secret';
+import { NOTIFICATION_SECRET, dataPath } from '../files/data-files.js';
 /** Mint a signed link token. It is the whole of what the link carries. */
-export function signNotificationToken(dataDir, claim, now = new Date()) {
+export function signNotificationToken(dataDir, claim, now) {
     const expiresAt = Math.floor(now.getTime() / 1000) + claim.lifetimeSeconds;
     const payload = Buffer.from(JSON.stringify({ a: claim.action, s: claim.subject, x: expiresAt })).toString('base64url');
     return `${payload}.${sign(dataDir, payload)}`;
@@ -40,7 +14,7 @@ export function signNotificationToken(dataDir, claim, now = new Date()) {
  * The signature is checked before the payload is believed, so nothing here
  * ever acts on bytes a stranger chose.
  */
-export function readNotificationToken(dataDir, token, now = new Date()) {
+export function readNotificationToken(dataDir, token, now) {
     const [payload, signature] = token.split('.');
     if (payload === undefined || signature === undefined || payload === '')
         return undefined;
@@ -114,7 +88,7 @@ function matches(expected, given) {
  * every link a site has sent and costs nothing else.
  */
 function notificationSecret(dataDir) {
-    const file = path.join(dataDir, NOTIFICATION_SECRET_FILE);
+    const file = dataPath(dataDir, NOTIFICATION_SECRET);
     const held = readFileIfPresentSync(file)?.trim();
     if (held !== undefined && held !== '')
         return held;

package/dist/notifications/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/notifications/tokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/notifications/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AA4CvE,0EAA0E;AAC1E,MAAM,UAAU,qBAAqB,CACnC,OAAe,EACf,KAA2B,EAC3B,GAAS;IAET,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,eAAe,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CACpE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAExB,OAAO,GAAG,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;AAChD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACnC,OAAe,EACf,KAAa,EACb,GAAS;IAET,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACzF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAElE,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAE7F,MAAM,KAAK,GAAG,MAAiC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IAClE,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACpE,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IACnF,IAAI,SAAS,GAAG,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE;QAAE,OAAO,SAAS,CAAC;IAExD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,KAAa;IACpE,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACvE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACvF,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACpE,MAAM,OAAO,GAAI,MAAkC,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,OAAO,SAAS,CAAC;QAC/E,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,SAAS,IAAI,CAAC,OAAe,EAAE,OAAe;IAC5C,OAAO,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/F,CAAC;AAED,+EAA+E;AAC/E,SAAS,OAAO,CAAC,QAAgB,EAAE,KAAa;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACtE,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,kBAAkB,CAAC,OAAe;IACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACjD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAEnD,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/C,uBAAuB,CAAC,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/notify.d.ts

@@ -1,4 +1,5 @@
 import type { ResolvedConfig } from './config.ts';
+import type { SettingsRegistry } from './settings/types.ts';
 import type { DocumentChange } from './content/sync.ts';
 /**
  * How long one ping is given before it is abandoned.
@@ -34,7 +35,8 @@ export interface CreateFeedNotifierOptions {
      * scheduled post is held against, and the content directory the settings —
      * the notify server and the two archive bases — are read from.
      */
-    config: Pick<ResolvedConfig, 'baseUrl' | 'contentDir' | 'dataDir' | 'devMode' | 'now'>;
+    config: Pick<ResolvedConfig, 'baseUrl' | 'contentDir' | 'dataDir' | 'now'>;
+    settings: SettingsRegistry;
     /** Where failures are reported. Defaults to `console`. */
     logger?: NotifyLogger | undefined;
 }
@@ -69,7 +71,7 @@ export interface FeedNotifier {
      * the post carried before or after it. Absolute, deduplicated, and empty
      * when the change moved no feed at all.
      */
-    feedsFor(change: DocumentChange): string[];
+    feedsFor(change: DocumentChange): Promise<string[]>;
     /** Resolve once every queued ping has finished, however it finished. */
     settled(): Promise<void>;
 }

package/dist/notify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notify.d.ts","sourceRoot":"","sources":["../src/notify.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAUxD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAS,CAAC;AAExC,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,0CAA0C;IAC1C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,yDAAyD;AACzD,MAAM,WAAW,YAAY;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;CACvC;AAED,wEAAwE;AACxE,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,6CAA6C;AAC7C,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;IACvF,0DAA0D;IAC1D,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACvD;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,EAAE,CAAC;IAC3C,wEAAwE;IACxE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,CAwGnF"}
+{"version":3,"file":"notify.d.ts","sourceRoot":"","sources":["../src/notify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAaxD;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAS,CAAC;AAExC,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,0CAA0C;IAC1C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,yDAAyD;AACzD,MAAM,WAAW,YAAY;IAC3B,0EAA0E;IAC1E,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;CACvC;AAED,wEAAwE;AACxE,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,6CAA6C;AAC7C,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GAAG,KAAK,CAAC,CAAC;IAC3E,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,0DAA0D;IAC1D,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACvD;;;;;;;OAOG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACpD,wEAAwE;IACxE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,YAAY,CAwGnF"}