@paroicms/server-image-cache-engine 1.14.11 → 1.15.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.
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { ScImageCompressionQualityPolicyStep, ScImagePolicy } from "@paroicms/public-anywhere-lib";
|
|
2
|
-
export interface
|
|
3
|
-
new (message
|
|
2
|
+
export interface ApiErrorType {
|
|
3
|
+
new (message: string, options: {
|
|
4
|
+
status: 400;
|
|
5
|
+
}): Error;
|
|
4
6
|
}
|
|
5
7
|
export interface OriginalImage {
|
|
6
8
|
binaryFile: Buffer;
|
|
@@ -10,10 +12,10 @@ export interface OriginalImage {
|
|
|
10
12
|
mediaType: string;
|
|
11
13
|
lossless: boolean | undefined;
|
|
12
14
|
}
|
|
13
|
-
export declare function processOriginalImage({ binaryFile, mediaType,
|
|
15
|
+
export declare function processOriginalImage({ binaryFile, mediaType, ApiError, policy, defaultPolicy, qualityPolicy, }: {
|
|
14
16
|
binaryFile: Buffer;
|
|
15
17
|
mediaType: string;
|
|
16
|
-
|
|
18
|
+
ApiError: ApiErrorType;
|
|
17
19
|
policy?: ScImagePolicy;
|
|
18
20
|
defaultPolicy: ScImagePolicy;
|
|
19
21
|
qualityPolicy: ScImageCompressionQualityPolicyStep[];
|
|
@@ -8,7 +8,7 @@ const sharp_1 = __importDefault(require("sharp"));
|
|
|
8
8
|
const constants_1 = require("./constants");
|
|
9
9
|
const image_processor_setup_1 = require("./image-processor-setup");
|
|
10
10
|
const resizer_1 = require("./internal/resizer");
|
|
11
|
-
async function processOriginalImage({ binaryFile, mediaType,
|
|
11
|
+
async function processOriginalImage({ binaryFile, mediaType, ApiError, policy, defaultPolicy, qualityPolicy, }) {
|
|
12
12
|
const weightB = binaryFile.byteLength;
|
|
13
13
|
const sharpInst = (0, sharp_1.default)(binaryFile);
|
|
14
14
|
const { width, height, format } = await (0, image_processor_setup_1.sharpQueue)(() => sharpInst.metadata());
|
|
@@ -17,16 +17,18 @@ async function processOriginalImage({ binaryFile, mediaType, BadRequestError, po
|
|
|
17
17
|
}
|
|
18
18
|
const foundMediaType = (0, resizer_1.convertSharpFormatToMediaType)(format);
|
|
19
19
|
if (foundMediaType !== mediaType) {
|
|
20
|
-
throw new
|
|
20
|
+
throw new ApiError(`mismatch media type '${mediaType}' with '${foundMediaType}'`, {
|
|
21
|
+
status: 400,
|
|
22
|
+
});
|
|
21
23
|
}
|
|
22
24
|
if (!constants_1.authorizedMediaTypes.has(mediaType)) {
|
|
23
|
-
throw new
|
|
25
|
+
throw new ApiError("Invalid image type", { status: 400 });
|
|
24
26
|
}
|
|
25
27
|
const weightLimitB = policy?.weightLimitB ?? defaultPolicy.weightLimitB;
|
|
26
28
|
const areaLimitPx = policy?.areaLimitPx ?? defaultPolicy.areaLimitPx;
|
|
27
29
|
if (mediaType === "image/gif" || mediaType === "image/svg+xml") {
|
|
28
30
|
if (weightLimitB && weightB > weightLimitB) {
|
|
29
|
-
throw new
|
|
31
|
+
throw new ApiError("Image weight exceeds limit", { status: 400 });
|
|
30
32
|
}
|
|
31
33
|
return { binaryFile, width, height, mediaType, weightB, lossless: undefined };
|
|
32
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"original-images-processing.js","sourceRoot":"","sources":["../src/original-images-processing.ts"],"names":[],"mappings":";;;;;AA8BA,
|
|
1
|
+
{"version":3,"file":"original-images-processing.js","sourceRoot":"","sources":["../src/original-images-processing.ts"],"names":[],"mappings":"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"}
|