@warlock.js/core 5.30.0 → 5.31.0

package/esm/http/uploads/resolve-image-variant.d.mts

@@ -3,7 +3,7 @@ import { VariantOutputFormat } from "./image-variant-types.mjs";
 
 //#region ../../packages/core/src/http/uploads/resolve-image-variant.d.ts
 /**
- * What to render: a file on a local disk and a variant named in
+ * What to render: a file on a storage disk and a variant named in
  * `uploads.images.variants`
  */
 type ResolveImageVariantInput = {
@@ -21,7 +21,7 @@ type ResolveImageVariantInput = {
    */
   format?: VariantOutputFormat;
   /**
-   * Local disk the source lives on; the default disk when omitted
+   * Disk the source lives on; the default disk when omitted
    */
   disk?: StorageDriverName;
 };
@@ -41,7 +41,7 @@ type ResolvedImageVariant = {
   contentType: string;
 };
 /**
- * Resolve, and render on a cache miss, one variant of an image on a local
+ * Resolve, and render on a cache miss, one variant of an image on a storage
  * disk. This is what `uploadedFileController` serves; call it from your own
  * route to serve variants of a private disk behind authentication:
  *
@@ -61,7 +61,6 @@ type ResolvedImageVariant = {
  * are pruned once a new derivative is written.
  *
  * @returns `undefined` when the path does not resolve to a file on the disk
- * @throws ImageVariantsConfigError when the disk is not a local disk
  * @throws HttpError(400) when variants are not configured, or the variant or
  * format is not allowed
  * @throws HttpError(413) when the source is over the configured limits

package/esm/http/uploads/resolve-image-variant.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-image-variant.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variant.ts"],"mappings":";;;;;;AAoCA;;KAAY,wBAAA;EAoBc;;;EAhBxB,IAAA;EAWS;;;EANT,OAAA;EAWwB;AAM1B;;;EAXE,MAAA,GAAS,mBAAA;EAeT;;;EAVA,IAAA,GAAO,iBAAiB;AAAA;;AAmBb;AAwCb;KArDY,oBAAA;;;;EAIV,YAAA;EAmDQ;;;EA9CR,IAAA;EAEA,MAAA,EAAQ,mBAAmB;EAE3B,WAAA;AAAA;AA0C6B;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iBAFT,mBAAA,CACpB,KAAA,EAAO,wBAAA,GACN,OAAA,CAAQ,oBAAA"}
+{"version":3,"file":"resolve-image-variant.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variant.ts"],"mappings":";;;;;;AAoCA;;KAAY,wBAAA;EAoBc;;;EAhBxB,IAAA;EAWS;;;EANT,OAAA;EAWwB;AAM1B;;;EAXE,MAAA,GAAS,mBAAA;EAeT;;;EAVA,IAAA,GAAO,iBAAiB;AAAA;;AAmBb;AA6Bb;KA1CY,oBAAA;;;;EAIV,YAAA;EAwCQ;;;EAnCR,IAAA;EAEA,MAAA,EAAQ,mBAAmB;EAE3B,WAAA;AAAA;AA+B6B;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iBAFT,mBAAA,CACpB,KAAA,EAAO,wBAAA,GACN,OAAA,CAAQ,oBAAA"}

package/esm/http/uploads/resolve-image-variant.mjs

@@ -2,14 +2,14 @@ import { HttpError } from "../errors/errors.mjs";
 import { uploadsConfig } from "../uploads-config.mjs";
 import { variantCacheKey, variantCachePath, variantGenerationTag, variantSourceDirectory, variantSourceKey } from "./variant-cache-key.mjs";
 import { pruneStaleVariantGenerationsIfCurrent, retryOnVanishedDirectory, warnIfVariantCacheIsPublic } from "./image-variant-cache.mjs";
-import { generateImageVariant } from "./generate-image-variant.mjs";
-import { ImageVariantsConfigError } from "./image-variants-config-error.mjs";
+import { localDiskRoot } from "./local-disk-root.mjs";
 import { loadVariantSource } from "./load-variant-source.mjs";
+import { generateImageVariant } from "./generate-image-variant.mjs";
 import { resolveImageVariantsConfig } from "./resolve-image-variants-config.mjs";
-import { resolveVariantCandidate } from "./resolve-variant-candidate.mjs";
+import { freshImageVariant, scheduleImageVariantCacheTrim } from "./trim-image-variant-cache.mjs";
 import { variantGenerations } from "./variant-generations.mjs";
-import { localDiskRoot } from "./local-disk-root.mjs";
-import fs from "node:fs/promises";
+import { resolveRemoteImageVariant } from "./resolve-remote-image-variant.mjs";
+import { resolveVariantCandidate } from "./resolve-variant-candidate.mjs";
 
 //#region ../../packages/core/src/http/uploads/resolve-image-variant.ts
 const CONTENT_TYPES = {
@@ -18,16 +18,8 @@ const CONTENT_TYPES = {
 	webp: "image/webp",
 	avif: "image/avif"
 };
-async function exists(target) {
-	try {
-		await fs.access(target);
-		return true;
-	} catch {
-		return false;
-	}
-}
 /**
-* Resolve, and render on a cache miss, one variant of an image on a local
+* Resolve, and render on a cache miss, one variant of an image on a storage
 * disk. This is what `uploadedFileController` serves; call it from your own
 * route to serve variants of a private disk behind authentication:
 *
@@ -47,7 +39,6 @@ async function exists(target) {
 * are pruned once a new derivative is written.
 *
 * @returns `undefined` when the path does not resolve to a file on the disk
-* @throws ImageVariantsConfigError when the disk is not a local disk
 * @throws HttpError(400) when variants are not configured, or the variant or
 * format is not allowed
 * @throws HttpError(413) when the source is over the configured limits
@@ -55,7 +46,7 @@ async function exists(target) {
 */
 async function resolveImageVariant(input) {
 	const diskRoot = localDiskRoot(input.disk);
-	if (!diskRoot) throw new ImageVariantsConfigError(input.disk === void 0 ? "Image variants need a local storage driver with a root." : `Image variants need a local disk; "${input.disk}" is not one.`);
+	if (!diskRoot) return resolveRemoteImageVariant(input);
 	const images = resolveImageVariantsConfig(uploadsConfig("images"), diskRoot);
 	if (!images) throw new HttpError(400, "Image variants are not configured.");
 	const variant = Object.prototype.hasOwnProperty.call(images.variants, input.variant) ? images.variants[input.variant] : void 0;
@@ -79,8 +70,8 @@ async function resolveImageVariant(input) {
 		sourceKey,
 		generation
 	}, hash, format);
-	if (!await exists(target)) await variantGenerations.run(target, async () => {
-		if (await exists(target)) return;
+	if (!await freshImageVariant(target, images.maxCacheAge)) await variantGenerations.run(target, async () => {
+		if (await freshImageVariant(target, images.maxCacheAge)) return;
 		const image = await loadVariantSource(source.absolutePath, {
 			maxSourceBytes: images.maxSourceBytes,
 			maxSourcePixels: images.maxSourcePixels,
@@ -92,6 +83,7 @@ async function resolveImageVariant(input) {
 			format,
 			targetPath: target
 		}));
+		scheduleImageVariantCacheTrim(images, target);
 		await pruneStaleVariantGenerationsIfCurrent(source.absolutePath, variantSourceDirectory(images.cacheDirectory, sourceKey), generation);
 	});
 	return {

package/esm/http/uploads/resolve-image-variant.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-image-variant.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variant.ts"],"sourcesContent":["import fs from \"node:fs/promises\";\nimport type { StorageDriverName } from \"../../storage/types\";\nimport { HttpError } from \"../errors\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport { generateImageVariant } from \"./generate-image-variant\";\nimport {\n  pruneStaleVariantGenerationsIfCurrent,\n  retryOnVanishedDirectory,\n  warnIfVariantCacheIsPublic,\n} from \"./image-variant-cache\";\nimport { ImageVariantsConfigError } from \"./image-variants-config-error\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\nimport { loadVariantSource } from \"./load-variant-source\";\nimport { localDiskRoot } from \"./local-disk-root\";\nimport { resolveImageVariantsConfig } from \"./resolve-image-variants-config\";\nimport { resolveVariantCandidate } from \"./resolve-variant-candidate\";\nimport {\n  variantCacheKey,\n  variantCachePath,\n  variantGenerationTag,\n  variantSourceDirectory,\n  variantSourceKey,\n} from \"./variant-cache-key\";\nimport { variantGenerations } from \"./variant-generations\";\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\n/**\n * What to render: a file on a local disk and a variant named in\n * `uploads.images.variants`\n */\nexport type ResolveImageVariantInput = {\n  /**\n   * Path of the source, relative to the disk root\n   */\n  path: string;\n\n  /**\n   * Variant name from `uploads.images.variants`\n   */\n  variant: string;\n\n  /**\n   * Output format; defaults to the source's own format. Must be the source\n   * format or one listed in `uploads.images.formats`.\n   */\n  format?: VariantOutputFormat;\n\n  /**\n   * Local disk the source lives on; the default disk when omitted\n   */\n  disk?: StorageDriverName;\n};\n\n/**\n * A derivative on disk, ready to send\n */\nexport type ResolvedImageVariant = {\n  /**\n   * Absolute path of the cached derivative\n   */\n  absolutePath: string;\n\n  /**\n   * sha256 of everything the derivative depends on; a strong ETag value\n   */\n  hash: string;\n\n  format: VariantOutputFormat;\n\n  contentType: string;\n};\n\nasync function exists(target: string): Promise<boolean> {\n  try {\n    await fs.access(target);\n\n    return true;\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Resolve, and render on a cache miss, one variant of an image on a local\n * disk. This is what `uploadedFileController` serves; call it from your own\n * route to serve variants of a private disk behind authentication:\n *\n * ```ts\n * const variant = await resolveImageVariant({ disk: \"private\", path, variant: \"thumb\" });\n * if (!variant) return response.notFound();\n * return response.sendBuffer(await fs.readFile(variant.absolutePath), {\n *   contentType: variant.contentType,\n * });\n * ```\n *\n * The same guards apply as on the public route: the path must stay inside\n * the disk root and outside the derivative cache, the source must be a\n * jpeg/png/webp/avif within `maxSourceBytes`/`maxSourcePixels`, and only\n * declared variants and formats render. Derivatives are generated once per\n * key, even under concurrent calls, and older versions of a rewritten source\n * are pruned once a new derivative is written.\n *\n * @returns `undefined` when the path does not resolve to a file on the disk\n * @throws ImageVariantsConfigError when the disk is not a local disk\n * @throws HttpError(400) when variants are not configured, or the variant or\n * format is not allowed\n * @throws HttpError(413) when the source is over the configured limits\n * @throws HttpError(415) when the source is not jpeg, png, webp or avif\n */\nexport async function resolveImageVariant(\n  input: ResolveImageVariantInput,\n): Promise<ResolvedImageVariant | undefined> {\n  const diskRoot = localDiskRoot(input.disk);\n\n  if (!diskRoot) {\n    throw new ImageVariantsConfigError(\n      input.disk === undefined\n        ? \"Image variants need a local storage driver with a root.\"\n        : `Image variants need a local disk; \"${input.disk}\" is not one.`,\n    );\n  }\n\n  const images = resolveImageVariantsConfig(uploadsConfig(\"images\"), diskRoot);\n\n  if (!images) {\n    throw new HttpError(400, \"Image variants are not configured.\");\n  }\n\n  const variant = Object.prototype.hasOwnProperty.call(images.variants, input.variant)\n    ? images.variants[input.variant]\n    : undefined;\n\n  if (variant === undefined) {\n    throw new HttpError(400, `Unknown variant \"${input.variant}\".`);\n  }\n\n  if (input.format !== undefined && !images.formats.includes(input.format as never)) {\n    throw new HttpError(400, `Format \"${input.format}\" is not allowed.`);\n  }\n\n  warnIfVariantCacheIsPublic(images.cacheDirectory);\n\n  const candidate = await resolveVariantCandidate(input.path, diskRoot, images);\n\n  if (!candidate) return undefined;\n\n  const { source, stats, sourceFormat } = candidate;\n  const format: VariantOutputFormat = input.format ?? sourceFormat;\n  const hash = variantCacheKey({\n    relativePath: source.relativePath,\n    sourceSize: stats.size,\n    sourceMtimeMs: stats.mtimeMs,\n    variant,\n    format,\n  });\n  const sourceKey = variantSourceKey(source.root, source.relativePath);\n  const generation = variantGenerationTag(stats.size, stats.mtimeMs);\n  const target = variantCachePath(images.cacheDirectory, { sourceKey, generation }, hash, format);\n\n  if (!(await exists(target))) {\n    // Keyed on the target path, which includes the disk's real root: the\n    // same file on two disks (a mirror copied with its mtime) has the same\n    // `hash`, and joining the other disk's flight would leave this target\n    // unwritten.\n    await variantGenerations.run(target, async () => {\n      if (await exists(target)) return;\n\n      const image = await loadVariantSource(source.absolutePath, {\n        maxSourceBytes: images.maxSourceBytes,\n        maxSourcePixels: images.maxSourcePixels,\n        expectedFormat: sourceFormat,\n      });\n\n      await retryOnVanishedDirectory(() =>\n        generateImageVariant({ image: image.clone(), variant, format, targetPath: target }),\n      );\n      await pruneStaleVariantGenerationsIfCurrent(\n        source.absolutePath,\n        variantSourceDirectory(images.cacheDirectory, sourceKey),\n        generation,\n      );\n    });\n  }\n\n  return { absolutePath: target, hash, format, contentType: CONTENT_TYPES[format] };\n}\n"],"mappings":";;;;;;;;;;;;;;AAyBA,MAAM,gBAAqD;CACzD,MAAM;CACN,KAAK;CACL,MAAM;CACN,MAAM;AACR;AAgDA,eAAe,OAAO,QAAkC;CACtD,IAAI;EACF,MAAM,GAAG,OAAO,MAAM;EAEtB,OAAO;CACT,QAAQ;EACN,OAAO;CACT;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,eAAsB,oBACpB,OAC2C;CAC3C,MAAM,WAAW,cAAc,MAAM,IAAI;CAEzC,IAAI,CAAC,UACH,MAAM,IAAI,yBACR,MAAM,SAAS,SACX,4DACA,sCAAsC,MAAM,KAAK,cACvD;CAGF,MAAM,SAAS,2BAA2B,cAAc,QAAQ,GAAG,QAAQ;CAE3E,IAAI,CAAC,QACH,MAAM,IAAI,UAAU,KAAK,oCAAoC;CAG/D,MAAM,UAAU,OAAO,UAAU,eAAe,KAAK,OAAO,UAAU,MAAM,OAAO,IAC/E,OAAO,SAAS,MAAM,WACtB;CAEJ,IAAI,YAAY,QACd,MAAM,IAAI,UAAU,KAAK,oBAAoB,MAAM,QAAQ,GAAG;CAGhE,IAAI,MAAM,WAAW,UAAa,CAAC,OAAO,QAAQ,SAAS,MAAM,MAAe,GAC9E,MAAM,IAAI,UAAU,KAAK,WAAW,MAAM,OAAO,kBAAkB;CAGrE,2BAA2B,OAAO,cAAc;CAEhD,MAAM,YAAY,MAAM,wBAAwB,MAAM,MAAM,UAAU,MAAM;CAE5E,IAAI,CAAC,WAAW,OAAO;CAEvB,MAAM,EAAE,QAAQ,OAAO,iBAAiB;CACxC,MAAM,SAA8B,MAAM,UAAU;CACpD,MAAM,OAAO,gBAAgB;EAC3B,cAAc,OAAO;EACrB,YAAY,MAAM;EAClB,eAAe,MAAM;EACrB;EACA;CACF,CAAC;CACD,MAAM,YAAY,iBAAiB,OAAO,MAAM,OAAO,YAAY;CACnE,MAAM,aAAa,qBAAqB,MAAM,MAAM,MAAM,OAAO;CACjE,MAAM,SAAS,iBAAiB,OAAO,gBAAgB;EAAE;EAAW;CAAW,GAAG,MAAM,MAAM;CAE9F,IAAI,CAAE,MAAM,OAAO,MAAM,GAKvB,MAAM,mBAAmB,IAAI,QAAQ,YAAY;EAC/C,IAAI,MAAM,OAAO,MAAM,GAAG;EAE1B,MAAM,QAAQ,MAAM,kBAAkB,OAAO,cAAc;GACzD,gBAAgB,OAAO;GACvB,iBAAiB,OAAO;GACxB,gBAAgB;EAClB,CAAC;EAED,MAAM,+BACJ,qBAAqB;GAAE,OAAO,MAAM,MAAM;GAAG;GAAS;GAAQ,YAAY;EAAO,CAAC,CACpF;EACA,MAAM,sCACJ,OAAO,cACP,uBAAuB,OAAO,gBAAgB,SAAS,GACvD,UACF;CACF,CAAC;CAGH,OAAO;EAAE,cAAc;EAAQ;EAAM;EAAQ,aAAa,cAAc;CAAQ;AAClF"}
+{"version":3,"file":"resolve-image-variant.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variant.ts"],"sourcesContent":["import type { StorageDriverName } from \"../../storage/types\";\nimport { HttpError } from \"../errors\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport { generateImageVariant } from \"./generate-image-variant\";\nimport {\n  pruneStaleVariantGenerationsIfCurrent,\n  retryOnVanishedDirectory,\n  warnIfVariantCacheIsPublic,\n} from \"./image-variant-cache\";\nimport { resolveRemoteImageVariant } from \"./resolve-remote-image-variant\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\nimport { loadVariantSource } from \"./load-variant-source\";\nimport { localDiskRoot } from \"./local-disk-root\";\nimport { resolveImageVariantsConfig } from \"./resolve-image-variants-config\";\nimport { resolveVariantCandidate } from \"./resolve-variant-candidate\";\nimport {\n  variantCacheKey,\n  variantCachePath,\n  variantGenerationTag,\n  variantSourceDirectory,\n  variantSourceKey,\n} from \"./variant-cache-key\";\nimport { freshImageVariant, scheduleImageVariantCacheTrim } from \"./trim-image-variant-cache\";\nimport { variantGenerations } from \"./variant-generations\";\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\n/**\n * What to render: a file on a storage disk and a variant named in\n * `uploads.images.variants`\n */\nexport type ResolveImageVariantInput = {\n  /**\n   * Path of the source, relative to the disk root\n   */\n  path: string;\n\n  /**\n   * Variant name from `uploads.images.variants`\n   */\n  variant: string;\n\n  /**\n   * Output format; defaults to the source's own format. Must be the source\n   * format or one listed in `uploads.images.formats`.\n   */\n  format?: VariantOutputFormat;\n\n  /**\n   * Disk the source lives on; the default disk when omitted\n   */\n  disk?: StorageDriverName;\n};\n\n/**\n * A derivative on disk, ready to send\n */\nexport type ResolvedImageVariant = {\n  /**\n   * Absolute path of the cached derivative\n   */\n  absolutePath: string;\n\n  /**\n   * sha256 of everything the derivative depends on; a strong ETag value\n   */\n  hash: string;\n\n  format: VariantOutputFormat;\n\n  contentType: string;\n};\n\n/**\n * Resolve, and render on a cache miss, one variant of an image on a storage\n * disk. This is what `uploadedFileController` serves; call it from your own\n * route to serve variants of a private disk behind authentication:\n *\n * ```ts\n * const variant = await resolveImageVariant({ disk: \"private\", path, variant: \"thumb\" });\n * if (!variant) return response.notFound();\n * return response.sendBuffer(await fs.readFile(variant.absolutePath), {\n *   contentType: variant.contentType,\n * });\n * ```\n *\n * The same guards apply as on the public route: the path must stay inside\n * the disk root and outside the derivative cache, the source must be a\n * jpeg/png/webp/avif within `maxSourceBytes`/`maxSourcePixels`, and only\n * declared variants and formats render. Derivatives are generated once per\n * key, even under concurrent calls, and older versions of a rewritten source\n * are pruned once a new derivative is written.\n *\n * @returns `undefined` when the path does not resolve to a file on the disk\n * @throws HttpError(400) when variants are not configured, or the variant or\n * format is not allowed\n * @throws HttpError(413) when the source is over the configured limits\n * @throws HttpError(415) when the source is not jpeg, png, webp or avif\n */\nexport async function resolveImageVariant(\n  input: ResolveImageVariantInput,\n): Promise<ResolvedImageVariant | undefined> {\n  const diskRoot = localDiskRoot(input.disk);\n\n  if (!diskRoot) return resolveRemoteImageVariant(input);\n\n  const images = resolveImageVariantsConfig(uploadsConfig(\"images\"), diskRoot);\n\n  if (!images) {\n    throw new HttpError(400, \"Image variants are not configured.\");\n  }\n\n  const variant = Object.prototype.hasOwnProperty.call(images.variants, input.variant)\n    ? images.variants[input.variant]\n    : undefined;\n\n  if (variant === undefined) {\n    throw new HttpError(400, `Unknown variant \"${input.variant}\".`);\n  }\n\n  if (input.format !== undefined && !images.formats.includes(input.format as never)) {\n    throw new HttpError(400, `Format \"${input.format}\" is not allowed.`);\n  }\n\n  warnIfVariantCacheIsPublic(images.cacheDirectory);\n\n  const candidate = await resolveVariantCandidate(input.path, diskRoot, images);\n\n  if (!candidate) return undefined;\n\n  const { source, stats, sourceFormat } = candidate;\n  const format: VariantOutputFormat = input.format ?? sourceFormat;\n  const hash = variantCacheKey({\n    relativePath: source.relativePath,\n    sourceSize: stats.size,\n    sourceMtimeMs: stats.mtimeMs,\n    variant,\n    format,\n  });\n  const sourceKey = variantSourceKey(source.root, source.relativePath);\n  const generation = variantGenerationTag(stats.size, stats.mtimeMs);\n  const target = variantCachePath(images.cacheDirectory, { sourceKey, generation }, hash, format);\n\n  if (!(await freshImageVariant(target, images.maxCacheAge))) {\n    // Keyed on the target path, which includes the disk's real root: the\n    // same file on two disks (a mirror copied with its mtime) has the same\n    // `hash`, and joining the other disk's flight would leave this target\n    // unwritten.\n    await variantGenerations.run(target, async () => {\n      if (await freshImageVariant(target, images.maxCacheAge)) return;\n\n      const image = await loadVariantSource(source.absolutePath, {\n        maxSourceBytes: images.maxSourceBytes,\n        maxSourcePixels: images.maxSourcePixels,\n        expectedFormat: sourceFormat,\n      });\n\n      await retryOnVanishedDirectory(() =>\n        generateImageVariant({ image: image.clone(), variant, format, targetPath: target }),\n      );\n      scheduleImageVariantCacheTrim(images, target);\n      await pruneStaleVariantGenerationsIfCurrent(\n        source.absolutePath,\n        variantSourceDirectory(images.cacheDirectory, sourceKey),\n        generation,\n      );\n    });\n  }\n\n  return { absolutePath: target, hash, format, contentType: CONTENT_TYPES[format] };\n}\n"],"mappings":";;;;;;;;;;;;;;AAyBA,MAAM,gBAAqD;CACzD,MAAM;CACN,KAAK;CACL,MAAM;CACN,MAAM;AACR;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0EA,eAAsB,oBACpB,OAC2C;CAC3C,MAAM,WAAW,cAAc,MAAM,IAAI;CAEzC,IAAI,CAAC,UAAU,OAAO,0BAA0B,KAAK;CAErD,MAAM,SAAS,2BAA2B,cAAc,QAAQ,GAAG,QAAQ;CAE3E,IAAI,CAAC,QACH,MAAM,IAAI,UAAU,KAAK,oCAAoC;CAG/D,MAAM,UAAU,OAAO,UAAU,eAAe,KAAK,OAAO,UAAU,MAAM,OAAO,IAC/E,OAAO,SAAS,MAAM,WACtB;CAEJ,IAAI,YAAY,QACd,MAAM,IAAI,UAAU,KAAK,oBAAoB,MAAM,QAAQ,GAAG;CAGhE,IAAI,MAAM,WAAW,UAAa,CAAC,OAAO,QAAQ,SAAS,MAAM,MAAe,GAC9E,MAAM,IAAI,UAAU,KAAK,WAAW,MAAM,OAAO,kBAAkB;CAGrE,2BAA2B,OAAO,cAAc;CAEhD,MAAM,YAAY,MAAM,wBAAwB,MAAM,MAAM,UAAU,MAAM;CAE5E,IAAI,CAAC,WAAW,OAAO;CAEvB,MAAM,EAAE,QAAQ,OAAO,iBAAiB;CACxC,MAAM,SAA8B,MAAM,UAAU;CACpD,MAAM,OAAO,gBAAgB;EAC3B,cAAc,OAAO;EACrB,YAAY,MAAM;EAClB,eAAe,MAAM;EACrB;EACA;CACF,CAAC;CACD,MAAM,YAAY,iBAAiB,OAAO,MAAM,OAAO,YAAY;CACnE,MAAM,aAAa,qBAAqB,MAAM,MAAM,MAAM,OAAO;CACjE,MAAM,SAAS,iBAAiB,OAAO,gBAAgB;EAAE;EAAW;CAAW,GAAG,MAAM,MAAM;CAE9F,IAAI,CAAE,MAAM,kBAAkB,QAAQ,OAAO,WAAW,GAKtD,MAAM,mBAAmB,IAAI,QAAQ,YAAY;EAC/C,IAAI,MAAM,kBAAkB,QAAQ,OAAO,WAAW,GAAG;EAEzD,MAAM,QAAQ,MAAM,kBAAkB,OAAO,cAAc;GACzD,gBAAgB,OAAO;GACvB,iBAAiB,OAAO;GACxB,gBAAgB;EAClB,CAAC;EAED,MAAM,+BACJ,qBAAqB;GAAE,OAAO,MAAM,MAAM;GAAG;GAAS;GAAQ,YAAY;EAAO,CAAC,CACpF;EACA,8BAA8B,QAAQ,MAAM;EAC5C,MAAM,sCACJ,OAAO,cACP,uBAAuB,OAAO,gBAAgB,SAAS,GACvD,UACF;CACF,CAAC;CAGH,OAAO;EAAE,cAAc;EAAQ;EAAM;EAAQ,aAAa,cAAc;CAAQ;AAClF"}

package/esm/http/uploads/resolve-image-variants-config.mjs

@@ -1,5 +1,5 @@
 import { ImageVariantsConfigError } from "./image-variants-config-error.mjs";
-import path from "node:path";
+import { variantCacheDirectoryFor } from "./image-variant-cache.mjs";
 
 //#region ../../packages/core/src/http/uploads/resolve-image-variants-config.ts
 /**
@@ -76,13 +76,15 @@ function resolveImageVariantsConfig(images, storageRoot) {
 	if (!rawVariants || typeof rawVariants !== "object" || Object.keys(rawVariants).length === 0) throw new ImageVariantsConfigError("uploads.images.variants must declare at least one variant.");
 	const variants = {};
 	for (const [name, raw] of Object.entries(rawVariants)) variants[name] = resolveVariant(name, raw);
-	const cacheDirectory = images.cacheDirectory ? path.resolve(images.cacheDirectory) : path.join(storageRoot, ".cache", "image-variants");
+	const cacheDirectory = variantCacheDirectoryFor(storageRoot, images);
 	return {
 		variants,
 		formats: resolveFormats(images.formats),
 		maxSourceBytes: resolveLimit("maxSourceBytes", images.maxSourceBytes, DEFAULT_MAX_SOURCE_BYTES),
 		maxSourcePixels: resolveLimit("maxSourcePixels", images.maxSourcePixels, DEFAULT_MAX_SOURCE_PIXELS),
-		cacheDirectory
+		cacheDirectory,
+		maxCacheBytes: resolveLimit("maxCacheBytes", images.maxCacheBytes, 512 * 1024 * 1024),
+		maxCacheAge: resolveLimit("maxCacheAge", images.maxCacheAge, 10080 * 60)
 	};
 }
 

package/esm/http/uploads/resolve-image-variants-config.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-image-variants-config.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variants-config.ts"],"sourcesContent":["import path from \"node:path\";\nimport type {\n  ImageVariantDefinition,\n  ImageVariantFit,\n  ImageVariantOutputFormat,\n  UploadsImagesConfigurations,\n} from \"../uploads-types\";\nimport { ImageVariantsConfigError } from \"./image-variants-config-error\";\nimport type { ResolvedImageVariantsConfig } from \"./image-variant-types\";\n\n/**\n * Largest width or height a variant may declare\n */\nexport const MAX_VARIANT_DIMENSION = 8192;\n\n/**\n * Default `maxSourceBytes`: 25 MB\n */\nexport const DEFAULT_MAX_SOURCE_BYTES = 25 * 1024 * 1024;\n\n/**\n * Default `maxSourcePixels`\n */\nexport const DEFAULT_MAX_SOURCE_PIXELS = 40_000_000;\n\nconst FITS: readonly ImageVariantFit[] = [\"cover\", \"contain\", \"inside\"];\n\nconst OUTPUT_FORMATS: readonly ImageVariantOutputFormat[] = [\"avif\", \"webp\"];\n\nconst VARIANT_NAME = /^[A-Za-z0-9_-]+$/;\n\nfunction isPositiveInteger(value: unknown, max = Number.MAX_SAFE_INTEGER): value is number {\n  return typeof value === \"number\" && Number.isInteger(value) && value >= 1 && value <= max;\n}\n\nfunction resolveVariant(name: string, raw: unknown): ImageVariantDefinition {\n  const key = `uploads.images.variants.${name}`;\n\n  if (!VARIANT_NAME.test(name)) {\n    throw new ImageVariantsConfigError(\n      `${key}: a variant name may only use letters, digits, \"-\" and \"_\".`,\n    );\n  }\n\n  if (!raw || typeof raw !== \"object\") {\n    throw new ImageVariantsConfigError(`${key} must be an object with a width.`);\n  }\n\n  const { width, height, fit, quality, enlarge } = raw as Record<string, unknown>;\n\n  if (!isPositiveInteger(width, MAX_VARIANT_DIMENSION)) {\n    throw new ImageVariantsConfigError(\n      `${key}.width must be an integer from 1 to ${MAX_VARIANT_DIMENSION}, got ${JSON.stringify(width)}.`,\n    );\n  }\n\n  const variant: ImageVariantDefinition = { width };\n\n  if (height !== undefined) {\n    if (!isPositiveInteger(height, MAX_VARIANT_DIMENSION)) {\n      throw new ImageVariantsConfigError(\n        `${key}.height must be an integer from 1 to ${MAX_VARIANT_DIMENSION}, got ${JSON.stringify(height)}.`,\n      );\n    }\n\n    variant.height = height;\n  }\n\n  if (fit !== undefined) {\n    if (!FITS.includes(fit as ImageVariantFit)) {\n      throw new ImageVariantsConfigError(\n        `${key}.fit must be one of ${FITS.join(\", \")}, got ${JSON.stringify(fit)}.`,\n      );\n    }\n\n    variant.fit = fit as ImageVariantFit;\n  }\n\n  if (quality !== undefined) {\n    if (!isPositiveInteger(quality, 100)) {\n      throw new ImageVariantsConfigError(\n        `${key}.quality must be an integer from 1 to 100, got ${JSON.stringify(quality)}.`,\n      );\n    }\n\n    variant.quality = quality;\n  }\n\n  if (enlarge !== undefined && typeof enlarge !== \"boolean\") {\n    throw new ImageVariantsConfigError(\n      `${key}.enlarge must be a boolean, got ${JSON.stringify(enlarge)}.`,\n    );\n  }\n\n  // Always set, never left undefined: the effective flag (default false) is\n  // part of the normalized variant, so toggling it changes the cache key.\n  variant.enlarge = enlarge === true;\n\n  return variant;\n}\n\nfunction resolveFormats(raw: unknown): readonly ImageVariantOutputFormat[] {\n  if (raw === undefined) return [];\n\n  if (!Array.isArray(raw)) {\n    throw new ImageVariantsConfigError(`uploads.images.formats must be an array.`);\n  }\n\n  for (const format of raw) {\n    if (!OUTPUT_FORMATS.includes(format)) {\n      throw new ImageVariantsConfigError(\n        `uploads.images.formats may only contain ${OUTPUT_FORMATS.join(\", \")}, got ${JSON.stringify(format)}.`,\n      );\n    }\n  }\n\n  return [...new Set(raw as ImageVariantOutputFormat[])];\n}\n\nfunction resolveLimit(name: string, raw: unknown, fallback: number): number {\n  if (raw === undefined) return fallback;\n\n  if (!isPositiveInteger(raw)) {\n    throw new ImageVariantsConfigError(\n      `uploads.images.${name} must be a positive integer, got ${JSON.stringify(raw)}.`,\n    );\n  }\n\n  return raw;\n}\n\n/**\n * Validate the `uploads.images` config and apply its defaults.\n *\n * Every variant is copied field by field, so an unknown key in the config can\n * never reach sharp, and the result is what the cache key is computed from.\n *\n * @param images - the raw `uploads.images` value\n * @param storageRoot - the local storage root, base of the default cache directory\n * @returns the resolved config, or `undefined` when variants are not configured\n * @throws ImageVariantsConfigError when any value is out of bounds\n */\nexport function resolveImageVariantsConfig(\n  images: UploadsImagesConfigurations | undefined,\n  storageRoot: string,\n): ResolvedImageVariantsConfig | undefined {\n  if (images === undefined || images === null) return undefined;\n\n  if (typeof images !== \"object\") {\n    throw new ImageVariantsConfigError(\"uploads.images must be an object.\");\n  }\n\n  const rawVariants = (images as { variants?: unknown }).variants;\n\n  if (!rawVariants || typeof rawVariants !== \"object\" || Object.keys(rawVariants).length === 0) {\n    throw new ImageVariantsConfigError(\n      \"uploads.images.variants must declare at least one variant.\",\n    );\n  }\n\n  const variants: Record<string, ImageVariantDefinition> = {};\n\n  for (const [name, raw] of Object.entries(rawVariants)) {\n    variants[name] = resolveVariant(name, raw);\n  }\n\n  const cacheDirectory = images.cacheDirectory\n    ? path.resolve(images.cacheDirectory)\n    : path.join(storageRoot, \".cache\", \"image-variants\");\n\n  return {\n    variants,\n    formats: resolveFormats(images.formats),\n    maxSourceBytes: resolveLimit(\"maxSourceBytes\", images.maxSourceBytes, DEFAULT_MAX_SOURCE_BYTES),\n    maxSourcePixels: resolveLimit(\n      \"maxSourcePixels\",\n      images.maxSourcePixels,\n      DEFAULT_MAX_SOURCE_PIXELS,\n    ),\n    cacheDirectory,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"resolve-image-variants-config.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-image-variants-config.ts"],"sourcesContent":["import type {\n  ImageVariantDefinition,\n  ImageVariantFit,\n  ImageVariantOutputFormat,\n  UploadsImagesConfigurations,\n} from \"../uploads-types\";\nimport { variantCacheDirectoryFor } from \"./image-variant-cache\";\nimport { ImageVariantsConfigError } from \"./image-variants-config-error\";\nimport type { ResolvedImageVariantsConfig } from \"./image-variant-types\";\n\n/**\n * Largest width or height a variant may declare\n */\nexport const MAX_VARIANT_DIMENSION = 8192;\n\n/**\n * Default `maxSourceBytes`: 25 MB\n */\nexport const DEFAULT_MAX_SOURCE_BYTES = 25 * 1024 * 1024;\n\n/**\n * Default `maxSourcePixels`\n */\nexport const DEFAULT_MAX_SOURCE_PIXELS = 40_000_000;\n\nconst FITS: readonly ImageVariantFit[] = [\"cover\", \"contain\", \"inside\"];\n\nconst OUTPUT_FORMATS: readonly ImageVariantOutputFormat[] = [\"avif\", \"webp\"];\n\nconst VARIANT_NAME = /^[A-Za-z0-9_-]+$/;\n\nfunction isPositiveInteger(value: unknown, max = Number.MAX_SAFE_INTEGER): value is number {\n  return typeof value === \"number\" && Number.isInteger(value) && value >= 1 && value <= max;\n}\n\nfunction resolveVariant(name: string, raw: unknown): ImageVariantDefinition {\n  const key = `uploads.images.variants.${name}`;\n\n  if (!VARIANT_NAME.test(name)) {\n    throw new ImageVariantsConfigError(\n      `${key}: a variant name may only use letters, digits, \"-\" and \"_\".`,\n    );\n  }\n\n  if (!raw || typeof raw !== \"object\") {\n    throw new ImageVariantsConfigError(`${key} must be an object with a width.`);\n  }\n\n  const { width, height, fit, quality, enlarge } = raw as Record<string, unknown>;\n\n  if (!isPositiveInteger(width, MAX_VARIANT_DIMENSION)) {\n    throw new ImageVariantsConfigError(\n      `${key}.width must be an integer from 1 to ${MAX_VARIANT_DIMENSION}, got ${JSON.stringify(width)}.`,\n    );\n  }\n\n  const variant: ImageVariantDefinition = { width };\n\n  if (height !== undefined) {\n    if (!isPositiveInteger(height, MAX_VARIANT_DIMENSION)) {\n      throw new ImageVariantsConfigError(\n        `${key}.height must be an integer from 1 to ${MAX_VARIANT_DIMENSION}, got ${JSON.stringify(height)}.`,\n      );\n    }\n\n    variant.height = height;\n  }\n\n  if (fit !== undefined) {\n    if (!FITS.includes(fit as ImageVariantFit)) {\n      throw new ImageVariantsConfigError(\n        `${key}.fit must be one of ${FITS.join(\", \")}, got ${JSON.stringify(fit)}.`,\n      );\n    }\n\n    variant.fit = fit as ImageVariantFit;\n  }\n\n  if (quality !== undefined) {\n    if (!isPositiveInteger(quality, 100)) {\n      throw new ImageVariantsConfigError(\n        `${key}.quality must be an integer from 1 to 100, got ${JSON.stringify(quality)}.`,\n      );\n    }\n\n    variant.quality = quality;\n  }\n\n  if (enlarge !== undefined && typeof enlarge !== \"boolean\") {\n    throw new ImageVariantsConfigError(\n      `${key}.enlarge must be a boolean, got ${JSON.stringify(enlarge)}.`,\n    );\n  }\n\n  // Always set, never left undefined: the effective flag (default false) is\n  // part of the normalized variant, so toggling it changes the cache key.\n  variant.enlarge = enlarge === true;\n\n  return variant;\n}\n\nfunction resolveFormats(raw: unknown): readonly ImageVariantOutputFormat[] {\n  if (raw === undefined) return [];\n\n  if (!Array.isArray(raw)) {\n    throw new ImageVariantsConfigError(`uploads.images.formats must be an array.`);\n  }\n\n  for (const format of raw) {\n    if (!OUTPUT_FORMATS.includes(format)) {\n      throw new ImageVariantsConfigError(\n        `uploads.images.formats may only contain ${OUTPUT_FORMATS.join(\", \")}, got ${JSON.stringify(format)}.`,\n      );\n    }\n  }\n\n  return [...new Set(raw as ImageVariantOutputFormat[])];\n}\n\nfunction resolveLimit(name: string, raw: unknown, fallback: number): number {\n  if (raw === undefined) return fallback;\n\n  if (!isPositiveInteger(raw)) {\n    throw new ImageVariantsConfigError(\n      `uploads.images.${name} must be a positive integer, got ${JSON.stringify(raw)}.`,\n    );\n  }\n\n  return raw;\n}\n\n/**\n * Validate the `uploads.images` config and apply its defaults.\n *\n * Every variant is copied field by field, so an unknown key in the config can\n * never reach sharp, and the result is what the cache key is computed from.\n *\n * @param images - the raw `uploads.images` value\n * @param storageRoot - the local storage root, base of the default cache directory\n * @returns the resolved config, or `undefined` when variants are not configured\n * @throws ImageVariantsConfigError when any value is out of bounds\n */\nexport function resolveImageVariantsConfig(\n  images: UploadsImagesConfigurations | undefined,\n  storageRoot: string,\n): ResolvedImageVariantsConfig | undefined {\n  if (images === undefined || images === null) return undefined;\n\n  if (typeof images !== \"object\") {\n    throw new ImageVariantsConfigError(\"uploads.images must be an object.\");\n  }\n\n  const rawVariants = (images as { variants?: unknown }).variants;\n\n  if (!rawVariants || typeof rawVariants !== \"object\" || Object.keys(rawVariants).length === 0) {\n    throw new ImageVariantsConfigError(\n      \"uploads.images.variants must declare at least one variant.\",\n    );\n  }\n\n  const variants: Record<string, ImageVariantDefinition> = {};\n\n  for (const [name, raw] of Object.entries(rawVariants)) {\n    variants[name] = resolveVariant(name, raw);\n  }\n\n  const cacheDirectory = variantCacheDirectoryFor(storageRoot, images);\n\n  return {\n    variants,\n    formats: resolveFormats(images.formats),\n    maxSourceBytes: resolveLimit(\"maxSourceBytes\", images.maxSourceBytes, DEFAULT_MAX_SOURCE_BYTES),\n    maxSourcePixels: resolveLimit(\n      \"maxSourcePixels\",\n      images.maxSourcePixels,\n      DEFAULT_MAX_SOURCE_PIXELS,\n    ),\n    cacheDirectory,\n    maxCacheBytes: resolveLimit(\"maxCacheBytes\", images.maxCacheBytes, 512 * 1024 * 1024),\n    maxCacheAge: resolveLimit(\"maxCacheAge\", images.maxCacheAge, 7 * 24 * 60 * 60),\n  };\n}\n"],"mappings":"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"}

package/esm/http/uploads/resolve-remote-image-variant.mjs

@@ -0,0 +1,89 @@
+import { HttpError } from "../errors/errors.mjs";
+import { uploadsConfig } from "../uploads-config.mjs";
+import { variantCacheKey, variantCachePath, variantSourceDirectory, variantSourceKey } from "./variant-cache-key.mjs";
+import { retryOnVanishedDirectory, warnIfVariantCacheIsPublic } from "./image-variant-cache.mjs";
+import { isVariantSourceFormat } from "./detect-image-format.mjs";
+import { remoteVariantDisk, remoteVariantSource } from "./remote-variant-source.mjs";
+import { generateImageVariant } from "./generate-image-variant.mjs";
+import { resolveImageVariantsConfig } from "./resolve-image-variants-config.mjs";
+import { freshImageVariant, scheduleImageVariantCacheTrim } from "./trim-image-variant-cache.mjs";
+import { variantGenerations } from "./variant-generations.mjs";
+import path from "node:path";
+import { atomicWriteAsync } from "@warlock.js/fs";
+import fs from "node:fs/promises";
+
+//#region ../../packages/core/src/http/uploads/resolve-remote-image-variant.ts
+/** Cloud sources are read through their driver; derivatives remain in a local cache. */
+async function resolveRemoteImageVariant(input) {
+	const disk = remoteVariantDisk(input.disk);
+	const images = resolveImageVariantsConfig(uploadsConfig("images"), disk.cacheRoot);
+	if (!images) throw new HttpError(400, "Image variants are not configured.");
+	if (!Object.prototype.hasOwnProperty.call(images.variants, input.variant)) throw new HttpError(400, `Unknown variant "${input.variant}".`);
+	if (input.format !== void 0 && !images.formats.includes(input.format)) throw new HttpError(400, `Format "${input.format}" is not allowed.`);
+	const source = await remoteVariantSource(input.path, disk, images);
+	if (!source) return void 0;
+	try {
+		return await renderRemoteImageVariant(input, disk, images, source);
+	} finally {
+		source.release();
+	}
+}
+/** Ingest rendering reuses one source handle and its memoized bounded download. */
+async function renderRemoteImageVariant(input, disk, images, source) {
+	const variant = Object.prototype.hasOwnProperty.call(images.variants, input.variant) ? images.variants[input.variant] : void 0;
+	if (!variant) throw new HttpError(400, `Unknown variant "${input.variant}".`);
+	if (input.format !== void 0 && !images.formats.includes(input.format)) throw new HttpError(400, `Format "${input.format}" is not allowed.`);
+	const generation = source.metadataGeneration ?? (await source.load()).generation;
+	const sourceKey = variantSourceKey(disk.root, source.sourcePath);
+	const manifestPath = path.join(variantSourceDirectory(images.cacheDirectory, sourceKey), generation, "source.json");
+	let format = input.format;
+	if (!format) {
+		try {
+			const savedFormat = JSON.parse(await fs.readFile(manifestPath, "utf8"))?.format;
+			if (isVariantSourceFormat(savedFormat)) format = savedFormat;
+		} catch (error) {
+			if (error.code !== "ENOENT" && !(error instanceof SyntaxError)) throw error;
+		}
+		format ??= (await source.load()).sourceFormat;
+	}
+	const hash = variantCacheKey({
+		relativePath: JSON.stringify([
+			disk.root,
+			source.sourcePath,
+			generation
+		]),
+		sourceSize: 0,
+		sourceMtimeMs: 0,
+		variant,
+		format
+	});
+	const target = variantCachePath(images.cacheDirectory, {
+		sourceKey,
+		generation
+	}, hash, format);
+	warnIfVariantCacheIsPublic(images.cacheDirectory);
+	if (!await freshImageVariant(target, images.maxCacheAge)) await variantGenerations.run(target, async () => {
+		if (await freshImageVariant(target, images.maxCacheAge)) return;
+		const loaded = await source.load();
+		await retryOnVanishedDirectory(async () => {
+			await generateImageVariant({
+				image: loaded.image.clone(),
+				variant,
+				format,
+				targetPath: target
+			});
+			await atomicWriteAsync(manifestPath, JSON.stringify({ format: loaded.sourceFormat }));
+		});
+		scheduleImageVariantCacheTrim(images, target);
+	});
+	return {
+		absolutePath: target,
+		hash,
+		format,
+		contentType: `image/${format}`
+	};
+}
+
+//#endregion
+export { renderRemoteImageVariant, resolveRemoteImageVariant };
+//# sourceMappingURL=resolve-remote-image-variant.mjs.map

package/esm/http/uploads/resolve-remote-image-variant.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-remote-image-variant.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/resolve-remote-image-variant.ts"],"sourcesContent":["import { atomicWriteAsync } from \"@warlock.js/fs\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { HttpError } from \"../errors\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport { isVariantSourceFormat } from \"./detect-image-format\";\nimport { generateImageVariant } from \"./generate-image-variant\";\nimport { retryOnVanishedDirectory, warnIfVariantCacheIsPublic } from \"./image-variant-cache\";\nimport type { ResolvedImageVariantsConfig, VariantOutputFormat } from \"./image-variant-types\";\nimport {\n  remoteVariantDisk,\n  remoteVariantSource,\n  type RemoteVariantSource,\n} from \"./remote-variant-source\";\nimport { resolveImageVariantsConfig } from \"./resolve-image-variants-config\";\nimport type { ResolveImageVariantInput, ResolvedImageVariant } from \"./resolve-image-variant\";\nimport { freshImageVariant, scheduleImageVariantCacheTrim } from \"./trim-image-variant-cache\";\nimport {\n  variantCacheKey,\n  variantCachePath,\n  variantSourceDirectory,\n  variantSourceKey,\n} from \"./variant-cache-key\";\nimport { variantGenerations } from \"./variant-generations\";\n\n/** Cloud sources are read through their driver; derivatives remain in a local cache. */\nexport async function resolveRemoteImageVariant(\n  input: ResolveImageVariantInput,\n): Promise<ResolvedImageVariant | undefined> {\n  const disk = remoteVariantDisk(input.disk);\n  const images = resolveImageVariantsConfig(uploadsConfig(\"images\"), disk.cacheRoot);\n  if (!images) throw new HttpError(400, \"Image variants are not configured.\");\n  if (!Object.prototype.hasOwnProperty.call(images.variants, input.variant))\n    throw new HttpError(400, `Unknown variant \"${input.variant}\".`);\n  if (input.format !== undefined && !images.formats.includes(input.format as never))\n    throw new HttpError(400, `Format \"${input.format}\" is not allowed.`);\n  const source = await remoteVariantSource(input.path, disk, images);\n  if (!source) return undefined;\n  try {\n    return await renderRemoteImageVariant(input, disk, images, source);\n  } finally {\n    source.release();\n  }\n}\n\n/** Ingest rendering reuses one source handle and its memoized bounded download. */\nexport async function renderRemoteImageVariant(\n  input: ResolveImageVariantInput,\n  disk: ReturnType<typeof remoteVariantDisk>,\n  images: ResolvedImageVariantsConfig,\n  source: RemoteVariantSource,\n): Promise<ResolvedImageVariant> {\n  const variant = Object.prototype.hasOwnProperty.call(images.variants, input.variant)\n    ? images.variants[input.variant]\n    : undefined;\n  if (!variant) throw new HttpError(400, `Unknown variant \"${input.variant}\".`);\n  if (input.format !== undefined && !images.formats.includes(input.format as never))\n    throw new HttpError(400, `Format \"${input.format}\" is not allowed.`);\n  const generation = source.metadataGeneration ?? (await source.load()).generation;\n  const sourceKey = variantSourceKey(disk.root, source.sourcePath);\n  const manifestPath = path.join(\n    variantSourceDirectory(images.cacheDirectory, sourceKey),\n    generation,\n    \"source.json\",\n  );\n  let format: VariantOutputFormat | undefined = input.format;\n  if (!format) {\n    try {\n      const saved: unknown = JSON.parse(await fs.readFile(manifestPath, \"utf8\"));\n      const savedFormat = (saved as { format?: unknown } | null)?.format;\n      if (isVariantSourceFormat(savedFormat as never)) format = savedFormat as VariantOutputFormat;\n    } catch (error) {\n      if ((error as NodeJS.ErrnoException).code !== \"ENOENT\" && !(error instanceof SyntaxError))\n        throw error;\n    }\n    format ??= (await source.load()).sourceFormat;\n  }\n  const hash = variantCacheKey({\n    relativePath: JSON.stringify([disk.root, source.sourcePath, generation]),\n    sourceSize: 0,\n    sourceMtimeMs: 0,\n    variant,\n    format,\n  });\n  const target = variantCachePath(images.cacheDirectory, { sourceKey, generation }, hash, format);\n  warnIfVariantCacheIsPublic(images.cacheDirectory);\n  if (!(await freshImageVariant(target, images.maxCacheAge))) {\n    await variantGenerations.run(target, async () => {\n      if (await freshImageVariant(target, images.maxCacheAge)) return;\n      const loaded = await source.load();\n      await retryOnVanishedDirectory(async () => {\n        await generateImageVariant({\n          image: loaded.image.clone(),\n          variant,\n          format,\n          targetPath: target,\n        });\n        await atomicWriteAsync(manifestPath, JSON.stringify({ format: loaded.sourceFormat }));\n      });\n      scheduleImageVariantCacheTrim(images, target);\n      // Retain other generations: an older concurrent download must not prune\n      // a newer object's derivatives. Background eviction reclaims them.\n    });\n  }\n  return { absolutePath: target, hash, format, contentType: `image/${format}` };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA0BA,eAAsB,0BACpB,OAC2C;CAC3C,MAAM,OAAO,kBAAkB,MAAM,IAAI;CACzC,MAAM,SAAS,2BAA2B,cAAc,QAAQ,GAAG,KAAK,SAAS;CACjF,IAAI,CAAC,QAAQ,MAAM,IAAI,UAAU,KAAK,oCAAoC;CAC1E,IAAI,CAAC,OAAO,UAAU,eAAe,KAAK,OAAO,UAAU,MAAM,OAAO,GACtE,MAAM,IAAI,UAAU,KAAK,oBAAoB,MAAM,QAAQ,GAAG;CAChE,IAAI,MAAM,WAAW,UAAa,CAAC,OAAO,QAAQ,SAAS,MAAM,MAAe,GAC9E,MAAM,IAAI,UAAU,KAAK,WAAW,MAAM,OAAO,kBAAkB;CACrE,MAAM,SAAS,MAAM,oBAAoB,MAAM,MAAM,MAAM,MAAM;CACjE,IAAI,CAAC,QAAQ,OAAO;CACpB,IAAI;EACF,OAAO,MAAM,yBAAyB,OAAO,MAAM,QAAQ,MAAM;CACnE,UAAU;EACR,OAAO,QAAQ;CACjB;AACF;;AAGA,eAAsB,yBACpB,OACA,MACA,QACA,QAC+B;CAC/B,MAAM,UAAU,OAAO,UAAU,eAAe,KAAK,OAAO,UAAU,MAAM,OAAO,IAC/E,OAAO,SAAS,MAAM,WACtB;CACJ,IAAI,CAAC,SAAS,MAAM,IAAI,UAAU,KAAK,oBAAoB,MAAM,QAAQ,GAAG;CAC5E,IAAI,MAAM,WAAW,UAAa,CAAC,OAAO,QAAQ,SAAS,MAAM,MAAe,GAC9E,MAAM,IAAI,UAAU,KAAK,WAAW,MAAM,OAAO,kBAAkB;CACrE,MAAM,aAAa,OAAO,uBAAuB,MAAM,OAAO,KAAK,EAAC,CAAE;CACtE,MAAM,YAAY,iBAAiB,KAAK,MAAM,OAAO,UAAU;CAC/D,MAAM,eAAe,KAAK,KACxB,uBAAuB,OAAO,gBAAgB,SAAS,GACvD,YACA,aACF;CACA,IAAI,SAA0C,MAAM;CACpD,IAAI,CAAC,QAAQ;EACX,IAAI;GAEF,MAAM,cADiB,KAAK,MAAM,MAAM,GAAG,SAAS,cAAc,MAAM,CAC/C,CAAC,EAAkC;GAC5D,IAAI,sBAAsB,WAAoB,GAAG,SAAS;EAC5D,SAAS,OAAO;GACd,IAAK,MAAgC,SAAS,YAAY,EAAE,iBAAiB,cAC3E,MAAM;EACV;EACA,YAAY,MAAM,OAAO,KAAK,EAAC,CAAE;CACnC;CACA,MAAM,OAAO,gBAAgB;EAC3B,cAAc,KAAK,UAAU;GAAC,KAAK;GAAM,OAAO;GAAY;EAAU,CAAC;EACvE,YAAY;EACZ,eAAe;EACf;EACA;CACF,CAAC;CACD,MAAM,SAAS,iBAAiB,OAAO,gBAAgB;EAAE;EAAW;CAAW,GAAG,MAAM,MAAM;CAC9F,2BAA2B,OAAO,cAAc;CAChD,IAAI,CAAE,MAAM,kBAAkB,QAAQ,OAAO,WAAW,GACtD,MAAM,mBAAmB,IAAI,QAAQ,YAAY;EAC/C,IAAI,MAAM,kBAAkB,QAAQ,OAAO,WAAW,GAAG;EACzD,MAAM,SAAS,MAAM,OAAO,KAAK;EACjC,MAAM,yBAAyB,YAAY;GACzC,MAAM,qBAAqB;IACzB,OAAO,OAAO,MAAM,MAAM;IAC1B;IACA;IACA,YAAY;GACd,CAAC;GACD,MAAM,iBAAiB,cAAc,KAAK,UAAU,EAAE,QAAQ,OAAO,aAAa,CAAC,CAAC;EACtF,CAAC;EACD,8BAA8B,QAAQ,MAAM;CAG9C,CAAC;CAEH,OAAO;EAAE,cAAc;EAAQ;EAAM;EAAQ,aAAa,SAAS;CAAS;AAC9E"}

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 = 60 * 6e4;
+/**
+* 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 = 5 * 6e4;
+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 { freshImageVariant, scheduleImageVariantCacheTrim };
+//# 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

@@ -6,13 +6,15 @@ import { RequestHandler } from "../../router/types.mjs";
  */
 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;
+  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);

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":";;;;;;KA6FY,6BAAA;EAA6B;;;;;EAMvC,IAAA,GAAO,iBAAiB,EAGlB;EAAN,MAAA;AAAA;;;;;;;;AA0Be;AA+HjB;;;;AAAoF;;;;;;;;;iBAjIpE,4BAAA,CACd,OAAA,GAAS,6BAAA,GACR,cAAc;;;;cA+HJ,sBAAA,EAAwB,cAA+C"}