@warlock.js/core 5.30.0 → 5.32.0

package/esm/http/uploads/trim-image-variant-cache.mjs

@@ -0,0 +1,193 @@
+import { variantCacheGenerations } from "./image-variant-cache-entries.mjs";
+import { log } from "@warlock.js/logger";
+import fs from "node:fs/promises";
+
+//#region ../../packages/core/src/http/uploads/trim-image-variant-cache.ts
+const SWEEP_INTERVAL_MS = 6e4;
+/**
+* A writer's temporary file older than this is an orphan left by a crashed
+* write and is removed by the sweep. Younger ones are never touched: a writer
+* may still be renaming them into place.
+*/
+const ORPHAN_TEMP_AGE_MS = 36e5;
+/**
+* A generation directory left without derivatives is removed only when it
+* was last changed longer ago than this, so a directory a writer has just
+* created for its first derivative survives. The writers also retry once when
+* their directory vanishes between `mkdir` and the rename.
+*/
+const EMPTY_GENERATION_GRACE_MS = 3e5;
+const caches = /* @__PURE__ */ new Map();
+function cacheState(directory) {
+	let state = caches.get(directory);
+	if (!state) {
+		state = {
+			lastSweep: 0,
+			lastWalk: 0,
+			bytes: 0,
+			sizes: /* @__PURE__ */ new Map(),
+			keep: /* @__PURE__ */ new Set(),
+			reconciled: false
+		};
+		caches.set(directory, state);
+	}
+	return state;
+}
+function errorCode(error) {
+	return error?.code;
+}
+/** Age is measured from generation; hits do not extend a derivative's life. */
+async function freshImageVariant(target, maxAgeSeconds) {
+	try {
+		const stats = await fs.stat(target);
+		return stats.isFile() && Date.now() - stats.mtimeMs < maxAgeSeconds * 1e3;
+	} catch (error) {
+		if (errorCode(error) === "ENOENT") return false;
+		throw error;
+	}
+}
+/**
+* Whether a scheduled check must walk the cache. It may skip only when a walk
+* has already reconciled the byte estimate, the cache is within its byte
+* budget, nothing retained has expired (new writes are always younger than
+* the oldest retained derivative), and a walk ran within the last
+* `maxCacheAge`, which also bounds how long an orphaned temporary can linger.
+*/
+function sweepIsDue(state, images) {
+	const maxAgeMs = images.maxCacheAge * 1e3;
+	const now = Date.now();
+	return !state.reconciled || state.bytes > images.maxCacheBytes || state.oldestMtimeMs !== void 0 && state.oldestMtimeMs <= now - maxAgeMs || now - state.lastWalk >= maxAgeMs;
+}
+/**
+* Schedule housekeeping only after a write. Hits do no cache-directory I/O.
+* Writes update a running byte estimate; at most one background check per
+* minute walks the cache, and only when it may have something to reclaim
+* (see {@link sweepIsDue}).
+*/
+function scheduleImageVariantCacheTrim(images, target) {
+	const state = cacheState(images.cacheDirectory);
+	fs.stat(target).then((stats) => {
+		state.bytes += stats.size - (state.sizes.get(target) ?? 0);
+		state.sizes.set(target, stats.size);
+		state.oldestMtimeMs = Math.min(state.oldestMtimeMs ?? stats.mtimeMs, stats.mtimeMs);
+		if (state.timer) return;
+		const delay = Math.max(0, state.lastSweep + SWEEP_INTERVAL_MS - Date.now());
+		state.timer = setTimeout(() => {
+			state.timer = void 0;
+			if (!sweepIsDue(state, images)) {
+				state.lastSweep = Date.now();
+				return;
+			}
+			trimImageVariantCache(images, target).catch((error) => {
+				log.warn("uploads", "image-variants", error);
+			});
+		}, delay);
+		state.timer.unref();
+	}).catch((error) => {
+		if (errorCode(error) !== "ENOENT") log.warn("uploads", "image-variants", error);
+	});
+}
+/** Remove a temporary only when it is a regular file older than {@link ORPHAN_TEMP_AGE_MS}. */
+async function removeOrphanTemporary(target) {
+	try {
+		const stats = await fs.lstat(target);
+		if (stats.isFile() && Date.now() - stats.mtimeMs > 36e5) await fs.rm(target, { force: true });
+	} catch (error) {
+		if (errorCode(error) !== "ENOENT") throw error;
+	}
+}
+/**
+* Remove a generation left without derivatives: its manifest, then the
+* directory itself with a non-recursive `rmdir`, so anything a writer has put
+* there since the walk keeps the directory in place.
+*/
+async function removeEmptyGeneration(generation) {
+	if (generation.derivatives > 0) return;
+	if (Date.now() - generation.mtimeMs <= 3e5) return;
+	if (generation.manifest) await fs.rm(generation.manifest, { force: true });
+	try {
+		if (!(await fs.lstat(generation.directory)).isDirectory()) return;
+		await fs.rmdir(generation.directory);
+	} catch (error) {
+		const code = errorCode(error);
+		if (code !== "ENOENT" && code !== "ENOTEMPTY" && code !== "EEXIST") throw error;
+	}
+}
+/**
+* Join an in-flight sweep rather than queueing another walk. Retain the file
+* about to be served, even if it alone exceeds the byte budget. Only paths in
+* the generated cache layout are touched and symlinks are never followed:
+* expired and oldest derivatives are evicted, writer temporaries older than
+* {@link ORPHAN_TEMP_AGE_MS} are removed, and a generation directory left
+* without derivatives loses its manifest and the directory itself once it is
+* older than {@link EMPTY_GENERATION_GRACE_MS}. The cache root, shard and
+* source directories, user folders and unrelated files stay in place.
+*/
+async function trimImageVariantCache(images, keep) {
+	const state = cacheState(images.cacheDirectory);
+	state.keep.add(keep);
+	if (state.sweep) return state.sweep;
+	state.lastSweep = Date.now();
+	state.lastWalk = state.lastSweep;
+	const sweep = (async () => {
+		const files = [];
+		const generations = [];
+		for await (const found of variantCacheGenerations(images.cacheDirectory)) {
+			let mtimeMs;
+			try {
+				mtimeMs = (await fs.lstat(found.directory)).mtimeMs;
+			} catch (error) {
+				if (errorCode(error) === "ENOENT") continue;
+				throw error;
+			}
+			const generation = {
+				directory: found.directory,
+				mtimeMs,
+				derivatives: 0
+			};
+			generations.push(generation);
+			for (const entry of found.entries) if (entry.type === "manifest") generation.manifest = entry.target;
+			else if (entry.type === "temporary") await removeOrphanTemporary(entry.target);
+			else try {
+				const stats = await fs.stat(entry.target);
+				files.push({
+					target: entry.target,
+					size: stats.size,
+					mtimeMs: stats.mtimeMs,
+					generation
+				});
+				generation.derivatives += 1;
+			} catch (error) {
+				if (errorCode(error) !== "ENOENT") throw error;
+			}
+		}
+		state.sizes = new Map(files.map((file) => [file.target, file.size]));
+		state.bytes = files.reduce((sum, file) => sum + file.size, 0);
+		const cutoff = Date.now() - images.maxCacheAge * 1e3;
+		let oldestMtimeMs;
+		for (const file of files.sort((a, b) => a.mtimeMs - b.mtimeMs)) {
+			if (!state.keep.has(file.target) && (file.mtimeMs <= cutoff || state.bytes > images.maxCacheBytes)) {
+				await fs.rm(file.target, { force: true });
+				state.bytes -= file.size;
+				state.sizes.delete(file.target);
+				file.generation.derivatives -= 1;
+				continue;
+			}
+			oldestMtimeMs = Math.min(oldestMtimeMs ?? file.mtimeMs, file.mtimeMs);
+		}
+		for (const generation of generations) await removeEmptyGeneration(generation);
+		state.oldestMtimeMs = oldestMtimeMs;
+		state.reconciled = true;
+	})();
+	state.sweep = sweep;
+	try {
+		await sweep;
+	} finally {
+		state.sweep = void 0;
+		state.keep.clear();
+	}
+}
+
+//#endregion
+export { EMPTY_GENERATION_GRACE_MS, ORPHAN_TEMP_AGE_MS, freshImageVariant, scheduleImageVariantCacheTrim, trimImageVariantCache };
+//# sourceMappingURL=trim-image-variant-cache.mjs.map

package/esm/http/uploads/trim-image-variant-cache.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"trim-image-variant-cache.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/trim-image-variant-cache.ts"],"sourcesContent":["import { log } from \"@warlock.js/logger\";\nimport fs from \"node:fs/promises\";\nimport type { ResolvedImageVariantsConfig } from \"./image-variant-types\";\nimport { variantCacheGenerations } from \"./image-variant-cache-entries\";\n\nconst SWEEP_INTERVAL_MS = 60_000;\n\n/**\n * A writer's temporary file older than this is an orphan left by a crashed\n * write and is removed by the sweep. Younger ones are never touched: a writer\n * may still be renaming them into place.\n */\nexport const ORPHAN_TEMP_AGE_MS = 60 * 60_000;\n\n/**\n * A generation directory left without derivatives is removed only when it\n * was last changed longer ago than this, so a directory a writer has just\n * created for its first derivative survives. The writers also retry once when\n * their directory vanishes between `mkdir` and the rename.\n */\nexport const EMPTY_GENERATION_GRACE_MS = 5 * 60_000;\n\ntype CacheState = {\n  sweep?: Promise<void>;\n  timer?: ReturnType<typeof setTimeout>;\n  /** When the last scheduled check ran, whether or not it walked the cache. */\n  lastSweep: number;\n  /** When the cache was last walked. */\n  lastWalk: number;\n  bytes: number;\n  sizes: Map<string, number>;\n  keep: Set<string>;\n  /** True once a walk has reconciled `bytes` with the disk. */\n  reconciled: boolean;\n  /** The oldest retained derivative's mtime; undefined when none is known. */\n  oldestMtimeMs?: number;\n};\nconst caches = new Map<string, CacheState>();\nfunction cacheState(directory: string): CacheState {\n  let state = caches.get(directory);\n  if (!state) {\n    state = {\n      lastSweep: 0,\n      lastWalk: 0,\n      bytes: 0,\n      sizes: new Map(),\n      keep: new Set(),\n      reconciled: false,\n    };\n    caches.set(directory, state);\n  }\n  return state;\n}\n\nfunction errorCode(error: unknown): string | undefined {\n  return (error as NodeJS.ErrnoException | undefined)?.code;\n}\n\n/** Age is measured from generation; hits do not extend a derivative's life. */\nexport async function freshImageVariant(target: string, maxAgeSeconds: number): Promise<boolean> {\n  try {\n    const stats = await fs.stat(target);\n    return stats.isFile() && Date.now() - stats.mtimeMs < maxAgeSeconds * 1000;\n  } catch (error) {\n    if (errorCode(error) === \"ENOENT\") return false;\n    throw error;\n  }\n}\n\n/**\n * Whether a scheduled check must walk the cache. It may skip only when a walk\n * has already reconciled the byte estimate, the cache is within its byte\n * budget, nothing retained has expired (new writes are always younger than\n * the oldest retained derivative), and a walk ran within the last\n * `maxCacheAge`, which also bounds how long an orphaned temporary can linger.\n */\nfunction sweepIsDue(state: CacheState, images: ResolvedImageVariantsConfig): boolean {\n  const maxAgeMs = images.maxCacheAge * 1000;\n  const now = Date.now();\n  return (\n    !state.reconciled ||\n    state.bytes > images.maxCacheBytes ||\n    (state.oldestMtimeMs !== undefined && state.oldestMtimeMs <= now - maxAgeMs) ||\n    now - state.lastWalk >= maxAgeMs\n  );\n}\n\n/**\n * Schedule housekeeping only after a write. Hits do no cache-directory I/O.\n * Writes update a running byte estimate; at most one background check per\n * minute walks the cache, and only when it may have something to reclaim\n * (see {@link sweepIsDue}).\n */\nexport function scheduleImageVariantCacheTrim(\n  images: ResolvedImageVariantsConfig,\n  target: string,\n): void {\n  const state = cacheState(images.cacheDirectory);\n  void fs\n    .stat(target)\n    .then((stats) => {\n      state.bytes += stats.size - (state.sizes.get(target) ?? 0);\n      state.sizes.set(target, stats.size);\n      state.oldestMtimeMs = Math.min(state.oldestMtimeMs ?? stats.mtimeMs, stats.mtimeMs);\n      if (state.timer) return;\n      const delay = Math.max(0, state.lastSweep + SWEEP_INTERVAL_MS - Date.now());\n      state.timer = setTimeout(() => {\n        state.timer = undefined;\n        if (!sweepIsDue(state, images)) {\n          state.lastSweep = Date.now();\n          return;\n        }\n        void trimImageVariantCache(images, target).catch((error: unknown) => {\n          log.warn(\"uploads\", \"image-variants\", error);\n        });\n      }, delay);\n      state.timer.unref();\n    })\n    .catch((error: unknown) => {\n      if (errorCode(error) !== \"ENOENT\") log.warn(\"uploads\", \"image-variants\", error);\n    });\n}\n\ntype Derivative = { target: string; size: number; mtimeMs: number; generation: Generation };\ntype Generation = {\n  directory: string;\n  /** The directory's mtime before this sweep removed anything from it. */\n  mtimeMs: number;\n  derivatives: number;\n  manifest?: string;\n};\n\n/** Remove a temporary only when it is a regular file older than {@link ORPHAN_TEMP_AGE_MS}. */\nasync function removeOrphanTemporary(target: string): Promise<void> {\n  try {\n    const stats = await fs.lstat(target);\n    if (stats.isFile() && Date.now() - stats.mtimeMs > ORPHAN_TEMP_AGE_MS) {\n      await fs.rm(target, { force: true });\n    }\n  } catch (error) {\n    if (errorCode(error) !== \"ENOENT\") throw error;\n  }\n}\n\n/**\n * Remove a generation left without derivatives: its manifest, then the\n * directory itself with a non-recursive `rmdir`, so anything a writer has put\n * there since the walk keeps the directory in place.\n */\nasync function removeEmptyGeneration(generation: Generation): Promise<void> {\n  if (generation.derivatives > 0) return;\n  if (Date.now() - generation.mtimeMs <= EMPTY_GENERATION_GRACE_MS) return;\n  if (generation.manifest) await fs.rm(generation.manifest, { force: true });\n  try {\n    if (!(await fs.lstat(generation.directory)).isDirectory()) return;\n    await fs.rmdir(generation.directory);\n  } catch (error) {\n    const code = errorCode(error);\n    if (code !== \"ENOENT\" && code !== \"ENOTEMPTY\" && code !== \"EEXIST\") throw error;\n  }\n}\n\n/**\n * Join an in-flight sweep rather than queueing another walk. Retain the file\n * about to be served, even if it alone exceeds the byte budget. Only paths in\n * the generated cache layout are touched and symlinks are never followed:\n * expired and oldest derivatives are evicted, writer temporaries older than\n * {@link ORPHAN_TEMP_AGE_MS} are removed, and a generation directory left\n * without derivatives loses its manifest and the directory itself once it is\n * older than {@link EMPTY_GENERATION_GRACE_MS}. The cache root, shard and\n * source directories, user folders and unrelated files stay in place.\n */\nexport async function trimImageVariantCache(\n  images: ResolvedImageVariantsConfig,\n  keep: string,\n): Promise<void> {\n  const state = cacheState(images.cacheDirectory);\n  state.keep.add(keep);\n  if (state.sweep) return state.sweep;\n  state.lastSweep = Date.now();\n  state.lastWalk = state.lastSweep;\n  const sweep = (async () => {\n    const files: Derivative[] = [];\n    const generations: Generation[] = [];\n    for await (const found of variantCacheGenerations(images.cacheDirectory)) {\n      let mtimeMs: number;\n      try {\n        mtimeMs = (await fs.lstat(found.directory)).mtimeMs;\n      } catch (error) {\n        if (errorCode(error) === \"ENOENT\") continue;\n        throw error;\n      }\n      const generation: Generation = { directory: found.directory, mtimeMs, derivatives: 0 };\n      generations.push(generation);\n      for (const entry of found.entries) {\n        if (entry.type === \"manifest\") {\n          generation.manifest = entry.target;\n        } else if (entry.type === \"temporary\") {\n          await removeOrphanTemporary(entry.target);\n        } else {\n          try {\n            const stats = await fs.stat(entry.target);\n            files.push({\n              target: entry.target,\n              size: stats.size,\n              mtimeMs: stats.mtimeMs,\n              generation,\n            });\n            generation.derivatives += 1;\n          } catch (error) {\n            if (errorCode(error) !== \"ENOENT\") throw error;\n          }\n        }\n      }\n    }\n    state.sizes = new Map(files.map((file) => [file.target, file.size]));\n    state.bytes = files.reduce((sum, file) => sum + file.size, 0);\n    const cutoff = Date.now() - images.maxCacheAge * 1000;\n    let oldestMtimeMs: number | undefined;\n    for (const file of files.sort((a, b) => a.mtimeMs - b.mtimeMs)) {\n      if (\n        !state.keep.has(file.target) &&\n        (file.mtimeMs <= cutoff || state.bytes > images.maxCacheBytes)\n      ) {\n        await fs.rm(file.target, { force: true });\n        state.bytes -= file.size;\n        state.sizes.delete(file.target);\n        file.generation.derivatives -= 1;\n        continue;\n      }\n      oldestMtimeMs = Math.min(oldestMtimeMs ?? file.mtimeMs, file.mtimeMs);\n    }\n    for (const generation of generations) await removeEmptyGeneration(generation);\n    state.oldestMtimeMs = oldestMtimeMs;\n    state.reconciled = true;\n  })();\n  state.sweep = sweep;\n  try {\n    await sweep;\n  } finally {\n    state.sweep = undefined;\n    state.keep.clear();\n  }\n}\n"],"mappings":"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"}

package/esm/http/uploads/uploaded-file.controller.d.mts

@@ -1,18 +1,22 @@
 import { StorageDriverName } from "../../storage/types.mjs";
 import { RequestHandler } from "../../router/types.mjs";
+import "../../router/index.mjs";
 //#region ../../packages/core/src/http/uploads/uploaded-file.controller.d.ts
 /**
  * Options for {@link createUploadedFileController}
  */
-type UploadedFileControllerOptions = {
+export type UploadedFileControllerOptions = {
   /**
-   * Local disk to serve from; the default disk when omitted. A private disk
+   * Disk to serve from; remote disks support variants only. Uses the default
+   * disk when omitted. A private disk
    * should be served from a route that checks access first.
    */
   disk?: StorageDriverName;
+  /** Allow derivatives from the default cloud disk. Explicit disk selection also opts in. */
+  remote?: boolean;
 };
 /**
- * Serves local uploads, and bounded on-demand variants of the images among them.
+ * Serves local uploads and bounded on-demand image variants from any disk.
  *
  * ```ts
  * router.get("/uploads/*", uploadedFileController);
@@ -32,11 +36,10 @@ type UploadedFileControllerOptions = {
  * (see `resolveImageVariant`), written atomically, generated once per key even
  * under concurrent requests, and sent with an immutable cache and an ETag.
  */
-declare function createUploadedFileController(options?: UploadedFileControllerOptions): RequestHandler;
+export declare function createUploadedFileController(options?: UploadedFileControllerOptions): RequestHandler;
 /**
  * Serves the default disk's uploads; see {@link createUploadedFileController}
  */
-declare const uploadedFileController: RequestHandler;
+export declare const uploadedFileController: RequestHandler;
 //#endregion
-export { UploadedFileControllerOptions, createUploadedFileController, uploadedFileController };
 //# sourceMappingURL=uploaded-file.controller.d.mts.map

package/esm/http/uploads/uploaded-file.controller.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"uploaded-file.controller.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/uploaded-file.controller.ts"],"mappings":";;;;;;KA6FY,6BAAA;EAA6B;;;AAKf;EAAxB,IAAA,GAAO,iBAAiB;AAAA;;;;;;;AA0BT;AA8GjB;;;;AAAoF;;;;;;;;;;iBAhHpE,4BAAA,CACd,OAAA,GAAS,6BAAA,GACR,cAAc;;;;cA8GJ,sBAAA,EAAwB,cAA+C"}
+{"version":3,"file":"uploaded-file.controller.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/uploaded-file.controller.ts"],"mappings":";;;;;;;YA6FY;;;;;;EAMV,OAAO;;EAGP;;;;;;;;;;;;;;;;;;;;;;;wBAwBc,6BACd,UAAS,gCACR;;;;qBA+HU,wBAAwB"}

package/esm/http/uploads/uploaded-file.controller.mjs

@@ -1,10 +1,10 @@
 import { HttpError } from "../errors/errors.mjs";
+import { evaluateConditionalRequest } from "../conditional-request.mjs";
 import { isMissingFileError, variantCacheDirectoryFor } from "./image-variant-cache.mjs";
-import { matchesIfNoneMatch } from "./matches-if-none-match.mjs";
+import { localDiskRoot } from "./local-disk-root.mjs";
 import { detectImageFormat, isVariantSourceFormat } from "./detect-image-format.mjs";
 import { readFileHead } from "./read-file-head.mjs";
 import { resolveUploadPath } from "./resolve-upload-path.mjs";
-import { localDiskRoot } from "./local-disk-root.mjs";
 import { resolveImageVariant } from "./resolve-image-variant.mjs";
 import { parseUploadedFileQuery } from "./parse-uploaded-file-query.mjs";
 import { resolveInlineImageContentType } from "./resolve-inline-image-content-type.mjs";
@@ -70,7 +70,7 @@ async function sendOriginalInline(response, absolutePath, contentType) {
 	});
 }
 /**
-* Serves local uploads, and bounded on-demand variants of the images among them.
+* Serves local uploads and bounded on-demand image variants from any disk.
 *
 * ```ts
 * router.get("/uploads/*", uploadedFileController);
@@ -93,17 +93,19 @@ async function sendOriginalInline(response, absolutePath, contentType) {
 function createUploadedFileController(options = {}) {
 	return async ({ request, response }) => {
 		const diskRoot = localDiskRoot(options.disk);
-		if (!diskRoot) {
-			log.error("uploads", "serve", options.disk === void 0 ? "uploadedFileController needs a local storage driver with a root." : `uploadedFileController needs a local disk; "${options.disk}" is not one.`);
-			return notFound(response);
-		}
+		if (!diskRoot && options.disk === void 0 && options.remote !== true) return notFound(response);
 		const query = parseUploadedFileQuery(request.url);
 		if (query.type === "invalid") return response.badRequest({ error: query.reason });
 		response.header("X-Content-Type-Options", "nosniff");
 		if (query.type === "original") {
+			if (!diskRoot) {
+				log.error("uploads", "serve", options.disk === void 0 ? "uploadedFileController needs a local storage driver with a root." : `uploadedFileController needs a local disk; "${options.disk}" is not one.`);
+				return notFound(response);
+			}
 			const source = await resolveUploadPath(request.params["*"], diskRoot, [path.join(diskRoot, ".cache", "image-variants"), variantCacheDirectoryFor(diskRoot)]);
 			if (!source) return notFound(response);
-			const sniffedFormat = detectImageFormat(await readFileHead(source.absolutePath, 512));
+			const head = await readFileHead(source.absolutePath, 512);
+			const sniffedFormat = detectImageFormat(head);
 			if (!isVariantSourceFormat(sniffedFormat)) return sendOriginalAsAttachment(response, source.absolutePath);
 			const inlineContentType = resolveInlineImageContentType(source.absolutePath, sniffedFormat);
 			if (!inlineContentType) return sendOriginalAsAttachment(response, source.absolutePath);
@@ -118,7 +120,14 @@ function createUploadedFileController(options = {}) {
 			};
 			let variant = await resolveImageVariant(variantInput);
 			if (!variant) return notFound(response);
-			if (matchesIfNoneMatch(request.header("if-none-match"), `"${variant.hash}"`)) return response.baseResponse.status(304).send();
+			const precondition = evaluateConditionalRequest({
+				method: request.method,
+				etag: `"${variant.hash}"`,
+				ifMatch: request.header("if-match"),
+				ifNoneMatch: request.header("if-none-match")
+			});
+			if (precondition === "not-modified") return response.baseResponse.status(304).send();
+			if (precondition === "precondition-failed") return response.baseResponse.status(412).send();
 			let body;
 			try {
 				body = await fs.readFile(variant.absolutePath);

package/esm/http/uploads/uploaded-file.controller.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"uploaded-file.controller.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/uploaded-file.controller.ts"],"sourcesContent":["import { log } from \"@warlock.js/logger\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { RequestHandler } from \"../../router\";\nimport type { StorageDriverName } from \"../../storage/types\";\nimport { HttpError } from \"../errors\";\nimport type { Response } from \"../response\";\nimport {\n  detectImageFormat,\n  IMAGE_SIGNATURE_BYTES,\n  isVariantSourceFormat,\n} from \"./detect-image-format\";\nimport { isMissingFileError, variantCacheDirectoryFor } from \"./image-variant-cache\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\nimport { localDiskRoot } from \"./local-disk-root\";\nimport { matchesIfNoneMatch } from \"./matches-if-none-match\";\nimport { parseUploadedFileQuery } from \"./parse-uploaded-file-query\";\nimport { readFileHead } from \"./read-file-head\";\nimport { resolveImageVariant } from \"./resolve-image-variant\";\nimport { resolveInlineImageContentType } from \"./resolve-inline-image-content-type\";\nimport { resolveOriginalContentType } from \"./resolve-original-content-type\";\nimport { resolveUploadPath } from \"./resolve-upload-path\";\n\n/**\n * One year, in seconds: originals and derivatives are both long-lived\n */\nconst ONE_YEAR = 31_536_000;\n\nconst CONTENT_TYPES: Record<VariantOutputFormat, string> = {\n  jpeg: \"image/jpeg\",\n  png: \"image/png\",\n  webp: \"image/webp\",\n  avif: \"image/avif\",\n};\n\nfunction notFound(response: Response) {\n  return response.notFound({ error: \"File Not Found\" });\n}\n\nasync function sendVariant(\n  response: Response,\n  body: Buffer,\n  hash: string,\n  format: VariantOutputFormat,\n) {\n  return response.sendBuffer(body, {\n    contentType: CONTENT_TYPES[format],\n    cacheTime: ONE_YEAR,\n    immutable: true,\n    etag: `\"${hash}\"`,\n  });\n}\n\n/**\n * Serve an upload original that isn't safe to render inline: a non-raster\n * format (html, xml, the svg family, anything unrecognised) is markup a\n * browser will parse and execute, and a raster-sniffed file whose extension\n * doesn't back that format up (see `resolveInlineImageContentType`) is a\n * polyglot — so both go out as a download instead of a rendered response.\n * `Content-Type` stays extension-derived, except the svg/html/xml family,\n * which is downgraded to `application/octet-stream` so the browser never\n * renders it even if it ignores the disposition.\n */\nasync function sendOriginalAsAttachment(response: Response, absolutePath: string) {\n  response.header(\"Content-Security-Policy\", \"sandbox\");\n\n  return response.sendBuffer(await fs.readFile(absolutePath), {\n    contentType: resolveOriginalContentType(absolutePath),\n    cacheTime: ONE_YEAR,\n    immutable: true,\n    inline: false,\n    filename: path.basename(absolutePath),\n  });\n}\n\n/**\n * Serve an upload original inline, once the sniffed raster format and the\n * extension-derived format have been confirmed to agree. The content type is\n * always the SNIFFED image type, passed explicitly — never `sendFile`'s\n * extension-derived guess, which is exactly what let a JPEG named `.html`\n * out as `text/html` before this existed.\n */\nasync function sendOriginalInline(response: Response, absolutePath: string, contentType: string) {\n  return response.sendBuffer(await fs.readFile(absolutePath), {\n    contentType,\n    cacheTime: ONE_YEAR,\n    immutable: true,\n  });\n}\n\n/**\n * Options for {@link createUploadedFileController}\n */\nexport type UploadedFileControllerOptions = {\n  /**\n   * Local disk to serve from; the default disk when omitted. A private disk\n   * should be served from a route that checks access first.\n   */\n  disk?: StorageDriverName;\n};\n\n/**\n * Serves local uploads, and bounded on-demand variants of the images among them.\n *\n * ```ts\n * router.get(\"/uploads/*\", uploadedFileController);\n * router.get(\"/invoices/*\", createUploadedFileController({ disk: \"private\" }), {\n *   middleware: [authMiddleware()],\n * });\n * ```\n *\n * - `GET /uploads/<path>` sends the original file with a one-year cache.\n * - `GET /uploads/<path>?variant=<name>[&format=webp|avif]` sends a derivative\n *   rendered from a variant named in `uploads.images.variants`. No other query\n *   key is accepted, so a client can never ask for an arbitrary size.\n *\n * The path must stay inside the disk root (after symlinks are resolved) and\n * outside the variant cache; anything else is a 404, the same answer a missing\n * file gets. Derivatives are cached on disk under a directory per source\n * (see `resolveImageVariant`), written atomically, generated once per key even\n * under concurrent requests, and sent with an immutable cache and an ETag.\n */\nexport function createUploadedFileController(\n  options: UploadedFileControllerOptions = {},\n): RequestHandler {\n  return async ({ request, response }) => {\n    const diskRoot = localDiskRoot(options.disk);\n\n    if (!diskRoot) {\n      log.error(\n        \"uploads\",\n        \"serve\",\n        options.disk === undefined\n          ? \"uploadedFileController needs a local storage driver with a root.\"\n          : `uploadedFileController needs a local disk; \"${options.disk}\" is not one.`,\n      );\n\n      return notFound(response);\n    }\n\n    const query = parseUploadedFileQuery(request.url);\n\n    if (query.type === \"invalid\") {\n      return response.badRequest({ error: query.reason });\n    }\n\n    // Every uploads response — originals and variants — tells the browser not\n    // to guess a content type from the bytes, so a mislabeled body can never be\n    // sniffed into something executable.\n    response.header(\"X-Content-Type-Options\", \"nosniff\");\n\n    if (query.type === \"original\") {\n      const source = await resolveUploadPath(request.params[\"*\"], diskRoot, [\n        path.join(diskRoot, \".cache\", \"image-variants\"),\n        variantCacheDirectoryFor(diskRoot),\n      ]);\n\n      if (!source) return notFound(response);\n\n      // Inline is decided by SNIFFED bytes, never by extension: an svg (or any\n      // other non-raster file) named `.png` must still download, not render.\n      const head = await readFileHead(source.absolutePath, IMAGE_SIGNATURE_BYTES);\n      const sniffedFormat = detectImageFormat(head);\n\n      if (!isVariantSourceFormat(sniffedFormat)) {\n        return sendOriginalAsAttachment(response, source.absolutePath);\n      }\n\n      // Inline is only safe when the extension-derived type agrees with the\n      // sniffed bytes too — otherwise `sendFile` would advertise the\n      // extension's type (e.g. text/html for JPEG bytes named `.html`).\n      const inlineContentType = resolveInlineImageContentType(source.absolutePath, sniffedFormat);\n\n      if (!inlineContentType) {\n        return sendOriginalAsAttachment(response, source.absolutePath);\n      }\n\n      return sendOriginalInline(response, source.absolutePath, inlineContentType);\n    }\n\n    try {\n      const variantInput = {\n        path: request.params[\"*\"] as string,\n        variant: query.variant,\n        ...(query.format !== undefined ? { format: query.format as VariantOutputFormat } : {}),\n        ...(options.disk !== undefined ? { disk: options.disk } : {}),\n      };\n      let variant = await resolveImageVariant(variantInput);\n\n      if (!variant) return notFound(response);\n\n      if (matchesIfNoneMatch(request.header(\"if-none-match\"), `\"${variant.hash}\"`)) {\n        return response.baseResponse.status(304).send();\n      }\n\n      let body: Buffer;\n\n      try {\n        body = await fs.readFile(variant.absolutePath);\n      } catch (readError) {\n        if (!isMissingFileError(readError)) throw readError;\n\n        // Pruned between the existence check and the read: the source was\n        // rewritten in place and a request for the new version cleared the\n        // old generation. Resolve (and render) once more.\n        variant = await resolveImageVariant(variantInput);\n\n        if (!variant) return notFound(response);\n\n        body = await fs.readFile(variant.absolutePath);\n      }\n\n      return sendVariant(response, body, variant.hash, variant.format);\n    } catch (error) {\n      if (error instanceof HttpError) {\n        return response.send({ error: error.message }, error.status);\n      }\n\n      log.error(\n        \"uploads\",\n        \"variant\",\n        `Could not generate variant \"${query.variant}\" of ${String(request.params[\"*\"])}: ${\n          error instanceof Error ? error.message : String(error)\n        }`,\n      );\n\n      return response.serverError({ error: \"Could not generate the image variant.\" });\n    }\n  };\n}\n\n/**\n * Serves the default disk's uploads; see {@link createUploadedFileController}\n */\nexport const uploadedFileController: RequestHandler = createUploadedFileController();\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA0BA,MAAM,WAAW;AAEjB,MAAM,gBAAqD;CACzD,MAAM;CACN,KAAK;CACL,MAAM;CACN,MAAM;AACR;AAEA,SAAS,SAAS,UAAoB;CACpC,OAAO,SAAS,SAAS,EAAE,OAAO,iBAAiB,CAAC;AACtD;AAEA,eAAe,YACb,UACA,MACA,MACA,QACA;CACA,OAAO,SAAS,WAAW,MAAM;EAC/B,aAAa,cAAc;EAC3B,WAAW;EACX,WAAW;EACX,MAAM,IAAI,KAAK;CACjB,CAAC;AACH;;;;;;;;;;;AAYA,eAAe,yBAAyB,UAAoB,cAAsB;CAChF,SAAS,OAAO,2BAA2B,SAAS;CAEpD,OAAO,SAAS,WAAW,MAAM,GAAG,SAAS,YAAY,GAAG;EAC1D,aAAa,2BAA2B,YAAY;EACpD,WAAW;EACX,WAAW;EACX,QAAQ;EACR,UAAU,KAAK,SAAS,YAAY;CACtC,CAAC;AACH;;;;;;;;AASA,eAAe,mBAAmB,UAAoB,cAAsB,aAAqB;CAC/F,OAAO,SAAS,WAAW,MAAM,GAAG,SAAS,YAAY,GAAG;EAC1D;EACA,WAAW;EACX,WAAW;CACb,CAAC;AACH;;;;;;;;;;;;;;;;;;;;;;AAkCA,SAAgB,6BACd,UAAyC,CAAC,GAC1B;CAChB,OAAO,OAAO,EAAE,SAAS,eAAe;EACtC,MAAM,WAAW,cAAc,QAAQ,IAAI;EAE3C,IAAI,CAAC,UAAU;GACb,IAAI,MACF,WACA,SACA,QAAQ,SAAS,SACb,qEACA,+CAA+C,QAAQ,KAAK,cAClE;GAEA,OAAO,SAAS,QAAQ;EAC1B;EAEA,MAAM,QAAQ,uBAAuB,QAAQ,GAAG;EAEhD,IAAI,MAAM,SAAS,WACjB,OAAO,SAAS,WAAW,EAAE,OAAO,MAAM,OAAO,CAAC;EAMpD,SAAS,OAAO,0BAA0B,SAAS;EAEnD,IAAI,MAAM,SAAS,YAAY;GAC7B,MAAM,SAAS,MAAM,kBAAkB,QAAQ,OAAO,MAAM,UAAU,CACpE,KAAK,KAAK,UAAU,UAAU,gBAAgB,GAC9C,yBAAyB,QAAQ,CACnC,CAAC;GAED,IAAI,CAAC,QAAQ,OAAO,SAAS,QAAQ;GAKrC,MAAM,gBAAgB,kBAAkB,MADrB,aAAa,OAAO,iBAAmC,CAC9B;GAE5C,IAAI,CAAC,sBAAsB,aAAa,GACtC,OAAO,yBAAyB,UAAU,OAAO,YAAY;GAM/D,MAAM,oBAAoB,8BAA8B,OAAO,cAAc,aAAa;GAE1F,IAAI,CAAC,mBACH,OAAO,yBAAyB,UAAU,OAAO,YAAY;GAG/D,OAAO,mBAAmB,UAAU,OAAO,cAAc,iBAAiB;EAC5E;EAEA,IAAI;GACF,MAAM,eAAe;IACnB,MAAM,QAAQ,OAAO;IACrB,SAAS,MAAM;IACf,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAA8B,IAAI,CAAC;IACpF,GAAI,QAAQ,SAAS,SAAY,EAAE,MAAM,QAAQ,KAAK,IAAI,CAAC;GAC7D;GACA,IAAI,UAAU,MAAM,oBAAoB,YAAY;GAEpD,IAAI,CAAC,SAAS,OAAO,SAAS,QAAQ;GAEtC,IAAI,mBAAmB,QAAQ,OAAO,eAAe,GAAG,IAAI,QAAQ,KAAK,EAAE,GACzE,OAAO,SAAS,aAAa,OAAO,GAAG,CAAC,CAAC,KAAK;GAGhD,IAAI;GAEJ,IAAI;IACF,OAAO,MAAM,GAAG,SAAS,QAAQ,YAAY;GAC/C,SAAS,WAAW;IAClB,IAAI,CAAC,mBAAmB,SAAS,GAAG,MAAM;IAK1C,UAAU,MAAM,oBAAoB,YAAY;IAEhD,IAAI,CAAC,SAAS,OAAO,SAAS,QAAQ;IAEtC,OAAO,MAAM,GAAG,SAAS,QAAQ,YAAY;GAC/C;GAEA,OAAO,YAAY,UAAU,MAAM,QAAQ,MAAM,QAAQ,MAAM;EACjE,SAAS,OAAO;GACd,IAAI,iBAAiB,WACnB,OAAO,SAAS,KAAK,EAAE,OAAO,MAAM,QAAQ,GAAG,MAAM,MAAM;GAG7D,IAAI,MACF,WACA,WACA,+BAA+B,MAAM,QAAQ,OAAO,OAAO,QAAQ,OAAO,IAAI,EAAE,IAC9E,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK,GAEzD;GAEA,OAAO,SAAS,YAAY,EAAE,OAAO,wCAAwC,CAAC;EAChF;CACF;AACF;;;;AAKA,MAAa,yBAAyC,6BAA6B"}
+{"version":3,"file":"uploaded-file.controller.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/uploaded-file.controller.ts"],"sourcesContent":["import { log } from \"@warlock.js/logger\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { RequestHandler } from \"../../router\";\nimport type { StorageDriverName } from \"../../storage/types\";\nimport { HttpError } from \"../errors\";\nimport type { Response } from \"../response\";\nimport {\n  detectImageFormat,\n  IMAGE_SIGNATURE_BYTES,\n  isVariantSourceFormat,\n} from \"./detect-image-format\";\nimport { isMissingFileError, variantCacheDirectoryFor } from \"./image-variant-cache\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\nimport { localDiskRoot } from \"./local-disk-root\";\nimport { evaluateConditionalRequest } from \"../conditional-request\";\nimport { parseUploadedFileQuery } from \"./parse-uploaded-file-query\";\nimport { readFileHead } from \"./read-file-head\";\nimport { resolveImageVariant } from \"./resolve-image-variant\";\nimport { resolveInlineImageContentType } from \"./resolve-inline-image-content-type\";\nimport { resolveOriginalContentType } from \"./resolve-original-content-type\";\nimport { resolveUploadPath } from \"./resolve-upload-path\";\n\n/**\n * One year, in seconds: originals and derivatives are both long-lived\n */\nconst ONE_YEAR = 31_536_000;\n\nconst CONTENT_TYPES: Record<VariantOutputFormat, string> = {\n  jpeg: \"image/jpeg\",\n  png: \"image/png\",\n  webp: \"image/webp\",\n  avif: \"image/avif\",\n};\n\nfunction notFound(response: Response) {\n  return response.notFound({ error: \"File Not Found\" });\n}\n\nasync function sendVariant(\n  response: Response,\n  body: Buffer,\n  hash: string,\n  format: VariantOutputFormat,\n) {\n  return response.sendBuffer(body, {\n    contentType: CONTENT_TYPES[format],\n    cacheTime: ONE_YEAR,\n    immutable: true,\n    etag: `\"${hash}\"`,\n  });\n}\n\n/**\n * Serve an upload original that isn't safe to render inline: a non-raster\n * format (html, xml, the svg family, anything unrecognised) is markup a\n * browser will parse and execute, and a raster-sniffed file whose extension\n * doesn't back that format up (see `resolveInlineImageContentType`) is a\n * polyglot — so both go out as a download instead of a rendered response.\n * `Content-Type` stays extension-derived, except the svg/html/xml family,\n * which is downgraded to `application/octet-stream` so the browser never\n * renders it even if it ignores the disposition.\n */\nasync function sendOriginalAsAttachment(response: Response, absolutePath: string) {\n  response.header(\"Content-Security-Policy\", \"sandbox\");\n\n  return response.sendBuffer(await fs.readFile(absolutePath), {\n    contentType: resolveOriginalContentType(absolutePath),\n    cacheTime: ONE_YEAR,\n    immutable: true,\n    inline: false,\n    filename: path.basename(absolutePath),\n  });\n}\n\n/**\n * Serve an upload original inline, once the sniffed raster format and the\n * extension-derived format have been confirmed to agree. The content type is\n * always the SNIFFED image type, passed explicitly — never `sendFile`'s\n * extension-derived guess, which is exactly what let a JPEG named `.html`\n * out as `text/html` before this existed.\n */\nasync function sendOriginalInline(response: Response, absolutePath: string, contentType: string) {\n  return response.sendBuffer(await fs.readFile(absolutePath), {\n    contentType,\n    cacheTime: ONE_YEAR,\n    immutable: true,\n  });\n}\n\n/**\n * Options for {@link createUploadedFileController}\n */\nexport type UploadedFileControllerOptions = {\n  /**\n   * Disk to serve from; remote disks support variants only. Uses the default\n   * disk when omitted. A private disk\n   * should be served from a route that checks access first.\n   */\n  disk?: StorageDriverName;\n\n  /** Allow derivatives from the default cloud disk. Explicit disk selection also opts in. */\n  remote?: boolean;\n};\n\n/**\n * Serves local uploads and bounded on-demand image variants from any disk.\n *\n * ```ts\n * router.get(\"/uploads/*\", uploadedFileController);\n * router.get(\"/invoices/*\", createUploadedFileController({ disk: \"private\" }), {\n *   middleware: [authMiddleware()],\n * });\n * ```\n *\n * - `GET /uploads/<path>` sends the original file with a one-year cache.\n * - `GET /uploads/<path>?variant=<name>[&format=webp|avif]` sends a derivative\n *   rendered from a variant named in `uploads.images.variants`. No other query\n *   key is accepted, so a client can never ask for an arbitrary size.\n *\n * The path must stay inside the disk root (after symlinks are resolved) and\n * outside the variant cache; anything else is a 404, the same answer a missing\n * file gets. Derivatives are cached on disk under a directory per source\n * (see `resolveImageVariant`), written atomically, generated once per key even\n * under concurrent requests, and sent with an immutable cache and an ETag.\n */\nexport function createUploadedFileController(\n  options: UploadedFileControllerOptions = {},\n): RequestHandler {\n  return async ({ request, response }) => {\n    const diskRoot = localDiskRoot(options.disk);\n    // The scaffold's public route must not expose private objects when the\n    // default disk changes to a cloud bucket. Remote access is deliberate.\n    if (!diskRoot && options.disk === undefined && options.remote !== true)\n      return notFound(response);\n\n    const query = parseUploadedFileQuery(request.url);\n\n    if (query.type === \"invalid\") {\n      return response.badRequest({ error: query.reason });\n    }\n\n    // Every uploads response — originals and variants — tells the browser not\n    // to guess a content type from the bytes, so a mislabeled body can never be\n    // sniffed into something executable.\n    response.header(\"X-Content-Type-Options\", \"nosniff\");\n\n    if (query.type === \"original\") {\n      if (!diskRoot) {\n        log.error(\n          \"uploads\",\n          \"serve\",\n          options.disk === undefined\n            ? \"uploadedFileController needs a local storage driver with a root.\"\n            : `uploadedFileController needs a local disk; \"${options.disk}\" is not one.`,\n        );\n\n        return notFound(response);\n      }\n\n      const source = await resolveUploadPath(request.params[\"*\"], diskRoot, [\n        path.join(diskRoot, \".cache\", \"image-variants\"),\n        variantCacheDirectoryFor(diskRoot),\n      ]);\n\n      if (!source) return notFound(response);\n\n      // Inline is decided by SNIFFED bytes, never by extension: an svg (or any\n      // other non-raster file) named `.png` must still download, not render.\n      const head = await readFileHead(source.absolutePath, IMAGE_SIGNATURE_BYTES);\n      const sniffedFormat = detectImageFormat(head);\n\n      if (!isVariantSourceFormat(sniffedFormat)) {\n        return sendOriginalAsAttachment(response, source.absolutePath);\n      }\n\n      // Inline is only safe when the extension-derived type agrees with the\n      // sniffed bytes too — otherwise `sendFile` would advertise the\n      // extension's type (e.g. text/html for JPEG bytes named `.html`).\n      const inlineContentType = resolveInlineImageContentType(source.absolutePath, sniffedFormat);\n\n      if (!inlineContentType) {\n        return sendOriginalAsAttachment(response, source.absolutePath);\n      }\n\n      return sendOriginalInline(response, source.absolutePath, inlineContentType);\n    }\n\n    try {\n      const variantInput = {\n        path: request.params[\"*\"] as string,\n        variant: query.variant,\n        ...(query.format !== undefined ? { format: query.format as VariantOutputFormat } : {}),\n        ...(options.disk !== undefined ? { disk: options.disk } : {}),\n      };\n      let variant = await resolveImageVariant(variantInput);\n\n      if (!variant) return notFound(response);\n\n      // The variant hash is a strong validator: If-None-Match compares weakly,\n      // If-Match strongly (RFC 9110 §13.1).\n      const precondition = evaluateConditionalRequest({\n        method: request.method,\n        etag: `\"${variant.hash}\"`,\n        ifMatch: request.header(\"if-match\"),\n        ifNoneMatch: request.header(\"if-none-match\"),\n      });\n\n      if (precondition === \"not-modified\") {\n        return response.baseResponse.status(304).send();\n      }\n\n      if (precondition === \"precondition-failed\") {\n        return response.baseResponse.status(412).send();\n      }\n\n      let body: Buffer;\n\n      try {\n        body = await fs.readFile(variant.absolutePath);\n      } catch (readError) {\n        if (!isMissingFileError(readError)) throw readError;\n\n        // Pruned between the existence check and the read: the source was\n        // rewritten in place and a request for the new version cleared the\n        // old generation. Resolve (and render) once more.\n        variant = await resolveImageVariant(variantInput);\n\n        if (!variant) return notFound(response);\n\n        body = await fs.readFile(variant.absolutePath);\n      }\n\n      return sendVariant(response, body, variant.hash, variant.format);\n    } catch (error) {\n      if (error instanceof HttpError) {\n        return response.send({ error: error.message }, error.status);\n      }\n\n      log.error(\n        \"uploads\",\n        \"variant\",\n        `Could not generate variant \"${query.variant}\" of ${String(request.params[\"*\"])}: ${\n          error instanceof Error ? error.message : String(error)\n        }`,\n      );\n\n      return response.serverError({ error: \"Could not generate the image variant.\" });\n    }\n  };\n}\n\n/**\n * Serves the default disk's uploads; see {@link createUploadedFileController}\n */\nexport const uploadedFileController: RequestHandler = createUploadedFileController();\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA0BA,MAAM,WAAW;AAEjB,MAAM,gBAAqD;CACzD,MAAM;CACN,KAAK;CACL,MAAM;CACN,MAAM;AACR;AAEA,SAAS,SAAS,UAAoB;CACpC,OAAO,SAAS,SAAS,EAAE,OAAO,iBAAiB,CAAC;AACtD;AAEA,eAAe,YACb,UACA,MACA,MACA,QACA;CACA,OAAO,SAAS,WAAW,MAAM;EAC/B,aAAa,cAAc;EAC3B,WAAW;EACX,WAAW;EACX,MAAM,IAAI,KAAK;CACjB,CAAC;AACH;;;;;;;;;;;AAYA,eAAe,yBAAyB,UAAoB,cAAsB;CAChF,SAAS,OAAO,2BAA2B,SAAS;CAEpD,OAAO,SAAS,WAAW,MAAM,GAAG,SAAS,YAAY,GAAG;EAC1D,aAAa,2BAA2B,YAAY;EACpD,WAAW;EACX,WAAW;EACX,QAAQ;EACR,UAAU,KAAK,SAAS,YAAY;CACtC,CAAC;AACH;;;;;;;;AASA,eAAe,mBAAmB,UAAoB,cAAsB,aAAqB;CAC/F,OAAO,SAAS,WAAW,MAAM,GAAG,SAAS,YAAY,GAAG;EAC1D;EACA,WAAW;EACX,WAAW;CACb,CAAC;AACH;;;;;;;;;;;;;;;;;;;;;;AAsCA,SAAgB,6BACd,UAAyC,CAAC,GAC1B;CAChB,OAAO,OAAO,EAAE,SAAS,eAAe;EACtC,MAAM,WAAW,cAAc,QAAQ,IAAI;EAG3C,IAAI,CAAC,YAAY,QAAQ,SAAS,UAAa,QAAQ,WAAW,MAChE,OAAO,SAAS,QAAQ;EAE1B,MAAM,QAAQ,uBAAuB,QAAQ,GAAG;EAEhD,IAAI,MAAM,SAAS,WACjB,OAAO,SAAS,WAAW,EAAE,OAAO,MAAM,OAAO,CAAC;EAMpD,SAAS,OAAO,0BAA0B,SAAS;EAEnD,IAAI,MAAM,SAAS,YAAY;GAC7B,IAAI,CAAC,UAAU;IACb,IAAI,MACF,WACA,SACA,QAAQ,SAAS,SACb,qEACA,+CAA+C,QAAQ,KAAK,cAClE;IAEA,OAAO,SAAS,QAAQ;GAC1B;GAEA,MAAM,SAAS,MAAM,kBAAkB,QAAQ,OAAO,MAAM,UAAU,CACpE,KAAK,KAAK,UAAU,UAAU,gBAAgB,GAC9C,yBAAyB,QAAQ,CACnC,CAAC;GAED,IAAI,CAAC,QAAQ,OAAO,SAAS,QAAQ;GAIrC,MAAM,OAAO,MAAM,aAAa,OAAO,iBAAmC;GAC1E,MAAM,gBAAgB,kBAAkB,IAAI;GAE5C,IAAI,CAAC,sBAAsB,aAAa,GACtC,OAAO,yBAAyB,UAAU,OAAO,YAAY;GAM/D,MAAM,oBAAoB,8BAA8B,OAAO,cAAc,aAAa;GAE1F,IAAI,CAAC,mBACH,OAAO,yBAAyB,UAAU,OAAO,YAAY;GAG/D,OAAO,mBAAmB,UAAU,OAAO,cAAc,iBAAiB;EAC5E;EAEA,IAAI;GACF,MAAM,eAAe;IACnB,MAAM,QAAQ,OAAO;IACrB,SAAS,MAAM;IACf,GAAI,MAAM,WAAW,SAAY,EAAE,QAAQ,MAAM,OAA8B,IAAI,CAAC;IACpF,GAAI,QAAQ,SAAS,SAAY,EAAE,MAAM,QAAQ,KAAK,IAAI,CAAC;GAC7D;GACA,IAAI,UAAU,MAAM,oBAAoB,YAAY;GAEpD,IAAI,CAAC,SAAS,OAAO,SAAS,QAAQ;GAItC,MAAM,eAAe,2BAA2B;IAC9C,QAAQ,QAAQ;IAChB,MAAM,IAAI,QAAQ,KAAK;IACvB,SAAS,QAAQ,OAAO,UAAU;IAClC,aAAa,QAAQ,OAAO,eAAe;GAC7C,CAAC;GAED,IAAI,iBAAiB,gBACnB,OAAO,SAAS,aAAa,OAAO,GAAG,CAAC,CAAC,KAAK;GAGhD,IAAI,iBAAiB,uBACnB,OAAO,SAAS,aAAa,OAAO,GAAG,CAAC,CAAC,KAAK;GAGhD,IAAI;GAEJ,IAAI;IACF,OAAO,MAAM,GAAG,SAAS,QAAQ,YAAY;GAC/C,SAAS,WAAW;IAClB,IAAI,CAAC,mBAAmB,SAAS,GAAG,MAAM;IAK1C,UAAU,MAAM,oBAAoB,YAAY;IAEhD,IAAI,CAAC,SAAS,OAAO,SAAS,QAAQ;IAEtC,OAAO,MAAM,GAAG,SAAS,QAAQ,YAAY;GAC/C;GAEA,OAAO,YAAY,UAAU,MAAM,QAAQ,MAAM,QAAQ,MAAM;EACjE,SAAS,OAAO;GACd,IAAI,iBAAiB,WACnB,OAAO,SAAS,KAAK,EAAE,OAAO,MAAM,QAAQ,GAAG,MAAM,MAAM;GAG7D,IAAI,MACF,WACA,WACA,+BAA+B,MAAM,QAAQ,OAAO,OAAO,QAAQ,OAAO,IAAI,EAAE,IAC9E,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK,GAEzD;GAEA,OAAO,SAAS,YAAY,EAAE,OAAO,wCAAwC,CAAC;EAChF;CACF;AACF;;;;AAKA,MAAa,yBAAyC,6BAA6B"}

package/esm/http/uploads/variant-cache-key.mjs

@@ -1,5 +1,5 @@
-import path from "node:path";
 import { createHash } from "node:crypto";
+import path from "node:path";
 
 //#region ../../packages/core/src/http/uploads/variant-cache-key.ts
 /**
@@ -66,5 +66,5 @@ function variantCachePath(cacheDirectory, source, hash, format) {
 }
 
 //#endregion
-export { variantCacheKey, variantCachePath, variantGenerationTag, variantSourceDirectory, variantSourceKey };
+export { variantCacheKey, variantCachePath, variantExtension, variantGenerationTag, variantSourceDirectory, variantSourceKey };
 //# sourceMappingURL=variant-cache-key.mjs.map

package/esm/http/uploads-config.d.mts

@@ -1,5 +1,4 @@
 import { UploadsConfigurations } from "./uploads-types.mjs";
-
 //#region ../../packages/core/src/http/uploads-config.d.ts
 /**
  * Default uploads configuration values
@@ -7,7 +6,7 @@ import { UploadsConfigurations } from "./uploads-types.mjs";
  * These defaults are used when no configuration is provided
  * or when specific keys are missing from the app config.
  */
-declare const UPLOADS_DEFAULTS: UploadsConfigurations;
+export declare const UPLOADS_DEFAULTS: UploadsConfigurations;
 /**
  * Get uploads configuration value
  *
@@ -24,7 +23,6 @@ declare const UPLOADS_DEFAULTS: UploadsConfigurations;
  * const length = uploadsConfig("randomLength", 32);
  * ```
  */
-declare function uploadsConfig<K extends keyof UploadsConfigurations>(key: K, defaultValue?: UploadsConfigurations[K]): UploadsConfigurations[K];
+export declare function uploadsConfig<K extends keyof UploadsConfigurations>(key: K, defaultValue?: UploadsConfigurations[K]): UploadsConfigurations[K];
 //#endregion
-export { UPLOADS_DEFAULTS, uploadsConfig };
 //# sourceMappingURL=uploads-config.d.mts.map

package/esm/http/uploads-config.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"uploads-config.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/uploads-config.ts"],"mappings":";;;;;AASA;;;;cAAa,gBAAA,EAAkB,qBAQ9B;AAkBD;;;;;;;;;;;;;;;;AAAA,iBAAgB,aAAA,iBAA8B,qBAAA,EAC5C,GAAA,EAAK,CAAA,EACL,YAAA,GAAe,qBAAA,CAAsB,CAAA,IACpC,qBAAA,CAAsB,CAAA"}
+{"version":3,"file":"uploads-config.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/uploads-config.ts"],"mappings":";;;;;;;;qBASa,kBAAkB;;;;;;;;;;;;;;;;;wBA0Bf,cAAc,gBAAgB,uBAC5C,KAAK,GACL,eAAe,sBAAsB,KACpC,sBAAsB"}

package/esm/http/uploads-types.d.mts

@@ -1,7 +1,8 @@
 import { StorageDriverName } from "../storage/types.mjs";
+import "../storage/index.mjs";
 import { Image, ImageFormat, ImageTransformOptions } from "../image/image.mjs";
+import "../image/index.mjs";
 import { FileValidationOptions } from "./uploaded-file.mjs";
-
 //#region ../../packages/core/src/http/uploads-types.d.ts
 /**
  * Prefix options for file path generation
@@ -24,7 +25,7 @@ import { FileValidationOptions } from "./uploaded-file.mjs";
  * // → a7x9/image.png
  * ```
  */
-type PrefixOptions = {
+export type PrefixOptions = {
   /**
    * Date format string using tokens:
    * - `dd`: Day (01-31)
@@ -65,7 +66,7 @@ type PrefixOptions = {
  * - `string`: Static prefix string (e.g., "avatar-", "user-123-")
  * - `PrefixOptions`: Full control over format, randomness, and output mode
  */
-type PrefixConfig = boolean | string | PrefixOptions;
+export type PrefixConfig = boolean | string | PrefixOptions;
 /**
  * File naming strategy
  *
@@ -73,7 +74,7 @@ type PrefixConfig = boolean | string | PrefixOptions;
  * - `"original"`: Use the original uploaded filename (sanitized)
  * - `string`: Custom filename (extension auto-appended from original file)
  */
-type FileNamingStrategy = "random" | "original" | (string & {});
+export type FileNamingStrategy = "random" | "original" | (string & {});
 /**
  * Options for saving uploaded files
  *
@@ -92,7 +93,7 @@ type FileNamingStrategy = "random" | "original" | (string & {});
  * });
  * ```
  */
-type SaveOptions = {
+export type SaveOptions = {
   /**
    * Filename strategy
    *
@@ -133,7 +134,7 @@ type SaveOptions = {
  *
  * Same as SaveOptions but without name/prefix since the full path is explicit.
  */
-type SaveAsOptions = Omit<SaveOptions, "name" | "prefix">;
+export type SaveAsOptions = Omit<SaveOptions, "name" | "prefix">;
 /**
  * Image transformation callback function
  *
@@ -149,7 +150,7 @@ type SaveAsOptions = Omit<SaveOptions, "name" | "prefix">;
  * );
  * ```
  */
-type ImageTransformCallback = (img: Image) => Image;
+export type ImageTransformCallback = (img: Image) => Image;
 /**
  * Image transformation configuration
  *
@@ -157,7 +158,7 @@ type ImageTransformCallback = (img: Image) => Image;
  * - An options object with predefined transforms
  * - A callback function for full control
  */
-type ImageTransformConfig = ImageTransformOptions | ImageTransformCallback;
+export type ImageTransformConfig = ImageTransformOptions | ImageTransformCallback;
 /**
  * Uploads configuration for app config
  *
@@ -172,7 +173,7 @@ type ImageTransformConfig = ImageTransformOptions | ImageTransformCallback;
  * }
  * ```
  */
-type UploadsConfigurations = {
+export type UploadsConfigurations = {
   /**
    * Default naming strategy for uploaded files
    *
@@ -216,11 +217,11 @@ type UploadsConfigurations = {
 /**
  * Output formats a client may request with `&format=` on an image variant
  */
-type ImageVariantOutputFormat = "avif" | "webp";
+export type ImageVariantOutputFormat = "avif" | "webp";
 /**
  * How an image variant fits into its box, see sharp's `fit` resize option
  */
-type ImageVariantFit = "cover" | "contain" | "inside";
+export type ImageVariantFit = "cover" | "contain" | "inside";
 /**
  * One named image variant
  *
@@ -229,7 +230,7 @@ type ImageVariantFit = "cover" | "contain" | "inside";
  * { width: 640, height: 480, fit: "cover", quality: 80 }
  * ```
  */
-type ImageVariantDefinition = {
+export type ImageVariantDefinition = {
   /**
    * Target width in pixels, a positive integer up to 8192
    */
@@ -272,7 +273,7 @@ type ImageVariantDefinition = {
  * }
  * ```
  */
-type UploadsImagesConfigurations = {
+export type UploadsImagesConfigurations = {
   /**
    * The named variants a client may request with `?variant=<name>`
    */
@@ -296,18 +297,24 @@ type UploadsImagesConfigurations = {
    */
   maxSourcePixels?: number;
   /**
-   * Absolute directory the generated variants are cached in
+   * Absolute directory dedicated to generated variants. Keep originals and
+   * other application files elsewhere; purge removes recognized cache files
+   * without deleting this directory.
    *
    * @default storage.root(".cache/image-variants")
    */
   cacheDirectory?: string;
+  /** Maximum total cached derivative bytes. Default 512 MiB. */
+  maxCacheBytes?: number;
+  /** Maximum derivative age in seconds, measured from generation. Default 7 days. */
+  maxCacheAge?: number;
 };
 /**
  * High-level image options that can be chained on UploadedFile
  *
  * These are stored internally and applied before saving.
  */
-type UploadedFileImageOptions = {
+export type UploadedFileImageOptions = {
   /**
    * Resize dimensions
    */
@@ -337,5 +344,4 @@ type UploadedFileImageOptions = {
   grayscale?: boolean;
 };
 //#endregion
-export { FileNamingStrategy, ImageTransformCallback, ImageTransformConfig, ImageVariantDefinition, ImageVariantFit, ImageVariantOutputFormat, PrefixConfig, PrefixOptions, SaveAsOptions, SaveOptions, UploadedFileImageOptions, UploadsConfigurations, UploadsImagesConfigurations };
 //# sourceMappingURL=uploads-types.d.mts.map

package/esm/http/uploads-types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"uploads-types.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/uploads-types.ts"],"mappings":";;;;;;;;;AAyBA;;;;;;;;AAiCI;AAWJ;;;;AAA2D;AAS3D;;;KArDY,aAAA;EAqDkB;AAoB9B;;;;;;;;;;;;EA3DE,MAAA;EAyFA;;;;;AAOgC;AAQlC;;EA9FE,YAAA;EA8F0B;AAAgB;AAiB5C;;;;;EAtGE,EAAA;AAAA;;AAsGwD;AAS1D;;;;AAAiF;AAgBjF;KApHY,YAAA,sBAAkC,aAAa;;;;;;;;KAS/C,kBAAA;;;AAsJ0B;AAMtC;;;;AAAoC;AAKpC;;;;AAA2B;AAU3B;;;;;KAvJY,WAAA;EAuKV;;;;;AAcO;AAkBT;;;EA7LE,IAAA,GAAO,kBAAA;EAiMY;;;;;;;;;EAtLnB,MAAA,GAAS,YAAA;EA6LU;;;;;AAqBL;AAQhB;EAjNE,MAAA,GAAS,iBAAA;;;;;;EAOT,QAAA,GAAW,qBAAA;AAAA;;;;;;KAQD,aAAA,GAAgB,IAAI,CAAC,WAAA;;;;;;;;;;;;;;;;KAiBrB,sBAAA,IAA0B,GAAA,EAAK,KAAA,KAAU,KAAK;;;;;;;;KAS9C,oBAAA,GAAuB,qBAAA,GAAwB,sBAAsB;;;;;;;;;;;;;;;KAgBrE,qBAAA;;;;;;EAMV,IAAA;;;;;;EAOA,YAAA;;;;;;;;;EAUA,MAAA,GAAS,YAAA;;;;;;EAOT,mBAAA;;;;;;;;;;;;EAaA,MAAA,GAAS,2BAA2B;AAAA;;;;KAM1B,wBAAA;;;;KAKA,eAAA;;;;;;;;;KAUA,sBAAA;;;;EAIV,KAAA;;;;EAKA,MAAA;;;;;;EAOA,GAAA,GAAM,eAAe;;;;EAKrB,OAAA;;;;;;;;EASA,OAAA;AAAA;;;;;;;;;;;;;;;;KAkBU,2BAAA;;;;EAIV,QAAA,EAAU,QAAA,CAAS,MAAA,SAAe,sBAAA;;;;;;EAOlC,OAAA,YAAmB,wBAAA;;;;;;EAOnB,cAAA;;;;;;EAOA,eAAA;;;;;;EAOA,cAAA;AAAA;;;;;;KAQU,wBAAA;;;;EAIV,MAAA;IAAW,KAAA;IAAe,MAAA;EAAA;;;;EAK1B,OAAA;;;;EAKA,MAAA,GAAS,WAAW;;;;EAKpB,MAAA;;;;EAKA,IAAA;;;;EAKA,SAAA;AAAA"}
+{"version":3,"file":"uploads-types.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/uploads-types.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;YAyBY;;;;;;;;;;;;;;EAcV;;;;;;;;;EAUA;;;;;;;;EASA;;;;;;;;;;YAWU,kCAAkC;;;;;;;;YASlC;;;;;;;;;;;;;;;;;;;YAoBA;;;;;;;;;;EAUV,OAAO;;;;;;;;;;EAWP,SAAS;;;;;;;;EAST,SAAS;;;;;;EAOT,WAAW;;;;;;;YAQD,gBAAgB,KAAK;;;;;;;;;;;;;;;;YAiBrB,0BAA0B,KAAK,UAAU;;;;;;;;YASzC,uBAAuB,wBAAwB;;;;;;;;;;;;;;;YAgB/C;;;;;;EAMV;;;;;;EAOA;;;;;;;;;EAUA,SAAS;;;;;;EAOT;;;;;;;;;;;;EAaA,SAAS;;;;;YAMC;;;;YAKA;;;;;;;;;YAUA;;;;EAIV;;;;EAKA;;;;;;EAOA,MAAM;;;;EAKN;;;;;;;;EASA;;;;;;;;;;;;;;;;;YAkBU;;;;EAIV,UAAU,SAAS,eAAe;;;;;;EAOlC,mBAAmB;;;;;;EAOnB;;;;;;EAOA;;;;;;;;EASA;;EAGA;;EAGA;;;;;;;YAQU;;;;EAIV;IAAW;IAAe;;;;;EAK1B;;;;EAKA,SAAS;;;;EAKT;;;;EAKA;;;;EAKA"}

package/esm/http/xmlable.d.mts

@@ -6,9 +6,8 @@
  * feed package) never imports core — a `Sitemap` satisfies `XMLable` just by
  * having a `toXML()` method.
  */
-interface XMLable {
+export interface XMLable {
   toXML(): string;
 }
 //#endregion
-export { XMLable };
 //# sourceMappingURL=xmlable.d.mts.map

package/esm/http/xmlable.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"xmlable.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/xmlable.ts"],"mappings":";;AAOA;;;;AACO;;UADU,OAAA;EACf,KAAK;AAAA"}
+{"version":3,"file":"xmlable.d.mts","names":[],"sources":["../../../../../../../../packages/core/src/http/xmlable.ts"],"mappings":";;;;;;;;iBAOiB;EACf"}

package/esm/image/image.d.mts

@@ -1,12 +1,11 @@
 import sharp, { FormatEnum } from "sharp";
-
 //#region ../../packages/core/src/image/image.d.ts
-type ImageFormat = keyof FormatEnum;
-type ImageInput = string | Buffer | Uint8Array | ArrayBuffer;
+export type ImageFormat = keyof FormatEnum;
+export type ImageInput = string | Buffer | Uint8Array | ArrayBuffer;
 /**
  * Watermark configuration for deferred execution
  */
-type WatermarkConfig = {
+export type WatermarkConfig = {
   image: ImageInput | Image;
   options: sharp.OverlayOptions;
 };
@@ -70,7 +69,7 @@ type ImageOperation = {
  * 10. opacity - Transparency (applied via composite)
  * 11. format/quality - Applied on save/export
  */
-type ImageTransformOptions = {
+export type ImageTransformOptions = {
   /**
    * Output quality (1-100), applied based on final format
    */
@@ -174,7 +173,7 @@ type InternalOptions = {
  *   .save("output.jpg");
  * ```
  */
-declare class Image {
+export declare class Image {
   /**
    * Image options that will be applied on save/export
    */
@@ -386,5 +385,5 @@ declare class Image {
   reset(): this;
 }
 //#endregion
-export { Image, ImageFormat, ImageInput, ImageTransformOptions, WatermarkConfig };
+export {};
 //# sourceMappingURL=image.d.mts.map