@paroicms/server-image-cache-engine 1.28.2 → 1.29.0
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.
- package/ddl/image-cache.ddl.sql +1 -6
- package/dist/db-init/db-init.d.ts +4 -2
- package/dist/db-init/db-init.js +10 -4
- package/dist/db-init/db-init.js.map +1 -1
- package/dist/db-init/ddl-migration.d.ts +3 -2
- package/dist/db-init/ddl-migration.js +5 -4
- package/dist/db-init/ddl-migration.js.map +1 -1
- package/dist/image-cache-engine.d.ts +3 -1
- package/dist/image-cache-engine.js +3 -2
- package/dist/image-cache-engine.js.map +1 -1
- package/dist/internal/engine-context.d.ts +2 -1
- package/dist/internal/engine-context.js +4 -3
- package/dist/internal/engine-context.js.map +1 -1
- package/package.json +2 -2
package/ddl/image-cache.ddl.sql
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
PRAGMA journal_mode = TRUNCATE;
|
|
2
2
|
PRAGMA foreign_keys = 1;
|
|
3
3
|
|
|
4
|
-
drop index if exists PaImageCacheOwner_ownerHandle_idx;
|
|
5
|
-
drop table if exists PaImageCacheOwner;
|
|
6
|
-
drop table if exists PaImageCache;
|
|
7
|
-
drop table if exists PaMetadata;
|
|
8
|
-
|
|
9
4
|
create table PaMetadata (
|
|
10
5
|
dbSchema varchar(100) not null,
|
|
11
6
|
k varchar(100) not null,
|
|
@@ -13,7 +8,7 @@ create table PaMetadata (
|
|
|
13
8
|
primary key (dbSchema, k)
|
|
14
9
|
);
|
|
15
10
|
|
|
16
|
-
insert into PaMetadata (dbSchema, k, val) values ('image-cache', 'dbSchemaVersion', '
|
|
11
|
+
insert into PaMetadata (dbSchema, k, val) values ('image-cache', 'dbSchemaVersion', '8');
|
|
17
12
|
|
|
18
13
|
create table PaImageCache (
|
|
19
14
|
id integer not null primary key autoincrement,
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { type BasicAppLogger } from "@paroicms/internal-server-lib";
|
|
2
2
|
import type { Knex } from "knex";
|
|
3
|
-
export declare function
|
|
3
|
+
export declare function createOrOpenImageCacheConnection({ sqliteFile, logger, dependsOn, }: {
|
|
4
4
|
sqliteFile: string;
|
|
5
5
|
logger: BasicAppLogger;
|
|
6
|
+
dependsOn: string;
|
|
6
7
|
}): Promise<{
|
|
7
8
|
cn: Knex<any, any[]>;
|
|
8
9
|
logNextQuery: (count?: number) => void;
|
|
9
|
-
|
|
10
|
+
isFresh: boolean;
|
|
11
|
+
databaseId: string;
|
|
10
12
|
}>;
|
package/dist/db-init/db-init.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { join } from "node:path";
|
|
2
1
|
import { createOrOpenSqliteConnection, createSqlLogger, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
|
|
2
|
+
import { join } from "node:path";
|
|
3
3
|
import { packageDir } from "../constants.js";
|
|
4
4
|
import { currentDbSchemaVersion, dbSchemaName, migrateImageCacheDb } from "./ddl-migration.js";
|
|
5
|
-
export async function
|
|
5
|
+
export async function createOrOpenImageCacheConnection({ sqliteFile, logger, dependsOn, }) {
|
|
6
6
|
const { logNextQuery, knexLogger } = createSqlLogger({ logger, dbSchemaName });
|
|
7
|
-
const { cn,
|
|
7
|
+
const { cn, newDatabase, migrationReport, databaseId } = await createOrOpenSqliteConnection({
|
|
8
8
|
canCreate: true,
|
|
9
9
|
dbSchemaName,
|
|
10
10
|
sqliteFile,
|
|
@@ -12,6 +12,10 @@ export async function createOrOpenConnection({ sqliteFile, logger, }) {
|
|
|
12
12
|
migrateDb,
|
|
13
13
|
logger,
|
|
14
14
|
knexLogger,
|
|
15
|
+
ensureDependsOn: {
|
|
16
|
+
dependsOn,
|
|
17
|
+
onMismatch: "reset",
|
|
18
|
+
},
|
|
15
19
|
});
|
|
16
20
|
async function migrateDb(cn) {
|
|
17
21
|
const dbVersion = await getMetadataDbSchemaVersion(cn, { dbSchemaName });
|
|
@@ -24,6 +28,7 @@ export async function createOrOpenConnection({ sqliteFile, logger, }) {
|
|
|
24
28
|
await migrateImageCacheDb(cn, {
|
|
25
29
|
fromVersion: dbVersion,
|
|
26
30
|
logger,
|
|
31
|
+
dependsOn,
|
|
27
32
|
});
|
|
28
33
|
return {
|
|
29
34
|
migrated: true,
|
|
@@ -31,6 +36,7 @@ export async function createOrOpenConnection({ sqliteFile, logger, }) {
|
|
|
31
36
|
schemaVersion: currentDbSchemaVersion,
|
|
32
37
|
};
|
|
33
38
|
}
|
|
34
|
-
|
|
39
|
+
const isFresh = !!newDatabase || migrationReport.migrated;
|
|
40
|
+
return { cn, logNextQuery, isFresh, databaseId };
|
|
35
41
|
}
|
|
36
42
|
//# sourceMappingURL=db-init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../src/db-init/db-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,4BAA4B,EAC5B,eAAe,EAEf,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,EACrD,UAAU,EACV,MAAM,EACN,SAAS,GAKV;IACC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IAE/E,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,4BAA4B,CAAC;QAC1F,SAAS,EAAE,IAAI;QACf,YAAY;QACZ,UAAU;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,qBAAqB,CAAC;QACvD,SAAS;QACT,MAAM;QACN,UAAU;QACV,eAAe,EAAE;YACf,SAAS;YACT,UAAU,EAAE,OAAO;SACpB;KACF,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAQ;QAC/B,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QACzE,IAAI,SAAS,KAAK,sBAAsB,EAAE,CAAC;YACzC,OAAO;gBACL,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,SAAS;aACzB,CAAC;QACJ,CAAC;QACD,MAAM,mBAAmB,CAAC,EAAE,EAAE;YAC5B,WAAW,EAAE,SAAS;YACtB,MAAM;YACN,SAAS;SACV,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,sBAAsB;SACtC,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,IAAI,eAAe,CAAC,QAAQ,CAAC;IAE1D,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACnD,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { type BasicAppLogger } from "@paroicms/internal-server-lib";
|
|
2
2
|
import type { Knex } from "knex";
|
|
3
3
|
export declare const dbSchemaName = "image-cache";
|
|
4
|
-
export declare const currentDbSchemaVersion =
|
|
5
|
-
export declare function migrateImageCacheDb(cn: Knex, { fromVersion, logger }: {
|
|
4
|
+
export declare const currentDbSchemaVersion = 8;
|
|
5
|
+
export declare function migrateImageCacheDb(cn: Knex, { fromVersion, logger, dependsOn, }: {
|
|
6
6
|
fromVersion: number;
|
|
7
7
|
logger: BasicAppLogger;
|
|
8
|
+
dependsOn: string;
|
|
8
9
|
}): Promise<void>;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { executeDdl, getMetadataDbSchemaVersion, insertNewDatabaseMetadataValues, } from "@paroicms/internal-server-lib";
|
|
1
2
|
import { join } from "node:path";
|
|
2
|
-
import { executeDdl, getMetadataDbSchemaVersion, } from "@paroicms/internal-server-lib";
|
|
3
3
|
import { packageDir } from "../constants.js";
|
|
4
4
|
export const dbSchemaName = "image-cache";
|
|
5
|
-
export const currentDbSchemaVersion =
|
|
6
|
-
export async function migrateImageCacheDb(cn, { fromVersion, logger }) {
|
|
5
|
+
export const currentDbSchemaVersion = 8;
|
|
6
|
+
export async function migrateImageCacheDb(cn, { fromVersion, logger, dependsOn, }) {
|
|
7
7
|
const toVersion = currentDbSchemaVersion;
|
|
8
8
|
let currentVersion = fromVersion;
|
|
9
9
|
if (currentVersion === 4) {
|
|
@@ -13,7 +13,8 @@ export async function migrateImageCacheDb(cn, { fromVersion, logger }) {
|
|
|
13
13
|
// Warning: don't reset the image cache until the text cache is reset too
|
|
14
14
|
if (currentVersion < toVersion) {
|
|
15
15
|
logger.info("reset the image-cache database");
|
|
16
|
-
await executeDdl(cn, join(packageDir, "ddl", "image-cache.ddl.sql"));
|
|
16
|
+
await executeDdl(cn, join(packageDir, "ddl", "image-cache.ddl.sql"), { dropAll: true });
|
|
17
|
+
await insertNewDatabaseMetadataValues(cn, { dbSchemaName, dependsOn });
|
|
17
18
|
currentVersion = await getMetadataDbSchemaVersion(cn, { dbSchemaName });
|
|
18
19
|
}
|
|
19
20
|
if (currentVersion !== toVersion) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ddl-migration.js","sourceRoot":"","sources":["../../src/db-init/ddl-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,0BAA0B,EAC1B,+BAA+B,GAChC,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,EACE,WAAW,EACX,MAAM,EACN,SAAS,GAC0D;IAErE,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,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACxF,MAAM,+BAA+B,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;QACvE,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"}
|
|
@@ -45,6 +45,7 @@ export interface CreateImageCacheEngineOptions {
|
|
|
45
45
|
storage: ImageVariantStorage;
|
|
46
46
|
getOriginalImage: GetOriginalImage;
|
|
47
47
|
logger?: AppLogger;
|
|
48
|
+
dependsOn: string;
|
|
48
49
|
qualityPolicy: ScImageCompressionQualityPolicyStep[];
|
|
49
50
|
/**
|
|
50
51
|
* For example: `"14d"`. Leave `undefined` to keep cache data undefinitely.
|
|
@@ -54,5 +55,6 @@ export interface CreateImageCacheEngineOptions {
|
|
|
54
55
|
}
|
|
55
56
|
export declare function createImageCacheEngine(options: CreateImageCacheEngineOptions): Promise<{
|
|
56
57
|
imageCache: ImageCacheEngine;
|
|
57
|
-
|
|
58
|
+
isFresh: boolean;
|
|
59
|
+
databaseId: string;
|
|
58
60
|
}>;
|
|
@@ -5,7 +5,7 @@ import { makeOwnerKey, makeTaskKey } from "./internal/utils.js";
|
|
|
5
5
|
import { createOwnerTransaction } from "./owner-transaction/owner-transaction.js";
|
|
6
6
|
let pendingSeq = 0;
|
|
7
7
|
export async function createImageCacheEngine(options) {
|
|
8
|
-
const { context,
|
|
8
|
+
const { context, isFresh, databaseId } = await createVariantEngineContext(options);
|
|
9
9
|
let processing = false;
|
|
10
10
|
const pendingTransactions = new Map();
|
|
11
11
|
function checkStatus() {
|
|
@@ -112,7 +112,8 @@ export async function createImageCacheEngine(options) {
|
|
|
112
112
|
};
|
|
113
113
|
return {
|
|
114
114
|
imageCache,
|
|
115
|
-
|
|
115
|
+
isFresh,
|
|
116
|
+
databaseId,
|
|
116
117
|
};
|
|
117
118
|
}
|
|
118
119
|
//# sourceMappingURL=image-cache-engine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EACL,QAAQ,EACR,oBAAoB,EACpB,cAAc,EACd,4BAA4B,EAC5B,2BAA2B,EAC3B,kCAAkC,EAClC,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,IAAI,UAAU,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createOrOpenImageCacheConnection } from "../db-init/db-init.js";
|
|
2
2
|
export async function createVariantEngineContext(options) {
|
|
3
3
|
const logger = options.logger ?? console;
|
|
4
|
-
const { cn, logNextQuery,
|
|
4
|
+
const { cn, logNextQuery, isFresh, databaseId } = await createOrOpenImageCacheConnection({
|
|
5
5
|
sqliteFile: options.storage.file,
|
|
6
6
|
logger,
|
|
7
|
+
dependsOn: options.dependsOn,
|
|
7
8
|
});
|
|
8
9
|
const context = {
|
|
9
10
|
...options,
|
|
@@ -16,6 +17,6 @@ export async function createVariantEngineContext(options) {
|
|
|
16
17
|
cn,
|
|
17
18
|
logNextQuery,
|
|
18
19
|
};
|
|
19
|
-
return { context,
|
|
20
|
+
return { context, isFresh, databaseId };
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=engine-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"engine-context.js","sourceRoot":"","sources":["../../src/internal/engine-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gCAAgC,EAAE,MAAM,uBAAuB,CAAC;AAwBzE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,OAAsC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzC,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,gCAAgC,CAAC;QACvF,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAChC,MAAM;QACN,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,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,OAAO,EAAE,UAAU,EAAE,CAAC;AAC1C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server-image-cache-engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.29.0",
|
|
4
4
|
"description": "The image variant engine that we use at Paroi.",
|
|
5
5
|
"author": "Paroi Team",
|
|
6
6
|
"keywords": [
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@paroi/async-lib": "~0.3.1",
|
|
37
37
|
"@paroicms/internal-anywhere-lib": "1.35.2",
|
|
38
|
-
"@paroicms/internal-server-lib": "1.
|
|
38
|
+
"@paroicms/internal-server-lib": "1.22.0",
|
|
39
39
|
"@paroicms/public-anywhere-lib": "0.37.0",
|
|
40
40
|
"@paroicms/public-server-lib": "0.47.0",
|
|
41
41
|
"@paroicms/script-lib": "0.3.2",
|