@paroicms/server-image-cache-engine 1.27.2 → 1.27.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -50,6 +50,7 @@ export interface CreateImageCacheEngineOptions {
50
50
  * For example: `"14d"`. Leave `undefined` to keep cache data undefinitely.
51
51
  */
52
52
  timeToIdle?: string;
53
+ debugMode?: boolean;
53
54
  }
54
55
  export declare function createImageCacheEngine(options: CreateImageCacheEngineOptions): Promise<{
55
56
  imageCache: ImageCacheEngine;
@@ -89,10 +89,7 @@ export async function createImageCacheEngine(options) {
89
89
  },
90
90
  async cleanUnusedValues() {
91
91
  checkStatus();
92
- const count = await deleteOrphanVariants(context);
93
- if (count !== undefined && count > 0) {
94
- context.logger.debug(`${count} unused cache image were deleted`);
95
- }
92
+ await deleteOrphanVariants(context);
96
93
  },
97
94
  async clearCache() {
98
95
  checkStatus();
@@ -1 +1 @@
1
- {"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,7 @@ export interface VariantEngineContext extends Omit<CreateImageCacheEngineOptions
11
11
  pendingTaskByOwnerKeys: Map<OwnerKey, PendingTask>;
12
12
  cn: Knex;
13
13
  logNextQuery: (count?: number) => void;
14
+ debugMode: boolean;
14
15
  }
15
16
  export interface PendingTask {
16
17
  resolve: (result: ImageVariantWithBinary) => void;
@@ -7,6 +7,7 @@ export async function createVariantEngineContext(options) {
7
7
  });
8
8
  const context = {
9
9
  ...options,
10
+ debugMode: options.debugMode ?? false,
10
11
  status: "ready",
11
12
  logger,
12
13
  queue: [],
@@ -1 +1 @@
1
- {"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAuB/D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAsC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,sBAAsB,CAAC;QACnE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAyB;QACpC,GAAG,OAAO;QACV,MAAM,EAAE,OAAO;QACf,MAAM;QACN,KAAK,EAAE,EAAE;QACT,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,sBAAsB,EAAE,IAAI,GAAG,EAAE;QACjC,EAAE;QACF,YAAY;KACb,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC"}
1
+ {"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAwB/D,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAsC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,sBAAsB,CAAC;QACnE,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAyB;QACpC,GAAG,OAAO;QACV,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,KAAK;QACrC,MAAM,EAAE,OAAO;QACf,MAAM;QACN,KAAK,EAAE,EAAE;QACT,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,sBAAsB,EAAE,IAAI,GAAG,EAAE;QACjC,EAAE;QACF,YAAY;KACb,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC"}
@@ -70,7 +70,7 @@ export declare function fetchBatchOfStoredCacheItems(ctx: Pick<VariantEngineCont
70
70
  }[];
71
71
  mediaIds: string[];
72
72
  }[], alreadyOwnedBy: string): Promise<StoredCacheItem[]>;
73
- export declare function clearAll({ cn }: VariantEngineContext): Promise<void>;
73
+ export declare function clearAll({ cn, logger }: VariantEngineContext): Promise<void>;
74
74
  export declare function makeMTypeRSizeKey(image: {
75
75
  mediaType: string;
76
76
  rawWidth: number;
@@ -1,3 +1,4 @@
1
+ import { parseTimeWithUnit } from "@paroicms/internal-anywhere-lib";
1
2
  import { parseSqliteDateTime } from "@paroicms/internal-server-lib";
2
3
  import { isDef } from "@paroicms/public-anywhere-lib";
3
4
  import { type } from "arktype";
@@ -168,34 +169,60 @@ export async function fetchImageVariantWithBinaryByOwner(ctx, input) {
168
169
  export async function deleteVariants(ctx, options) {
169
170
  const { cn } = ctx;
170
171
  if ("mediaIds" in options) {
172
+ if (ctx.debugMode) {
173
+ await logBeforeDeleteCacheImages(ctx, options.mediaIds);
174
+ }
171
175
  await cn("PaImageCache").whereIn("mediaId", options.mediaIds).delete();
172
176
  }
173
177
  else {
174
- await cn("PaImageCache").where("mediaId", options.mediaId);
178
+ if (ctx.debugMode) {
179
+ await logBeforeDeleteCacheImages(ctx, [options.mediaId]);
180
+ }
181
+ await cn("PaImageCache").where("mediaId", options.mediaId).delete();
175
182
  }
176
183
  }
177
184
  /**
178
185
  * @returns the list of cache ownerHandles that were deleted
179
186
  */
180
187
  export async function deleteVariantsByDependencies(ctx, options) {
181
- const { cn } = ctx;
182
- await cn("PaImageCacheOwner as o").whereIn("o.ownerHandle", options.ownerHandles).delete();
188
+ const { cn, logger } = ctx;
189
+ const count = await cn("PaImageCacheOwner as o")
190
+ .whereIn("o.ownerHandle", options.ownerHandles)
191
+ .delete();
192
+ logger.debug(`[image-cache] Deleted ${count} cache owner(s) for [${options.ownerHandles.join("] [")}]`);
183
193
  await deleteOrphanVariants(ctx);
184
194
  }
195
+ const OrphanVariantRowAT = type({
196
+ id: "number",
197
+ mediaId: "string",
198
+ "+": "reject",
199
+ }).pipe((r) => ({
200
+ id: String(r.id),
201
+ mediaId: r.mediaId,
202
+ }));
185
203
  /**
186
204
  * Delete the images that have no ownerHandle and that have not been used recently.
187
205
  * @returns the number of cache identifiers that were deleted
188
206
  */
189
207
  export async function deleteOrphanVariants(ctx) {
190
- const { cn } = ctx;
191
- // Find records to delete
192
- const subquery = cn("PaImageCacheOwner as k")
193
- .select(1)
194
- .whereRaw("k.imageCacheId = PaImageCache.id");
208
+ const { cn, timeToIdle } = ctx;
209
+ if (timeToIdle === undefined)
210
+ return 0;
211
+ const days = parseTimeWithUnit(timeToIdle).delay;
212
+ const rows = await cn("PaImageCache")
213
+ .select("id", "mediaId")
214
+ .whereNotExists(cn("PaImageCacheOwner as k").select(1).whereRaw("k.imageCacheId = PaImageCache.id"))
215
+ .andWhereRaw(`date(modifiedAt) < date(current_timestamp, '-${days} day')`);
216
+ if (rows.length === 0)
217
+ return 0;
218
+ const orphanRows = rows.map((row) => OrphanVariantRowAT.assert(row));
219
+ if (ctx.debugMode) {
220
+ await logBeforeDeleteCacheImages(ctx, orphanRows.map((row) => row.mediaId));
221
+ }
195
222
  const result = await cn("PaImageCache")
196
- .whereNotExists(subquery)
197
- .andWhereRaw(`date(modifiedAt) < date(current_timestamp, '-7 day')`)
223
+ .whereIn("id", orphanRows.map((row) => row.id))
198
224
  .delete();
225
+ ctx.logger.debug(`[image-cache] Deleted ${result} orphaned image cache variants (older than ${days} days)`);
199
226
  return result;
200
227
  }
201
228
  const PreviousOwnedRowAT = type({
@@ -207,7 +234,7 @@ const PreviousOwnedRowAT = type({
207
234
  rawResizeR: r.rawResizeR,
208
235
  }));
209
236
  export async function associateOwnerToImages(ctx, { ownerHandle, cacheImages, isHandleReusable, }) {
210
- const { cn } = ctx;
237
+ const { cn, logger } = ctx;
211
238
  await cn.transaction(async (tx) => {
212
239
  const prevRows = await tx("PaImageCacheOwner")
213
240
  .select(["imageCacheId", "rawResizeR"])
@@ -232,14 +259,11 @@ export async function associateOwnerToImages(ctx, { ownerHandle, cacheImages, is
232
259
  .filter(([key]) => !newCacheImages.has(key))
233
260
  .map(([_, item]) => item);
234
261
  if (toDelete.length > 0) {
235
- const query = tx("PaImageCacheOwner").where({ ownerHandle });
236
- for (const item of toDelete) {
237
- query.orWhere({
238
- imageCacheId: item.imageCacheId,
239
- rawResizeR: item.rawResizeR,
240
- });
241
- }
242
- await query.delete();
262
+ const count = await tx("PaImageCacheOwner")
263
+ .where({ ownerHandle })
264
+ .whereIn(["imageCacheId", "rawResizeR"], toDelete.map((item) => [item.imageCacheId, item.rawResizeR]))
265
+ .delete();
266
+ logger.debug(`[image-cache] Deleted ${count} cache owner(s) for [${ownerHandle}]`);
243
267
  }
244
268
  }
245
269
  });
@@ -309,9 +333,10 @@ export async function fetchBatchOfStoredCacheItems(ctx, groups, alreadyOwnedBy)
309
333
  };
310
334
  });
311
335
  }
312
- export async function clearAll({ cn }) {
336
+ export async function clearAll({ cn, logger }) {
313
337
  await cn("PaImageCacheOwner").delete();
314
338
  await cn("PaImageCache").delete();
339
+ logger.debug("[image-cache] Cleared all image cache entries");
315
340
  }
316
341
  const UsedRawSizeRowAT = type({
317
342
  rawResizeR: "string",
@@ -339,4 +364,68 @@ export async function fetchUsedRawSizesByMedia(ctx, mediaId) {
339
364
  };
340
365
  });
341
366
  }
367
+ const CacheEntryWithOwnerRowAT = type({
368
+ id: "number",
369
+ mediaId: "string",
370
+ resourceVersion: "string",
371
+ mTypeRSize: "string",
372
+ modifiedAt: "string|number|Date",
373
+ ownerHandle: "string|null",
374
+ rawResizeR: "string|null",
375
+ "+": "reject",
376
+ }).pipe((r) => ({
377
+ id: String(r.id),
378
+ mediaId: r.mediaId,
379
+ resourceVersion: r.resourceVersion,
380
+ mTypeRSize: r.mTypeRSize,
381
+ modifiedAt: parseSqliteDateTime(r.modifiedAt),
382
+ ownerHandle: r.ownerHandle ?? undefined,
383
+ rawResizeR: r.rawResizeR ?? undefined,
384
+ }));
385
+ async function logBeforeDeleteCacheImages(ctx, mediaIds) {
386
+ if (!ctx.debugMode)
387
+ return;
388
+ if (mediaIds.length === 0)
389
+ return;
390
+ const { cn } = ctx;
391
+ const rows = await cn("PaImageCache as v")
392
+ .select([
393
+ "v.id",
394
+ "v.mediaId",
395
+ "v.resourceVersion",
396
+ "v.mTypeRSize",
397
+ "v.modifiedAt",
398
+ "o.ownerHandle",
399
+ "o.rawResizeR",
400
+ ])
401
+ .leftJoin("PaImageCacheOwner as o", "o.imageCacheId", "v.id")
402
+ .whereIn("v.mediaId", mediaIds)
403
+ .orderBy("v.id");
404
+ const validatedRows = rows.map((row) => CacheEntryWithOwnerRowAT.assert(row));
405
+ const entriesMap = new Map();
406
+ for (const row of validatedRows) {
407
+ const { id, mediaId, resourceVersion, mTypeRSize, modifiedAt, ownerHandle, rawResizeR } = row;
408
+ let entry = entriesMap.get(id);
409
+ if (!entry) {
410
+ entry = {
411
+ id,
412
+ mediaId,
413
+ resourceVersion,
414
+ mTypeRSize,
415
+ modifiedAt,
416
+ owners: [],
417
+ };
418
+ entriesMap.set(id, entry);
419
+ }
420
+ if (ownerHandle && rawResizeR) {
421
+ entry.owners.push({ ownerHandle, rawResizeR });
422
+ }
423
+ }
424
+ for (const entry of entriesMap.values()) {
425
+ const ownersStr = entry.owners.length > 0
426
+ ? entry.owners.map((o) => `(${o.ownerHandle} ${o.rawResizeR})`).join(", ")
427
+ : "no owners";
428
+ ctx.logger.debug(`[image-cache] DELETE image cache [${entry.id}][${entry.mediaId}][${entry.resourceVersion}] ${entry.mTypeRSize} - ${entry.modifiedAt.toISOString()} - owned by: ${ownersStr}`);
429
+ }
430
+ }
342
431
  //# sourceMappingURL=queries.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/internal/queries.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paroicms/server-image-cache-engine",
3
- "version": "1.27.2",
3
+ "version": "1.27.4",
4
4
  "description": "The image variant engine that we use at Paroi.",
5
5
  "author": "Paroi Team",
6
6
  "keywords": [
@@ -34,11 +34,11 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@paroi/async-lib": "~0.3.1",
37
- "@paroicms/internal-anywhere-lib": "1.34.0",
38
- "@paroicms/internal-server-lib": "1.20.1",
39
- "@paroicms/public-anywhere-lib": "0.35.0",
40
- "@paroicms/public-server-lib": "0.45.0",
41
- "@paroicms/script-lib": "0.2.1",
37
+ "@paroicms/internal-anywhere-lib": "1.34.1",
38
+ "@paroicms/internal-server-lib": "1.20.3",
39
+ "@paroicms/public-anywhere-lib": "0.35.1",
40
+ "@paroicms/public-server-lib": "0.45.1",
41
+ "@paroicms/script-lib": "0.2.2",
42
42
  "arktype": "~2.1.20",
43
43
  "ico-endec": "~0.1.6",
44
44
  "sharp": "~0.34.2"