@paroicms/server 1.87.3 → 1.88.0

package/dist/rendered-site/liquidjs-tags/use-image-tag.js

@@ -1,10 +1,20 @@
-import { boolValOrUndef, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { applyRatioToImageSize, isImageSize } from "@paroicms/public-server-lib";
+import { boolValOrUndef, nbValOrUndef, strValOrUndef } from "@paroi/data-formatters-lib";
+import { isResizeRule } from "@paroicms/public-anywhere-lib";
 import { Hash, Tag } from "liquidjs";
+import { dependencyKeyOfMedia } from "../../common/text-cache.js";
+import { createLiquidJsDropFromPromise } from "../../liquidjs-tools/liquidjs-drop.js";
 import { makeTagCacheKeyForRendering } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { extractRenderingContext } from "../../liquidjs-tools/liquidjs-utils.js";
-import { makeImageAvailable, } from "../../rendering-payload/make-image-available.js";
-const availableParameterNames = new Set(["uid", "handle", "size", "autoCrop", "noPixelRatio"]);
+import { extractRenderingContext, getLiquidJsDocValues, } from "../../liquidjs-tools/liquidjs-utils.js";
+import { loadTpImageVariant } from "./grouping-media-query.js";
+const availableParameterNames = new Set([
+    "uid",
+    "size",
+    "image",
+    "resize",
+    "autoCrop",
+    "pixelRatio",
+    "mediaType",
+]);
 export function createUseImageLiquidJsTag(siteContext) {
     return class UseImageTag extends Tag {
         #hash;
@@ -15,59 +25,99 @@ export function createUseImageLiquidJsTag(siteContext) {
             this.#hash = new Hash(tagToken.args);
         }
         *render(ctx) {
-            const options = validateParameters(yield this.#hash.render(ctx), this.#varName, siteContext);
-            if (!options)
+            const renderingContext = extractRenderingContext(ctx);
+            const { siteContext } = renderingContext;
+            const options = validateParameters(siteContext, yield this.#hash.render(ctx), this.#varName);
+            const { image: imageParam, resize: resizeRule } = options;
+            if (!imageParam)
                 return;
+            const mediaId = typeof imageParam === "string" ? imageParam : imageParam.mediaId;
             const cacheKey = makeTagCacheKeyForRendering("useImage", { tagParameters: options });
-            const renderingContext = extractRenderingContext(ctx);
             const cacheVal = renderingContext.getValueFromCache(cacheKey);
             if (cacheVal.found) {
                 ctx.bottom()[this.#varName] = cacheVal.val;
                 return;
             }
-            const realSize = options.noPixelRatio
-                ? options.size
-                : applyRatioToImageSize(options.size, siteContext.themeConf.pixelRatio);
-            const image = (yield makeImageAvailable(siteContext, renderingContext, {
+            const doc = getLiquidJsDocValues(ctx);
+            const language = strValOrUndef(doc?.language) ?? siteContext.siteSchema.defaultLanguage;
+            const promise = loadTpImageVariant(renderingContext, {
                 ...options,
-                size: realSize,
-            }));
-            if (!image)
-                throw new Error("useImage: missing image");
-            const imageSize = options.noPixelRatio
-                ? {
-                    width: image.width,
-                    height: image.height,
-                }
-                : {
-                    width: Math.round(image.width / siteContext.themeConf.pixelRatio),
-                    height: Math.round(image.height / siteContext.themeConf.pixelRatio),
-                };
-            const val = {
-                ...image,
-                ...imageSize,
-            };
+                image: imageParam,
+                resizeRule,
+                language,
+            });
+            const val = createLiquidJsDropFromPromise({
+                renderingCacheKey: cacheKey,
+                renderingContext,
+                value: promise,
+            });
+            renderingContext.addDependencyKey(dependencyKeyOfMedia(mediaId));
             renderingContext.setValueIntoCache(cacheKey, val);
             ctx.bottom()[this.#varName] = val;
         }
     };
 }
-function validateParameters(values, varName, { logger }) {
+function validateParameters(siteContext, values, varName) {
+    const { logger } = siteContext;
     for (const name of Object.keys(values)) {
         if (!availableParameterNames.has(name) && name !== varName) {
             logger.warn(`[useImage] unknown parameter "${name}"`);
         }
     }
-    const size = strVal(values.size);
-    if (!isImageSize(size))
-        throw new Error(`useImage param size is not valid, size:${size}`);
+    let resize;
+    const resizeVal = strValOrUndef(values.resize);
+    if (resizeVal) {
+        if (!isResizeRule(resizeVal))
+            throw new Error(`[useImage] invalid parameter resize: "${resize}"`);
+        resize = resizeVal;
+    }
+    else {
+        const size = strValOrUndef(values.size);
+        if (!size)
+            throw new Error(`[useImage] missing parameter "resize"`);
+        if (!isResizeRule(size))
+            throw new Error(`useImage param size is not valid: ${size}`);
+        logger.warn(`[useImage] parameter "size" is deprecated. Please use "resize" instead`);
+        resize = size;
+    }
     const uid = strValOrUndef(values.uid);
-    const handle = strValOrUndef(values.handle);
+    if (uid !== undefined) {
+        logger.warn(`[useImage] deprecated parameter "uid". Please use "image" instead.`);
+    }
+    const image = typeof values.image === "string"
+        ? values.image
+        : toTpSourceImageOrUndefParameter(siteContext, values.image, {
+            warnPrefix: `[useImage] parameter "image"`,
+        });
     const autoCrop = boolValOrUndef(values.autoCrop);
-    const noPixelRatio = boolValOrUndef(values.noPixelRatio);
-    if (uid)
-        return { imageSel: { uid }, size, autoCrop, noPixelRatio };
-    if (handle)
-        return { imageSel: { handle }, size, autoCrop, noPixelRatio };
+    const pixelRatio = nbValOrUndef(values.pixelRatio);
+    let mediaType = strValOrUndef(values.mediaType);
+    if (mediaType && !mediaType.startsWith("image/")) {
+        logger.warn(`[useImage] parameter "mediaType" should starts with "image/", got "${mediaType}"`);
+        mediaType = undefined;
+    }
+    return {
+        image: image ?? uid,
+        resize,
+        autoCrop,
+        pixelRatio,
+        mediaType,
+    };
+}
+export function toTpSourceImageOrUndefParameter(siteContext, image, { warnPrefix }) {
+    if (!image)
+        return;
+    if (image.kind === "file") {
+        return;
+    }
+    if (image.kind !== "image") {
+        siteContext.logger.warn(`${warnPrefix} should be an image`);
+        return;
+    }
+    if (!image.isSource) {
+        siteContext.logger.warn(`${warnPrefix} should be a source image (${image.mediaId}, ${image.originalName})`);
+        return;
+    }
+    return image;
 }
 //# sourceMappingURL=use-image-tag.js.map

package/dist/rendered-site/liquidjs-tags/use-image-tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-image-tag.js","sourceRoot":"","sources":["../../../src/rendered-site/liquidjs-tags/use-image-tag.ts"],"names":[],"mappings":"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"}

package/dist/rendered-site/media-serve/_media-serve-helpers.d.ts

@@ -1,5 +1,11 @@
-import type { VariantName } from "@paroicms/public-anywhere-lib";
-export declare function parseNameAndExt(nameAndExt: string): {
+import { type ResizeRule, type SizeName } from "@paroicms/public-anywhere-lib";
+export declare function parseImageRawSizeNameAndExt(nameAndExt: string): {
     slug: string;
-    variantName: VariantName;
+    rawSizeName: SizeName;
+    mediaType: string;
+} | undefined;
+export declare function parseImageRenderedResizeRuleAndExt(nameAndExt: string): {
+    slug: string;
+    resizeRule: ResizeRule;
+    mediaType: string;
 } | undefined;

package/dist/rendered-site/media-serve/_media-serve-helpers.js

@@ -1,15 +1,35 @@
-import { isVariantName } from "@paroicms/public-server-lib";
-export function parseNameAndExt(nameAndExt) {
+import { isResizeRule, isSizeName, } from "@paroicms/public-anywhere-lib";
+import { extensionToMediaType } from "@paroicms/server-image-cache-engine";
+export function parseImageRawSizeNameAndExt(nameAndExt) {
     const extIndex = nameAndExt.lastIndexOf(".");
     if (extIndex === -1)
         return;
+    const mediaType = extensionToMediaType(nameAndExt.slice(extIndex + 1));
+    if (!mediaType)
+        return;
     const name = nameAndExt.slice(0, extIndex);
     const match = name.match(/^(.+)-([0-9]+x[0-9]+)$/);
     if (!match)
         return;
-    const [, slug, variantName] = match;
-    if (!isVariantName(variantName))
+    const [, slug, rawSizeName] = match;
+    if (!isSizeName(rawSizeName))
+        return;
+    return { slug, rawSizeName, mediaType };
+}
+export function parseImageRenderedResizeRuleAndExt(nameAndExt) {
+    const extIndex = nameAndExt.lastIndexOf(".");
+    if (extIndex === -1)
+        return;
+    const mediaType = extensionToMediaType(nameAndExt.slice(extIndex + 1));
+    if (!mediaType)
+        return;
+    const nameAndSuffix = nameAndExt.slice(0, extIndex);
+    const match = nameAndSuffix.match(/^(.+)-([0-9x]+)-rendered$/);
+    if (!match)
+        return;
+    const [, slug, resizeRule] = match;
+    if (!isResizeRule(resizeRule))
         return;
-    return { slug, variantName };
+    return { slug, resizeRule, mediaType };
 }
 //# sourceMappingURL=_media-serve-helpers.js.map

package/dist/rendered-site/media-serve/_media-serve-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../src/rendered-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,MAAM,UAAU,eAAe,CAC7B,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,CAAC,CAAC;QAAE,OAAO;IAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IACpC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QAAE,OAAO;IACxC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"_media-serve-helpers.js","sourceRoot":"","sources":["../../../src/rendered-site/media-serve/_media-serve-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACZ,UAAU,GACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,MAAM,UAAU,2BAA2B,CACzC,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,CAAC,CAAC;QAAE,OAAO;IAC5B,MAAM,SAAS,GAAG,oBAAoB,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;IACpC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO;IACrC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,kCAAkC,CAChD,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,QAAQ,KAAK,CAAC,CAAC;QAAE,OAAO;IAC5B,MAAM,SAAS,GAAG,oBAAoB,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;IACnC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;QAAE,OAAO;IACtC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC"}

package/dist/rendered-site/media-serve/media-serve.controller.d.ts

@@ -1,5 +1,13 @@
+import type { ResizeRule } from "@paroicms/public-anywhere-lib";
 import { type PaHttpContext } from "@paroicms/public-server-lib";
 import type { SiteContext } from "../../site-context/site-context.types.js";
 export declare function serveFilecontroller(siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>): Promise<void>;
-export declare function serveVersionedImageController(siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>): Promise<void>;
-export declare function serveUnversionedImageController(siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>): Promise<void>;
+export declare function serveCacheImageController(siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>): Promise<void>;
+export declare function serveUnversionedImage(siteContext: SiteContext, httpContext: PaHttpContext, options: {
+    mediaId: string;
+    mediaType: string;
+    ownerHandle: string;
+    isHandleReusable: boolean;
+    resizeRule: ResizeRule;
+    ensureUrlFilename?: string;
+}): Promise<void>;

package/dist/rendered-site/media-serve/media-serve.controller.js

@@ -1,63 +1,74 @@
-import { ApiError, generateImageSlug, isVariantName, makeUrlOfImageVariant, makeUrlOfMediaFile, } from "@paroicms/public-server-lib";
+import { ApiError, applyPixelRatioToResizeRule, generateImageSlug, } from "@paroicms/public-server-lib";
+import { parseSizeName } from "@paroicms/server-image-cache-engine";
 import { HTTP_MAX_AGE } from "../../express/http-constants.js";
 import { getRouteParameter, serve301Redirect, serve304NotModified, } from "../../express/http-helpers.js";
-import { parseNameAndExt } from "./_media-serve-helpers.js";
+import { makeUrlOfImageVariant, makeUrlOfMediaFile, makeUrlOfUnversionedImageVariant, } from "../../helpers/url-helpers.js";
+import { parseImageRawSizeNameAndExt, parseImageRenderedResizeRuleAndExt, } from "./_media-serve-helpers.js";
 export async function serveFilecontroller(siteContext, httpContext, routeParams) {
     const { req, res } = httpContext;
-    const mediaUid = getRouteParameter(routeParams, "mediaUid");
+    const mediaId = getRouteParameter(routeParams, "mediaId");
     const nameAndExt = getRouteParameter(routeParams, "nameAndExt");
     const cacheControl = "max-age=0";
-    const fts = await getFileToServe(siteContext, {
-        mediaUid,
-        ifNoneMatch: req.headers["if-none-match"],
-    });
-    if (fts.status === 304) {
+    const ifNoneMatch = req.headers["if-none-match"];
+    const media = await siteContext.mediaStorage.getMediaWithBinary(mediaId);
+    if (!media)
+        throw new ApiError(`media '${mediaId}' not found`, 404);
+    if (media.resourceVersion === ifNoneMatch) {
         return serve304NotModified(httpContext, {
             cacheControl,
-            etag: fts.resourceVersion,
+            etag: media.resourceVersion,
         });
     }
-    const { file } = fts;
-    const { url, fileName } = makeUrlOfMediaFile(siteContext, { mediaUid, mediaType: file.mediaType, originalName: file.originalName }, { returnObj: true });
-    if (fileName !== nameAndExt)
+    const { url, filename } = makeUrlOfMediaFile(siteContext, { mediaId, mediaType: media.mediaType, originalName: media.originalName }, { returnObj: true });
+    if (filename !== nameAndExt)
         return serve301Redirect(httpContext, url);
     res.append("Cache-Control", cacheControl);
-    res.append("Etag", file.resourceVersion);
-    res.append("Content-Type", file.mediaType);
-    res.append("Content-Length", file.binaryFile.byteLength.toString());
-    res.send(file.binaryFile);
+    res.append("Etag", media.resourceVersion);
+    res.append("Content-Type", media.mediaType);
+    res.append("Content-Length", media.binaryFile.byteLength.toString());
+    res.send(media.binaryFile);
 }
-export async function serveVersionedImageController(siteContext, httpContext, routeParams) {
-    const { req, res } = httpContext;
-    const cacheControl = `public, max-age=${HTTP_MAX_AGE}, immutable`;
-    const mediaUid = getRouteParameter(routeParams, "mediaUid");
+export async function serveCacheImageController(siteContext, httpContext, routeParams) {
+    const mediaId = getRouteParameter(routeParams, "mediaId");
     const resourceVersion = getRouteParameter(routeParams, "resourceVersion");
     const nameAndExt = getRouteParameter(routeParams, "nameAndExt");
-    const parsed = parseNameAndExt(nameAndExt);
+    if (resourceVersion === "unversioned") {
+        await serveUnversionedFTextImage(siteContext, httpContext, {
+            mediaId,
+            nameAndExt,
+        });
+        return;
+    }
+    const { req, res } = httpContext;
+    const cacheControl = `public, max-age=${HTTP_MAX_AGE}, immutable`;
+    const ifNoneMatch = req.headers["if-none-match"];
+    const parsed = parseImageRawSizeNameAndExt(nameAndExt);
     if (!parsed)
-        throw new ApiError("invalid name and ext", 404);
-    const { variantName } = parsed;
-    const fts = await getVariantImageToServe(siteContext, {
-        mediaUid,
-        variantName,
-        canCreateVariant: false,
-        ifNoneMatch: req.headers["if-none-match"],
+        throw new ApiError(404);
+    const { rawSizeName, mediaType } = parsed;
+    const { width: rawWidth, height: rawHeight } = parseSizeName(rawSizeName);
+    const file = await siteContext.imageCache.getImageVariantWithBinary({
+        mediaId,
+        mediaType,
+        rawWidth,
+        rawHeight,
     });
-    if (fts.status === 304) {
+    if (!file)
+        throw new ApiError(404);
+    if (ifNoneMatch === file.resourceVersion) {
         return serve304NotModified(httpContext, {
             cacheControl,
-            etag: fts.resourceVersion,
+            etag: file.resourceVersion,
         });
     }
-    const { file } = fts;
     const newUrl = makeUrlOfImageVariant(siteContext, {
-        mediaUid,
+        mediaId,
         mediaType: file.mediaType,
-        variantName,
+        rawSizeName,
         resourceVersion: file.resourceVersion,
         slug: file.slug,
     }, { returnObj: true });
-    if (file.resourceVersion !== resourceVersion || newUrl.fileName !== nameAndExt) {
+    if (file.resourceVersion !== resourceVersion || newUrl.filename !== nameAndExt) {
         return serve301Redirect(httpContext, newUrl.url);
     }
     res.append("Cache-Control", cacheControl);
@@ -66,105 +77,92 @@ export async function serveVersionedImageController(siteContext, httpContext, ro
     res.append("Content-Length", file.binaryFile.byteLength.toString());
     res.send(file.binaryFile);
 }
-export async function serveUnversionedImageController(siteContext, httpContext, routeParams) {
-    const { req, res } = httpContext;
-    const cacheControl = "max-age=0";
-    const mediaUid = getRouteParameter(routeParams, "mediaUid");
-    const nameAndExt = getRouteParameter(routeParams, "nameAndExt");
-    const parsed = parseNameAndExt(nameAndExt);
-    if (!parsed) {
-        throw new ApiError("invalid name and ext", 404);
-    }
-    const { variantName } = parsed;
-    if (!isVariantName(variantName))
-        throw new ApiError("invalid variant name", 404);
-    const fts = await getVariantImageToServe(siteContext, {
-        mediaUid,
-        variantName,
-        canCreateVariant: true,
-        ifNoneMatch: req.headers["if-none-match"],
+async function serveUnversionedFTextImage(siteContext, httpContext, routeParams) {
+    const { mediaId, nameAndExt } = routeParams;
+    const parsed = parseImageRenderedResizeRuleAndExt(nameAndExt);
+    if (!parsed)
+        throw new ApiError(404);
+    const { resizeRule, mediaType } = parsed;
+    if (!siteContext.themeConf.fTextImageResizeRules.includes(resizeRule))
+        throw new ApiError(404);
+    if (mediaType !== "image/webp")
+        throw new ApiError(404);
+    await serveUnversionedImage(siteContext, httpContext, {
+        mediaId,
+        mediaType,
+        ownerHandle: `fText:${resizeRule}`,
+        isHandleReusable: true,
+        resizeRule,
+        ensureUrlFilename: nameAndExt,
     });
-    if (fts.status === 304) {
-        return serve304NotModified(httpContext, {
-            cacheControl,
-            etag: fts.resourceVersion,
-        });
-    }
-    const { file } = fts;
-    const newUrl = makeUrlOfImageVariant(siteContext, {
-        mediaUid,
-        mediaType: file.mediaType,
-        variantName,
-        resourceVersion: undefined,
-        slug: file.slug,
-    }, { returnObj: true });
-    if (newUrl.fileName !== nameAndExt) {
-        return serve301Redirect(httpContext, newUrl.url);
-    }
-    res.append("Cache-Control", cacheControl);
-    res.append("Etag", file.resourceVersion);
-    res.append("Content-Type", file.mediaType);
-    res.append("Content-Length", file.binaryFile.byteLength.toString());
-    res.send(file.binaryFile);
 }
-async function getVariantImageToServe(siteContext, options) {
-    const { mediaUid, variantName, canCreateVariant, ifNoneMatch } = options;
-    let file = await siteContext.imageCache.getImageVariantWithBinary({
-        imageUid: mediaUid,
-        variantName,
+export async function serveUnversionedImage(siteContext, httpContext, options) {
+    const { req, res } = httpContext;
+    const cacheControl = "max-age=0";
+    const ifNoneMatch = req.headers["if-none-match"];
+    const { mediaId, mediaType, ownerHandle, isHandleReusable, resizeRule, ensureUrlFilename } = options;
+    const rawResizeR = applyPixelRatioToResizeRule(resizeRule, siteContext.themeConf.pixelRatio);
+    let variant = await siteContext.imageCache.getImageVariantWithBinaryByOwner({
+        mediaId,
+        mediaType,
+        ownerHandle,
+        rawResizeR,
     });
-    if (file) {
-        if (ifNoneMatch === file.resourceVersion) {
-            return {
-                status: 304,
-                resourceVersion: file.resourceVersion,
-            };
+    if (variant) {
+        if (ifNoneMatch === variant.resourceVersion) {
+            return serve304NotModified(httpContext, {
+                cacheControl,
+                etag: variant.resourceVersion,
+            });
         }
     }
     else {
-        if (canCreateVariant) {
-            file = await tryToCreateImageVariant(siteContext, { mediaUid, variantName });
-        }
-        if (!file)
-            throw new ApiError("image not found", 404);
+        variant = await createUnversionedImageVariant(siteContext, {
+            ownerHandle,
+            isHandleReusable,
+            mediaId,
+            mediaType,
+            rawResizeR,
+        });
+        if (!variant)
+            throw new ApiError(404);
     }
-    return {
-        status: 200,
-        file,
-    };
-}
-async function getFileToServe(siteContext, options) {
-    const { mediaUid, ifNoneMatch } = options;
-    const media = await siteContext.mediaStorage.getMediaWithBinary(mediaUid);
-    if (!media)
-        throw new ApiError(`media '${mediaUid}' not found`, 404);
-    if (media.resourceVersion === ifNoneMatch) {
-        return {
-            status: 304,
-            resourceVersion: media.resourceVersion,
-        };
+    if (ensureUrlFilename) {
+        const newUrl = makeUrlOfUnversionedImageVariant(siteContext, {
+            mediaId,
+            mediaType: variant.mediaType,
+            resizeRule,
+            slug: variant.slug,
+        }, { returnObj: true });
+        if (newUrl.filename !== ensureUrlFilename) {
+            return serve301Redirect(httpContext, newUrl.url);
+        }
     }
-    return {
-        status: 200,
-        file: media,
-    };
+    res.append("Cache-Control", cacheControl);
+    res.append("Etag", variant.resourceVersion);
+    res.append("Content-Type", variant.mediaType);
+    res.append("Content-Length", variant.binaryFile.byteLength.toString());
+    res.send(variant.binaryFile);
 }
-async function tryToCreateImageVariant(siteContext, options) {
-    const { mediaUid, variantName } = options;
-    const media = await siteContext.mediaStorage.getMedia({ uid: mediaUid });
-    if (!media || media.kind !== "image") {
-        throw new ApiError(`image '${mediaUid}' not found`, 404);
-    }
-    return await siteContext.imageCache.conditionallyCreateImageVariantWithBinary({
-        imageUid: media.uid,
-        mediaType: media.mediaType,
-        width: media.width,
-        height: media.height,
-    }, {
-        authorisedImageSizes: siteContext.themeConf.fTextImages.map((val) => val.realSize),
-        variantName,
-        slug: generateImageSlug(media.originalName),
-        dependsOnUsedKey: "themeConf.fTextImages",
+async function createUnversionedImageVariant(siteContext, options) {
+    const { ownerHandle, isHandleReusable, mediaId, mediaType, rawResizeR } = options;
+    const media = await siteContext.mediaStorage.getMedia({ mediaId });
+    if (!media || media.kind !== "image")
+        return;
+    const variant = await siteContext.imageCache.makeImageAvailable({
+        ownerHandle,
+        isHandleReusable,
+        rawResizeR,
+        mediaType,
+        sourceImage: {
+            mediaId: media.id,
+            mediaType: media.mediaType,
+            rawWidth: media.rawWidth,
+            rawHeight: media.rawHeight,
+            slug: generateImageSlug(media.originalName),
+        },
+        canBeRetrievedByOwner: true,
     });
+    return await siteContext.imageCache.getImageVariantWithBinary(variant);
 }
 //# sourceMappingURL=media-serve.controller.js.map

package/dist/rendered-site/media-serve/media-serve.controller.js.map

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