@paroicms/server-image-cache-engine 1.3.3 → 1.5.0

package/ddl/image-cache.ddl.sql

@@ -1,17 +1,19 @@
 PRAGMA journal_mode = TRUNCATE;
 PRAGMA foreign_keys = 1;
 
-drop index if exists PaImageCacheUsed_usedKey_index;
+drop index if exists PaImageCacheUsed_usedKey_idx;
 drop table if exists PaImageCacheUsed;
 drop table if exists PaImageCache;
-drop table if exists PaDbMetadata;
+drop table if exists PaMetadata;
 
-create table PaDbMetadata (
-  dbSchema varchar(100) not null primary key,
-  dbVersion integer not null
+create table PaMetadata (
+  dbSchema varchar(100) not null,
+  k varchar(100) not null,
+  val varchar(250) not null,
+  primary key (dbSchema, k)
 );
 
-insert into PaDbMetadata (dbSchema, dbVersion) values ('image-cache', 5);
+insert into PaMetadata (dbSchema, k, val) values ('image-cache', 'dbSchemaVersion', '6');
 
 create table PaImageCache (
   id integer not null primary key autoincrement,
@@ -23,8 +25,8 @@ create table PaImageCache (
   weightB integer not null,
   width integer not null,
   height integer not null,
-  ts timestamp not null default current_timestamp,
-  lastUseTs timestamp not null default current_timestamp,
+  modifiedAt timestamp not null default current_timestamp,
+  readAt timestamp not null default current_timestamp,
   binaryFile blob not null,
   unique (imageUid, variantName)
 );
@@ -36,4 +38,4 @@ create table PaImageCacheUsed (
   primary key (imageCacheId, usedKey)
 );
 
-create index PaImageCacheUsed_usedKey_index on PaImageCacheUsed (usedKey);
+create index PaImageCacheUsed_usedKey_idx on PaImageCacheUsed (usedKey);

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

@@ -1,10 +1,10 @@
 import { type AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
-export declare function createOrOpenMainCn({ sqliteFile, siteName, appLog, }: {
+export declare function createOrOpenConnection({ sqliteFile, appLog, }: {
     sqliteFile: string;
-    siteName: string;
     appLog: AppLog;
 }): Promise<{
-    mainCn: DataSource;
+    cn: DataSource;
     logNextQuery: (count?: number | undefined) => void;
+    isCleared: boolean;
 }>;

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

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOrOpenMainCn = void 0;
+exports.createOrOpenConnection = void 0;
 const server_lib_1 = require("@paroicms/server-lib");
 const node_path_1 = require("node:path");
 const constants_1 = require("../constants");
-const PaImageCache_entity_1 = require("../database/PaImageCache.entity");
-const PaImageCacheUsed_entity_1 = require("../database/PaImageCacheUsed.entity");
 const ddl_migration_1 = require("./ddl-migration");
-async function createOrOpenMainCn({ sqliteFile, siteName, appLog, }) {
-    const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({ appLog, siteName, dbSchemaName: ddl_migration_1.dbSchemaName });
-    const { mainCn } = await (0, server_lib_1.createOrOpenSqliteConnection)({
-        siteName: siteName,
+const PaImageCache_entity_1 = require("./entities/PaImageCache.entity");
+const PaImageCacheUsed_entity_1 = require("./entities/PaImageCacheUsed.entity");
+async function createOrOpenConnection({ sqliteFile, appLog, }) {
+    const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({ appLog, dbSchemaName: ddl_migration_1.dbSchemaName });
+    const { cn, isNewDb, migrationReport } = await (0, server_lib_1.createOrOpenSqliteConnection)({
         canCreate: true,
         dbSchemaName: ddl_migration_1.dbSchemaName,
         sqliteFile,
@@ -21,16 +20,24 @@ async function createOrOpenMainCn({ sqliteFile, siteName, appLog, }) {
         appLog,
     });
     async function migrateDb(cn) {
-        const dbVersion = await (0, ddl_migration_1.getDbVersion)(cn, { siteName });
-        if (dbVersion !== ddl_migration_1.currentVariantsDbSchemaVersion) {
-            await (0, ddl_migration_1.migrateMediasDb)(cn, {
-                fromVersion: dbVersion,
-                siteName,
-                appLog,
-            });
+        const dbVersion = await (0, server_lib_1.getMetadataDbSchemaVersion)(cn, { dbSchemaName: ddl_migration_1.dbSchemaName });
+        if (dbVersion === ddl_migration_1.currentDbSchemaVersion) {
+            return {
+                migrated: false,
+                schemaVersion: dbVersion,
+            };
         }
+        await (0, ddl_migration_1.migrateImageCacheDb)(cn, {
+            fromVersion: dbVersion,
+            appLog,
+        });
+        return {
+            migrated: true,
+            fromVersion: dbVersion,
+            schemaVersion: ddl_migration_1.currentDbSchemaVersion,
+        };
     }
-    return { mainCn, logNextQuery };
+    return { cn, logNextQuery, isCleared: isNewDb || migrationReport.migrated };
 }
-exports.createOrOpenMainCn = createOrOpenMainCn;
+exports.createOrOpenConnection = createOrOpenConnection;
 //# sourceMappingURL=db-init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,qDAAkG;AAClG,yCAAiC;AAEjC,4CAA0C;AAC1C,yEAAqE;AACrE,iFAA6E;AAC7E,mDAKyB;AAElB,KAAK,UAAU,kBAAkB,CAAC,EACvC,UAAU,EACV,QAAQ,EACR,MAAM,GACmD;IACzD,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAE5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QACpD,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,IAAI;QACf,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC;QACvD,SAAS;QACT,QAAQ,EAAE,CAAC,wCAAkB,EAAE,gDAAsB,CAAC;QACtD,MAAM,EAAE,aAAa;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,SAAS,KAAK,8CAA8B,EAAE,CAAC;YACjD,MAAM,IAAA,+BAAe,EAAC,EAAE,EAAE;gBACxB,WAAW,EAAE,SAAS;gBACtB,QAAQ;gBACR,MAAM;aACP,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AA/BD,gDA+BC"}
+{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,qDAM8B;AAC9B,yCAAiC;AAEjC,4CAA0C;AAC1C,mDAA4F;AAC5F,wEAAoE;AACpE,gFAA4E;AAErE,KAAK,UAAU,sBAAsB,CAAC,EAC3C,UAAU,EACV,MAAM,GACiC;IACvC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,EAAE,MAAM,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;IAElF,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QAC1E,SAAS,EAAE,IAAI;QACf,YAAY,EAAZ,4BAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC;QACvD,SAAS;QACT,QAAQ,EAAE,CAAC,wCAAkB,EAAE,gDAAsB,CAAC;QACtD,MAAM,EAAE,aAAa;QACrB,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,4BAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sCAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,IAAA,mCAAmB,EAAC,EAAE,EAAE;YAC5B,WAAW,EAAE,SAAS;YACtB,MAAM;SACP,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sCAAsB;SACtC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;AAC9E,CAAC;AArCD,wDAqCC"}

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

@@ -1,12 +1,8 @@
 import { type AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
 export declare const dbSchemaName = "image-cache";
-export declare const currentVariantsDbSchemaVersion = 5;
-export declare function getDbVersion(cn: DataSource, { siteName }: {
-    siteName: string;
-}): Promise<number>;
-export declare function migrateMediasDb(cn: DataSource, { fromVersion, siteName, appLog }: {
+export declare const currentDbSchemaVersion = 6;
+export declare function migrateImageCacheDb(cn: DataSource, { fromVersion, appLog }: {
     fromVersion: number;
-    siteName: string;
     appLog: AppLog;
 }): Promise<void>;

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

@@ -1,21 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateMediasDb = exports.getDbVersion = exports.currentVariantsDbSchemaVersion = exports.dbSchemaName = void 0;
-const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
+exports.migrateImageCacheDb = exports.currentDbSchemaVersion = exports.dbSchemaName = void 0;
 const server_lib_1 = require("@paroicms/server-lib");
 const node_path_1 = require("node:path");
 const constants_1 = require("../constants");
 exports.dbSchemaName = "image-cache";
-exports.currentVariantsDbSchemaVersion = 5;
-async function getDbVersion(cn, { siteName }) {
-    const [row] = await cn.query(`select dbVersion from PaDbMetadata where dbSchema = '${exports.dbSchemaName}'`);
-    if (!row)
-        throw new Error(`[${siteName}] missing dbSchema '${exports.dbSchemaName}' in database`);
-    return (0, data_formatters_lib_1.nbVal)(row.dbVersion, { varName: "dbVersion" });
-}
-exports.getDbVersion = getDbVersion;
-async function migrateMediasDb(cn, { fromVersion, siteName, appLog }) {
-    const toVersion = exports.currentVariantsDbSchemaVersion;
+exports.currentDbSchemaVersion = 6;
+async function migrateImageCacheDb(cn, { fromVersion, appLog }) {
+    const toVersion = exports.currentDbSchemaVersion;
     let currentVersion = fromVersion;
     if (currentVersion === 4) {
         await cn.query("drop table PaImageCacheKey");
@@ -23,14 +15,14 @@ async function migrateMediasDb(cn, { fromVersion, siteName, appLog }) {
     // We don't care losing cache data
     // Warning: don't reset the image cache until the text cache is reset too
     if (currentVersion < toVersion) {
-        appLog.info(`[${siteName}] reset the image-cache database`);
+        appLog.info("reset the image-cache database");
         await (0, server_lib_1.executeDdl)(cn, (0, node_path_1.join)(constants_1.packageDir, "ddl", "image-cache.ddl.sql"));
-        currentVersion = await getDbVersion(cn, { siteName });
+        currentVersion = await (0, server_lib_1.getMetadataDbSchemaVersion)(cn, { dbSchemaName: exports.dbSchemaName });
     }
     if (currentVersion !== toVersion) {
-        throw new Error(`[${siteName}] version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
+        throw new Error(`version of ${exports.dbSchemaName} database should be '${toVersion}', but is '${currentVersion}'`);
     }
-    appLog.info(`[${siteName}] ${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
+    appLog.info(`${exports.dbSchemaName} database was migrated from ${fromVersion} to ${currentVersion}`);
 }
-exports.migrateMediasDb = migrateMediasDb;
+exports.migrateImageCacheDb = migrateImageCacheDb;
 //# sourceMappingURL=ddl-migration.js.map

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,oEAAmD;AAEnD,qDAA+D;AAC/D,yCAAiC;AAEjC,4CAA0C;AAE7B,QAAA,YAAY,GAAG,aAAa,CAAC;AAC7B,QAAA,8BAA8B,GAAG,CAAC,CAAC;AAEzC,KAAK,UAAU,YAAY,CAAC,EAAc,EAAE,EAAE,QAAQ,EAAwB;IACnF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,EAAE,CAAC,KAAK,CAC1B,wDAAwD,oBAAY,GAAG,CACxE,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,uBAAuB,oBAAY,eAAe,CAAC,CAAC;IAC1F,OAAO,IAAA,2BAAK,EAAC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;AACxD,CAAC;AAND,oCAMC;AAEM,KAAK,UAAU,eAAe,CACnC,EAAc,EACd,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAA6D;IAE5F,MAAM,SAAS,GAAG,sCAA8B,CAAC;IACjD,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC/C,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ,kCAAkC,CAAC,CAAC;QAC5D,MAAM,IAAA,uBAAU,EAAC,EAAE,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,cAAc,GAAG,MAAM,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,IAAI,QAAQ,gBAAgB,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CACzG,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CACT,IAAI,QAAQ,KAAK,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAC/F,CAAC;AACJ,CAAC;AA5BD,0CA4BC"}
+{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":";;;AAAA,qDAA2F;AAC3F,yCAAiC;AAEjC,4CAA0C;AAE7B,QAAA,YAAY,GAAG,aAAa,CAAC;AAC7B,QAAA,sBAAsB,GAAG,CAAC,CAAC;AAEjC,KAAK,UAAU,mBAAmB,CACvC,EAAc,EACd,EAAE,WAAW,EAAE,MAAM,EAA2C;IAEhE,MAAM,SAAS,GAAG,8BAAsB,CAAC;IACzC,IAAI,cAAc,GAAG,WAAW,CAAC;IAEjC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC/C,CAAC;IAED,kCAAkC;IAClC,yEAAyE;IACzE,IAAI,cAAc,GAAG,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC9C,MAAM,IAAA,uBAAU,EAAC,EAAE,EAAE,IAAA,gBAAI,EAAC,sBAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACrE,cAAc,GAAG,MAAM,IAAA,uCAA0B,EAAC,EAAE,EAAE,EAAE,YAAY,EAAZ,oBAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,cAAc,oBAAY,wBAAwB,SAAS,cAAc,cAAc,GAAG,CAC3F,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAG,oBAAY,+BAA+B,WAAW,OAAO,cAAc,EAAE,CAAC,CAAC;AAChG,CAAC;AA1BD,kDA0BC"}

package/dist/{database → db-init/entities}/PaImageCache.entity.d.ts

@@ -8,8 +8,8 @@ export declare class PaImageCacheEntity {
     width: number;
     height: number;
     weightB: number;
-    ts: Date;
-    lastUseTs: Date;
+    modifiedAt: Date;
+    readAt: Date;
     binaryFile: Buffer;
     slug?: string;
 }

package/dist/{database → db-init/entities}/PaImageCache.entity.js

@@ -20,8 +20,8 @@ let PaImageCacheEntity = class PaImageCacheEntity {
     width;
     height;
     weightB;
-    ts;
-    lastUseTs;
+    modifiedAt;
+    readAt;
     binaryFile;
     slug;
 };
@@ -61,11 +61,11 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
     __metadata("design:type", Date)
-], PaImageCacheEntity.prototype, "ts", void 0);
+], PaImageCacheEntity.prototype, "modifiedAt", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "datetime", default: () => "current_timestamp" }),
     __metadata("design:type", Date)
-], PaImageCacheEntity.prototype, "lastUseTs", void 0);
+], PaImageCacheEntity.prototype, "readAt", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: "blob" }),
     __metadata("design:type", Buffer)

package/dist/db-init/entities/PaImageCache.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaImageCache.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaImageCache.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyE;AAIlE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE7B,EAAE,CAAU;IAGZ,eAAe,CAAU;IAGzB,QAAQ,CAAU;IAGlB,WAAW,CAAU;IAGrB,SAAS,CAAU;IAGnB,KAAK,CAAU;IAGf,MAAM,CAAU;IAGhB,OAAO,CAAU;IAGjB,UAAU,CAAQ;IAGlB,MAAM,CAAQ;IAGd,UAAU,CAAU;IAGpB,IAAI,CAAU;CACf,CAAA;AApCY,gDAAkB;AAE7B;IADC,IAAA,gCAAsB,GAAE;;8CACb;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;2DACH;AAGzB;IADC,IAAA,gBAAM,GAAE;;oDACS;AAGlB;IADC,IAAA,gBAAM,GAAE;;uDACY;AAGrB;IADC,IAAA,gBAAM,GAAE;;qDACU;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;iDACb;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kDACZ;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;mDACX;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACpD,IAAI;sDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACxD,IAAI;kDAAC;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;8BACZ,MAAM;sDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC9B;6BAnCH,kBAAkB;IAF9B,IAAA,gBAAM,EAAC,cAAc,CAAC;IACtB,IAAA,gBAAM,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;GACvB,kBAAkB,CAoC9B"}

package/dist/db-init/entities/PaImageCacheUsed.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PaImageCacheUsed.entity.js","sourceRoot":"","sources":["../../../src/db-init/entities/PaImageCacheUsed.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEjC,YAAY,CAAU;IAGtB,OAAO,CAAU;IAGjB,IAAI,CAAW;CAChB,CAAA;AATY,wDAAsB;AAEjC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;4DACrB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;uDACT;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDAC5B;iCARJ,sBAAsB;IADlC,IAAA,gBAAM,EAAC,kBAAkB,CAAC;GACd,sBAAsB,CASlC"}

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

@@ -3,7 +3,6 @@ import type { AppLog } from "@paroicms/server-lib";
 import type { GetOriginalImage, ImageRef, ImageVariant, ImageVariantStorage, ImageVariantWithBinary, NewImageProps } from "./engine-types";
 import { type VariantEngineContext } from "./internal/engine-context";
 export interface CreateImageCacheEngineOptions {
-    siteName: string;
     storage: ImageVariantStorage;
     getOriginalImage: GetOriginalImage;
     appLog?: AppLog;
@@ -13,7 +12,10 @@ export interface CreateImageCacheEngineOptions {
      */
     timeToIdle?: string;
 }
-export declare function createImageCacheEngine(options: CreateImageCacheEngineOptions): Promise<ImageCacheEngine>;
+export declare function createImageCacheEngine(options: CreateImageCacheEngineOptions): Promise<{
+    imageCache: ImageCacheEngine;
+    isCleared: boolean;
+}>;
 export declare class ImageCacheEngine {
     #private;
     constructor(context: VariantEngineContext);

package/dist/image-cache-engine.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageCacheEngine = exports.createImageCacheEngine = void 0;
 const async_lib_1 = require("@paroi/async-lib");
 const server_lib_1 = require("@paroicms/server-lib");
-const queries_1 = require("./database/queries");
 const compute_variant_size_1 = require("./internal/compute-variant-size");
 const engine_context_1 = require("./internal/engine-context");
+const queries_1 = require("./internal/queries");
 const task_processor_1 = require("./internal/task-processor");
 async function createImageCacheEngine(options) {
-    const context = await (0, engine_context_1.createVariantEngineContext)(options);
-    return new ImageCacheEngine(context);
+    const { context, isCleared } = await (0, engine_context_1.createVariantEngineContext)(options);
+    return {
+        imageCache: new ImageCacheEngine(context),
+        isCleared,
+    };
 }
 exports.createImageCacheEngine = createImageCacheEngine;
 class ImageCacheEngine {
@@ -118,13 +121,13 @@ class ImageCacheEngine {
         this.#checkStatus();
         const count = await (0, queries_1.deleteUnusedVariants)(this.#context);
         if (count !== undefined && count > 0) {
-            this.#context.appLog.debug(`[${this.#context.siteName}] ${count} unused cache image were deleted`);
+            this.#context.appLog.debug(`${count} unused cache image were deleted`);
         }
     }
     async clearCache() {
         this.#checkStatus();
         await (0, queries_1.clearVariantCache)(this.#context);
-        this.#context.appLog.debug(`[${this.#context.siteName}] cache is cleared`);
+        this.#context.appLog.debug("cache is cleared");
     }
     #startQueue() {
         if (this.#processing)
@@ -142,7 +145,7 @@ class ImageCacheEngine {
         if (this.#context.status === "destroyed")
             return;
         this.#context.status = "destroyed";
-        await this.#context.mainCn.destroy();
+        await this.#context.cn.destroy();
     }
     #checkStatus() {
         if (this.#context.status !== "ready") {

package/dist/image-cache-engine.js.map

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

package/dist/image-processor-setup.d.ts

@@ -2,7 +2,7 @@ import type { AppLog } from "@paroicms/server-lib";
 export declare let sharpQueue: <T extends () => Promise<any>>(task: T) => ReturnType<T>;
 export interface SetupImageProcessorOptions {
     cpuCoresPerFile?: number;
-    oneSharpAtATime?: boolean;
+    allowConcurrency?: boolean;
     appLog: AppLog;
 }
-export declare function setupImageProcessor({ cpuCoresPerFile, oneSharpAtATime, appLog, }: SetupImageProcessorOptions): void;
+export declare function setupImageProcessor({ cpuCoresPerFile, allowConcurrency, appLog, }: SetupImageProcessorOptions): void;

package/dist/image-processor-setup.js

@@ -7,14 +7,17 @@ exports.setupImageProcessor = exports.sharpQueue = void 0;
 const async_lib_1 = require("@paroi/async-lib");
 const sharp_1 = __importDefault(require("sharp"));
 exports.sharpQueue = execImmediately;
-function setupImageProcessor({ cpuCoresPerFile, oneSharpAtATime, appLog, }) {
+function setupImageProcessor({ cpuCoresPerFile, allowConcurrency, appLog, }) {
+    const oldValue = sharp_1.default.concurrency();
     if (cpuCoresPerFile !== undefined) {
-        const oldValue = sharp_1.default.concurrency();
         // https://sharp.pixelplumbing.com/api-utility#concurrency
         sharp_1.default.concurrency(cpuCoresPerFile);
         appLog.info(`Set sharp concurrency (cpu cores per file) to '${cpuCoresPerFile}' (was ${oldValue})`);
     }
-    if (oneSharpAtATime) {
+    else {
+        appLog.info(`Use the sharp concurrency (cpu cores per file) default value: ${oldValue}`);
+    }
+    if (!allowConcurrency) {
         exports.sharpQueue = (0, async_lib_1.createAsyncQueue)({
             delayMs: 50,
         });

package/dist/image-processor-setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-processor-setup.js","sourceRoot":"","sources":["../src/image-processor-setup.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAoD;AAEpD,kDAA0B;AAEf,QAAA,UAAU,GAA6D,eAAe,CAAC;AAQlG,SAAgB,mBAAmB,CAAC,EAClC,eAAe,EACf,eAAe,EACf,MAAM,GACqB;IAC3B,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,EAAE,CAAC;QACrC,0DAA0D;QAC1D,eAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CACT,kDAAkD,eAAe,UAAU,QAAQ,GAAG,CACvF,CAAC;IACJ,CAAC;IACD,IAAI,eAAe,EAAE,CAAC;QACpB,kBAAU,GAAG,IAAA,4BAAgB,EAAC;YAC5B,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAnBD,kDAmBC;AAED,SAAS,eAAe,CAA+B,IAAO;IAC5D,OAAO,IAAI,EAAmB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"image-processor-setup.js","sourceRoot":"","sources":["../src/image-processor-setup.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAoD;AAEpD,kDAA0B;AAEf,QAAA,UAAU,GAA6D,eAAe,CAAC;AAQlG,SAAgB,mBAAmB,CAAC,EAClC,eAAe,EACf,gBAAgB,EAChB,MAAM,GACqB;IAC3B,MAAM,QAAQ,GAAG,eAAK,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,0DAA0D;QAC1D,eAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CACT,kDAAkD,eAAe,UAAU,QAAQ,GAAG,CACvF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,iEAAiE,QAAQ,EAAE,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,kBAAU,GAAG,IAAA,4BAAgB,EAAC;YAC5B,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AArBD,kDAqBC;AAED,SAAS,eAAe,CAA+B,IAAO;IAC5D,OAAO,IAAI,EAAmB,CAAC;AACjC,CAAC"}

package/dist/internal/engine-context.d.ts

@@ -1,6 +1,6 @@
 import type { PromiseToHandle } from "@paroi/async-lib";
 import type { AppLog } from "@paroicms/server-lib";
-import type { DataSource, EntityManager } from "typeorm";
+import type { DataSource } from "typeorm";
 import type { ImageVariantWithBinary } from "../engine-types";
 import type { CreateImageCacheEngineOptions } from "../image-cache-engine";
 import type { TaskData, TaskKey } from "./internal.types";
@@ -9,9 +9,11 @@ export interface VariantEngineContext extends Omit<CreateImageCacheEngineOptions
     appLog: AppLog;
     queue: TaskData[];
     pendingTasks: Map<TaskKey, PromiseToHandle<ImageVariantWithBinary>>;
-    mainCn: DataSource;
-    cn: EntityManager;
+    cn: DataSource;
     logNextQuery: (count?: number) => void;
     timeToIdleDays?: number;
 }
-export declare function createVariantEngineContext(options: CreateImageCacheEngineOptions): Promise<VariantEngineContext>;
+export declare function createVariantEngineContext(options: CreateImageCacheEngineOptions): Promise<{
+    context: VariantEngineContext;
+    isCleared: boolean;
+}>;

package/dist/internal/engine-context.js

@@ -5,22 +5,21 @@ const anywhere_lib_1 = require("@paroicms/anywhere-lib");
 const db_init_1 = require("../db-init/db-init");
 async function createVariantEngineContext(options) {
     const appLog = options.appLog ?? console;
-    const { mainCn, logNextQuery } = await (0, db_init_1.createOrOpenMainCn)({
-        siteName: options.siteName,
+    const { cn, logNextQuery, isCleared } = await (0, db_init_1.createOrOpenConnection)({
         sqliteFile: options.storage.file,
         appLog,
     });
-    return {
+    const context = {
         ...options,
         status: "ready",
         appLog,
         queue: [],
         pendingTasks: new Map(),
-        mainCn,
-        cn: mainCn.manager,
+        cn,
         logNextQuery,
         timeToIdleDays: options.timeToIdle === undefined ? undefined : (0, anywhere_lib_1.parseTimeWithUnit)(options.timeToIdle).delay,
     };
+    return { context, isCleared };
 }
 exports.createVariantEngineContext = createVariantEngineContext;
 //# sourceMappingURL=engine-context.js.map

package/dist/internal/engine-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":";;;AACA,yDAA2D;AAG3D,gDAAwD;AAgBjD,KAAK,UAAU,0BAA0B,CAC9C,OAAsC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,4BAAkB,EAAC;QACxD,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM;KACP,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,OAAO;QACf,MAAM;QACN,KAAK,EAAE,EAAE;QACT,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,MAAM;QACN,EAAE,EAAE,MAAM,CAAC,OAAO;QAClB,YAAY;QACZ,cAAc,EACZ,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK;KAC7F,CAAC;AACJ,CAAC;AAvBD,gEAuBC"}
+{"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":";;;AACA,yDAA2D;AAG3D,gDAA4D;AAerD,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,IAAA,gCAAsB,EAAC;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,EAAE;QACF,YAAY;QACZ,cAAc,EACZ,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gCAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK;KAC7F,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAvBD,gEAuBC"}

package/dist/{database → internal}/queries.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import type { CompleteVariantName } from "@paroicms/anywhere-lib";
-import type { EntityManager } from "typeorm";
+import type { QueryBuilderConnection } from "@paroicms/server-lib";
 import type { ImageVariant, ImageVariantWithBinary } from "../engine-types";
 import type { VariantEngineContext } from "../internal/engine-context";
-export declare function insertIntoImageVariant(cn: EntityManager, data: {
+export declare function insertIntoImageVariant(cn: QueryBuilderConnection, data: {
     resourceVersion: string;
     imageUid: string;
     variantName: CompleteVariantName;
@@ -17,7 +17,7 @@ export declare function insertIntoImageVariant(cn: EntityManager, data: {
     newId: string;
     lastModified: string;
 }>;
-export declare function deleteVariants(cn: EntityManager, options: {
+export declare function deleteVariants(cn: QueryBuilderConnection, options: {
     imageUid: string;
     variantName?: string;
 } | {
@@ -26,17 +26,17 @@ export declare function deleteVariants(cn: EntityManager, options: {
 /**
  * @returns the list of cache usedKeys that were deleted
  */
-export declare function deleteVariantsByDependencies(cn: EntityManager, options: {
+export declare function deleteVariantsByDependencies(cn: QueryBuilderConnection, options: {
     usedKeys: string[];
 }): Promise<number>;
-export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog" | "siteName">, { imageUid, completeVariantName, }: {
+export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid, completeVariantName, }: {
     imageUid: string;
     completeVariantName: CompleteVariantName;
 }): Promise<{
     id: string;
     variant: ImageVariant;
 } | undefined>;
-export declare function fetchImageVariantWithBinary(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog" | "siteName">, { imageUid, completeVariantName, }: {
+export declare function fetchImageVariantWithBinary(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid, completeVariantName, }: {
     imageUid: string;
     completeVariantName: CompleteVariantName;
 }): Promise<{

package/dist/{database → internal}/queries.js

@@ -10,10 +10,10 @@ async function insertIntoImageVariant(cn, data, usedKey) {
         .into("PaImageCache")
         .values({
         ...data,
-        ts: () => "current_timestamp",
-        lastUseTs: () => "current_timestamp",
+        modifiedAt: () => "current_timestamp",
+        readAt: () => "current_timestamp",
     })
-        .orUpdate(["mediaType", "width", "height", "weightB", "binaryFile", "ts", "lastUseTs"], ["imageUid", "variantName"])
+        .orUpdate(["mediaType", "width", "height", "weightB", "binaryFile", "modifiedAt", "readAt"], ["imageUid", "variantName"])
         .execute();
     let newId = (0, data_formatters_lib_1.strValOrUndef)(result.identifiers[0].id, { varName: "PaImageCache.id" });
     if (newId === undefined) {
@@ -39,13 +39,13 @@ async function insertIntoImageVariant(cn, data, usedKey) {
         .execute();
     const row = await cn
         .createQueryBuilder()
-        .select("v.ts", "ts")
+        .select("v.modifiedAt", "modifiedAt")
         .from("PaImageCache", "v")
         .where("v.id = :id", { id: newId })
         .getRawOne();
     if (!row)
         throw new Error(`missing cache row: ${newId}`);
-    const lastModified = (0, data_formatters_lib_1.dateVal)(row.ts).toISOString();
+    const lastModified = (0, data_formatters_lib_1.dateVal)(row.modifiedAt).toISOString();
     return { newId, lastModified };
 }
 exports.insertIntoImageVariant = insertIntoImageVariant;
@@ -90,10 +90,10 @@ async function fetchImageVariant(ctx, { imageUid, completeVariantName, }) {
         .addSelect("v.mediaType", "mediaType")
         .addSelect("v.width", "width")
         .addSelect("v.height", "height")
-        .addSelect("v.ts", "ts")
+        .addSelect("v.modifiedAt", "modifiedAt")
         .addSelect("v.resourceVersion", "resourceVersion")
         .addSelect("v.slug", "slug")
-        .addSelect("v.lastUseTs", "lastUseTs")
+        .addSelect("v.readAt", "readAt")
         .from("PaImageCache", "v")
         .where("v.imageUid = :imageUid", { imageUid })
         .andWhere("v.variantName = :completeVariantName", { completeVariantName })
@@ -101,10 +101,10 @@ async function fetchImageVariant(ctx, { imageUid, completeVariantName, }) {
     if (!row)
         return;
     const id = (0, data_formatters_lib_1.strVal)(row.id);
-    const lastUseTs = (0, data_formatters_lib_1.dateVal)(row.lastUseTs);
-    await updateLastUseTsOfImageVariant(ctx, {
+    const readAt = (0, data_formatters_lib_1.dateVal)(row.readAt);
+    await updateReadAtOfImageVariant(ctx, {
         id,
-        lastUseTs,
+        readAt,
         imageUid,
         completeVariantName,
     });
@@ -130,8 +130,8 @@ async function fetchImageVariantWithBinary(ctx, { imageUid, completeVariantName,
         .addSelect("v.height", "height")
         .addSelect("v.weightB", "weightB")
         .addSelect("v.binaryFile", "binaryFile")
-        .addSelect("v.ts", "ts")
-        .addSelect("v.lastUseTs", "lastUseTs")
+        .addSelect("v.modifiedAt", "modifiedAt")
+        .addSelect("v.readAt", "readAt")
         .addSelect("v.resourceVersion", "resourceVersion")
         .addSelect("v.slug", "slug")
         .from("PaImageCache", "v")
@@ -141,8 +141,8 @@ async function fetchImageVariantWithBinary(ctx, { imageUid, completeVariantName,
     if (!row)
         return;
     const id = (0, data_formatters_lib_1.strVal)(row.id);
-    const lastUseTs = (0, data_formatters_lib_1.dateVal)(row.lastUseTs);
-    await updateLastUseTsOfImageVariant(ctx, { id, lastUseTs, imageUid, completeVariantName });
+    const readAt = (0, data_formatters_lib_1.dateVal)(row.readAt);
+    await updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, completeVariantName });
     return {
         id,
         variant: {
@@ -153,22 +153,22 @@ async function fetchImageVariantWithBinary(ctx, { imageUid, completeVariantName,
             height: (0, data_formatters_lib_1.nbVal)(row.height),
             weightB: (0, data_formatters_lib_1.nbVal)(row.weightB),
             binaryFile: row.binaryFile,
-            lastModified: (0, data_formatters_lib_1.dateVal)(row.ts).toISOString(),
+            lastModified: (0, data_formatters_lib_1.dateVal)(row.modifiedAt).toISOString(),
             completeVariantName,
         },
     };
 }
 exports.fetchImageVariantWithBinary = fetchImageVariantWithBinary;
-async function updateLastUseTsOfImageVariant(ctx, { id, lastUseTs, imageUid, completeVariantName, }) {
+async function updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, completeVariantName, }) {
     const { cn, timeToIdleDays, appLog } = ctx;
-    if (timeToIdleDays === undefined || (0, anywhere_lib_1.isSameTimeUnit)(lastUseTs, "day"))
+    if (timeToIdleDays === undefined || (0, anywhere_lib_1.isSameTimeUnit)(readAt, "day"))
         return;
-    appLog.debug(`updating lastUseTs of image cache: ${imageUid}, ${completeVariantName}`);
+    appLog.debug(`updating readAt of image cache: ${imageUid}, ${completeVariantName}`);
     await cn
         .createQueryBuilder()
         .update("PaImageCache")
         .set({
-        lastUseTs: () => "current_timestamp",
+        readAt: () => "current_timestamp",
     })
         .where("id = :id", { id })
         .execute();
@@ -182,7 +182,7 @@ async function deleteUnusedVariants({ cn, timeToIdleDays, }) {
         .createQueryBuilder()
         .delete()
         .from("PaImageCache")
-        .where(`date(lastUseTs) < date(current_timestamp, '-${timeToIdleDays} day')`)
+        .where(`date(readAt) < date(current_timestamp, '-${timeToIdleDays} day')`)
         .andWhere(`not exists (
   select 1
   from PaImageCacheUsed k

package/dist/{database → internal}/queries.js.map

@@ -1 +1 @@
-{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/database/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/task-processor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processAllPending = void 0;
-const queries_1 = require("../database/queries");
+const queries_1 = require("./queries");
 const resizer_1 = require("./resizer");
 async function processAllPending(context) {
     while (true) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paroicms/server-image-cache-engine",
-  "version": "1.3.3",
+  "version": "1.5.0",
   "description": "The image variant engine that we use at Paroi.",
   "author": "Paroi Team",
   "main": "dist/api.js",
@@ -34,10 +34,10 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@paroi/async-lib": "~0.1.2",
-    "@paroi/data-formatters-lib": "~0.1.2",
-    "@paroicms/anywhere-lib": "1.6.0",
-    "@paroicms/server-lib": "1.2.3",
+    "@paroi/async-lib": "~0.2.0",
+    "@paroi/data-formatters-lib": "~0.3.0",
+    "@paroicms/anywhere-lib": "1.7.0",
+    "@paroicms/server-lib": "1.4.0",
     "ico-endec": "~0.1.6",
     "sharp": "~0.33.3"
   },

package/dist/database/PaImageCache.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PaImageCache.entity.js","sourceRoot":"","sources":["../../src/database/PaImageCache.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyE;AAIlE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAE7B,EAAE,CAAU;IAGZ,eAAe,CAAU;IAGzB,QAAQ,CAAU;IAGlB,WAAW,CAAU;IAGrB,SAAS,CAAU;IAGnB,KAAK,CAAU;IAGf,MAAM,CAAU;IAGhB,OAAO,CAAU;IAGjB,EAAE,CAAQ;IAGV,SAAS,CAAQ;IAGjB,UAAU,CAAU;IAGpB,IAAI,CAAU;CACf,CAAA;AApCY,gDAAkB;AAE7B;IADC,IAAA,gCAAsB,GAAE;;8CACb;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;2DACH;AAGzB;IADC,IAAA,gBAAM,GAAE;;oDACS;AAGlB;IADC,IAAA,gBAAM,GAAE;;uDACY;AAGrB;IADC,IAAA,gBAAM,GAAE;;qDACU;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;iDACb;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;kDACZ;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;mDACX;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BAC5D,IAAI;8CAAC;AAGV;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAAC;8BACrD,IAAI;qDAAC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;8BACZ,MAAM;sDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC9B;6BAnCH,kBAAkB;IAF9B,IAAA,gBAAM,EAAC,cAAc,CAAC;IACtB,IAAA,gBAAM,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;GACvB,kBAAkB,CAoC9B"}

package/dist/database/PaImageCacheUsed.entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PaImageCacheUsed.entity.js","sourceRoot":"","sources":["../../src/database/PaImageCacheUsed.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AAGlC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEjC,YAAY,CAAU;IAGtB,OAAO,CAAU;IAGjB,IAAI,CAAW;CAChB,CAAA;AATY,wDAAsB;AAEjC;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;4DACrB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;uDACT;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDAC5B;iCARJ,sBAAsB;IADlC,IAAA,gBAAM,EAAC,kBAAkB,CAAC;GACd,sBAAsB,CASlC"}