@social-mail/social-mail-web-server 1.8.552 → 1.9.2

package/Test.Dockerfile

@@ -1,27 +1,31 @@
-# Version 2
-FROM neurospeech/social-mail-base-community:dev
+# Version 1
+FROM node:24-alpine
+RUN apk add --no-cache tini
+RUN apk add --no-cache openssl
+RUN apk add 7zip
+RUN apk update \
+    && apk add \
+        bind \
+        bind-tools \
+        bind-dnssec-tools
 
 VOLUME /var/lib/clamav
 VOLUME /data
 VOLUME /cache
-WORKDIR /app
 
+ENV FILE_CONVERSION_SERVER_PORT=/fcs/sockets/fcs.sock
 ENV HOST=0.0.0.0
 ENV SELF_HOST=true
-
 EXPOSE 80 443 25
-EXPOSE 9090
 ENTRYPOINT ["/sbin/tini", "--", "npm", "run", "dev"]
 
-COPY package*.json ./
+WORKDIR /app
+
 COPY index.js ./
 COPY dev.js ./
-COPY test-fetch.js ./
 COPY images ./images
 COPY content ./content
+COPY package*.json ./
 RUN npm install --omit=dev
-RUN npm install --include=optional sharp
 COPY src ./src
 COPY dist ./dist
-
-# ENTRYPOINT ["/sbin/tini", "--", "npm", "start"]

package/dist/common/globalEnv.d.ts

@@ -24,6 +24,10 @@ export declare const globalEnv: {
         letsEncryptPrefix: string;
         ns: string[];
     };
+    fcs: {
+        port: string;
+        host: any;
+    };
     altHosts: string[];
     wildcardDomain: string;
     name: string;

package/dist/common/globalEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BlB,4EAA4E;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2B1B,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyF7F,CAAC;AAeF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}
+{"version":3,"file":"globalEnv.d.ts","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkClB,4EAA4E;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2B1B,aAAa,GAAG,YAAY,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyF7F,CAAC;AAeF,eAAO,MAAM,OAAO,QACR,MAAM,WACQ,CAAC"}

package/dist/common/globalEnv.js

@@ -53,6 +53,10 @@ export const globalEnv = {
         letsEncryptPrefix: process.env.SOCIAL_MAIL_DNS_LE_PREFIX,
         ns: (process.env.SOCIAL_MAIL_DNS_NS || "ns1,ns2").split(/[\s\,\;]/g).map((x) => x.trim()).filter((x) => x),
     },
+    fcs: {
+        port: process.env.FILE_CONVERSION_SERVER_PORT,
+        host: null,
+    },
     altHosts: (process.env.SOCIAL_MAIL_ALT_HOSTS || "").split(","),
     wildcardDomain: process.env.SOCIAL_MAIL_WILDCARD_DOMAIN,
     name: process.env.SOCIAL_MAIL_NAME || "Social Mail",

package/dist/common/globalEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}

package/dist/server/services/captcha/CaptchaService.d.ts

@@ -2,7 +2,7 @@ import VerificationToken from "../../model/entities/VerificationToken.js";
 export default class CaptchaService {
     private diskCache;
     private db;
-    private tfs;
+    private fcs;
     private ss;
     verify(v: VerificationToken): Promise<boolean>;
     delete(v: VerificationToken): Promise<boolean>;
@@ -11,6 +11,5 @@ export default class CaptchaService {
         accessCode: `${string}-${string}-${string}-${string}-${string}`;
     }>;
     getVideo(code: string): Promise<import("@entity-access/server-pages/dist/core/LocalFile.js").LocalFile>;
-    prepareVideo(code: string, saveAs: string): Promise<void>;
 }
 //# sourceMappingURL=CaptchaService.d.ts.map

package/dist/server/services/captcha/CaptchaService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CaptchaService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"AAWA,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAwB1E,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,OAAO,CAAC,SAAS,CAKb;IAGJ,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,EAAE,CAAkB;IAEtB,MAAM,CAAC,CAAC,EAAE,iBAAiB;IAc3B,MAAM,CAAC,CAAC,EAAE,iBAAiB;IAM3B,YAAY,CAAC,EAAE,SAAK;;;;IAkBpB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CA8BlD"}
+{"version":3,"file":"CaptchaService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"AASA,OAAO,iBAAiB,MAAM,2CAA2C,CAAC;AAW1E,MAAM,CAAC,OAAO,OAAO,cAAc;IAE/B,OAAO,CAAC,SAAS,CAKb;IAGJ,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAwB;IAGnC,OAAO,CAAC,EAAE,CAAkB;IAEtB,MAAM,CAAC,CAAC,EAAE,iBAAiB;IAc3B,MAAM,CAAC,CAAC,EAAE,iBAAiB;IAM3B,YAAY,CAAC,EAAE,SAAK;;;;IAkBpB,QAAQ,CAAC,IAAI,EAAE,MAAM;CAI9B"}

package/dist/server/services/captcha/CaptchaService.js

@@ -11,29 +11,17 @@ import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import ensureDir from "../../../common/FileApi.js";
-import { spawnPromise } from "../../../common/spawnPromise.js";
-import TempFileService from "../../storage/TempFileService.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import { randomUUID } from "crypto";
 import BaseDiskCache from "../../../common/BaseDiskCache.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import FileSize from "../../../common/FileSize.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
+import FileConversionService from "../convert/FileConversionService.js";
 const captchaCache = "/cache/captcha";
 ensureDir(captchaCache);
 const tempSize = FileSize.parse(globalEnv.tmpSize);
 const minSize = tempSize / 2;
-const zero = '0'.charCodeAt(0);
-const filter = "[0]pad=width=750:height=200:x=0:y=0:color=white[v0];"
-    + "[0][1]hstack=inputs=2[i1];"
-    + "[i1]pad=width=750:height=200:x=0:y=0:color=white[v1];"
-    + "[0][1][2]hstack=inputs=3[i2];"
-    + "[i2]pad=width=750:height=200:x=0:y=0:color=white[v2];"
-    + "[0][1][2][3]hstack=inputs=4[i3];"
-    + "[i3]pad=width=750:height=200:x=0:y=0:color=white[v3];"
-    + "[0][1][2][3][4]hstack=inputs=5[i4];"
-    + "[i4]pad=width=750:height=200:x=0:y=0:color=white[v4];"
-    + "[v0][v1][v2][v3][v4]concat=n=5:v=1,format=yuv420p[v]";
 let CaptchaService = class CaptchaService {
     constructor() {
         this.diskCache = new BaseDiskCache({
@@ -76,32 +64,7 @@ let CaptchaService = class CaptchaService {
         return { id: v.verificationID, accessCode };
     }
     async getVideo(code) {
-        return this.diskCache.getOrCreateAsync(code + ".gif", (cf) => this.prepareVideo(code, cf.path));
-    }
-    async prepareVideo(code, saveAs) {
-        const tf = await this.tfs.createTempFile(".webm", "code", "video/webm");
-        const input = "/app/content/video/all.webm";
-        await spawnPromise("/ffmpeg/ffmpeg", [
-            "-ss", ((code.charCodeAt(0) - zero) * 3.5).toString(), "-t", "3.5", "-i", input,
-            "-ss", ((code.charCodeAt(1) - zero) * 3.5).toString(), "-t", "3.5", "-i", input,
-            "-ss", ((code.charCodeAt(2) - zero) * 3.5).toString(), "-t", "3.5", "-i", input,
-            "-ss", ((code.charCodeAt(3) - zero) * 3.5).toString(), "-t", "3.5", "-i", input,
-            "-ss", ((code.charCodeAt(4) - zero) * 3.5).toString(), "-t", "3.5", "-i", input,
-            "-filter_complex", filter,
-            "-map", "[v]",
-            "-y", tf.path
-        ], {
-            logData: false,
-            logCommand: false,
-        });
-        await spawnPromise("/ffmpeg/ffmpeg", [
-            "-i", tf.path,
-            "-filter:v", "scale=300:-1",
-            "-y", saveAs
-        ], {
-            logData: false,
-            logCommand: false,
-        });
+        return this.diskCache.getOrCreateAsync(code + ".gif", (cf) => void this.fcs.generateCaptcha(code, cf));
     }
 };
 __decorate([
@@ -110,8 +73,8 @@ __decorate([
 ], CaptchaService.prototype, "db", void 0);
 __decorate([
     Inject,
-    __metadata("design:type", TempFileService)
-], CaptchaService.prototype, "tfs", void 0);
+    __metadata("design:type", FileConversionService)
+], CaptchaService.prototype, "fcs", void 0);
 __decorate([
     Inject,
     __metadata("design:type", SessionSecurity)

package/dist/server/services/captcha/CaptchaService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptchaService.js","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CaptchaService.js","sourceRoot":"","sources":["../../../../src/server/services/captcha/CaptchaService.ts"],"names":[],"mappings":"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"}

package/dist/server/services/convert/FileConversionService.d.ts

@@ -11,12 +11,14 @@ interface IDownloadConvertedFile {
 export default class FileConversionService {
     private tempFileService;
     private cacheService;
+    transform(type: string, source: LocalFile, { fileName, ...extra }?: {
+        fileName?: any;
+    }): Promise<LocalFile>;
+    extractText(source: LocalFile): Promise<LocalFile>;
+    generateCaptcha(code: string, saveAs?: LocalFile): Promise<LocalFile>;
+    copyToFCS(src: LocalFile): Promise<LocalFile>;
     downloadConvertedFile({ appFile, fileContentID, type, fileName, key, senderDomain }: IDownloadConvertedFile): Promise<LocalFile>;
     downloadFileContent(appFile: AppFile, fileContentID?: number): Promise<LocalFile>;
-    pdf(file: LocalFile): Promise<LocalFile>;
-    html(file: LocalFile): Promise<LocalFile>;
-    webm(file: LocalFile): Promise<LocalFile>;
-    webmBranded(file: LocalFile, senderDomain: any): Promise<LocalFile>;
 }
 export {};
 //# sourceMappingURL=FileConversionService.d.ts.map

package/dist/server/services/convert/FileConversionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAUtD,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;IAE7B,qBAAqB,CAAC,EACxB,OAAO,EACP,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,GAA2E,EAC3E,YAAY,EACf,EAAE,sBAAsB,GAAI,OAAO,CAAC,SAAS,CAAC;IAyDzC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM;IAe5D,GAAG,CAAC,IAAI,EAAE,SAAS;IAUnB,IAAI,CAAC,IAAI,EAAE,SAAS;IAiCpB,IAAI,CAAC,IAAI,EAAE,SAAS;IAWpB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,KAAA;CAclD"}
+{"version":3,"file":"FileConversionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAatD,UAAU,sBAAsB;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAiCD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAGtC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,YAAY,CAAe;IAE7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,QAAiB,EAAE,GAAI,KAAK,EAAE;;KAAK;IAYhF,WAAW,CAAC,MAAM,EAAE,SAAS;IAU7B,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS;IAQhD,SAAS,CAAC,GAAG,EAAE,SAAS;IAUxB,qBAAqB,CAAC,EACxB,OAAO,EACP,aAAa,EACb,IAAI,EACJ,QAAQ,EACR,GAA2E,EAC3E,YAAY,EACf,EAAE,sBAAsB,GAAI,OAAO,CAAC,SAAS,CAAC;IAoCzC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,MAAM;CAerE"}

package/dist/server/services/convert/FileConversionService.js

@@ -59,105 +59,143 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+/* eslint-disable no-console */
 import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import TempFileService from "../../storage/TempFileService.js";
-import { Convert } from "./Convert.js";
-import FFCommand from "./FFCommand.js";
+import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
 import CacheService from "../cache/CacheService.js";
-import ImageConverterService from "../image-converter/ImageConverterService.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import StringFormat from "../../../common/StringFormat.js";
 import { globalEnv } from "../../../common/globalEnv.js";
-import PdfDoc from "../extract/pdf/PdfDoc.js";
 import LockFile from "../../storage/LockFile.js";
+import ensureDir from "../../../common/FileApi.js";
+import { join, parse } from "path";
+import { rmdir, unlink } from "fs/promises";
+import { randomBytes } from "crypto";
+import { fetch, Agent } from "undici";
+import { connect } from "net";
+const newID = () => randomBytes(8).readBigUInt64BE().toString(36);
+const connectArgs = {};
+let port = globalEnv.fcs.port;
+if (/^\d+$/i.test(port)) {
+    port = Number(port);
+    connectArgs.port = port;
+    connectArgs.host = globalEnv.fcs.host;
+}
+else {
+    connectArgs.path = port;
+}
+const dispatcher = new Agent({
+    connect: (options, callback) => {
+        try {
+            const s = connect(connectArgs, () => callback(null, s));
+            s.on("error", (e) => {
+                if (e.name !== "InformationalError") {
+                    console.error(e);
+                }
+                callback(e, null);
+            });
+        }
+        catch (error) {
+            callback(error, null);
+        }
+    }
+});
 let FileConversionService = class FileConversionService {
+    async transform(type, source, { fileName = void 0, ...extra } = {}) {
+        const env_1 = { stack: [], error: void 0, hasError: false };
+        try {
+            const fcsSource = __addDisposableResource(env_1, await this.copyToFCS(source), true);
+            const u = new URL(`http://localhost/convert/${type}/${source.fileName}`);
+            u.searchParams.set("filePath", fcsSource.path);
+            const rs = await fetch(u, { dispatcher });
+            fileName ??= source.fileName;
+            const { ext, base } = parse(fileName);
+            const tf = await this.tempFileService.createTempFile(ext, base, source.contentType);
+            await tf.writeAll(rs.body);
+            return tf;
+        }
+        catch (e_1) {
+            env_1.error = e_1;
+            env_1.hasError = true;
+        }
+        finally {
+            const result_1 = __disposeResources(env_1);
+            if (result_1)
+                await result_1;
+        }
+    }
+    async extractText(source) {
+        const env_2 = { stack: [], error: void 0, hasError: false };
+        try {
+            const fcsSource = __addDisposableResource(env_2, await this.copyToFCS(source), true);
+            const u = new URL(`http://localhost/extract/text/${source.fileName}`);
+            u.searchParams.set("filePath", fcsSource.path);
+            const rs = await fetch(u, { dispatcher });
+            const tf = await this.tempFileService.createTempFile(".txt", "ouput.txt", "text/plain");
+            await tf.writeAll(rs.body);
+            return tf;
+        }
+        catch (e_2) {
+            env_2.error = e_2;
+            env_2.hasError = true;
+        }
+        finally {
+            const result_2 = __disposeResources(env_2);
+            if (result_2)
+                await result_2;
+        }
+    }
+    async generateCaptcha(code, saveAs) {
+        const u = new URL(`http://localhost/captcha/v1/${code}`);
+        const rs = await fetch(u, { dispatcher });
+        saveAs ??= await this.tempFileService.createTempFile(".gif", "code.gif", "image/gif");
+        await saveAs.writeAll(rs.body);
+        return saveAs;
+    }
+    async copyToFCS(src) {
+        const name = src.fileName;
+        const folder = join("/fcs/cache/" + Date.now().toString(36) + "-" + newID());
+        ensureDir(folder);
+        const fp = join(folder, name);
+        const f = new LocalFile(fp, name, void 0, () => unlink(fp).then(() => rmdir(folder), console.error).catch(console.error));
+        await src.copyTo(f);
+        return f;
+    }
     async downloadConvertedFile({ appFile, fileContentID, type, fileName, key = `/file/${type}/${fileContentID ?? appFile.fileContentID}/${fileName}`, senderDomain }) {
-        let file;
         const ttl = TimeSpan.fromDays(30);
+        let lockFileName = null;
         // transform here...
         if (/^(size|jpg|png|webp|gif|face\-circle)\(?/i.test(type)) {
-            return await this.cacheService.get({ key, ttl,
-                factory: async () => {
-                    const env_1 = { stack: [], error: void 0, hasError: false };
-                    try {
-                        file = await this.downloadFileContent(appFile, fileContentID);
-                        const _fl = __addDisposableResource(env_1, await LockFile.lock(`${globalEnv.serverID}-${process.pid}-img`), false);
-                        // resize...
-                        const ics = ServiceProvider.resolve(this, ImageConverterService);
-                        return await ics.transform(type, file, fileName);
-                    }
-                    catch (e_1) {
-                        env_1.error = e_1;
-                        env_1.hasError = true;
-                    }
-                    finally {
-                        __disposeResources(env_1);
-                    }
-                }
-            });
+            lockFileName = `${globalEnv.serverID}-img`;
         }
         if (/^webm\-branded?$/i.test(type)) {
-            return await this.cacheService.get({ key, ttl,
-                factory: async () => {
-                    const env_2 = { stack: [], error: void 0, hasError: false };
-                    try {
-                        file = await this.downloadFileContent(appFile, fileContentID);
-                        const _fl = __addDisposableResource(env_2, await LockFile.lock(`${globalEnv.serverID}-video`), false);
-                        const ics = this;
-                        return await ics.webmBranded(file, senderDomain);
-                    }
-                    catch (e_2) {
-                        env_2.error = e_2;
-                        env_2.hasError = true;
-                    }
-                    finally {
-                        __disposeResources(env_2);
-                    }
-                }
-            });
+            lockFileName = `${globalEnv.serverID}-video`;
         }
         if (/^webm/i.test(type)) {
-            return await this.cacheService.get({ key, ttl,
-                factory: async () => {
-                    const env_3 = { stack: [], error: void 0, hasError: false };
-                    try {
-                        file = await this.downloadFileContent(appFile, fileContentID);
-                        const _fl = __addDisposableResource(env_3, await LockFile.lock(`${globalEnv.serverID}-video`), false);
-                        const ics = this;
-                        return await ics.webm(file);
-                    }
-                    catch (e_3) {
-                        env_3.error = e_3;
-                        env_3.hasError = true;
-                    }
-                    finally {
-                        __disposeResources(env_3);
-                    }
-                }
-            });
+            lockFileName = `${globalEnv.serverID}-video`;
         }
         if (/^(pdf|html)$/i.test(type)) {
-            return await this.cacheService.get({ key, ttl,
-                factory: async () => {
-                    const env_4 = { stack: [], error: void 0, hasError: false };
-                    try {
-                        file = await this.downloadFileContent(appFile, fileContentID);
-                        const _fl = __addDisposableResource(env_4, await LockFile.lock(`${globalEnv.serverID}-doc`), false);
-                        const ics = this;
-                        return await ics[StringFormat.toCamelCase(type)](file, fileName);
-                    }
-                    catch (e_4) {
-                        env_4.error = e_4;
-                        env_4.hasError = true;
-                    }
-                    finally {
-                        __disposeResources(env_4);
-                    }
-                }
-            });
+            lockFileName = `${globalEnv.serverID}-doc`;
         }
-        return await this.downloadFileContent(appFile, fileContentID);
+        if (!lockFileName) {
+            return await this.downloadFileContent(appFile, fileContentID);
+        }
+        return await this.cacheService.get({ key, ttl, factory: async () => {
+                const env_3 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const f = await this.downloadFileContent(appFile);
+                    const _ = __addDisposableResource(env_3, await LockFile.lock(lockFileName), false);
+                    return await this.transform(type, f, { fileName });
+                }
+                catch (e_3) {
+                    env_3.error = e_3;
+                    env_3.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_3);
+                }
+            } });
     }
     async downloadFileContent(appFile, fileContentID) {
         if (!fileContentID || fileContentID === appFile.fileContentID) {
@@ -171,59 +209,6 @@ let FileConversionService = class FileConversionService {
             .firstOrFail();
         return this.tempFileService.downloadFileContent(fc, appFile);
     }
-    async pdf(file) {
-        if (/pdf/i.test(file.contentType) || /\.pdf$/i.test(file.fileName)) {
-            return file;
-        }
-        const output = await this.tempFileService.createTempFile(".pdf", file.fileName + ".pdf", "application/pdf");
-        await Convert.convert(file, "pdf", output.path);
-        return output;
-    }
-    async html(file) {
-        if (/html/i.test(file.contentType) || /\.html$/i.test(file.fileName)) {
-            return file;
-        }
-        const output = await this.tempFileService.createTempFile(".html", file.fileName + ".html", "text/html");
-        if (/text\//.test(file.contentType)) {
-            // display text inside pre
-            let html = await file.readAsText();
-            html = html.split("\n").join("\n</br>\n");
-            const text = `<!DOCTYPE html><html>
-                <body>
-                    <pre>${html}</pre>
-                </body>
-            </html>`;
-            await output.writeAllText(text);
-            return output;
-        }
-        if (/pdf/i.test(file.contentType) || /\.pdf$/i.test(file.fileName)) {
-            await PdfDoc.extractAsHtmlToFile(file, output);
-            return output;
-        }
-        await Convert.convert(file, "html", output.path);
-        return output;
-    }
-    async webm(file) {
-        if (!/^(video|audio)\//i.test(file.contentType)) {
-            throw new Error("Not an audio or video file");
-        }
-        if (/\.webm$/i.test(file.fileName)) {
-            return file;
-        }
-        const output = await this.tempFileService.createTempFile(".webm", file.fileName + ".webm", "video/webm");
-        return FFCommand.webm(file, output);
-    }
-    async webmBranded(file, senderDomain) {
-        const text = "https://" + senderDomain;
-        if (!/^(video|audio)\//i.test(file.contentType)) {
-            throw new Error("Not an audio or video file");
-        }
-        if (/\.webm$/i.test(file.fileName)) {
-            return file;
-        }
-        const output = await this.tempFileService.createTempFile(".webm", file.fileName + ".webm", "video/webm");
-        return FFCommand.webmText(file, text, output);
-    }
 };
 __decorate([
     Inject,

package/dist/server/services/convert/FileConversionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileConversionService.js","sourceRoot":"","sources":["../../../../src/server/services/convert/FileConversionService.ts"],"names":[],"mappings":"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"}

package/dist/server/services/emails/IndexEmailService.d.ts

@@ -1,10 +1,10 @@
 import SocialMailContext from "../../model/SocialMailContext.js";
 import { Email } from "../../model/entities/Email.js";
-import TextExtractorService from "../extract/TextExtractorService.js";
 import TempFileService from "../../storage/TempFileService.js";
+import FileConversionService from "../convert/FileConversionService.js";
 export default class IndexEmailService {
     db: SocialMailContext;
-    te: TextExtractorService;
+    fcs: FileConversionService;
     tempFileService: TempFileService;
     indexEmail({ emailID, subject, textBody }: Partial<Email>): Promise<void>;
 }

package/dist/server/services/emails/IndexEmailService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IndexEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/emails/IndexEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,oBAAoB,MAAM,oCAAoC,CAAC;AACtE,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAG/D,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,EAAE,EAAE,oBAAoB,CAAC;IAGzB,eAAe,EAAE,eAAe,CAAC;IAE3B,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;CAkClE"}
+{"version":3,"file":"IndexEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/emails/IndexEmailService.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,qBAAqB,MAAM,qCAAqC,CAAC;AAGxE,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,qBAAqB,CAAC;IAG3B,eAAe,EAAE,eAAe,CAAC;IAE3B,UAAU,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;CAkClE"}