@social-mail/social-mail-web-server 1.7.333 → 1.7.334
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/server/services/image-converter/ImageConverterService.d.ts +2 -1
- package/dist/server/services/image-converter/ImageConverterService.d.ts.map +1 -1
- package/dist/server/services/image-converter/ImageConverterService.js +20 -1
- package/dist/server/services/image-converter/ImageConverterService.js.map +1 -1
- package/dist/server/services/image-converter/external/convert-heic.d.ts +2 -0
- package/dist/server/services/image-converter/external/convert-heic.d.ts.map +1 -0
- package/dist/server/services/image-converter/external/convert-heic.js +15 -0
- package/dist/server/services/image-converter/external/convert-heic.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/src/server/services/image-converter/ImageConverterService.ts +21 -1
- package/src/server/services/image-converter/external/convert-heic.ts +17 -0
|
@@ -3,6 +3,7 @@ import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
|
3
3
|
export default class ImageConverterService {
|
|
4
4
|
tempFileService: TempFileService;
|
|
5
5
|
getImage(file: LocalFile, pageNumber?: any, retry?: boolean): Promise<LocalFile>;
|
|
6
|
-
transform(type: any, file: LocalFile, outputFileName?: string):
|
|
6
|
+
transform(type: any, file: LocalFile, outputFileName?: string, retry?: boolean): any;
|
|
7
|
+
private transformInternal;
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=ImageConverterService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageConverterService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"ImageConverterService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAY/E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,eAAe,EAAE,eAAe,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,KAAA,EAAE,KAAK,UAAO;IAyEnD,SAAS,CAAC,IAAI,KAAA,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,SAAa,EAAE,KAAK,UAAO;YAkBlE,iBAAiB;CAuDlC"}
|
|
@@ -64,6 +64,7 @@ import { copyFile, readdir } from "fs/promises";
|
|
|
64
64
|
import FFCommand from "../convert/FFCommand.js";
|
|
65
65
|
import { ImagesFolder } from "../../../common/ImagesFolder.js";
|
|
66
66
|
import IsolatedProcess from "../../../isolated/IsolatedProcess.js";
|
|
67
|
+
import { fileURLToPath } from "url";
|
|
67
68
|
let ImageConverterService = class ImageConverterService {
|
|
68
69
|
async getImage(file, pageNumber, retry = true) {
|
|
69
70
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
@@ -142,7 +143,25 @@ let ImageConverterService = class ImageConverterService {
|
|
|
142
143
|
__disposeResources(env_1);
|
|
143
144
|
}
|
|
144
145
|
}
|
|
145
|
-
async transform(type, file, outputFileName = "file.jpg") {
|
|
146
|
+
async transform(type, file, outputFileName = "file.jpg", retry = true) {
|
|
147
|
+
try {
|
|
148
|
+
return await this.transformInternal(type, file, outputFileName);
|
|
149
|
+
}
|
|
150
|
+
catch (error) {
|
|
151
|
+
if (error.toString().includes("No decoding plugin")) {
|
|
152
|
+
if (retry) {
|
|
153
|
+
// we will use vips to convert file to jpg
|
|
154
|
+
const { name } = parse(file.fileName);
|
|
155
|
+
const output = await this.tempFileService.createTempFile(".png", name, "image/png");
|
|
156
|
+
const modulePath = fileURLToPath(import.meta.resolve("./external/convert-heic.js"));
|
|
157
|
+
await spawnPromise(process.execPath, [modulePath], { env: { FILE_IN: file.path, FILE_OUT: output.path } });
|
|
158
|
+
return await this.transform(type, output, outputFileName, false);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
throw error;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
async transformInternal(type, file, outputFileName = "file.jpg") {
|
|
146
165
|
let { ext } = parse(outputFileName);
|
|
147
166
|
let fileName = type;
|
|
148
167
|
const matches = type.match(/(\w+)\(([^\)]+)\)/);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageConverterService.js","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,UAAU,MAAM,qDAAqD,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,eAAe,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"ImageConverterService.js","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"convert-heic.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/image-converter/external/convert-heic.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import { readFile, writeFile } from "fs/promises";
|
|
3
|
+
import convert from "heic-convert";
|
|
4
|
+
try {
|
|
5
|
+
const output = await convert({
|
|
6
|
+
buffer: await readFile(process.env.FILE_IN),
|
|
7
|
+
format: "PNG"
|
|
8
|
+
});
|
|
9
|
+
await writeFile(process.env.FILE_OUT, output);
|
|
10
|
+
}
|
|
11
|
+
catch (error) {
|
|
12
|
+
console.error(error);
|
|
13
|
+
process.exit(1);
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=convert-heic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"convert-heic.js","sourceRoot":"","sources":["../../../../../src/server/services/image-converter/external/convert-heic.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,IAAI,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;QACzB,MAAM,EAAE,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC3C,MAAM,EAAE,KAAK;KAChB,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAElD,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACb,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC"}
|