@paroicms/server-image-cache-engine 1.22.5 → 1.23.0

package/dist/internal/queries.js

@@ -1,11 +1,12 @@
-import { dateVal, nbVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
-import { isSameTimeUnit } from "@paroicms/internal-anywhere-lib";
-export async function insertIntoImageVariant(cn, data, usedKey) {
+import { dateVal, isDef, nbVal, strVal, strValOrUndef } from "@paroi/data-formatters-lib";
+export async function insertIntoImageVariant(ctx, data, owners) {
+    const { cn } = ctx;
+    const mTypeRSize = makeMTypeRSizeKey(data);
     const existingRow = await cn("PaImageCache")
         .select("id")
         .where({
-        imageUid: data.imageUid,
-        variantName: data.variantName,
+        mediaId: data.mediaId,
+        mTypeRSize,
     })
         .first();
     let imageCacheId = existingRow ? strVal(existingRow.id) : undefined;
@@ -14,16 +15,15 @@ export async function insertIntoImageVariant(cn, data, usedKey) {
         const [inserted] = await cn("PaImageCache")
             .insert({
             resourceVersion: data.resourceVersion,
-            imageUid: data.imageUid,
-            variantName: data.variantName,
-            slug: data.slug,
+            mediaId: data.mediaId,
+            mTypeRSize,
             mediaType: data.mediaType,
-            width: data.width,
-            height: data.height,
+            rawWidth: data.rawWidth,
+            rawHeight: data.rawHeight,
             weightB: data.weightB,
             binaryFile: data.binaryFile,
+            slug: data.slug,
             modifiedAt: cn.fn.now(),
-            readAt: cn.fn.now(),
         })
             .returning(["id", "modifiedAt"]);
         imageCacheId = strVal(inserted.id);
@@ -35,13 +35,9 @@ export async function insertIntoImageVariant(cn, data, usedKey) {
             id: imageCacheId,
         })
             .update({
-            mediaType: data.mediaType,
-            width: data.width,
-            height: data.height,
             weightB: data.weightB,
             binaryFile: data.binaryFile,
             modifiedAt: cn.fn.now(),
-            readAt: cn.fn.now(),
         });
         const row = await cn("PaImageCache")
             .select("modifiedAt")
@@ -51,166 +47,310 @@ export async function insertIntoImageVariant(cn, data, usedKey) {
             throw new Error(`missing cache row: ${imageCacheId}`);
         modifiedAt = dateVal(row.modifiedAt);
     }
-    // Insert into PaImageCacheUsed if it doesn't exist
-    const usedCountRow = await cn("PaImageCacheUsed")
-        .count("* as cnt")
-        .where({
-        imageCacheId,
-        usedKey,
-    })
-        .first();
-    if (!usedCountRow || usedCountRow.cnt === 0) {
-        await cn("PaImageCacheUsed").insert({
-            imageCacheId,
-            usedKey,
-        });
-    }
-    return { newId: imageCacheId, lastModified: modifiedAt.toISOString() };
-}
-export async function deleteVariants(cn, options) {
-    if ("imageUids" in options) {
-        await cn("PaImageCache").whereIn("imageUid", options.imageUids).delete();
-    }
-    else {
-        const query = cn("PaImageCache").where("imageUid", options.imageUid);
-        if (options.variantName) {
-            query.where("variantName", options.variantName);
-        }
-        await query.delete();
-    }
+    await insertIntoPaImageCacheOwner(ctx, { imageCacheId, owners });
+    return { imageCacheId, lastModified: modifiedAt.toISOString() };
 }
-/**
- * @returns the list of cache usedKeys that were deleted
- */
-export async function deleteVariantsByDependencies(cn, options) {
-    const rows = await cn("PaImageCacheUsed as k")
-        .select("k.imageCacheId")
-        .whereIn("k.usedKey", options.usedKeys);
-    const imageCacheIds = rows.map((row) => strVal(row.imageCacheId));
-    if (imageCacheIds.length > 0) {
-        await cn("PaImageCache").whereIn("id", imageCacheIds).delete();
+export async function insertIntoPaImageCacheOwner(ctx, input) {
+    const { cn } = ctx;
+    const { imageCacheId, owners } = input;
+    if (owners.length === 0)
+        return;
+    for (const { ownerHandle, rawResizeR } of owners) {
+        await cn("PaImageCacheOwner")
+            .insert({
+            imageCacheId,
+            ownerHandle,
+            rawResizeR,
+        })
+            .onConflict(["imageCacheId", "ownerHandle", "rawResizeR"])
+            .ignore();
     }
-    return imageCacheIds.length;
 }
-export async function fetchImageVariant(ctx, { imageUid, variantName, }) {
+export async function fetchImageVariant(ctx, input) {
+    const { mediaId, rawWidth, rawHeight } = input;
     const row = await ctx
         .cn("PaImageCache as v")
         .select([
         "v.id",
         "v.mediaType",
-        "v.width",
-        "v.height",
+        "v.rawWidth",
+        "v.rawHeight",
         "v.modifiedAt",
         "v.resourceVersion",
         "v.slug",
-        "v.readAt",
     ])
         .where({
-        "v.imageUid": imageUid,
-        "v.variantName": variantName,
+        "v.mediaId": mediaId,
+        "v.mTypeRSize": makeMTypeRSizeKey(input),
     })
         .first();
     if (!row)
         return;
     const id = strVal(row.id);
-    const readAt = dateVal(row.readAt);
-    await updateReadAtOfImageVariant(ctx, {
-        id,
-        readAt,
-        imageUid,
-        variantName,
-    });
     return {
         id,
         variant: {
+            mediaId,
             resourceVersion: strVal(row.resourceVersion),
             slug: strValOrUndef(row.slug),
             mediaType: strVal(row.mediaType),
-            width: nbVal(row.width),
-            height: nbVal(row.height),
-            variantName,
+            rawWidth: nbVal(row.rawWidth),
+            rawHeight: nbVal(row.rawHeight),
+            rawSizeName: `${rawWidth}x${rawHeight}`,
         },
     };
 }
-export async function fetchImageVariantWithBinary(ctx, { imageUid, variantName, }) {
+export async function fetchImageVariantWithBinary(ctx, input) {
+    const { mediaId } = input;
     const row = await ctx
         .cn("PaImageCache as v")
         .select([
         "v.id",
+        "v.resourceVersion",
+        "v.rawWidth",
+        "v.rawHeight",
         "v.mediaType",
-        "v.width",
-        "v.height",
         "v.weightB",
         "v.binaryFile",
         "v.modifiedAt",
-        "v.readAt",
-        "v.resourceVersion",
         "v.slug",
     ])
         .where({
-        "v.imageUid": imageUid,
-        "v.variantName": variantName,
+        "v.mediaId": mediaId,
+        "v.mTypeRSize": makeMTypeRSizeKey(input),
     })
         .first();
     if (!row)
         return;
     const id = strVal(row.id);
-    const readAt = dateVal(row.readAt);
-    await updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, variantName });
+    const rawWidth = nbVal(row.rawWidth);
+    const rawHeight = nbVal(row.rawHeight);
     return {
         id,
         variant: {
+            mediaId,
             resourceVersion: strVal(row.resourceVersion),
             slug: strValOrUndef(row.slug),
             mediaType: strVal(row.mediaType),
-            width: nbVal(row.width),
-            height: nbVal(row.height),
+            rawWidth,
+            rawHeight,
             weightB: nbVal(row.weightB),
             binaryFile: row.binaryFile,
             lastModified: dateVal(row.modifiedAt).toISOString(),
-            variantName,
+            rawSizeName: `${rawWidth}x${rawHeight}`,
         },
     };
 }
-async function updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, variantName, }) {
-    const { cn, timeToIdleDays, logger } = ctx;
-    if (timeToIdleDays === undefined || isSameTimeUnit(readAt, "day"))
+export async function fetchImageVariantWithBinaryByOwner(ctx, input) {
+    const { mediaId, mediaType, ownerHandle, rawResizeR } = input;
+    const row = await ctx
+        .cn("PaImageCache as v")
+        .innerJoin("PaImageCacheOwner as o", "o.imageCacheId", "v.id")
+        .select([
+        "v.id",
+        "v.mediaId",
+        "v.resourceVersion",
+        "v.rawWidth",
+        "v.rawHeight",
+        "v.mediaType",
+        "v.weightB",
+        "v.binaryFile",
+        "v.modifiedAt",
+        "v.slug",
+    ])
+        .where({
+        "v.mediaId": mediaId,
+        "v.mediaType": mediaType,
+        "o.ownerHandle": ownerHandle,
+        "o.rawResizeR": rawResizeR,
+    })
+        .first();
+    if (!row)
         return;
-    logger.debug(`updating readAt of image cache: ${imageUid}, ${variantName}`);
-    await cn("PaImageCache").where("id", id).update({
-        readAt: cn.fn.now(),
-    });
+    const id = strVal(row.id);
+    const rawWidth = nbVal(row.rawWidth);
+    const rawHeight = nbVal(row.rawHeight);
+    return {
+        id,
+        variant: {
+            mediaId: strVal(row.mediaId),
+            resourceVersion: strVal(row.resourceVersion),
+            slug: strValOrUndef(row.slug),
+            mediaType: strVal(row.mediaType),
+            rawWidth,
+            rawHeight,
+            weightB: nbVal(row.weightB),
+            binaryFile: row.binaryFile,
+            lastModified: dateVal(row.modifiedAt).toISOString(),
+            rawSizeName: `${rawWidth}x${rawHeight}`,
+        },
+    };
+}
+export async function deleteVariants(ctx, options) {
+    const { cn } = ctx;
+    if ("mediaIds" in options) {
+        await cn("PaImageCache").whereIn("mediaId", options.mediaIds).delete();
+    }
+    else {
+        await cn("PaImageCache").where("mediaId", options.mediaId);
+    }
+}
+/**
+ * @returns the list of cache ownerHandles that were deleted
+ */
+export async function deleteVariantsByDependencies(ctx, options) {
+    const { cn } = ctx;
+    await cn("PaImageCacheOwner as o").whereIn("o.ownerHandle", options.ownerHandles).delete();
+    await deleteOrphanVariants(ctx);
 }
 /**
- * Delete the images that have no usedKey and that have not been used recently.
+ * Delete the images that have no ownerHandle and that have not been used recently.
  * @returns the number of cache identifiers that were deleted
  */
-export async function deleteUnusedVariants({ cn, timeToIdleDays, }) {
+export async function deleteOrphanVariants(ctx) {
+    const { cn } = ctx;
     // Find records to delete
-    const subquery = cn("PaImageCacheUsed as k")
+    const subquery = cn("PaImageCacheOwner as k")
         .select(1)
-        .whereRaw("k.imageCacheId = PaImageCache.id")
-        .where("k.used", 1);
+        .whereRaw("k.imageCacheId = PaImageCache.id");
     const result = await cn("PaImageCache")
-        .whereRaw(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
         .whereNotExists(subquery)
+        .andWhereRaw(`date(modifiedAt) < date(current_timestamp, '-7 day')`)
         .delete();
     return result;
 }
-export async function markOneUsedKeyAsUsed(ctx, { imageCacheId, usedKey, }) {
-    await ctx
-        .cn("PaImageCacheUsed")
-        .where({
-        imageCacheId,
-        usedKey,
-    })
-        .update({ used: 1 });
+export async function associateOwnerToImages(ctx, { ownerHandle, cacheImages, isHandleReusable, }) {
+    const { cn } = ctx;
+    await cn.transaction(async (tx) => {
+        const prevRows = await tx("PaImageCacheOwner")
+            .select(["imageCacheId", "rawResizeR"])
+            .where({ ownerHandle });
+        const prevOwnedItems = new Map(prevRows.map((row) => {
+            const item = {
+                imageCacheId: strVal(row.imageCacheId),
+                rawResizeR: strVal(row.rawResizeR),
+            };
+            return [makeCacheImageKey(item), item];
+        }));
+        const newCacheImages = new Map(cacheImages.map((i) => [makeCacheImageKey(i), i.rawResizeR]));
+        // Insert new items
+        const toInsert = cacheImages.filter((item) => !prevOwnedItems.has(makeCacheImageKey(item)));
+        if (toInsert.length > 0) {
+            await tx("PaImageCacheOwner").insert(toInsert.map(({ imageCacheId, rawResizeR }) => ({
+                imageCacheId,
+                ownerHandle,
+                rawResizeR,
+            })));
+        }
+        // Delete obsolete items
+        if (!isHandleReusable) {
+            const toDelete = Array.from(prevOwnedItems.entries())
+                .filter(([key]) => !newCacheImages.has(key))
+                .map(([_, item]) => item);
+            if (toDelete.length > 0) {
+                const query = tx("PaImageCacheOwner").where({ ownerHandle });
+                for (const item of toDelete) {
+                    query.orWhere({
+                        imageCacheId: item.imageCacheId,
+                        rawResizeR: item.rawResizeR,
+                    });
+                }
+                await query.delete();
+            }
+        }
+    });
+}
+function makeCacheImageKey({ imageCacheId, rawResizeR, }) {
+    return `${imageCacheId}:${rawResizeR}`;
+}
+export async function fetchStoredCacheItems(ctx, ownerHandle) {
+    const { cn } = ctx;
+    const query = cn("PaImageCache as v")
+        .select([
+        "v.id",
+        "v.mediaId",
+        "v.mediaType",
+        "v.rawWidth",
+        "v.rawHeight",
+        "v.modifiedAt",
+        "v.resourceVersion",
+        "v.slug",
+    ])
+        .join("PaImageCacheOwner as o", "o.imageCacheId", "v.id")
+        .where("o.ownerHandle", ownerHandle);
+    const rows = await query;
+    return rows.map((row) => ({
+        imageCacheId: strVal(row.id),
+        variant: formatImageVariant(row),
+        alreadyOwned: true,
+    }));
 }
-export async function markUsedKeyAsUnused(ctx, { usedKey, }) {
-    await ctx.cn("PaImageCacheUsed").where({ usedKey }).update({ used: 0 });
+export async function fetchBatchOfStoredCacheItems(ctx, groups, alreadyOwnedBy) {
+    if (groups.length === 0)
+        return [];
+    const { cn } = ctx;
+    const query = cn("PaImageCache as v")
+        .select([
+        "v.id",
+        "v.mediaId",
+        "v.mediaType",
+        "v.rawWidth",
+        "v.rawHeight",
+        "v.modifiedAt",
+        "v.resourceVersion",
+        "v.slug",
+        "o.ownerHandle",
+    ])
+        .leftJoin("PaImageCacheOwner as o", {
+        "o.imageCacheId": "v.id",
+        "o.ownerHandle": cn.raw("?", [alreadyOwnedBy]),
+    });
+    query.where((qb) => {
+        for (const { mediaIds, requestedVariants } of groups) {
+            if (mediaIds.length === 0 || requestedVariants.length === 0)
+                continue;
+            qb.orWhere((subQb) => {
+                subQb.whereIn("v.mediaId", mediaIds).whereIn("v.mTypeRSize", requestedVariants.map((v) => makeMTypeRSizeKey(v)));
+            });
+        }
+    });
+    const rows = await query;
+    return rows.map((row) => ({
+        imageCacheId: strVal(row.id),
+        variant: formatImageVariant(row),
+        alreadyOwned: isDef(row.ownerHandle),
+    }));
 }
-export async function clearVariantCache({ cn }) {
-    await cn("PaImageCacheUsed").delete();
+export async function clearAll({ cn }) {
+    await cn("PaImageCacheOwner").delete();
     await cn("PaImageCache").delete();
 }
+function makeMTypeRSizeKey(image) {
+    return `${image.rawWidth}x${image.rawHeight}:${image.mediaType}`;
+}
+function formatImageVariant(row) {
+    return {
+        mediaId: strVal(row.mediaId),
+        resourceVersion: strVal(row.resourceVersion),
+        slug: strValOrUndef(row.slug),
+        mediaType: strVal(row.mediaType),
+        rawWidth: nbVal(row.rawWidth),
+        rawHeight: nbVal(row.rawHeight),
+        rawSizeName: `${nbVal(row.rawWidth)}x${nbVal(row.rawHeight)}`,
+    };
+}
+export async function fetchUsedRawSizesByMedia(ctx, mediaId) {
+    const { cn } = ctx;
+    const rows = await cn("PaImageCache as v")
+        .innerJoin("PaImageCacheOwner as o", "o.imageCacheId", "v.id")
+        .select(["o.rawResizeR", "v.rawWidth", "v.rawHeight"])
+        .where("v.mediaId", mediaId)
+        .orderBy("v.rawWidth", "asc")
+        .orderBy("v.rawHeight", "asc")
+        .distinct();
+    return rows.map((row) => ({
+        rawResizeR: strVal(row.rawResizeR),
+        rawSizeName: `${nbVal(row.rawWidth)}x${nbVal(row.rawHeight)}`,
+    }));
+}
 //# sourceMappingURL=queries.js.map

package/dist/internal/queries.js.map

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

package/dist/internal/resizer.d.ts

@@ -1,15 +1,15 @@
 import type { ScImageCompressionQualityPolicyStep } from "@paroicms/public-anywhere-lib";
-import type { ImageSize } from "./internal.types.js";
+import type { RawSize } from "../engine-types.js";
 export interface UnsavedImageVariantWithBinary {
-    width: number;
-    height: number;
+    rawWidth: number;
+    rawHeight: number;
     mediaType: string;
     weightB: number;
     binaryFile: Buffer;
 }
 export declare function resizeImage(options: {
     binaryFile: Buffer;
-    imageSize: ImageSize;
+    rawSize: RawSize;
     formatTo?: {
         mediaType: string;
         lossless?: boolean;
@@ -18,7 +18,7 @@ export declare function resizeImage(options: {
 }): Promise<UnsavedImageVariantWithBinary>;
 export declare function resizeIcoImage(options: {
     binaryFile: Buffer;
-    imageSize: ImageSize;
+    rawSize: RawSize;
 }): Promise<UnsavedImageVariantWithBinary>;
 export declare function convertSharpFormatToMediaType(format: string): string;
-export declare function getQuality({ width, height }: ImageSize, qualityPolicy?: ScImageCompressionQualityPolicyStep[]): number;
+export declare function getQuality({ rawWidth, rawHeight }: RawSize, qualityPolicy?: ScImageCompressionQualityPolicyStep[]): number;

package/dist/internal/resizer.js

@@ -9,15 +9,15 @@ export async function resizeImage(options) {
         ? convertMediaTypeToSharpFormat(options.formatTo.mediaType)
         : "webp";
     const sharpInst = sharp(options.binaryFile)
-        .resize(options.imageSize)
+        .resize({ width: options.rawSize.rawWidth, height: options.rawSize.rawHeight })
         .toFormat(sharpFormat, {
-        quality: getQuality(options.imageSize),
+        quality: getQuality(options.rawSize),
         lossless: options.formatTo?.lossless,
     });
     const { data, info } = await sharpQueue(() => sharpInst.toBuffer({ resolveWithObject: true }));
     return {
-        width: info.width,
-        height: info.height,
+        rawWidth: info.width,
+        rawHeight: info.height,
         weightB: data.byteLength,
         mediaType: convertSharpFormatToMediaType(info.format),
         binaryFile: data,
@@ -25,13 +25,13 @@ export async function resizeImage(options) {
 }
 export async function resizeIcoImage(options) {
     const { data, info } = await sharpQueue(() => sharp(options.binaryFile)
-        .resize(options.imageSize)
+        .resize({ width: options.rawSize.rawWidth, height: options.rawSize.rawHeight })
         .toFormat("png")
         .toBuffer({ resolveWithObject: true }));
     const binaryFile = icoEndec.encode([data]);
     return {
-        width: info.width,
-        height: info.height,
+        rawWidth: info.width,
+        rawHeight: info.height,
         weightB: binaryFile.byteLength,
         mediaType: "image/x-icon",
         binaryFile,
@@ -48,8 +48,8 @@ export function convertSharpFormatToMediaType(format) {
         return "image/svg+xml"; // Sharp omit +xml
     return `image/${format}`;
 }
-export function getQuality({ width, height }, qualityPolicy) {
-    const area = width * height;
+export function getQuality({ rawWidth, rawHeight }, qualityPolicy) {
+    const area = rawWidth * rawHeight;
     for (const { quality, areaLimitPx } of qualityPolicy ?? []) {
         if (areaLimitPx === undefined || area <= areaLimitPx)
             return quality;

package/dist/internal/resizer.js.map

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