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

package/dist/internal/task-processor.js

@@ -1,66 +1,69 @@
-import { fetchImageVariantWithBinary, insertIntoImageVariant, markOneUsedKeyAsUsed, } from "./queries.js";
+import { fetchImageVariantWithBinary, insertIntoImageVariant, insertIntoPaImageCacheOwner, } from "./queries.js";
 import { resizeImage } from "./resizer.js";
 export async function processAllPending(context) {
     while (true) {
-        const task = context.queue.shift();
-        if (!task)
+        const taskKey = context.queue.shift();
+        if (!taskKey)
             break;
-        const pth = context.pendingTasks.get(task.taskKey);
+        const pth = context.pendingTasks.get(taskKey);
         if (!pth) {
-            context.logger.error(`Missing pending variant '${task.taskKey}'`);
+            context.logger.error(`Missing pending variant '${taskKey}'`);
             continue;
         }
+        const { task, resolve, reject } = pth;
         try {
-            const result = await excecuteTask(task, context);
-            pth.resolve(result);
+            const result = await executeTask(task, context);
+            resolve(result);
         }
         catch (error) {
-            context.logger.error(`[image-cache-engine] image '${task.imageUid}', '${task.variantName}':`, error, task);
-            pth.reject(error);
+            context.logger.error(`[image-cache-engine] image '${task.variant.mediaId}', '${task.variant.rawSizeName}':`, error, task);
+            reject(error);
+        }
+        context.pendingTasks.delete(taskKey);
+        for (const oneOwnerKey of pth.ownerKeys) {
+            context.pendingTaskByOwnerKeys.delete(oneOwnerKey);
         }
-        context.pendingTasks.delete(task.taskKey);
     }
 }
-async function excecuteTask(task, ctx) {
-    const found = await fetchImageVariantWithBinary(ctx, {
-        imageUid: task.imageUid,
-        variantName: task.variantName,
-    });
+async function executeTask(task, ctx) {
+    const found = await fetchImageVariantWithBinary(ctx, task.variant);
     if (found) {
-        await markOneUsedKeyAsUsed(ctx, {
-            imageCacheId: found.id,
-            usedKey: task.dependsOnUsedKey,
-        });
+        if (task.owners.size > 0) {
+            await insertIntoPaImageCacheOwner(ctx, {
+                imageCacheId: found.id,
+                owners: Array.from(task.owners.values()),
+            });
+        }
         return found.variant;
     }
-    const origBinaryFile = await ctx.getOriginalImage(task.imageUid);
+    const origBinaryFile = await ctx.getOriginalImage(task.variant.mediaId);
     const result = await resizeImage({
         binaryFile: origBinaryFile,
-        imageSize: task.imageSize,
-        formatTo: task.changeMediaTypeTo
+        rawSize: task.variant,
+        formatTo: task.variant.mediaType !== task.input.sourceImage.mediaType
             ? {
-                mediaType: task.changeMediaTypeTo,
+                mediaType: task.variant.mediaType,
             }
             : undefined,
         qualityPolicy: ctx.qualityPolicy,
     });
-    const { lastModified } = await insertIntoImageVariant(ctx.cn, {
-        resourceVersion: task.resourceVersion,
-        imageUid: task.imageUid,
-        slug: task.slug,
+    const { lastModified } = await insertIntoImageVariant(ctx, {
+        resourceVersion: task.variant.resourceVersion,
+        mediaId: task.variant.mediaId,
         mediaType: result.mediaType,
-        variantName: task.variantName,
-        width: result.width,
-        height: result.height,
+        rawWidth: result.rawWidth,
+        rawHeight: result.rawHeight,
         weightB: result.weightB,
         binaryFile: result.binaryFile,
-    }, task.dependsOnUsedKey);
+        slug: task.variant.slug,
+    }, Array.from(task.owners.values()));
     return {
         ...result,
+        mediaId: task.variant.mediaId,
+        resourceVersion: task.variant.resourceVersion,
+        rawSizeName: task.variant.rawSizeName,
+        slug: task.variant.slug,
         lastModified,
-        resourceVersion: task.resourceVersion,
-        slug: task.slug,
-        variantName: task.variantName,
     };
 }
 //# sourceMappingURL=task-processor.js.map

package/dist/internal/task-processor.js.map

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

package/dist/internal/utils.d.ts

@@ -0,0 +1,16 @@
+import type { ResizeRule, SizeName } from "@paroicms/public-anywhere-lib";
+import type { NewVariantInput } from "../engine-types.js";
+import type { CompletedInput, OwnerKey, StoredCacheItem, TaskKey, TransactionCacheItem } from "./internal.types.js";
+export declare function makeTaskKey(v: {
+    mediaId: string;
+    mediaType: string;
+    rawSizeName: SizeName;
+}): TaskKey;
+export declare function makeOwnerKey(v: {
+    mediaId: string;
+    mediaType: string;
+    ownerHandle: string;
+    rawResizeR: ResizeRule;
+}): OwnerKey;
+export declare function completeInput(input: NewVariantInput): CompletedInput;
+export declare function toTransactionCacheItem(item: StoredCacheItem): TransactionCacheItem;

package/dist/internal/utils.js

@@ -0,0 +1,34 @@
+import { computeImageVariantSize } from "../compute-variant-size.js";
+export function makeTaskKey(v) {
+    return `${v.mediaId}:${v.rawSizeName}:${v.mediaType}`;
+}
+export function makeOwnerKey(v) {
+    return `${v.ownerHandle}:${v.mediaId}:${v.rawResizeR}:${v.mediaType}`;
+}
+export function completeInput(input) {
+    const { sourceImage, rawResizeR, autoCrop } = input;
+    const variantSize = computeImageVariantSize(input);
+    const { rawSizeName, rawWidth, rawHeight } = variantSize;
+    const mediaId = sourceImage.mediaId;
+    const mediaType = input.mediaType ?? sourceImage.mediaType;
+    return {
+        taskKey: makeTaskKey({ mediaId, mediaType, rawSizeName }),
+        sourceImage,
+        requestedVariant: {
+            rawSizeName,
+            mediaType,
+            rawWidth,
+            rawHeight,
+        },
+        rawResizeR,
+        autoCrop,
+    };
+}
+export function toTransactionCacheItem(item) {
+    const { variant, ...stored } = item;
+    return {
+        variant: item.variant,
+        stored,
+    };
+}
+//# sourceMappingURL=utils.js.map

package/dist/internal/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/internal/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAUrE,MAAM,UAAU,WAAW,CAAC,CAI3B;IACC,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,CAK5B;IACC,OAAO,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAsB;IAClD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACpD,MAAM,WAAW,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC;IACzD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IACpC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;IAC3D,OAAO;QACL,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QACzD,WAAW;QACX,gBAAgB,EAAE;YAChB,WAAW;YACX,SAAS;YACT,QAAQ;YACR,SAAS;SACV;QACD,UAAU;QACV,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAqB;IAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,MAAM;KACP,CAAC;AACJ,CAAC"}

package/dist/original-images-processing.d.ts

@@ -4,8 +4,8 @@ export interface ApiErrorType {
 }
 export interface OriginalImage {
     binaryFile: Buffer;
-    width: number;
-    height: number;
+    rawWidth: number;
+    rawHeight: number;
     weightB: number;
     mediaType: string;
     lossless: boolean | undefined;

package/dist/original-images-processing.js

@@ -22,17 +22,31 @@ export async function processOriginalImage({ binaryFile, mediaType, ApiError, po
         if (weightLimitB && weightB > weightLimitB) {
             throw new ApiError("Image weight exceeds limit", 400);
         }
-        return { binaryFile, width, height, mediaType, weightB, lossless: undefined };
+        return {
+            binaryFile,
+            rawWidth: width,
+            rawHeight: height,
+            mediaType,
+            weightB,
+            lossless: undefined,
+        };
     }
     const input = {
-        width,
-        height,
+        rawWidth: width,
+        rawHeight: height,
         mediaType,
         sharpInst,
     };
     if (mediaType === "image/webp") {
         if (weightLimitB === undefined || weightB <= weightLimitB) {
-            return { binaryFile, width, height, mediaType, weightB, lossless: undefined };
+            return {
+                binaryFile,
+                rawWidth: width,
+                rawHeight: height,
+                mediaType,
+                weightB,
+                lossless: undefined,
+            };
         }
         return await convertToWebp({ input, qualityPolicy, areaLimitPx, lossless: false });
     }
@@ -49,19 +63,18 @@ export async function processOriginalImage({ binaryFile, mediaType, ApiError, po
     return await convertToWebp({ input, qualityPolicy, areaLimitPx, lossless: false });
 }
 async function convertToWebp({ input, qualityPolicy, areaLimitPx, lossless, }) {
-    const { width, height } = areaLimitPx === undefined ? input : computeOriginalSize(input, areaLimitPx);
-    const size = { width, height }; // to be sure we keep only these properties
-    const quality = getQuality(size, qualityPolicy);
+    const { rawWidth, rawHeight } = areaLimitPx === undefined ? input : computeOriginalSize(input, areaLimitPx);
+    const quality = getQuality({ rawWidth, rawHeight }, qualityPolicy);
     const { data, info } = await sharpQueue(() => input.sharpInst
-        .resize(size)
+        .resize({ width: rawWidth, height: rawHeight })
         .webp({
         lossless,
         quality,
     })
         .toBuffer({ resolveWithObject: true }));
     return {
-        width: info.width,
-        height: info.height,
+        rawWidth: info.width,
+        rawHeight: info.height,
         weightB: data.byteLength,
         mediaType: "image/webp",
         lossless,
@@ -69,12 +82,12 @@ async function convertToWebp({ input, qualityPolicy, areaLimitPx, lossless, }) {
     };
 }
 function computeOriginalSize(input, areaLimitPx) {
-    const inputArea = input.width * input.height;
+    const inputArea = input.rawWidth * input.rawHeight;
     if (inputArea <= areaLimitPx)
         return input;
-    const ratio = input.width / input.height;
+    const ratio = input.rawWidth / input.rawHeight;
     const width = Math.trunc(Math.sqrt(areaLimitPx * ratio));
-    const height = Math.round((input.height / input.width) * width);
-    return { width, height };
+    const height = Math.round((input.rawHeight / input.rawWidth) * width);
+    return { rawWidth: width, rawHeight: height };
 }
 //# sourceMappingURL=original-images-processing.js.map

package/dist/original-images-processing.js.map

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

package/dist/owner-transaction/make-t-image-available.d.ts

@@ -0,0 +1,7 @@
+import type { ImageVariant, NewVariantInput } from "../engine-types.js";
+import type { OwnerTransactionContext } from "./owner-transaction-types.js";
+export declare function makeTransactionImageAvailable(otContext: OwnerTransactionContext, inputs: NewVariantInput[], { optimizeForBatch, }: {
+    optimizeForBatch?: {
+        getMoreInputsForBatch: (filter: (input: NewVariantInput) => boolean) => NewVariantInput[];
+    };
+}): Promise<ImageVariant[]>;

package/dist/owner-transaction/make-t-image-available.js

@@ -0,0 +1,122 @@
+import { completeInput, makeOwnerKey } from "../internal/utils.js";
+import { makeBatchOfImagesAvailable } from "./owner-batch.js";
+import { promiseToHandleSafely } from "./owner-utils.js";
+export async function makeTransactionImageAvailable(otContext, inputs, { optimizeForBatch, }) {
+    const { engineContext, ownerHandle, canBeRetrievedByOwner, localCache } = otContext;
+    const completedInputs = inputs.map(completeInput);
+    let unresolvedInputs = completedInputs.filter((input) => !localCache.has(input.taskKey));
+    const pendingVariants = new Map();
+    for (const input of unresolvedInputs) {
+        const pt = engineContext.pendingTasks.get(input.taskKey);
+        if (pt) {
+            pt.task.owners.set(ownerHandle, { ownerHandle, rawResizeR: input.rawResizeR });
+            pendingVariants.set(input.taskKey, pt.task.variant);
+            if (canBeRetrievedByOwner) {
+                pt.ownerKeys.add(makeOwnerKey({
+                    mediaId: input.sourceImage.mediaId,
+                    mediaType: input.requestedVariant.mediaType,
+                    ownerHandle,
+                    rawResizeR: input.rawResizeR,
+                }));
+            }
+        }
+    }
+    unresolvedInputs = unresolvedInputs.filter((input) => !pendingVariants.has(input.taskKey));
+    if (unresolvedInputs.length > 0) {
+        const unresolvedTaskKeys = new Set(unresolvedInputs.map((i) => i.taskKey));
+        let augmentedInputs = unresolvedInputs;
+        if (optimizeForBatch) {
+            const newItems = optimizeForBatch
+                .getMoreInputsForBatch((candidate) => {
+                return unresolvedTaskKeys.has(completeInput(candidate).taskKey);
+            })
+                .map(completeInput);
+            augmentedInputs = augmentedInputs.concat(newItems);
+        }
+        await makeBatchOfImagesAvailable(otContext, augmentedInputs);
+    }
+    createTasksAndCollectImageOwners(otContext, completedInputs, canBeRetrievedByOwner);
+    return completedInputs.map((input) => {
+        const pending = pendingVariants.get(input.taskKey);
+        if (pending)
+            return pending;
+        const v = localCache.get(input.taskKey);
+        if (!v) {
+            throw new Error(`Missing image variant for task "${input.taskKey}" (ownerHandle: ${ownerHandle})`);
+        }
+        v.usedBy = input;
+        return v.variant;
+    });
+}
+function createTasksAndCollectImageOwners(otContext, completedInputs, canBeRetrievedByOwner) {
+    const { startQueue } = otContext;
+    let hasCreatedTask = false;
+    for (const input of completedInputs) {
+        const taskCreated = processImageInput(otContext, input, canBeRetrievedByOwner);
+        if (taskCreated) {
+            hasCreatedTask = true;
+        }
+    }
+    if (hasCreatedTask) {
+        startQueue();
+    }
+}
+/**
+ * @returns `true` if a new task was created.
+ */
+function processImageInput(otContext, input, canBeRetrievedByOwner) {
+    const { engineContext, ownerHandle } = otContext;
+    const cacheItem = otContext.localCache.get(input.taskKey);
+    if (!cacheItem)
+        return false;
+    const { stored } = cacheItem;
+    if (stored) {
+        // Item is already stored - add to owner image manager if not already owned
+        if (!stored.alreadyOwned) {
+            otContext.ownerImageManager.add(stored.imageCacheId, input.rawResizeR);
+        }
+        return false;
+    }
+    // Item needs a task - check if task already exists
+    const pending = engineContext.pendingTasks.get(input.taskKey);
+    if (pending) {
+        pending.task.owners.set(ownerHandle, { ownerHandle, rawResizeR: input.rawResizeR });
+        if (canBeRetrievedByOwner) {
+            const ownerKey = makeOwnerKey({
+                mediaId: input.sourceImage.mediaId,
+                mediaType: input.requestedVariant.mediaType,
+                ownerHandle,
+                rawResizeR: input.rawResizeR,
+            });
+            pending.ownerKeys.add(ownerKey);
+        }
+        return false;
+    }
+    // Create new task
+    const ownerKey = canBeRetrievedByOwner
+        ? makeOwnerKey({
+            mediaId: input.sourceImage.mediaId,
+            mediaType: input.requestedVariant.mediaType,
+            ownerHandle,
+            rawResizeR: input.rawResizeR,
+        })
+        : undefined;
+    const task = {
+        variant: cacheItem.variant,
+        input,
+        owners: new Map([[ownerHandle, { ownerHandle, rawResizeR: input.rawResizeR }]]),
+    };
+    const pendingTask = {
+        ...promiseToHandleSafely(),
+        task,
+        ownerKeys: new Set(),
+    };
+    engineContext.queue.push(input.taskKey);
+    engineContext.pendingTasks.set(input.taskKey, pendingTask);
+    if (ownerKey) {
+        pendingTask.ownerKeys.add(ownerKey);
+        engineContext.pendingTaskByOwnerKeys.set(ownerKey, pendingTask);
+    }
+    return true;
+}
+//# sourceMappingURL=make-t-image-available.js.map

package/dist/owner-transaction/make-t-image-available.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"make-t-image-available.js","sourceRoot":"","sources":["../../src/owner-transaction/make-t-image-available.ts"],"names":[],"mappings":"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"}

package/dist/owner-transaction/owner-batch.d.ts

@@ -0,0 +1,10 @@
+import type { RequestedImageVariantWithSize, SourceImageRef } from "../engine-types.js";
+import type { CompletedInput } from "../internal/internal.types.js";
+import type { OwnerTransactionContext } from "./owner-transaction-types.js";
+export declare function makeBatchOfImagesAvailable(otContext: OwnerTransactionContext, inputs: CompletedInput[]): Promise<void>;
+export interface GroupedInputsByImage {
+    image: SourceImageRef;
+    requestedVariants: RequestedImageVariantWithSize[];
+    requestedListKey: string;
+    inputs: CompletedInput[];
+}

package/dist/owner-transaction/owner-batch.js

@@ -0,0 +1,85 @@
+import { generateResourceVersion } from "@paroicms/internal-server-lib";
+import { fetchBatchOfStoredCacheItems } from "../internal/queries.js";
+import { makeTaskKey, toTransactionCacheItem } from "../internal/utils.js";
+export async function makeBatchOfImagesAvailable(otContext, inputs) {
+    const { engineContext, ownerHandle, localCache } = otContext;
+    const groups1 = groupInputsByImages(inputs);
+    const groups2 = groupInputsByRequestedKeys(groups1);
+    const list = await fetchBatchOfStoredCacheItems(engineContext, groups2.map((grouped) => ({
+        mediaIds: grouped.images.map((image) => image.mediaId),
+        requestedVariants: grouped.requestedVariants,
+    })), ownerHandle);
+    const fetchedVariants = new Map(list.map((v) => [makeTaskKey(v.variant), v]));
+    for (const input of inputs) {
+        localCache.set(input.taskKey, createTransactionCacheItem(input, fetchedVariants));
+    }
+}
+function createTransactionCacheItem(input, fetchedVariants) {
+    const existing = fetchedVariants.get(input.taskKey);
+    if (existing)
+        return toTransactionCacheItem(existing);
+    const resourceVersion = generateResourceVersion();
+    const { sourceImage, requestedVariant } = input;
+    return {
+        variant: {
+            mediaId: sourceImage.mediaId,
+            resourceVersion,
+            mediaType: requestedVariant.mediaType,
+            rawWidth: requestedVariant.rawWidth,
+            rawHeight: requestedVariant.rawHeight,
+            rawSizeName: requestedVariant.rawSizeName,
+            slug: sourceImage.slug,
+        },
+    };
+}
+function groupInputsByRequestedKeys(groupedInputs) {
+    const map = new Map();
+    for (const entry of groupedInputs) {
+        let group = map.get(entry.requestedListKey);
+        if (!group) {
+            group = {
+                requestedVariants: entry.requestedVariants,
+                images: new Map(),
+            };
+            map.set(entry.requestedListKey, group);
+        }
+        group.images.set(entry.image.mediaId, entry.image);
+    }
+    return Array.from(map.values()).map((group) => ({
+        requestedVariants: group.requestedVariants,
+        images: Array.from(group.images.values()),
+    }));
+}
+function groupInputsByImages(inputs) {
+    const map = new Map();
+    for (let index = 0; index < inputs.length; ++index) {
+        const input = inputs[index];
+        const { sourceImage, requestedVariant } = input;
+        let entry = map.get(sourceImage.mediaId);
+        if (!entry) {
+            entry = {
+                image: sourceImage,
+                requestedVariants: [],
+                inputs: [],
+            };
+            map.set(sourceImage.mediaId, entry);
+        }
+        entry.inputs.push(input);
+        if (entry.requestedVariants.findIndex((v) => v.rawSizeName === requestedVariant.rawSizeName &&
+            v.mediaType === requestedVariant.mediaType) === -1) {
+            entry.requestedVariants.push(requestedVariant);
+        }
+    }
+    return Array.from(map.values()).map((entry) => {
+        const list = entry.requestedVariants.map(makeRequestedImageVariantKey);
+        const requestedListKey = JSON.stringify(list.sort());
+        return {
+            ...entry,
+            requestedListKey,
+        };
+    });
+}
+function makeRequestedImageVariantKey(r) {
+    return `${r.rawSizeName}:${r.mediaType}`;
+}
+//# sourceMappingURL=owner-batch.js.map

package/dist/owner-transaction/owner-batch.js.map

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

package/dist/owner-transaction/owner-image-manager.d.ts

@@ -0,0 +1,11 @@
+import type { ResizeRule } from "@paroicms/public-anywhere-lib";
+import type { VariantEngineContext } from "../internal/engine-context.js";
+export interface OwnerImageManager {
+    add(imageCacheId: string, rawResizeR: ResizeRule): void;
+    flush(): Promise<void>;
+}
+export declare function createOwnerImageManager({ ownerHandle, isHandleReusable, engineContext, }: {
+    ownerHandle: string;
+    isHandleReusable: boolean;
+    engineContext: VariantEngineContext;
+}): OwnerImageManager;

package/dist/owner-transaction/owner-image-manager.js

@@ -0,0 +1,44 @@
+import { associateOwnerToImages } from "../internal/queries.js";
+export function createOwnerImageManager({ ownerHandle, isHandleReusable, engineContext, }) {
+    const pendingData = new Map(); // key: imageCacheId, value: rawResizeR
+    let flushTimeout;
+    function startFlushTimeout() {
+        if (flushTimeout)
+            return;
+        flushTimeout = setTimeout(() => {
+            flushTimeout = undefined;
+            void flush().catch((error) => {
+                engineContext.logger.error("Error during auto-flush:", error);
+            });
+        }, 2_000);
+    }
+    async function flush() {
+        if (pendingData.size === 0)
+            return;
+        clearFlushTimeout();
+        const cacheImages = Array.from(pendingData).map(([imageCacheId, rawResizeR]) => ({
+            imageCacheId,
+            rawResizeR,
+        }));
+        pendingData.clear();
+        await associateOwnerToImages(engineContext, {
+            ownerHandle,
+            cacheImages,
+            isHandleReusable,
+        });
+    }
+    function clearFlushTimeout() {
+        if (flushTimeout) {
+            clearTimeout(flushTimeout);
+            flushTimeout = undefined;
+        }
+    }
+    return {
+        add(imageCacheId, rawResizeR) {
+            pendingData.set(imageCacheId, rawResizeR);
+            startFlushTimeout();
+        },
+        flush,
+    };
+}
+//# sourceMappingURL=owner-image-manager.js.map

package/dist/owner-transaction/owner-image-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"owner-image-manager.js","sourceRoot":"","sources":["../../src/owner-transaction/owner-image-manager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,MAAM,UAAU,uBAAuB,CAAC,EACtC,WAAW,EACX,gBAAgB,EAChB,aAAa,GAKd;IACC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC,CAAC,uCAAuC;IAC1F,IAAI,YAAwC,CAAC;IAE7C,SAAS,iBAAiB;QACxB,IAAI,YAAY;YAAE,OAAO;QACzB,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,YAAY,GAAG,SAAS,CAAC;YACzB,KAAK,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC3B,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IAED,KAAK,UAAU,KAAK;QAClB,IAAI,WAAW,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO;QACnC,iBAAiB,EAAE,CAAC;QAEpB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/E,YAAY;YACZ,UAAU;SACX,CAAC,CAAC,CAAC;QACJ,WAAW,CAAC,KAAK,EAAE,CAAC;QAEpB,MAAM,sBAAsB,CAAC,aAAa,EAAE;YAC1C,WAAW;YACX,WAAW;YACX,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,iBAAiB;QACxB,IAAI,YAAY,EAAE,CAAC;YACjB,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,YAAY,GAAG,SAAS,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,CAAC,YAAoB,EAAE,UAAsB;YAC9C,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC1C,iBAAiB,EAAE,CAAC;QACtB,CAAC;QAED,KAAK;KACN,CAAC;AACJ,CAAC"}

package/dist/owner-transaction/owner-transaction-types.d.ts

@@ -0,0 +1,12 @@
+import type { VariantEngineContext } from "../internal/engine-context.js";
+import type { TaskKey, TransactionCacheItem } from "../internal/internal.types.js";
+import type { OwnerImageManager } from "./owner-image-manager.js";
+export interface OwnerTransactionContext {
+    engineContext: VariantEngineContext;
+    startQueue: () => void;
+    ownerHandle: string;
+    isHandleReusable: boolean;
+    canBeRetrievedByOwner: boolean;
+    ownerImageManager: OwnerImageManager;
+    localCache: Map<TaskKey, TransactionCacheItem>;
+}

package/dist/owner-transaction/owner-transaction-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=owner-transaction-types.js.map

package/dist/owner-transaction/owner-transaction-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"owner-transaction-types.js","sourceRoot":"","sources":["../../src/owner-transaction/owner-transaction-types.ts"],"names":[],"mappings":""}

package/dist/owner-transaction/owner-transaction.d.ts

@@ -0,0 +1,13 @@
+import type { ImageCacheOwnerTransaction } from "../engine-types.js";
+import type { VariantEngineContext } from "../internal/engine-context.js";
+export declare function createOwnerTransaction(options: {
+    engine: {
+        context: VariantEngineContext;
+        startQueue: () => void;
+        checkStatus: () => void;
+        addPending: (closeNow: () => Promise<void>) => () => void;
+    };
+    ownerHandle: string;
+    isHandleReusable: boolean;
+    canBeRetrievedByOwner: boolean;
+}): ImageCacheOwnerTransaction;