@social-mail/social-mail-web-server 1.4.747 → 1.4.748
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 +1 -1
- package/dist/server/services/image-converter/ImageConverterService.d.ts.map +1 -1
- package/dist/server/services/image-converter/ImageConverterService.js +9 -4
- package/dist/server/services/image-converter/ImageConverterService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/services/image-converter/ImageConverterService.ts +11 -5
|
@@ -2,7 +2,7 @@ import TempFileService from "../../storage/TempFileService.js";
|
|
|
2
2
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
3
3
|
export default class ImageConverterService {
|
|
4
4
|
tempFileService: TempFileService;
|
|
5
|
-
getImage(file: LocalFile): Promise<LocalFile>;
|
|
5
|
+
getImage(file: LocalFile, pageNumber?: any): Promise<LocalFile>;
|
|
6
6
|
transform(type: any, file: LocalFile, outputFileName?: string): Promise<LocalFile>;
|
|
7
7
|
}
|
|
8
8
|
//# 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;AAG/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAa/E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,eAAe,EAAE,eAAe,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"ImageConverterService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAa/E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,eAAe,EAAE,eAAe,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,KAAA;IAkErC,SAAS,CAAC,IAAI,KAAA,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,SAAa;CA+DrE"}
|
|
@@ -19,7 +19,7 @@ import ensureDir from "../../../common/FileApi.js";
|
|
|
19
19
|
const cachePath = `./data/img-cache/`;
|
|
20
20
|
ensureDir(cachePath);
|
|
21
21
|
let ImageConverterService = class ImageConverterService {
|
|
22
|
-
async getImage(file) {
|
|
22
|
+
async getImage(file, pageNumber) {
|
|
23
23
|
let outputFile;
|
|
24
24
|
let folder;
|
|
25
25
|
let copy;
|
|
@@ -46,12 +46,17 @@ let ImageConverterService = class ImageConverterService {
|
|
|
46
46
|
return outputFile;
|
|
47
47
|
}
|
|
48
48
|
if (/pdf/i.test(file.contentType)) {
|
|
49
|
-
|
|
49
|
+
const args = [
|
|
50
50
|
"-singlefile",
|
|
51
51
|
"-png",
|
|
52
52
|
copy.path,
|
|
53
53
|
"png"
|
|
54
|
-
]
|
|
54
|
+
];
|
|
55
|
+
if (pageNumber) {
|
|
56
|
+
args.push("-f");
|
|
57
|
+
args.push(Number(pageNumber).toString());
|
|
58
|
+
}
|
|
59
|
+
await spawnPromise("pdftoppm", args, {
|
|
55
60
|
cwd: folder.folder
|
|
56
61
|
});
|
|
57
62
|
const isPng = /\.png$/i;
|
|
@@ -68,7 +73,6 @@ let ImageConverterService = class ImageConverterService {
|
|
|
68
73
|
return outputFile;
|
|
69
74
|
}
|
|
70
75
|
async transform(type, file, outputFileName = "file.jpg") {
|
|
71
|
-
file = await this.getImage(file);
|
|
72
76
|
let { ext } = parse(outputFileName);
|
|
73
77
|
let fileName = type;
|
|
74
78
|
const matches = type.match(/(\w+)\(([^\)]+)\)/);
|
|
@@ -99,6 +103,7 @@ let ImageConverterService = class ImageConverterService {
|
|
|
99
103
|
break;
|
|
100
104
|
}
|
|
101
105
|
}
|
|
106
|
+
file = await this.getImage(file, args?.[2] ?? void 0);
|
|
102
107
|
const { default: fx } = await import("./formats/" + fileName + ".js");
|
|
103
108
|
let r = await fx(file, ...args);
|
|
104
109
|
switch (ext) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageConverterService.js","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/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,SAAS,MAAM,4BAA4B,CAAC;AAEnD,MAAM,SAAS,GAAG,mBAAmB,CAAC;AAEtC,SAAS,CAAC,SAAS,CAAC,CAAC;AAGN,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAKtC,KAAK,CAAC,QAAQ,CAAC,IAAe;
|
|
1
|
+
{"version":3,"file":"ImageConverterService.js","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"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"}
|