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

package/ddl/image-cache.ddl.sql

@@ -1,8 +1,8 @@
 PRAGMA journal_mode = TRUNCATE;
 PRAGMA foreign_keys = 1;
 
-drop index if exists PaImageCacheUsed_usedKey_idx;
-drop table if exists PaImageCacheUsed;
+drop index if exists PaImageCacheOwner_ownerHandle_idx;
+drop table if exists PaImageCacheOwner;
 drop table if exists PaImageCache;
 drop table if exists PaMetadata;
 
@@ -13,29 +13,30 @@ create table PaMetadata (
   primary key (dbSchema, k)
 );
 
-insert into PaMetadata (dbSchema, k, val) values ('image-cache', 'dbSchemaVersion', '6');
+insert into PaMetadata (dbSchema, k, val) values ('image-cache', 'dbSchemaVersion', '7');
 
 create table PaImageCache (
   id integer not null primary key autoincrement,
   resourceVersion varchar(100) not null,
-  slug varchar(200),
-  imageUid varchar(36) not null,
-  variantName varchar(250) not null,
+  mediaId varchar(36) not null,
+  mTypeRSize varchar(100) not null,
   mediaType varchar(100) not null,
+  rawWidth integer not null,
+  rawHeight integer not null,
   weightB integer not null,
-  width integer not null,
-  height integer not null,
+  slug varchar(200),
   modifiedAt timestamp not null default current_timestamp,
-  readAt timestamp not null default current_timestamp,
   binaryFile blob not null,
-  unique (imageUid, variantName)
+  unique (mediaId, mTypeRSize)
 );
 
-create table PaImageCacheUsed (
+create index PaImageCache_mediaIdMediaType_idx on PaImageCache (mediaId, mediaType);
+
+create table PaImageCacheOwner (
   imageCacheId integer not null references PaImageCache (id) on delete cascade,
-  usedKey varchar(250) not null,
-  used tinyint(1) not null default 1,
-  primary key (imageCacheId, usedKey)
+  ownerHandle varchar(250) not null,
+  rawResizeR varchar(50) not null,
+  primary key (imageCacheId, ownerHandle, rawResizeR)
 );
 
-create index PaImageCacheUsed_usedKey_idx on PaImageCacheUsed (usedKey);
+create index PaImageCacheOwner_owner_idx on PaImageCacheOwner (ownerHandle, rawResizeR);

package/dist/compute-variant-size.d.ts

@@ -1,12 +1,7 @@
-import type { ImageSize, VariantName } from "@paroicms/public-anywhere-lib";
-import type { ImageRef, ParsedImageSizeWithVariant } from "./engine-types.js";
-export declare function findAuthorizedVariantSize(media: ImageRef, options: {
-    authorisedImageSizes: ImageSize[];
-    variantName: VariantName;
-}): ParsedImageSizeWithVariant | undefined;
+import type { ImageVariantSize, SourceImageRef } from "./engine-types.js";
 export interface ComputeVariantSizeParams {
-    imageRef: Pick<ImageRef, "width" | "height" | "avgWidth" | "avgHeight">;
-    imageSize: string;
+    sourceImage: Pick<SourceImageRef, "rawWidth" | "rawHeight" | "avgRawWidth" | "avgRawHeight">;
+    rawResizeR: string;
     autoCrop?: boolean;
 }
-export declare function computeVariantSize({ imageRef, imageSize, autoCrop, }: ComputeVariantSizeParams): ParsedImageSizeWithVariant;
+export declare function computeImageVariantSize({ sourceImage, rawResizeR, autoCrop, }: ComputeVariantSizeParams): ImageVariantSize;

package/dist/compute-variant-size.js

@@ -1,81 +1,71 @@
 import { nbVal } from "@paroi/data-formatters-lib";
-import { isImageSize } from "@paroicms/public-server-lib";
-export function findAuthorizedVariantSize(media, options) {
-    for (const imageSize of options.authorisedImageSizes) {
-        const variantSize = computeVariantSize({
-            imageSize,
-            imageRef: media,
-        });
-        if (variantSize.variantName === options.variantName)
-            return variantSize;
+import { isResizeRule } from "@paroicms/public-anywhere-lib";
+export function computeImageVariantSize({ sourceImage, rawResizeR, autoCrop, }) {
+    if (!isResizeRule(rawResizeR)) {
+        throw new Error(`This image size ${rawResizeR} is not handled.`);
     }
-}
-export function computeVariantSize({ imageRef, imageSize, autoCrop, }) {
-    if (!isImageSize(imageSize)) {
-        throw new Error(`This image size ${imageSize} is not handled.`);
-    }
-    const splitted = imageSize.split("x");
+    const splitted = rawResizeR.split("x");
     if (splitted.length === 3) {
         const value = splitted[1];
-        if (imageRef.height > imageRef.width) {
-            imageSize = `x${value}`;
+        if (sourceImage.rawHeight > sourceImage.rawWidth) {
+            rawResizeR = `x${value}`;
         }
-        else if (imageRef.width > imageRef.height) {
-            imageSize = `${value}x`;
+        else if (sourceImage.rawWidth > sourceImage.rawHeight) {
+            rawResizeR = `${value}x`;
         }
         else {
-            imageSize = `${value}x`;
+            rawResizeR = `${value}x`;
         }
     }
-    const [rawWidth, rawHeight] = imageSize.split("x");
+    const [rawWidth, rawHeight] = rawResizeR.split("x");
     const v = {
         width: rawWidth === "" ? undefined : nbVal(rawWidth),
         height: rawHeight === "" ? undefined : nbVal(rawHeight),
     };
     if (v.height !== undefined && v.width !== undefined) {
-        return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: v.width, height: v.height }, imageRef));
+        return toParsedResizeRuleWithVariant(reduceSizeIfNecessary({ rawWidth: v.width, rawHeight: v.height }, sourceImage));
     }
-    const autoCropAvg = autoCrop && imageRef.avgHeight !== undefined && imageRef.avgWidth !== undefined
+    const autoCropAvg = autoCrop && sourceImage.avgRawHeight !== undefined && sourceImage.avgRawWidth !== undefined
         ? {
-            width: imageRef.avgWidth,
-            height: imageRef.avgHeight,
+            width: sourceImage.avgRawWidth,
+            height: sourceImage.avgRawHeight,
         }
         : undefined;
     if (v.width !== undefined && v.height === undefined) {
         const targetHeight = autoCropAvg
             ? Math.round((v.width * autoCropAvg.height) / autoCropAvg.width)
-            : Math.round((v.width * imageRef.height) / imageRef.width);
-        return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: v.width, height: targetHeight }, imageRef));
+            : Math.round((v.width * sourceImage.rawHeight) / sourceImage.rawWidth);
+        return toParsedResizeRuleWithVariant(reduceSizeIfNecessary({ rawWidth: v.width, rawHeight: targetHeight }, sourceImage));
     }
     if (v.height !== undefined && v.width === undefined) {
         const targetWidth = autoCropAvg
             ? Math.round((v.height * autoCropAvg.width) / autoCropAvg.height)
-            : Math.round((v.height * imageRef.width) / imageRef.height);
-        return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: targetWidth, height: v.height }, imageRef));
+            : Math.round((v.height * sourceImage.rawWidth) / sourceImage.rawHeight);
+        return toParsedResizeRuleWithVariant(reduceSizeIfNecessary({ rawWidth: targetWidth, rawHeight: v.height }, sourceImage));
     }
-    throw new Error(`Invalid variant '${imageSize}'`);
+    throw new Error(`Invalid variant '${rawResizeR}'`);
 }
 function reduceSizeIfNecessary(preferredSize, actualSize) {
-    const diffW = actualSize.width - preferredSize.width;
-    const diffH = actualSize.height - preferredSize.height;
+    const diffW = actualSize.rawWidth - preferredSize.rawWidth;
+    const diffH = actualSize.rawHeight - preferredSize.rawHeight;
     if (diffW >= 0 && diffH >= 0) {
         return preferredSize;
     }
     if (diffW < diffH) {
         return {
-            width: actualSize.width,
-            height: Math.round((actualSize.width * preferredSize.height) / preferredSize.width),
+            rawWidth: actualSize.rawWidth,
+            rawHeight: Math.round((actualSize.rawWidth * preferredSize.rawHeight) / preferredSize.rawWidth),
         };
     }
     return {
-        width: Math.round((actualSize.height * preferredSize.width) / preferredSize.height),
-        height: actualSize.height,
+        rawWidth: Math.round((actualSize.rawHeight * preferredSize.rawWidth) / preferredSize.rawHeight),
+        rawHeight: actualSize.rawHeight,
     };
 }
-function toParsedImageSizeWithVariant(size) {
+function toParsedResizeRuleWithVariant(size) {
     return {
         ...size,
-        variantName: `${size.width}x${size.height}`,
+        rawSizeName: `${size.rawWidth}x${size.rawHeight}`,
     };
 }
 //# sourceMappingURL=compute-variant-size.js.map

package/dist/compute-variant-size.js.map

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

package/dist/constants.d.ts

@@ -1,3 +1,6 @@
 export declare const packageDir: string;
 export type AuthorizedSharpType = "jpeg" | "webp" | "png" | "gif";
 export declare const authorizedMediaTypes: Set<string>;
+export declare const mediaTypeByExtensions: {
+    [extension: string]: string;
+};

package/dist/constants.js

@@ -7,4 +7,12 @@ export const authorizedMediaTypes = new Set([
     "image/gif",
     "image/svg+xml",
 ]);
+const fileExtensions = {
+    "image/jpeg": "jpeg",
+    "image/webp": "webp",
+    "image/png": "png",
+    "image/gif": "gif",
+    "image/svg+xml": "svg",
+};
+export const mediaTypeByExtensions = Object.fromEntries(Object.entries(fileExtensions).map(([mediaType, extension]) => [extension, mediaType]));
 //# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAGpF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IAC1C,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,WAAW;IACX,eAAe;CAChB,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAGpF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IAC1C,YAAY;IACZ,YAAY;IACZ,WAAW;IACX,WAAW;IACX,eAAe;CAChB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAoC;IACtD,YAAY,EAAE,MAAM;IACpB,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,KAAK;IAClB,WAAW,EAAE,KAAK;IAClB,eAAe,EAAE,KAAK;CACd,CAAC;AAEX,MAAM,CAAC,MAAM,qBAAqB,GAAoC,MAAM,CAAC,WAAW,CACtF,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CACvF,CAAC"}

package/dist/db-init/ddl-migration.d.ts

@@ -1,7 +1,7 @@
 import { type BasicAppLogger } from "@paroicms/internal-server-lib";
 import type { Knex } from "knex";
 export declare const dbSchemaName = "image-cache";
-export declare const currentDbSchemaVersion = 6;
+export declare const currentDbSchemaVersion = 7;
 export declare function migrateImageCacheDb(cn: Knex, { fromVersion, logger }: {
     fromVersion: number;
     logger: BasicAppLogger;

package/dist/db-init/ddl-migration.js

@@ -2,7 +2,7 @@ import { executeDdl, getMetadataDbSchemaVersion, } from "@paroicms/internal-serv
 import { join } from "node:path";
 import { packageDir } from "../constants.js";
 export const dbSchemaName = "image-cache";
-export const currentDbSchemaVersion = 6;
+export const currentDbSchemaVersion = 7;
 export async function migrateImageCacheDb(cn, { fromVersion, logger }) {
     const toVersion = currentDbSchemaVersion;
     let currentVersion = fromVersion;

package/dist/db-init/ddl-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAQ,EACR,EAAE,WAAW,EAAE,MAAM,EAAmD;IAExE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,cAAc,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,YAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAC;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAQ,EACR,EAAE,WAAW,EAAE,MAAM,EAAmD;IAExE,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,UAAU,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,cAAc,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,YAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC"}

package/dist/default-bo-favicon.js

@@ -33,8 +33,8 @@ export async function createDefaultBoFavicon(binaryFile) {
         .toBuffer({ resolveWithObject: true }));
     const mediaType = convertSharpFormatToMediaType(result.info.format);
     return {
-        width: result.info.width,
-        height: result.info.height,
+        rawWidth: result.info.width,
+        rawHeight: result.info.height,
         weightB: result.data.byteLength,
         mediaType,
         lossless: mediaType === "image/png" || mediaType === "image/webp",

package/dist/default-bo-favicon.js.map

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

package/dist/engine-types.d.ts

@@ -1,34 +1,40 @@
-import type { VariantName } from "@paroicms/public-anywhere-lib";
+import type { ResizeRule, SizeName } from "@paroicms/public-anywhere-lib";
 export interface ImageVariantStorage {
     type: "sqlite";
     file: string;
 }
-export type GetOriginalImage = (uid: string) => Promise<Buffer>;
-export interface NewImageProps {
-    imageRef: ImageRef;
-    imageSize: string;
+export type GetOriginalImage = (mediaId: string) => Promise<Buffer>;
+export interface RequestedImageVariantWithSize extends RequestedImageVariant, ImageVariantSize {
+}
+export interface RequestedImageVariant {
+    rawSizeName: SizeName;
+    mediaType: string;
+}
+export interface NewVariantInput {
+    rawResizeR: ResizeRule;
     autoCrop?: boolean;
     mediaType?: string;
-    dependsOnUsedKey: string;
-    slug?: string;
+    sourceImage: SourceImageRef;
 }
-export interface ImageRef {
-    imageUid: string;
-    height: number;
-    width: number;
+export interface SourceImageRef {
+    mediaId: string;
+    rawHeight: number;
+    rawWidth: number;
     mediaType: string;
-    avgWidth?: number;
-    avgHeight?: number;
+    slug: string | undefined;
+    avgRawWidth?: number;
+    avgRawHeight?: number;
 }
-export interface ParsedImageSizeWithVariant {
-    width: number;
-    height: number;
-    variantName: VariantName;
+export interface ImageVariantSize {
+    rawWidth: number;
+    rawHeight: number;
+    rawSizeName: SizeName;
 }
-export interface ImageVariant extends ParsedImageSizeWithVariant {
+export interface ImageVariant extends ImageVariantSize {
+    mediaId: string;
+    mediaType: string;
     resourceVersion: string;
     slug?: string;
-    mediaType: string;
 }
 export interface ImageVariantWithBinary extends ImageVariant {
     weightB: number;
@@ -38,3 +44,20 @@ export interface ImageVariantWithBinary extends ImageVariant {
      */
     lastModified: string;
 }
+export interface ImageCacheOwnerTransaction {
+    makeImageAvailable(inputs: NewVariantInput[], options?: {
+        optimizeForBatch?: {
+            getMoreInputsForBatch: (filter: (input: NewVariantInput) => boolean) => NewVariantInput[];
+        };
+    }): Promise<ImageVariant[]>;
+    flush(): Promise<void>;
+    close(): Promise<void>;
+}
+export interface RawSize {
+    rawWidth: number;
+    rawHeight: number;
+}
+export interface UsedRawSize {
+    rawResizeR: ResizeRule;
+    rawSizeName: SizeName;
+}

package/dist/image-cache-engine.d.ts

@@ -1,7 +1,46 @@
 import type { AppLogger } from "@paroicms/internal-server-lib";
-import type { ImageSize, ScImageCompressionQualityPolicyStep, VariantName } from "@paroicms/public-anywhere-lib";
-import type { GetOriginalImage, ImageRef, ImageVariant, ImageVariantStorage, ImageVariantWithBinary, NewImageProps } from "./engine-types.js";
-import { type VariantEngineContext } from "./internal/engine-context.js";
+import type { ResizeRule, ScImageCompressionQualityPolicyStep } from "@paroicms/public-anywhere-lib";
+import type { GetOriginalImage, ImageCacheOwnerTransaction, ImageVariant, ImageVariantStorage, ImageVariantWithBinary, NewVariantInput } from "./engine-types.js";
+export interface ImageCacheEngine {
+    getImageVariantWithBinary(options: {
+        mediaId: string;
+        mediaType: string;
+        rawWidth: number;
+        rawHeight: number;
+    }): Promise<ImageVariantWithBinary | undefined>;
+    getImageVariantWithBinaryByOwner(options: {
+        mediaId: string;
+        mediaType: string;
+        ownerHandle: string;
+        rawResizeR: ResizeRule;
+    }): Promise<ImageVariantWithBinary | undefined>;
+    makeImageAvailable(input: NewVariantAndOwnerInput): Promise<ImageVariant>;
+    createOwnerTransaction(ownerHandle: string): ImageCacheOwnerTransaction;
+    invalidate(options: {
+        mediaId: string;
+    } | {
+        mediaIds: string[];
+    } | {
+        ownerHandles: string[];
+    }): Promise<void>;
+    /**
+     * Delete the images that have no ownerHandle and that have not been used recently.
+     */
+    cleanUnusedValues(): Promise<void>;
+    clearCache(): Promise<void>;
+    getUsedRawSizesByMedia(mediaId: string): Promise<import("./engine-types.js").UsedRawSize[]>;
+    close(): Promise<void>;
+}
+export interface NewVariantAndOwnerInput extends NewVariantInput {
+    ownerHandle: string;
+    isHandleReusable: boolean;
+    /**
+     * If `true`, the `ownerHandle` is used for a single variant with the same `mediaType` and
+     * `mediaId`. Also, `getImageVariantWithBinaryByOwner` can be safely used to fetch the image
+     * variant even when the variant is still being processed.
+     */
+    canBeRetrievedByOwner: boolean;
+}
 export interface CreateImageCacheEngineOptions {
     storage: ImageVariantStorage;
     getOriginalImage: GetOriginalImage;
@@ -16,36 +55,3 @@ export declare function createImageCacheEngine(options: CreateImageCacheEngineOp
     imageCache: ImageCacheEngine;
     isCleared: boolean;
 }>;
-export declare class ImageCacheEngine {
-    #private;
-    constructor(context: VariantEngineContext);
-    getImageVariantWithBinary({ imageUid, variantName, }: {
-        imageUid: string;
-        variantName: VariantName;
-    }): Promise<ImageVariantWithBinary | undefined>;
-    resetUsedKey(options: {
-        usedKey: string;
-    }): Promise<void>;
-    makeImageAvailable(params: NewImageProps): Promise<ImageVariant>;
-    getOrCreateImageWithBinary(params: NewImageProps): Promise<ImageVariantWithBinary | undefined>;
-    conditionallyCreateImageVariantWithBinary(media: ImageRef, options: {
-        authorisedImageSizes: ImageSize[];
-        variantName: VariantName;
-        dependsOnUsedKey: string;
-        slug?: string;
-    }): Promise<ImageVariantWithBinary | undefined>;
-    invalidate(options: {
-        imageUid: string;
-        variantName?: string;
-    } | {
-        imageUids: string[];
-    } | {
-        usedKeys: string[];
-    }): Promise<void>;
-    /**
-     * Delete the images that have no usedKey and that have not been used recently.
-     */
-    cleanUnusedValues(): Promise<void>;
-    clearCache(): Promise<void>;
-    close(): Promise<void>;
-}