@paroicms/server-image-cache-engine 1.5.1 → 1.6.1
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/dist/engine-types.d.ts +5 -5
- package/dist/image-cache-engine.d.ts +4 -4
- package/dist/image-cache-engine.js +11 -11
- package/dist/image-cache-engine.js.map +1 -1
- package/dist/internal/compute-variant-size.d.ts +7 -7
- package/dist/internal/compute-variant-size.js +23 -26
- package/dist/internal/compute-variant-size.js.map +1 -1
- package/dist/internal/internal.types.d.ts +4 -4
- package/dist/internal/queries.d.ts +6 -6
- package/dist/internal/queries.js +10 -10
- package/dist/internal/queries.js.map +1 -1
- package/dist/internal/task-processor.js +2 -2
- package/dist/internal/task-processor.js.map +1 -1
- package/dist/public-helpers.d.ts +3 -3
- package/dist/public-helpers.js +18 -18
- package/dist/public-helpers.js.map +1 -1
- package/package.json +3 -3
package/dist/engine-types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import type {
|
|
2
|
+
import type { VariantName } from "@paroicms/anywhere-lib";
|
|
3
3
|
export interface ImageVariantStorage {
|
|
4
4
|
type: "sqlite";
|
|
5
5
|
file: string;
|
|
@@ -7,7 +7,7 @@ export interface ImageVariantStorage {
|
|
|
7
7
|
export type GetOriginalImage = (uid: string) => Promise<Buffer>;
|
|
8
8
|
export interface NewImageProps {
|
|
9
9
|
imageRef: ImageRef;
|
|
10
|
-
|
|
10
|
+
imageSize: string;
|
|
11
11
|
autoCrop?: boolean;
|
|
12
12
|
mediaType?: string;
|
|
13
13
|
dependsOnUsedKey: string;
|
|
@@ -21,12 +21,12 @@ export interface ImageRef {
|
|
|
21
21
|
avgWidth?: number;
|
|
22
22
|
avgHeight?: number;
|
|
23
23
|
}
|
|
24
|
-
export interface
|
|
24
|
+
export interface ParsedImageSizeWithVariant {
|
|
25
25
|
width: number;
|
|
26
26
|
height: number;
|
|
27
|
-
|
|
27
|
+
variantName: VariantName;
|
|
28
28
|
}
|
|
29
|
-
export interface ImageVariant extends
|
|
29
|
+
export interface ImageVariant extends ParsedImageSizeWithVariant {
|
|
30
30
|
resourceVersion: string;
|
|
31
31
|
slug?: string;
|
|
32
32
|
mediaType: string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ImageCompressionQualityPolicy, ImageSize, VariantName } from "@paroicms/anywhere-lib";
|
|
2
2
|
import type { AppLog } from "@paroicms/server-lib";
|
|
3
3
|
import type { GetOriginalImage, ImageRef, ImageVariant, ImageVariantStorage, ImageVariantWithBinary, NewImageProps } from "./engine-types";
|
|
4
4
|
import { type VariantEngineContext } from "./internal/engine-context";
|
|
@@ -21,7 +21,7 @@ export declare class ImageCacheEngine {
|
|
|
21
21
|
constructor(context: VariantEngineContext);
|
|
22
22
|
getImageVariantWithBinary({ imageUid, variantName, }: {
|
|
23
23
|
imageUid: string;
|
|
24
|
-
variantName:
|
|
24
|
+
variantName: VariantName;
|
|
25
25
|
}): Promise<ImageVariantWithBinary | undefined>;
|
|
26
26
|
resetUsedKey(options: {
|
|
27
27
|
usedKey: string;
|
|
@@ -29,8 +29,8 @@ export declare class ImageCacheEngine {
|
|
|
29
29
|
makeImageAvailable(params: NewImageProps): Promise<ImageVariant>;
|
|
30
30
|
getOrCreateImageWithBinary(params: NewImageProps): Promise<ImageVariantWithBinary | undefined>;
|
|
31
31
|
conditionallyCreateImageVariantWithBinary(media: ImageRef, options: {
|
|
32
|
-
|
|
33
|
-
variantName:
|
|
32
|
+
authorisedImageSizes: ImageSize[];
|
|
33
|
+
variantName: VariantName;
|
|
34
34
|
dependsOnUsedKey: string;
|
|
35
35
|
slug?: string;
|
|
36
36
|
}): Promise<ImageVariantWithBinary | undefined>;
|
|
@@ -29,7 +29,7 @@ class ImageCacheEngine {
|
|
|
29
29
|
return pth.promise;
|
|
30
30
|
const found = await (0, queries_1.fetchImageVariantWithBinary)(this.#context, {
|
|
31
31
|
imageUid,
|
|
32
|
-
|
|
32
|
+
variantName,
|
|
33
33
|
});
|
|
34
34
|
return found ? found.variant : undefined;
|
|
35
35
|
}
|
|
@@ -39,8 +39,8 @@ class ImageCacheEngine {
|
|
|
39
39
|
async makeImageAvailable(params) {
|
|
40
40
|
this.#checkStatus();
|
|
41
41
|
const imageUid = params.imageRef.imageUid;
|
|
42
|
-
const { width, height,
|
|
43
|
-
const found = await (0, queries_1.fetchImageVariant)(this.#context, { imageUid,
|
|
42
|
+
const { width, height, variantName } = (0, compute_variant_size_1.computeVariantSize)(params);
|
|
43
|
+
const found = await (0, queries_1.fetchImageVariant)(this.#context, { imageUid, variantName });
|
|
44
44
|
if (found) {
|
|
45
45
|
await (0, queries_1.markOneUsedKeyAsUsed)(this.#context, {
|
|
46
46
|
imageCacheId: found.id,
|
|
@@ -49,11 +49,11 @@ class ImageCacheEngine {
|
|
|
49
49
|
return found.variant;
|
|
50
50
|
}
|
|
51
51
|
const resourceVersion = (0, server_lib_1.generateResourceVersion)();
|
|
52
|
-
const taskKey = `${imageUid}:${
|
|
52
|
+
const taskKey = `${imageUid}:${variantName}`;
|
|
53
53
|
if (!this.#context.pendingTasks.has(taskKey)) {
|
|
54
54
|
this.#context.queue.push({
|
|
55
55
|
taskKey,
|
|
56
|
-
variantName
|
|
56
|
+
variantName,
|
|
57
57
|
imageUid,
|
|
58
58
|
imageSize: {
|
|
59
59
|
width,
|
|
@@ -71,7 +71,7 @@ class ImageCacheEngine {
|
|
|
71
71
|
return {
|
|
72
72
|
width,
|
|
73
73
|
height,
|
|
74
|
-
|
|
74
|
+
variantName,
|
|
75
75
|
mediaType: params.mediaType ?? params.imageRef.mediaType,
|
|
76
76
|
resourceVersion,
|
|
77
77
|
slug: params.slug,
|
|
@@ -82,7 +82,7 @@ class ImageCacheEngine {
|
|
|
82
82
|
const variant = await this.makeImageAvailable(params);
|
|
83
83
|
return await this.getImageVariantWithBinary({
|
|
84
84
|
imageUid: params.imageRef.imageUid,
|
|
85
|
-
variantName: variant.
|
|
85
|
+
variantName: variant.variantName,
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
88
|
async conditionallyCreateImageVariantWithBinary(media, options) {
|
|
@@ -92,17 +92,17 @@ class ImageCacheEngine {
|
|
|
92
92
|
return;
|
|
93
93
|
const available = await this.makeImageAvailable({
|
|
94
94
|
autoCrop: false,
|
|
95
|
-
|
|
95
|
+
imageSize: authorized.variantName,
|
|
96
96
|
imageRef: media,
|
|
97
97
|
dependsOnUsedKey: options.dependsOnUsedKey,
|
|
98
98
|
slug: options.slug,
|
|
99
99
|
});
|
|
100
|
-
if (available.
|
|
101
|
-
throw new Error(`mismatch variants '${available.
|
|
100
|
+
if (available.variantName !== authorized.variantName) {
|
|
101
|
+
throw new Error(`mismatch variants '${available.variantName}' and '${authorized.variantName}'`);
|
|
102
102
|
}
|
|
103
103
|
return await this.getImageVariantWithBinary({
|
|
104
104
|
imageUid: media.imageUid,
|
|
105
|
-
variantName: available.
|
|
105
|
+
variantName: available.variantName,
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
async invalidate(options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":";;;AAAA,gDAAmD;
|
|
1
|
+
{"version":3,"file":"image-cache-engine.js","sourceRoot":"","sources":["../src/image-cache-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { ImageRef,
|
|
1
|
+
import type { ImageSize, VariantName } from "@paroicms/anywhere-lib";
|
|
2
|
+
import type { ImageRef, ParsedImageSizeWithVariant } from "../engine-types";
|
|
3
3
|
export declare function findAuthorizedVariantSize(media: ImageRef, options: {
|
|
4
|
-
|
|
5
|
-
variantName:
|
|
6
|
-
}):
|
|
4
|
+
authorisedImageSizes: ImageSize[];
|
|
5
|
+
variantName: VariantName;
|
|
6
|
+
}): ParsedImageSizeWithVariant | undefined;
|
|
7
7
|
export interface ComputeVariantSizeParams {
|
|
8
8
|
imageRef: Pick<ImageRef, "width" | "height" | "avgWidth" | "avgHeight">;
|
|
9
|
-
|
|
9
|
+
imageSize: string;
|
|
10
10
|
autoCrop?: boolean;
|
|
11
11
|
}
|
|
12
|
-
export declare function computeVariantSize({ imageRef,
|
|
12
|
+
export declare function computeVariantSize({ imageRef, imageSize, autoCrop, }: ComputeVariantSizeParams): ParsedImageSizeWithVariant;
|
|
@@ -4,36 +4,40 @@ exports.computeVariantSize = exports.findAuthorizedVariantSize = void 0;
|
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
5
|
const public_helpers_1 = require("../public-helpers");
|
|
6
6
|
function findAuthorizedVariantSize(media, options) {
|
|
7
|
-
for (const
|
|
7
|
+
for (const imageSize of options.authorisedImageSizes) {
|
|
8
8
|
const variantSize = computeVariantSize({
|
|
9
|
-
|
|
9
|
+
imageSize,
|
|
10
10
|
imageRef: media,
|
|
11
11
|
});
|
|
12
|
-
if (variantSize.
|
|
12
|
+
if (variantSize.variantName === options.variantName)
|
|
13
13
|
return variantSize;
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
exports.findAuthorizedVariantSize = findAuthorizedVariantSize;
|
|
17
|
-
function computeVariantSize({ imageRef,
|
|
18
|
-
if (!(0, public_helpers_1.
|
|
19
|
-
throw new Error(`This
|
|
17
|
+
function computeVariantSize({ imageRef, imageSize, autoCrop, }) {
|
|
18
|
+
if (!(0, public_helpers_1.isImageSize)(imageSize)) {
|
|
19
|
+
throw new Error(`This image size ${imageSize} is not handled.`);
|
|
20
20
|
}
|
|
21
|
-
const
|
|
22
|
-
if (
|
|
23
|
-
const value =
|
|
21
|
+
const splitted = imageSize.split("x");
|
|
22
|
+
if (splitted.length === 3) {
|
|
23
|
+
const value = splitted[1];
|
|
24
24
|
if (imageRef.height > imageRef.width) {
|
|
25
|
-
|
|
25
|
+
imageSize = `x${value}`;
|
|
26
26
|
}
|
|
27
27
|
else if (imageRef.width > imageRef.height) {
|
|
28
|
-
|
|
28
|
+
imageSize = `${value}x`;
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
|
|
31
|
+
imageSize = `${value}x`;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
-
const
|
|
34
|
+
const [rawWidth, rawHeight] = imageSize.split("x");
|
|
35
|
+
const v = {
|
|
36
|
+
width: rawWidth === "" ? undefined : (0, data_formatters_lib_1.nbVal)(rawWidth),
|
|
37
|
+
height: rawHeight === "" ? undefined : (0, data_formatters_lib_1.nbVal)(rawHeight),
|
|
38
|
+
};
|
|
35
39
|
if (v.height !== undefined && v.width !== undefined) {
|
|
36
|
-
return
|
|
40
|
+
return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: v.width, height: v.height }, imageRef));
|
|
37
41
|
}
|
|
38
42
|
const autoCropAvg = autoCrop && imageRef.avgHeight !== undefined && imageRef.avgWidth !== undefined
|
|
39
43
|
? {
|
|
@@ -45,24 +49,17 @@ function computeVariantSize({ imageRef, variantName, autoCrop, }) {
|
|
|
45
49
|
const targetHeight = autoCropAvg
|
|
46
50
|
? Math.round((v.width * autoCropAvg.height) / autoCropAvg.width)
|
|
47
51
|
: Math.round((v.width * imageRef.height) / imageRef.width);
|
|
48
|
-
return
|
|
52
|
+
return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: v.width, height: targetHeight }, imageRef));
|
|
49
53
|
}
|
|
50
54
|
if (v.height !== undefined && v.width === undefined) {
|
|
51
55
|
const targetWidth = autoCropAvg
|
|
52
56
|
? Math.round((v.height * autoCropAvg.width) / autoCropAvg.height)
|
|
53
57
|
: Math.round((v.height * imageRef.width) / imageRef.height);
|
|
54
|
-
return
|
|
58
|
+
return toParsedImageSizeWithVariant(reduceSizeIfNecessary({ width: targetWidth, height: v.height }, imageRef));
|
|
55
59
|
}
|
|
56
|
-
throw new Error(`Invalid variant '${
|
|
60
|
+
throw new Error(`Invalid variant '${imageSize}'`);
|
|
57
61
|
}
|
|
58
62
|
exports.computeVariantSize = computeVariantSize;
|
|
59
|
-
function parseVariantName(variantName) {
|
|
60
|
-
const [width, height] = variantName.split("x");
|
|
61
|
-
return {
|
|
62
|
-
width: width === "" ? undefined : (0, data_formatters_lib_1.nbVal)(width),
|
|
63
|
-
height: height === "" ? undefined : (0, data_formatters_lib_1.nbVal)(height),
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
63
|
function reduceSizeIfNecessary(preferredSize, actualSize) {
|
|
67
64
|
const diffW = actualSize.width - preferredSize.width;
|
|
68
65
|
const diffH = actualSize.height - preferredSize.height;
|
|
@@ -80,10 +77,10 @@ function reduceSizeIfNecessary(preferredSize, actualSize) {
|
|
|
80
77
|
height: actualSize.height,
|
|
81
78
|
};
|
|
82
79
|
}
|
|
83
|
-
function
|
|
80
|
+
function toParsedImageSizeWithVariant(size) {
|
|
84
81
|
return {
|
|
85
82
|
...size,
|
|
86
|
-
|
|
83
|
+
variantName: `${size.width}x${size.height}`,
|
|
87
84
|
};
|
|
88
85
|
}
|
|
89
86
|
//# sourceMappingURL=compute-variant-size.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-variant-size.js","sourceRoot":"","sources":["../../src/internal/compute-variant-size.ts"],"names":[],"mappings":";;;AAAA,oEAAmD;AAGnD,
|
|
1
|
+
{"version":3,"file":"compute-variant-size.js","sourceRoot":"","sources":["../../src/internal/compute-variant-size.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { VariantName } from "@paroicms/anywhere-lib";
|
|
2
2
|
export interface TaskData {
|
|
3
3
|
taskKey: TaskKey;
|
|
4
4
|
resourceVersion: string;
|
|
5
5
|
imageUid: string;
|
|
6
|
-
variantName:
|
|
6
|
+
variantName: VariantName;
|
|
7
7
|
imageSize: ImageSize;
|
|
8
8
|
mediaType: string;
|
|
9
9
|
changeMediaTypeTo?: string;
|
|
@@ -15,6 +15,6 @@ export interface ImageSize {
|
|
|
15
15
|
height: number;
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
* Format is: {imageUid}:{
|
|
18
|
+
* Format is: {imageUid}:{variantName}
|
|
19
19
|
*/
|
|
20
|
-
export type TaskKey = `${string}:${
|
|
20
|
+
export type TaskKey = `${string}:${VariantName}`;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import type {
|
|
2
|
+
import type { VariantName } from "@paroicms/anywhere-lib";
|
|
3
3
|
import type { QueryBuilderConnection } from "@paroicms/server-lib";
|
|
4
4
|
import type { ImageVariant, ImageVariantWithBinary } from "../engine-types";
|
|
5
5
|
import type { VariantEngineContext } from "../internal/engine-context";
|
|
6
6
|
export declare function insertIntoImageVariant(cn: QueryBuilderConnection, data: {
|
|
7
7
|
resourceVersion: string;
|
|
8
8
|
imageUid: string;
|
|
9
|
-
variantName:
|
|
9
|
+
variantName: VariantName;
|
|
10
10
|
slug?: string;
|
|
11
11
|
mediaType: string;
|
|
12
12
|
width: number;
|
|
@@ -29,16 +29,16 @@ export declare function deleteVariants(cn: QueryBuilderConnection, options: {
|
|
|
29
29
|
export declare function deleteVariantsByDependencies(cn: QueryBuilderConnection, options: {
|
|
30
30
|
usedKeys: string[];
|
|
31
31
|
}): Promise<number>;
|
|
32
|
-
export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid,
|
|
32
|
+
export declare function fetchImageVariant(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid, variantName, }: {
|
|
33
33
|
imageUid: string;
|
|
34
|
-
|
|
34
|
+
variantName: VariantName;
|
|
35
35
|
}): Promise<{
|
|
36
36
|
id: string;
|
|
37
37
|
variant: ImageVariant;
|
|
38
38
|
} | undefined>;
|
|
39
|
-
export declare function fetchImageVariantWithBinary(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid,
|
|
39
|
+
export declare function fetchImageVariantWithBinary(ctx: Pick<VariantEngineContext, "cn" | "timeToIdleDays" | "appLog">, { imageUid, variantName, }: {
|
|
40
40
|
imageUid: string;
|
|
41
|
-
|
|
41
|
+
variantName: VariantName;
|
|
42
42
|
}): Promise<{
|
|
43
43
|
variant: ImageVariantWithBinary;
|
|
44
44
|
id: string;
|
package/dist/internal/queries.js
CHANGED
|
@@ -83,7 +83,7 @@ async function deleteVariantsByDependencies(cn, options) {
|
|
|
83
83
|
return imageCacheIds.length;
|
|
84
84
|
}
|
|
85
85
|
exports.deleteVariantsByDependencies = deleteVariantsByDependencies;
|
|
86
|
-
async function fetchImageVariant(ctx, { imageUid,
|
|
86
|
+
async function fetchImageVariant(ctx, { imageUid, variantName, }) {
|
|
87
87
|
const row = await ctx.cn
|
|
88
88
|
.createQueryBuilder()
|
|
89
89
|
.select("v.id", "id")
|
|
@@ -96,7 +96,7 @@ async function fetchImageVariant(ctx, { imageUid, completeVariantName, }) {
|
|
|
96
96
|
.addSelect("v.readAt", "readAt")
|
|
97
97
|
.from("PaImageCache", "v")
|
|
98
98
|
.where("v.imageUid = :imageUid", { imageUid })
|
|
99
|
-
.andWhere("v.variantName = :
|
|
99
|
+
.andWhere("v.variantName = :variantName", { variantName })
|
|
100
100
|
.getRawOne();
|
|
101
101
|
if (!row)
|
|
102
102
|
return;
|
|
@@ -106,7 +106,7 @@ async function fetchImageVariant(ctx, { imageUid, completeVariantName, }) {
|
|
|
106
106
|
id,
|
|
107
107
|
readAt,
|
|
108
108
|
imageUid,
|
|
109
|
-
|
|
109
|
+
variantName,
|
|
110
110
|
});
|
|
111
111
|
return {
|
|
112
112
|
id,
|
|
@@ -116,12 +116,12 @@ async function fetchImageVariant(ctx, { imageUid, completeVariantName, }) {
|
|
|
116
116
|
mediaType: (0, data_formatters_lib_1.strVal)(row.mediaType),
|
|
117
117
|
width: (0, data_formatters_lib_1.nbVal)(row.width),
|
|
118
118
|
height: (0, data_formatters_lib_1.nbVal)(row.height),
|
|
119
|
-
|
|
119
|
+
variantName,
|
|
120
120
|
},
|
|
121
121
|
};
|
|
122
122
|
}
|
|
123
123
|
exports.fetchImageVariant = fetchImageVariant;
|
|
124
|
-
async function fetchImageVariantWithBinary(ctx, { imageUid,
|
|
124
|
+
async function fetchImageVariantWithBinary(ctx, { imageUid, variantName, }) {
|
|
125
125
|
const row = await ctx.cn
|
|
126
126
|
.createQueryBuilder()
|
|
127
127
|
.select("v.id", "id")
|
|
@@ -136,13 +136,13 @@ async function fetchImageVariantWithBinary(ctx, { imageUid, completeVariantName,
|
|
|
136
136
|
.addSelect("v.slug", "slug")
|
|
137
137
|
.from("PaImageCache", "v")
|
|
138
138
|
.where("v.imageUid = :imageUid", { imageUid })
|
|
139
|
-
.andWhere("v.variantName = :
|
|
139
|
+
.andWhere("v.variantName = :variantName", { variantName })
|
|
140
140
|
.getRawOne();
|
|
141
141
|
if (!row)
|
|
142
142
|
return;
|
|
143
143
|
const id = (0, data_formatters_lib_1.strVal)(row.id);
|
|
144
144
|
const readAt = (0, data_formatters_lib_1.dateVal)(row.readAt);
|
|
145
|
-
await updateReadAtOfImageVariant(ctx, { id, readAt, imageUid,
|
|
145
|
+
await updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, variantName });
|
|
146
146
|
return {
|
|
147
147
|
id,
|
|
148
148
|
variant: {
|
|
@@ -154,16 +154,16 @@ async function fetchImageVariantWithBinary(ctx, { imageUid, completeVariantName,
|
|
|
154
154
|
weightB: (0, data_formatters_lib_1.nbVal)(row.weightB),
|
|
155
155
|
binaryFile: row.binaryFile,
|
|
156
156
|
lastModified: (0, data_formatters_lib_1.dateVal)(row.modifiedAt).toISOString(),
|
|
157
|
-
|
|
157
|
+
variantName,
|
|
158
158
|
},
|
|
159
159
|
};
|
|
160
160
|
}
|
|
161
161
|
exports.fetchImageVariantWithBinary = fetchImageVariantWithBinary;
|
|
162
|
-
async function updateReadAtOfImageVariant(ctx, { id, readAt, imageUid,
|
|
162
|
+
async function updateReadAtOfImageVariant(ctx, { id, readAt, imageUid, variantName, }) {
|
|
163
163
|
const { cn, timeToIdleDays, appLog } = ctx;
|
|
164
164
|
if (timeToIdleDays === undefined || (0, anywhere_lib_1.isSameTimeUnit)(readAt, "day"))
|
|
165
165
|
return;
|
|
166
|
-
appLog.debug(`updating readAt of image cache: ${imageUid}, ${
|
|
166
|
+
appLog.debug(`updating readAt of image cache: ${imageUid}, ${variantName}`);
|
|
167
167
|
await cn
|
|
168
168
|
.createQueryBuilder()
|
|
169
169
|
.update("PaImageCache")
|
|
@@ -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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"}
|
|
@@ -28,7 +28,7 @@ exports.processAllPending = processAllPending;
|
|
|
28
28
|
async function excecuteTask(task, ctx) {
|
|
29
29
|
const found = await (0, queries_1.fetchImageVariantWithBinary)(ctx, {
|
|
30
30
|
imageUid: task.imageUid,
|
|
31
|
-
|
|
31
|
+
variantName: task.variantName,
|
|
32
32
|
});
|
|
33
33
|
if (found) {
|
|
34
34
|
await (0, queries_1.markOneUsedKeyAsUsed)(ctx, {
|
|
@@ -64,7 +64,7 @@ async function excecuteTask(task, ctx) {
|
|
|
64
64
|
lastModified,
|
|
65
65
|
resourceVersion: task.resourceVersion,
|
|
66
66
|
slug: task.slug,
|
|
67
|
-
|
|
67
|
+
variantName: task.variantName,
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
//# sourceMappingURL=task-processor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-processor.js","sourceRoot":"","sources":["../../src/internal/task-processor.ts"],"names":[],"mappings":";;;AAGA,uCAImB;AACnB,uCAAwC;AAEjC,KAAK,UAAU,iBAAiB,CAAC,OAA6B;IACnE,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,MAAM;QAEjB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YAClE,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEjD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,+BAA+B,IAAI,CAAC,QAAQ,OAAO,IAAI,CAAC,WAAW,IAAI,EACvE,KAAK,EACL,IAAI,CACL,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QAED,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AA3BD,8CA2BC;AAED,KAAK,UAAU,YAAY,CACzB,IAAc,EACd,GAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,IAAA,qCAA2B,EAAC,GAAG,EAAE;QACnD,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,
|
|
1
|
+
{"version":3,"file":"task-processor.js","sourceRoot":"","sources":["../../src/internal/task-processor.ts"],"names":[],"mappings":";;;AAGA,uCAImB;AACnB,uCAAwC;AAEjC,KAAK,UAAU,iBAAiB,CAAC,OAA6B;IACnE,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,MAAM;QAEjB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YAClE,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAEjD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,+BAA+B,IAAI,CAAC,QAAQ,OAAO,IAAI,CAAC,WAAW,IAAI,EACvE,KAAK,EACL,IAAI,CACL,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QAED,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AA3BD,8CA2BC;AAED,KAAK,UAAU,YAAY,CACzB,IAAc,EACd,GAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,IAAA,qCAA2B,EAAC,GAAG,EAAE;QACnD,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IACH,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,IAAA,8BAAoB,EAAC,GAAG,EAAE;YAC9B,YAAY,EAAE,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,IAAI,CAAC,gBAAgB;SAC/B,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAW,EAAC;QAC/B,UAAU,EAAE,cAAc;QAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,QAAQ,EAAE,IAAI,CAAC,iBAAiB;YAC9B,CAAC,CAAC;gBACE,SAAS,EAAE,IAAI,CAAC,iBAAiB;aAClC;YACH,CAAC,CAAC,SAAS;QACb,aAAa,EAAE,GAAG,CAAC,aAAa;KACjC,CAAC,CAAC;IAEH,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,gCAAsB,EACnD,GAAG,CAAC,EAAE,EACN;QACE,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,EACD,IAAI,CAAC,gBAAgB,CACtB,CAAC;IAEF,OAAO;QACL,GAAG,MAAM;QACT,YAAY;QACZ,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC;AACJ,CAAC"}
|
package/dist/public-helpers.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ImageSize, VariantName } from "@paroicms/anywhere-lib";
|
|
2
|
+
export declare function isImageSize(imageSize: string): imageSize is ImageSize;
|
|
2
3
|
export declare function isVariantName(variantName: string): variantName is VariantName;
|
|
3
|
-
export declare function isCompleteVariantName(variantName: string): variantName is CompleteVariantName;
|
|
4
4
|
export declare function generateImageSlug(fromName?: string): string | undefined;
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function applyRatioToImageSize(imageSize: ImageSize, pixelRatio: number): ImageSize;
|
package/dist/public-helpers.js
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.applyRatioToImageSize = exports.generateImageSlug = exports.isVariantName = exports.isImageSize = void 0;
|
|
4
4
|
const data_formatters_lib_1 = require("@paroi/data-formatters-lib");
|
|
5
5
|
const anywhere_lib_1 = require("@paroicms/anywhere-lib");
|
|
6
|
-
function
|
|
7
|
-
return /^[0-9]+x|x[0-9]+|x[0-9]+x|[0-9]+x[0-9]+$/.test(
|
|
6
|
+
function isImageSize(imageSize) {
|
|
7
|
+
return /^[0-9]+x|x[0-9]+|x[0-9]+x|[0-9]+x[0-9]+$/.test(imageSize);
|
|
8
8
|
}
|
|
9
|
-
exports.
|
|
10
|
-
function
|
|
9
|
+
exports.isImageSize = isImageSize;
|
|
10
|
+
function isVariantName(variantName) {
|
|
11
11
|
return /^[0-9]+x[0-9]+$/.test(variantName);
|
|
12
12
|
}
|
|
13
|
-
exports.
|
|
13
|
+
exports.isVariantName = isVariantName;
|
|
14
14
|
function generateImageSlug(fromName) {
|
|
15
15
|
if (!fromName)
|
|
16
16
|
return;
|
|
17
17
|
return (0, anywhere_lib_1.generateSlug)(fromName).substring(0, 12).replace(/-$/g, "");
|
|
18
18
|
}
|
|
19
19
|
exports.generateImageSlug = generateImageSlug;
|
|
20
|
-
function
|
|
21
|
-
const
|
|
22
|
-
if (
|
|
23
|
-
const value =
|
|
24
|
-
|
|
20
|
+
function applyRatioToImageSize(imageSize, pixelRatio) {
|
|
21
|
+
const splitted = imageSize.split("x");
|
|
22
|
+
if (splitted.length === 3) {
|
|
23
|
+
const value = splitted[1];
|
|
24
|
+
splitted[1] = `${Math.round((0, data_formatters_lib_1.nbVal)(value) * pixelRatio)}`;
|
|
25
25
|
}
|
|
26
|
-
else if (
|
|
27
|
-
const width =
|
|
28
|
-
const height =
|
|
26
|
+
else if (splitted.length === 2) {
|
|
27
|
+
const width = splitted[0];
|
|
28
|
+
const height = splitted[1];
|
|
29
29
|
if (height !== "")
|
|
30
|
-
|
|
30
|
+
splitted[1] = `${Math.round((0, data_formatters_lib_1.nbVal)(height) * pixelRatio)}`;
|
|
31
31
|
if (width !== "")
|
|
32
|
-
|
|
32
|
+
splitted[0] = `${Math.round((0, data_formatters_lib_1.nbVal)(width) * pixelRatio)}`;
|
|
33
33
|
}
|
|
34
|
-
return
|
|
34
|
+
return splitted.join("x");
|
|
35
35
|
}
|
|
36
|
-
exports.
|
|
36
|
+
exports.applyRatioToImageSize = applyRatioToImageSize;
|
|
37
37
|
//# sourceMappingURL=public-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-helpers.js","sourceRoot":"","sources":["../src/public-helpers.ts"],"names":[],"mappings":";;;AAAA,oEAAmD;AAEnD,yDAAsD;AAEtD,SAAgB,
|
|
1
|
+
{"version":3,"file":"public-helpers.js","sourceRoot":"","sources":["../src/public-helpers.ts"],"names":[],"mappings":";;;AAAA,oEAAmD;AAEnD,yDAAsD;AAEtD,SAAgB,WAAW,CAAC,SAAiB;IAC3C,OAAO,0CAA0C,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACpE,CAAC;AAFD,kCAEC;AAED,SAAgB,aAAa,CAAC,WAAmB;IAC/C,OAAO,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAFD,sCAEC;AAED,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,IAAI,CAAC,QAAQ;QAAE,OAAO;IACtB,OAAO,IAAA,2BAAY,EAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACpE,CAAC;AAHD,8CAGC;AAED,SAAgB,qBAAqB,CAAC,SAAoB,EAAE,UAAkB;IAC5E,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,2BAAK,EAAC,KAAK,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;IAC3D,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE3B,IAAI,MAAM,KAAK,EAAE;YAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,2BAAK,EAAC,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;QAC7E,IAAI,KAAK,KAAK,EAAE;YAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,2BAAK,EAAC,KAAK,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAc,CAAC;AACzC,CAAC;AAfD,sDAeC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server-image-cache-engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.1",
|
|
4
4
|
"description": "The image variant engine that we use at Paroi.",
|
|
5
5
|
"author": "Paroi Team",
|
|
6
6
|
"main": "dist/api.js",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@paroi/async-lib": "~0.2.0",
|
|
38
38
|
"@paroi/data-formatters-lib": "~0.3.0",
|
|
39
|
-
"@paroicms/anywhere-lib": "1.
|
|
40
|
-
"@paroicms/server-lib": "1.4.
|
|
39
|
+
"@paroicms/anywhere-lib": "1.10.0",
|
|
40
|
+
"@paroicms/server-lib": "1.4.3",
|
|
41
41
|
"ico-endec": "~0.1.6",
|
|
42
42
|
"sharp": "~0.33.3"
|
|
43
43
|
},
|