@geekity/cms 0.29.0 → 0.31.0

package/dist/maintenance.d.ts

@@ -1,4 +1,4 @@
-import type { Clock } from './content/store.ts';
+import type { Clock } from './util/clock.ts';
 /**
  * Maintenance mode (TASK-130) is a file, `data/maintenance.json`, that the
  * running site checks for and `geekity maintenance on` and `off` write and

package/dist/maintenance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maintenance.d.ts","sourceRoot":"","sources":["../src/maintenance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAKnD,iFAAiF;AACjF,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,uEAAuE;AACvE,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE;IAAE,KAAK,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAAO,GACxC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,yDAAyD;AACzD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAI9E;AAeD,qFAAqF;AACrF,MAAM,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAEpE;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC;CACZ,GAAG,iBAAiB,CAYpB"}
+{"version":3,"file":"maintenance.d.ts","sourceRoot":"","sources":["../src/maintenance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAG7C;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AAKnD,iFAAiF;AACjF,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,IAAI,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,uEAAuE;AACvE,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE;IAAE,KAAK,CAAC,EAAE,IAAI,GAAG,SAAS,CAAA;CAAO,GACxC,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,yDAAyD;AACzD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAI9E;AAeD,qFAAqF;AACrF,MAAM,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,GAAG,SAAS,CAAC;AAEpE;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,KAAK,CAAC;CACZ,GAAG,iBAAiB,CAYpB"}

package/dist/media/library.d.ts

@@ -0,0 +1,99 @@
+import type { UploadKind } from '../content/media.ts';
+import type { AltText } from '../content/alt-text.ts';
+/** One file under `content/uploads/`, as the screen shows it. */
+export interface MediaFile {
+    /**
+     * Where it is under `content/uploads/`, with `/` separators — `2026/09/a.png`.
+     * This is the file's identity: it is what the delete form carries, and what
+     * a variant directory would mirror.
+     */
+    path: string;
+    /** The public URL the site serves it at. */
+    url: string;
+    /** The last segment of {@link MediaFile.path}. */
+    name: string;
+    /** Its extension, lower case, with the dot. Empty when it has none. */
+    extension: string;
+    /** How big it is, in bytes. */
+    bytes: number;
+    /** When it last changed, as an ISO 8601 instant, which is what sorts the list. */
+    modified: string;
+    /**
+     * What it is for, from its extension: an image row shows a thumbnail and an
+     * alt-text field, and an audio or video file can be a post's enclosure.
+     * Unset for a file whose extension the CMS does not know.
+     */
+    kind: UploadKind | undefined;
+    /** What the library says an image is, from `content/_data/media.json`. Unset when nothing has been said. */
+    alt: AltText | undefined;
+    /** The Markdown for it: an embed with its alt text for an image, a link for anything else. */
+    markdown: string;
+}
+/**
+ * Every file under `content/uploads/`, newest first.
+ *
+ * Recursive, because uploads land under `{yyyy}/{mm}/`, and a site that has
+ * been copying files in by hand may have any shape at all under there. The
+ * order is by modification time rather than by the dated path: the path is
+ * only a hint about when a file arrived, and a file dropped in by hand may
+ * have no dated path to read.
+ *
+ * A directory that does not exist yet is an empty library rather than an
+ * error — a site that has never uploaded anything has no `uploads/`.
+ */
+export declare function listUploads(contentDir: string): Promise<MediaFile[]>;
+/** One upload as the screen shows it, from what a directory walk knows. */
+export declare function describeUpload(relative: string, bytes: number, modified: Date, alt?: AltText): MediaFile;
+/**
+ * Whether a body points at an upload URL.
+ *
+ * A substring search with one guard on the end of it: `/uploads/a.png` must not
+ * count as a mention of `/uploads/a.pn`, and `/uploads/logo.png` must not count
+ * as a mention of `/uploads/logo`. Anything that could still be part of the
+ * same filename disqualifies the match; a quote, a bracket, a space or the end
+ * of the body ends it.
+ *
+ * Deliberately blind to whether the mention is Markdown, HTML or prose. All
+ * three break when the file goes, and a warning that only understood
+ * `![](…)` would be a warning that missed most of them.
+ */
+export declare function mentionsUpload(body: string, url: string): boolean;
+/** What {@link deleteUpload} needs to take a file away. */
+export interface DeleteUploadOptions {
+    /** The site's content directory. */
+    contentDir: string;
+    /** The file, as a path under `content/uploads/` with `/` separators. */
+    path: string;
+    /**
+     * Take the file's derived files with it.
+     *
+     * The original under `content/uploads/` is the only source of truth
+     * (decision-10); the image variants beside it are derived, and derived state
+     * that outlives what it was derived from is rubbish nobody will ever clean
+     * up. The hook is passed the same content-relative path, is awaited before
+     * the delete reports success, and is expected to be forgiving: a file with
+     * no variants at all is the normal case.
+     */
+    removeDerived?: RemoveDerived | undefined;
+}
+/** Takes an upload's derived files away with it. See {@link DeleteUploadOptions.removeDerived}. */
+export type RemoveDerived = (uploadPath: string) => Promise<void>;
+/**
+ * Delete one upload, and whatever was derived from it.
+ *
+ * Returns `false` when there was no such file, which is what a second click on
+ * a Delete button on a stale page is, rather than throwing: the end state the
+ * admin asked for is the end state they have.
+ */
+export declare function deleteUpload(options: DeleteUploadOptions): Promise<boolean>;
+/**
+ * A submitted path as an absolute file under `content/uploads/`, or
+ * `undefined` when it is not one.
+ *
+ * The path arrives in a form, so it is an attacker's string as much as an
+ * admin's. Containment is checked after resolution rather than by inspecting
+ * the string, so `..`, an encoded one, or an absolute path cannot slip past —
+ * the same rule {@link findAsset} applies to a request for a file.
+ */
+export declare function resolveUpload(contentDir: string, relative: string): string | undefined;
+//# sourceMappingURL=library.d.ts.map

package/dist/media/library.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../src/media/library.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAItD,iEAAiE;AACjE,MAAM,WAAW,SAAS;IACxB;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,4GAA4G;IAC5G,GAAG,EAAE,OAAO,GAAG,SAAS,CAAC;IACzB,8FAA8F;IAC9F,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CA0C1E;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,IAAI,EACd,GAAG,CAAC,EAAE,OAAO,GACZ,SAAS,CA0BX;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAMjE;AAKD,2DAA2D;AAC3D,MAAM,WAAW,mBAAmB;IAClC,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CAC3C;AAED,mGAAmG;AACnG,MAAM,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBjF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOtF"}

package/dist/media/library.js

@@ -0,0 +1,157 @@
+import { readdir, stat, unlink } from 'node:fs/promises';
+import path from 'node:path';
+import { UPLOAD_MEDIA_TYPES } from '../content/media.js';
+import { UPLOAD_ASSET_PREFIX, UPLOAD_DIRECTORY } from '../content/uploads.js';
+import { readAltTexts, writeAltText } from '../content/alt-text.js';
+import { CITED_PICTURE_DIRECTORY } from '../webmention/cited-picture.js';
+import { uploadMarkdown } from './uploads.js';
+/**
+ * Every file under `content/uploads/`, newest first.
+ *
+ * Recursive, because uploads land under `{yyyy}/{mm}/`, and a site that has
+ * been copying files in by hand may have any shape at all under there. The
+ * order is by modification time rather than by the dated path: the path is
+ * only a hint about when a file arrived, and a file dropped in by hand may
+ * have no dated path to read.
+ *
+ * A directory that does not exist yet is an empty library rather than an
+ * error — a site that has never uploaded anything has no `uploads/`.
+ */
+export async function listUploads(contentDir) {
+    const root = path.join(contentDir, UPLOAD_DIRECTORY);
+    let entries;
+    try {
+        entries = await readdir(root, { recursive: true, withFileTypes: true });
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return [];
+        throw error;
+    }
+    const library = readAltTexts(contentDir);
+    const found = [];
+    for (const entry of entries) {
+        if (!entry.isFile())
+            continue;
+        // Hidden files are the operating system's business, not the site's:
+        // .DS_Store is not something anybody uploaded or wants to link to.
+        if (entry.name.startsWith('.'))
+            continue;
+        const file = path.join(entry.parentPath, entry.name);
+        const relative = path.relative(root, file).split(path.sep).join('/');
+        if (relative.startsWith(`${CITED_PICTURE_DIRECTORY}/`))
+            continue;
+        let stats;
+        try {
+            stats = await stat(file);
+        }
+        catch {
+            // It went away between the walk and the stat. Nothing to show.
+            continue;
+        }
+        found.push(describeUpload(relative, stats.size, stats.mtime, library.get(relative)));
+    }
+    // Newest first, and by path when two files share a timestamp, so a page of
+    // files copied in together has a stable order rather than the readdir one.
+    found.sort((left, right) => left.modified === right.modified
+        ? right.path.localeCompare(left.path)
+        : right.modified.localeCompare(left.modified));
+    return found;
+}
+/** One upload as the screen shows it, from what a directory walk knows. */
+export function describeUpload(relative, bytes, modified, alt) {
+    const name = relative.slice(relative.lastIndexOf('/') + 1);
+    const extension = path.extname(name).toLowerCase();
+    const kind = UPLOAD_MEDIA_TYPES.get(extension)?.kind;
+    const image = kind === 'image';
+    const url = `${UPLOAD_ASSET_PREFIX}${relative}`;
+    return {
+        path: relative,
+        url,
+        name,
+        extension,
+        bytes,
+        modified: modified.toISOString(),
+        kind,
+        alt: image ? alt : undefined,
+        // The same Markdown the editor's upload control pastes, from the same
+        // function, so a file linked from the media screen and the same file
+        // linked from the editor are written identically.
+        markdown: uploadMarkdown({
+            url,
+            label: name.slice(0, name.length - extension.length),
+            image,
+            alt,
+        }),
+    };
+}
+/**
+ * Whether a body points at an upload URL.
+ *
+ * A substring search with one guard on the end of it: `/uploads/a.png` must not
+ * count as a mention of `/uploads/a.pn`, and `/uploads/logo.png` must not count
+ * as a mention of `/uploads/logo`. Anything that could still be part of the
+ * same filename disqualifies the match; a quote, a bracket, a space or the end
+ * of the body ends it.
+ *
+ * Deliberately blind to whether the mention is Markdown, HTML or prose. All
+ * three break when the file goes, and a warning that only understood
+ * `![](…)` would be a warning that missed most of them.
+ */
+export function mentionsUpload(body, url) {
+    for (let at = body.indexOf(url); at !== -1; at = body.indexOf(url, at + 1)) {
+        const next = body[at + url.length];
+        if (next === undefined || !FILENAME_CHARACTER.test(next))
+            return true;
+    }
+    return false;
+}
+/** Characters that could still be part of the filename a match landed in. */
+const FILENAME_CHARACTER = /[A-Za-z0-9._~-]/;
+/**
+ * Delete one upload, and whatever was derived from it.
+ *
+ * Returns `false` when there was no such file, which is what a second click on
+ * a Delete button on a stale page is, rather than throwing: the end state the
+ * admin asked for is the end state they have.
+ */
+export async function deleteUpload(options) {
+    const file = resolveUpload(options.contentDir, options.path);
+    if (file === undefined)
+        return false;
+    try {
+        await unlink(file);
+    }
+    catch (error) {
+        if (error.code !== 'ENOENT')
+            throw error;
+        return false;
+    }
+    // After the original, so a hook that throws leaves a file with stale
+    // variants rather than variants with no file: the first is repairable by
+    // regenerating, the second is orphaned bytes.
+    await options.removeDerived?.(options.path);
+    if (readAltTexts(options.contentDir).has(options.path)) {
+        await writeAltText(options.contentDir, options.path, undefined);
+    }
+    return true;
+}
+/**
+ * A submitted path as an absolute file under `content/uploads/`, or
+ * `undefined` when it is not one.
+ *
+ * The path arrives in a form, so it is an attacker's string as much as an
+ * admin's. Containment is checked after resolution rather than by inspecting
+ * the string, so `..`, an encoded one, or an absolute path cannot slip past —
+ * the same rule {@link findAsset} applies to a request for a file.
+ */
+export function resolveUpload(contentDir, relative) {
+    if (relative === '' || relative.includes('\0'))
+        return undefined;
+    const root = path.resolve(contentDir, UPLOAD_DIRECTORY);
+    const file = path.resolve(root, relative);
+    if (!file.startsWith(root + path.sep))
+        return undefined;
+    return file;
+}
+//# sourceMappingURL=library.js.map

package/dist/media/library.js.map

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

package/dist/media/uploads.d.ts

@@ -0,0 +1,106 @@
+import type { ResolvedConfig } from '../config.ts';
+import type { UploadMediaType } from '../content/media.ts';
+import type { AltText } from '../content/alt-text.ts';
+import type { ImageConfig } from '../images/variants.ts';
+/** The form field the file arrives in. */
+export declare const UPLOAD_FIELD = "file";
+/**
+ * Slack allowed on top of the size limit when a `Content-Length` is checked.
+ *
+ * A multipart body is the file plus a boundary, a couple of headers and a
+ * trailing marker. Nobody wants a 9.99 MiB image refused because its envelope
+ * pushed the request over ten, so the header check is deliberately generous
+ * and {@link storeUpload} does the exact one on the file itself.
+ */
+export declare const UPLOAD_ENVELOPE_BYTES = 8192;
+/**
+ * The part of the config the upload rules are read out of.
+ *
+ * It carries the image settings as well as the upload ones because storing a
+ * picture and deriving its variants is one act: an upload whose variants were
+ * generated later, or by whichever screen remembered to ask, would be an
+ * upload that is responsive on some pages and not on others.
+ */
+export type UploadConfig = Pick<ResolvedConfig, 'contentDir' | 'uploadTypes' | 'uploadMaxBytes' | 'uploadMediaMaxBytes' | 'now'> & ImageConfig;
+/** One file that has landed under `content/uploads/`. */
+export interface StoredUpload {
+    /** The public URL of the file, which the site serves straight away. */
+    url: string;
+    /** What the CMS decided the file is; `media.kind` says what it is for. */
+    media: UploadMediaType;
+    /** The submitted name without its extension, for the text of a link to it. */
+    label: string;
+}
+/** Why an upload was refused, and the status that refusal answers with. */
+export interface UploadRefusal {
+    /** 400 for a request carrying no file, 413 for one too big, 415 for one of the wrong sort. */
+    status: 400 | 413 | 415;
+    /** What to tell whoever sent it. */
+    error: string;
+}
+/** What a caller may ask of an upload beyond the site's own rules. */
+export interface StoreUploadOptions {
+    /**
+     * Refuse anything that is not an image, whatever else the site's allowlist
+     * accepts. The avatar asks for this: a PDF is a fine upload and a hopeless
+     * profile picture.
+     */
+    imagesOnly?: boolean | undefined;
+}
+/** Whether an upload came to a refusal rather than a stored file. */
+export declare function refusedUpload<Accepted extends object>(outcome: Accepted | UploadRefusal): outcome is UploadRefusal;
+/**
+ * Validate one submitted file and write it under
+ * `content/uploads/{yyyy}/{mm}/{slug}{ext}`, or say why it cannot be.
+ *
+ * Three things have to agree before anything is written — the extension is on
+ * the site's allowlist, the media type the browser declared is one that
+ * extension is allowed to have, and the file's first bytes are that format's.
+ * A name is never overwritten; a second `photo.png` becomes `photo-2.png`.
+ *
+ * It is a function rather than part of the endpoint because the editor's
+ * uploads and the settings screen's avatar are the same rules over the same
+ * directory, and two copies of them would be two chances to disagree about
+ * what a site accepts.
+ */
+export declare function storeUpload(file: unknown, config: UploadConfig, options?: StoreUploadOptions): Promise<StoredUpload | UploadRefusal>;
+export interface AcceptedUpload {
+    extension: string;
+    media: UploadMediaType;
+    bytes: Uint8Array;
+}
+export declare function acceptUpload(name: string, declared: string, bytes: Uint8Array, config: Pick<UploadConfig, 'uploadTypes' | 'uploadMaxBytes' | 'uploadMediaMaxBytes'>, options?: StoreUploadOptions): AcceptedUpload | UploadRefusal;
+/**
+ * The largest file of this kind a site accepts: audio and video have a limit
+ * of their own, since an episode is far bigger than any picture.
+ */
+export declare function uploadLimit(media: UploadMediaType, config: Pick<ResolvedConfig, 'uploadMaxBytes' | 'uploadMediaMaxBytes'>): number;
+/**
+ * The most any upload may weigh. The headers do not say what a file is, so a
+ * check made before reading it can only hold it to the larger limit, and
+ * {@link storeUpload} holds each file to its own once it knows.
+ */
+export declare function largestUploadLimit(config: Pick<ResolvedConfig, 'uploadMaxBytes' | 'uploadMediaMaxBytes'>): number;
+/** What {@link uploadMarkdown} writes a link for. */
+export interface UploadMarkdownOptions {
+    /** The public URL of the file. */
+    url: string;
+    /** What a link says: the submitted name without its extension. Never an image's alt text. */
+    label: string;
+    /** Whether the Markdown is an embed rather than a link. */
+    image: boolean;
+    /** The library's alt text for an image. None, or decorative, embeds it with an empty one. */
+    alt?: AltText | undefined;
+}
+/**
+ * The Markdown for one upload: an embed for an image, a link for anything else.
+ *
+ * It is a function of its own because the editor's upload control is no longer
+ * the only thing that offers it — the media screen hands out the same line for
+ * a file uploaded months ago — and a picture that embedded from one screen and
+ * linked from the other would be a difference nobody could explain.
+ */
+export declare function uploadMarkdown(options: UploadMarkdownOptions): string;
+/** What an upload over the site's limit is told, and the limit it went over. */
+export declare function tooLargeMessage(limit: number): string;
+//# sourceMappingURL=uploads.d.ts.map

package/dist/media/uploads.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/media/uploads.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,0CAA0C;AAC1C,eAAO,MAAM,YAAY,SAAS,CAAC;AAEnC;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,cAAc,EACd,YAAY,GAAG,aAAa,GAAG,gBAAgB,GAAG,qBAAqB,GAAG,KAAK,CAChF,GACC,WAAW,CAAC;AAEd,yDAAyD;AACzD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,KAAK,EAAE,eAAe,CAAC;IACvB,8EAA8E;IAC9E,KAAK,EAAE,MAAM,CAAC;CACf;AAED,2EAA2E;AAC3E,MAAM,WAAW,aAAa;IAC5B,8FAA8F;IAC9F,MAAM,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IACxB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,sEAAsE;AACtE,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAClC;AAED,qEAAqE;AACrE,wBAAgB,aAAa,CAAC,QAAQ,SAAS,MAAM,EACnD,OAAO,EAAE,QAAQ,GAAG,aAAa,GAChC,OAAO,IAAI,aAAa,CAE1B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,YAAY,GAAG,aAAa,CAAC,CA0CvC;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,aAAa,GAAG,gBAAgB,GAAG,qBAAqB,CAAC,EACpF,OAAO,GAAE,kBAAuB,GAC/B,cAAc,GAAG,aAAa,CA+ChC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GACrE,MAAM,CAIR;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GACrE,MAAM,CAER;AA2BD,qDAAqD;AACrD,MAAM,WAAW,qBAAqB;IACpC,kCAAkC;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,6FAA6F;IAC7F,KAAK,EAAE,MAAM,CAAC;IACd,2DAA2D;IAC3D,KAAK,EAAE,OAAO,CAAC;IACf,6FAA6F;IAC7F,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAMrE;AAED,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD"}

package/dist/media/uploads.js

@@ -0,0 +1,192 @@
+import { mkdir, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { matchesSignature, UPLOAD_MEDIA_TYPES } from '../content/media.js';
+import { stripMetadata, UnreadableMetadataError } from '../content/metadata/index.js';
+import { slugify } from '../content/slug.js';
+import { UPLOAD_ASSET_PREFIX, UPLOAD_DIRECTORY } from '../content/uploads.js';
+import { generateImageVariants } from '../images/variants.js';
+import { messageOf } from '../util/errors.js';
+/** The form field the file arrives in. */
+export const UPLOAD_FIELD = 'file';
+/**
+ * Slack allowed on top of the size limit when a `Content-Length` is checked.
+ *
+ * A multipart body is the file plus a boundary, a couple of headers and a
+ * trailing marker. Nobody wants a 9.99 MiB image refused because its envelope
+ * pushed the request over ten, so the header check is deliberately generous
+ * and {@link storeUpload} does the exact one on the file itself.
+ */
+export const UPLOAD_ENVELOPE_BYTES = 8192;
+/** Whether an upload came to a refusal rather than a stored file. */
+export function refusedUpload(outcome) {
+    return 'error' in outcome;
+}
+/**
+ * Validate one submitted file and write it under
+ * `content/uploads/{yyyy}/{mm}/{slug}{ext}`, or say why it cannot be.
+ *
+ * Three things have to agree before anything is written — the extension is on
+ * the site's allowlist, the media type the browser declared is one that
+ * extension is allowed to have, and the file's first bytes are that format's.
+ * A name is never overwritten; a second `photo.png` becomes `photo-2.png`.
+ *
+ * It is a function rather than part of the endpoint because the editor's
+ * uploads and the settings screen's avatar are the same rules over the same
+ * directory, and two copies of them would be two chances to disagree about
+ * what a site accepts.
+ */
+export async function storeUpload(file, config, options = {}) {
+    if (!(file instanceof File)) {
+        return { status: 400, error: 'That upload carried no file.' };
+    }
+    const original = baseName(file.name);
+    const accepted = acceptUpload(original, declaredType(file.type), new Uint8Array(await file.arrayBuffer()), config, options);
+    if (refusedUpload(accepted))
+        return accepted;
+    const { extension, media, bytes: clean } = accepted;
+    const now = config.now();
+    const month = `${String(now.getUTCFullYear()).padStart(4, '0')}/${String(now.getUTCMonth() + 1).padStart(2, '0')}`;
+    const directory = path.join(config.contentDir, UPLOAD_DIRECTORY, ...month.split('/'));
+    await mkdir(directory, { recursive: true });
+    const stem = slugify(original.slice(0, original.length - extension.length)) || 'upload';
+    const name = await writeWithoutOverwriting(directory, stem, extension, clean);
+    // Derived immediately rather than on first sight in a page, so the encoding
+    // is paid for by whoever uploaded the file and not by whoever reads the
+    // post. A format with nothing to derive — a GIF, a PDF, a text file — comes
+    // straight back (decision-10), and a failure is reported and swallowed: a
+    // stored file with no variants is a site that serves the original, which is
+    // what it did before this feature existed.
+    try {
+        await generateImageVariants(config, `${month}/${name}`);
+    }
+    catch (error) {
+        const message = messageOf(error);
+        console.warn(`Stored ${month}/${name} but could not derive its variants: ${message}`);
+    }
+    return {
+        url: `${UPLOAD_ASSET_PREFIX}${month}/${name}`,
+        media,
+        label: original.slice(0, original.length - extension.length).trim() || name,
+    };
+}
+export function acceptUpload(name, declared, bytes, config, options = {}) {
+    const extension = path.extname(name).toLowerCase();
+    if (!config.uploadTypes.includes(extension)) {
+        const allowed = config.uploadTypes.join(', ');
+        return {
+            status: 415,
+            error: extension === ''
+                ? `That file has no extension, so there is no telling what it is. This site accepts ${allowed}.`
+                : `Uploads of ${extension} are not allowed here. This site accepts ${allowed}.`,
+        };
+    }
+    // Guaranteed by resolveConfig, which refuses an allowlist naming anything
+    // the table has no entry for.
+    const media = UPLOAD_MEDIA_TYPES.get(extension);
+    if (options.imagesOnly === true && media.kind !== 'image') {
+        return { status: 415, error: `A ${extension} is not an image, and this has to be one.` };
+    }
+    if (declared !== '' && !media.declared.includes(declared)) {
+        return {
+            status: 415,
+            error: `That file says it is ${declared}, which is not what a ${extension} is.`,
+        };
+    }
+    const limit = uploadLimit(media, config);
+    if (bytes.byteLength > limit) {
+        return { status: 413, error: tooLargeMessage(limit) };
+    }
+    if (!matchesSignature(media, bytes)) {
+        return { status: 415, error: `That file does not look like a ${extension} inside.` };
+    }
+    try {
+        return { extension, media, bytes: stripMetadata(extension, bytes).bytes };
+    }
+    catch (error) {
+        if (!(error instanceof UnreadableMetadataError))
+            throw error;
+        return {
+            status: 415,
+            error: `${error.message} Its location and camera details could not be removed, so it was not stored.`,
+        };
+    }
+}
+/**
+ * The largest file of this kind a site accepts: audio and video have a limit
+ * of their own, since an episode is far bigger than any picture.
+ */
+export function uploadLimit(media, config) {
+    return media.kind === 'audio' || media.kind === 'video'
+        ? config.uploadMediaMaxBytes
+        : config.uploadMaxBytes;
+}
+/**
+ * The most any upload may weigh. The headers do not say what a file is, so a
+ * check made before reading it can only hold it to the larger limit, and
+ * {@link storeUpload} holds each file to its own once it knows.
+ */
+export function largestUploadLimit(config) {
+    return Math.max(config.uploadMaxBytes, config.uploadMediaMaxBytes);
+}
+/**
+ * Write the bytes under the first name in the directory that is free.
+ *
+ * The exclusive flag is what makes "free" true rather than merely true a
+ * moment ago: two uploads of `photo.png` racing each other both ask for the
+ * same name, one of them gets `EEXIST`, and it moves on to `photo-2.png`
+ * instead of overwriting what the other just wrote.
+ */
+async function writeWithoutOverwriting(directory, stem, extension, bytes) {
+    for (let suffix = 1;; suffix += 1) {
+        const name = suffix === 1 ? `${stem}${extension}` : `${stem}-${String(suffix)}${extension}`;
+        try {
+            await writeFile(path.join(directory, name), bytes, { flag: 'wx' });
+            return name;
+        }
+        catch (error) {
+            if (error.code !== 'EEXIST')
+                throw error;
+        }
+    }
+}
+/**
+ * The Markdown for one upload: an embed for an image, a link for anything else.
+ *
+ * It is a function of its own because the editor's upload control is no longer
+ * the only thing that offers it — the media screen hands out the same line for
+ * a file uploaded months ago — and a picture that embedded from one screen and
+ * linked from the other would be a difference nobody could explain.
+ */
+export function uploadMarkdown(options) {
+    if (!options.image)
+        return `[${escapeLabel(options.label)}](${options.url})`;
+    // A file name is not a description (TASK-141): an image with no alt text in
+    // the library is embedded with none, and publishing it says so.
+    const alt = options.alt?.kind === 'described' ? escapeLabel(options.alt.text) : '';
+    return `![${alt}](${options.url})`;
+}
+/** What an upload over the site's limit is told, and the limit it went over. */
+export function tooLargeMessage(limit) {
+    return `That file is too big. This site accepts uploads up to ${String(limit)} bytes.`;
+}
+/**
+ * The last segment of a submitted filename.
+ *
+ * A browser sends a bare name, but a request is not a browser: anything with a
+ * path in it is reduced to its final component, so a name cannot be used to
+ * choose a directory. Both separators are cut, because a Windows client sends
+ * backslashes.
+ */
+function baseName(value) {
+    const segments = value.split(/[\\/]/);
+    return segments[segments.length - 1] ?? '';
+}
+/** A `Content-Type` header without its parameters, lower case. */
+function declaredType(value) {
+    return (value.split(';')[0] ?? '').trim().toLowerCase();
+}
+/** A filename as Markdown link text: the three characters that would break out. */
+function escapeLabel(value) {
+    return value.replace(/([\\[\]])/g, '\\$1');
+}
+//# sourceMappingURL=uploads.js.map

package/dist/media/uploads.js.map

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

package/dist/micropub/content.js

@@ -1,7 +1,7 @@
 import TurndownService from 'turndown';
 import { htmlInlineOffset, markdownTokens } from '../content/markdown.js';
 import { normalizeBody } from '../content/writer.js';
-import { cleanPostHtml } from '../web/sanitize.js';
+import { cleanPostHtml } from '../content/sanitize.js';
 /**
  * A Micropub client's content as the post body the site stores (TASK-258,
  * decision-27). The renderer passes raw HTML through, as Eleventy's does, so