@social-mail/social-mail-web-server 1.5.72 → 1.5.73
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/common/ImagesFolder.d.ts +9 -9
- package/dist/common/ImagesFolder.d.ts.map +1 -1
- package/dist/common/ImagesFolder.js +15 -12
- package/dist/common/ImagesFolder.js.map +1 -1
- 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 +6 -8
- package/dist/server/services/image-converter/ImageConverterService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/images/png/protected.png +0 -0
- package/images/png/unavailable.png +0 -0
- package/package.json +1 -1
- package/src/common/ImagesFolder.ts +17 -13
- package/src/server/services/image-converter/ImageConverterService.ts +6 -8
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
|
-
|
|
3
|
-
folder: string;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
};
|
|
2
|
+
declare class PackageFolder {
|
|
3
|
+
readonly folder: string;
|
|
4
|
+
constructor(folder: string);
|
|
5
|
+
file(...names: any[]): string;
|
|
6
|
+
localFile(...names: any[]): LocalFile;
|
|
7
|
+
}
|
|
8
|
+
export declare const ImagesFolder: PackageFolder;
|
|
9
|
+
export declare const contentFolder: PackageFolder;
|
|
10
|
+
export {};
|
|
11
11
|
//# sourceMappingURL=ImagesFolder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImagesFolder.d.ts","sourceRoot":"","sources":["../../src/common/ImagesFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;
|
|
1
|
+
{"version":3,"file":"ImagesFolder.d.ts","sourceRoot":"","sources":["../../src/common/ImagesFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAM/E,cAAM,aAAa;aACa,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAI1C,IAAI,CAAC,GAAI,KAAK,OAAA;IAId,SAAS,CAAC,GAAI,KAAK,OAAA;CAItB;AAED,eAAO,MAAM,YAAY,eAAyD,CAAC;AAEnF,eAAO,MAAM,aAAa,eAA0D,CAAC"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
1
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
2
|
import { dirname, join } from "path";
|
|
3
3
|
import { fileURLToPath } from "url";
|
|
4
|
-
const metaDir = dirname(import.meta.url);
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
4
|
+
const metaDir = fileURLToPath(dirname(import.meta.url));
|
|
5
|
+
class PackageFolder {
|
|
6
|
+
constructor(folder) {
|
|
7
|
+
this.folder = folder;
|
|
8
|
+
}
|
|
9
|
+
file(...names) {
|
|
10
|
+
return join(this.folder, ...names);
|
|
11
|
+
}
|
|
12
|
+
localFile(...names) {
|
|
13
|
+
const path = join(this.folder, ...names);
|
|
14
|
+
return new LocalFile(path, names.pop(), void 0, () => void 0);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export const ImagesFolder = new PackageFolder(join(metaDir, "..", "..", "images"));
|
|
18
|
+
export const contentFolder = new PackageFolder(join(metaDir, "..", "..", "content"));
|
|
16
19
|
//# sourceMappingURL=ImagesFolder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImagesFolder.js","sourceRoot":"","sources":["../../src/common/ImagesFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ImagesFolder.js","sourceRoot":"","sources":["../../src/common/ImagesFolder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAExD,MAAM,aAAa;IACf,YAA4B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAE1C,CAAC;IAED,IAAI,CAAC,GAAI,KAAK;QACV,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAI,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,CAAC,GAAI,KAAK;QACf,MAAM,IAAI,GAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAI,KAAK,CAAC,CAAC;QACzC,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAEnF,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC"}
|
|
@@ -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, pageNumber?: any, retry?: boolean):
|
|
5
|
+
getImage(file: LocalFile, pageNumber?: any, retry?: boolean): 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;
|
|
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;AAc/E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,eAAe,EAAE,eAAe,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC,KAAA,EAAE,KAAK,UAAO;IAqEnD,SAAS,CAAC,IAAI,KAAA,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,SAAa;CAkErE"}
|
|
@@ -63,8 +63,7 @@ import { spawnPromise } from "../../../common/spawnPromise.js";
|
|
|
63
63
|
import { copyFile, readdir } from "fs/promises";
|
|
64
64
|
import FFCommand from "../convert/FFCommand.js";
|
|
65
65
|
import ensureDir from "../../../common/FileApi.js";
|
|
66
|
-
import {
|
|
67
|
-
import { ContentFolder } from "../../../common/ImagesFolder.js";
|
|
66
|
+
import { ImagesFolder } from "../../../common/ImagesFolder.js";
|
|
68
67
|
const cachePath = `./data/img-cache/`;
|
|
69
68
|
ensureDir(cachePath);
|
|
70
69
|
let ImageConverterService = class ImageConverterService {
|
|
@@ -126,12 +125,8 @@ let ImageConverterService = class ImageConverterService {
|
|
|
126
125
|
return outputFile;
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
|
-
if (!
|
|
130
|
-
|
|
131
|
-
if (retry) {
|
|
132
|
-
const src = ContentFolder.localFile("pdf/protected.pdf");
|
|
133
|
-
return await this.getImage(src, pageNumber, false);
|
|
134
|
-
}
|
|
128
|
+
if (!outputFile.exists) {
|
|
129
|
+
return ImagesFolder.localFile("png", "protected.png");
|
|
135
130
|
}
|
|
136
131
|
}
|
|
137
132
|
// this is some kind of document??
|
|
@@ -178,6 +173,9 @@ let ImageConverterService = class ImageConverterService {
|
|
|
178
173
|
}
|
|
179
174
|
}
|
|
180
175
|
file = await this.getImage(file, args?.[2] ?? void 0);
|
|
176
|
+
if (!file.exists) {
|
|
177
|
+
file = ImagesFolder.localFile("png", "unavailable.png");
|
|
178
|
+
}
|
|
181
179
|
const { default: fx } = await import("./formats/" + fileName + ".js");
|
|
182
180
|
let r = await fx(file, ...args);
|
|
183
181
|
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;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ImageConverterService.js","sourceRoot":"","sources":["../../../../src/server/services/image-converter/ImageConverterService.ts"],"names":[],"mappings":"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"}
|