@paroicms/server-image-cache-engine 1.17.0 → 1.18.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/dist/api.d.ts +6 -6
- package/dist/api.js +6 -22
- package/dist/api.js.map +1 -1
- package/dist/compute-variant-size.d.ts +1 -1
- package/dist/compute-variant-size.js +7 -11
- package/dist/compute-variant-size.js.map +1 -1
- package/dist/constants.js +3 -6
- package/dist/constants.js.map +1 -1
- package/dist/db-init/db-init.js +16 -19
- package/dist/db-init/db-init.js.map +1 -1
- package/dist/db-init/ddl-migration.js +11 -15
- package/dist/db-init/ddl-migration.js.map +1 -1
- package/dist/db-init/entities/PaImageCache.entity.js +17 -20
- package/dist/db-init/entities/PaImageCache.entity.js.map +1 -1
- package/dist/db-init/entities/PaImageCacheUsed.entity.js +7 -10
- package/dist/db-init/entities/PaImageCacheUsed.entity.js.map +1 -1
- package/dist/default-bo-favicon.d.ts +1 -1
- package/dist/default-bo-favicon.js +9 -15
- package/dist/default-bo-favicon.js.map +1 -1
- package/dist/engine-types.js +1 -2
- package/dist/image-cache-engine.d.ts +2 -2
- package/dist/image-cache-engine.js +22 -27
- package/dist/image-cache-engine.js.map +1 -1
- package/dist/image-processor-setup.js +7 -14
- package/dist/image-processor-setup.js.map +1 -1
- package/dist/internal/engine-context.d.ts +3 -3
- package/dist/internal/engine-context.js +5 -8
- package/dist/internal/engine-context.js.map +1 -1
- package/dist/internal/internal.types.js +1 -2
- package/dist/internal/queries.d.ts +2 -2
- package/dist/internal/queries.js +32 -43
- package/dist/internal/queries.js.map +1 -1
- package/dist/internal/resizer.d.ts +1 -1
- package/dist/internal/resizer.js +12 -21
- package/dist/internal/resizer.js.map +1 -1
- package/dist/internal/task-processor.d.ts +1 -1
- package/dist/internal/task-processor.js +7 -10
- package/dist/internal/task-processor.js.map +1 -1
- package/dist/original-images-processing.js +11 -17
- package/dist/original-images-processing.js.map +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-processor.js","sourceRoot":"","sources":["../../src/internal/task-processor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-processor.js","sourceRoot":"","sources":["../../src/internal/task-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
exports.processOriginalImage = processOriginalImage;
|
|
7
|
-
const sharp_1 = __importDefault(require("sharp"));
|
|
8
|
-
const constants_1 = require("./constants");
|
|
9
|
-
const image_processor_setup_1 = require("./image-processor-setup");
|
|
10
|
-
const resizer_1 = require("./internal/resizer");
|
|
11
|
-
async function processOriginalImage({ binaryFile, mediaType, ApiError, policy, defaultPolicy, qualityPolicy, }) {
|
|
1
|
+
import sharp from "sharp";
|
|
2
|
+
import { authorizedMediaTypes } from "./constants.js";
|
|
3
|
+
import { sharpQueue } from "./image-processor-setup.js";
|
|
4
|
+
import { convertSharpFormatToMediaType, getQuality } from "./internal/resizer.js";
|
|
5
|
+
export async function processOriginalImage({ binaryFile, mediaType, ApiError, policy, defaultPolicy, qualityPolicy, }) {
|
|
12
6
|
const weightB = binaryFile.byteLength;
|
|
13
|
-
const sharpInst = (
|
|
14
|
-
const { width, height, format } = await
|
|
7
|
+
const sharpInst = sharp(binaryFile);
|
|
8
|
+
const { width, height, format } = await sharpQueue(() => sharpInst.metadata());
|
|
15
9
|
if (width === undefined || height === undefined || !format) {
|
|
16
10
|
throw new Error("cannot get image metadata");
|
|
17
11
|
}
|
|
18
|
-
const foundMediaType =
|
|
12
|
+
const foundMediaType = convertSharpFormatToMediaType(format);
|
|
19
13
|
if (foundMediaType !== mediaType) {
|
|
20
14
|
throw new ApiError(`mismatch media type '${mediaType}' with '${foundMediaType}'`, {
|
|
21
15
|
status: 400,
|
|
22
16
|
});
|
|
23
17
|
}
|
|
24
|
-
if (!
|
|
18
|
+
if (!authorizedMediaTypes.has(mediaType)) {
|
|
25
19
|
throw new ApiError("Invalid image type", { status: 400 });
|
|
26
20
|
}
|
|
27
21
|
const weightLimitB = policy?.weightLimitB ?? defaultPolicy.weightLimitB;
|
|
@@ -59,8 +53,8 @@ async function processOriginalImage({ binaryFile, mediaType, ApiError, policy, d
|
|
|
59
53
|
async function convertToWebp({ input, qualityPolicy, areaLimitPx, lossless, }) {
|
|
60
54
|
const { width, height } = areaLimitPx === undefined ? input : computeOriginalSize(input, areaLimitPx);
|
|
61
55
|
const size = { width, height }; // to be sure we keep only these properties
|
|
62
|
-
const quality =
|
|
63
|
-
const { data, info } = await
|
|
56
|
+
const quality = getQuality(size, qualityPolicy);
|
|
57
|
+
const { data, info } = await sharpQueue(() => input.sharpInst
|
|
64
58
|
.resize(size)
|
|
65
59
|
.webp({
|
|
66
60
|
lossless,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"original-images-processing.js","sourceRoot":"","sources":["../src/original-images-processing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"original-images-processing.js","sourceRoot":"","sources":["../src/original-images-processing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server-image-cache-engine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.18.0",
|
|
4
4
|
"description": "The image variant engine that we use at Paroi.",
|
|
5
5
|
"author": "Paroi Team",
|
|
6
|
-
"main": "dist/api.js",
|
|
7
6
|
"keywords": [
|
|
8
7
|
"paroicms",
|
|
9
8
|
"caching",
|
|
@@ -17,8 +16,9 @@
|
|
|
17
16
|
"directory": "packages/server-image-cache-engine"
|
|
18
17
|
},
|
|
19
18
|
"license": "MIT",
|
|
19
|
+
"type": "module",
|
|
20
|
+
"main": "dist/api.js",
|
|
20
21
|
"typings": "dist/api.d.ts",
|
|
21
|
-
"type": "commonjs",
|
|
22
22
|
"scripts": {
|
|
23
23
|
"build": "tsc",
|
|
24
24
|
"clear": "rimraf dist/*",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@paroi/async-lib": "~0.3.1",
|
|
37
37
|
"@paroi/data-formatters-lib": "~0.4.0",
|
|
38
|
-
"@paroicms/internal-anywhere-lib": "1.
|
|
39
|
-
"@paroicms/public-anywhere-lib": "0.
|
|
40
|
-
"@paroicms/public-server-lib": "0.
|
|
41
|
-
"@paroicms/internal-server-lib": "1.
|
|
38
|
+
"@paroicms/internal-anywhere-lib": "1.22.0",
|
|
39
|
+
"@paroicms/public-anywhere-lib": "0.15.0",
|
|
40
|
+
"@paroicms/public-server-lib": "0.23.0",
|
|
41
|
+
"@paroicms/internal-server-lib": "1.11.0",
|
|
42
42
|
"ico-endec": "~0.1.6",
|
|
43
43
|
"sharp": "~0.33.4"
|
|
44
44
|
},
|