@social-mail/social-mail-web-server 1.5.71 → 1.5.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.71",
+  "version": "1.5.73",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.25.0",
     "@entity-access/entity-access": "^1.0.360",
-    "@entity-access/server-pages": "^1.1.282",
+    "@entity-access/server-pages": "^1.1.289",
     "@otplib/preset-v11": "^12.0.1",
     "@social-mail/noto-emoji-svg": "^2.0.42",
     "@social-mail/shared": "^1.0.11",

package/src/common/ImagesFolder.ts

@@ -1,18 +1,24 @@
+import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 
-const metaDir = dirname(import.meta.url);
-const folder = join(fileURLToPath(metaDir), "..", "..", "images");
+const metaDir = fileURLToPath(dirname(import.meta.url));
 
-export const ImagesFolder = {
-    folder,
-    file: (name) =>
-        join(folder, name)
-};
+class PackageFolder {
+    constructor(public readonly folder: string) {
 
+    }
 
-const contentFolder = join(fileURLToPath(metaDir), "..", "..", "content");
-export const ContentFolder = {
-    folder: contentFolder,
-    file: (name) => join(contentFolder, name)
-};
+    file(... names) {
+        return join(this.folder, ... names);
+    }
+
+    localFile(... names) {
+        const path= join(this.folder, ... names);
+        return new LocalFile(path, names.pop(), void 0, () => void 0);
+    }
+}
+
+export const ImagesFolder = new PackageFolder(join(metaDir, "..", "..", "images"));
+
+export const contentFolder = new PackageFolder(join(metaDir, "..", "..", "content"));

package/src/server/services/image-converter/ImageConverterService.ts

@@ -9,8 +9,7 @@ import { spawnPromise } from "../../../common/spawnPromise.js";
 import { copyFile, readdir } from "fs/promises";
 import FFCommand from "../convert/FFCommand.js";
 import ensureDir from "../../../common/FileApi.js";
-import { existsSync } from "fs";
-import { ContentFolder } from "../../../common/ImagesFolder.js";
+import { ImagesFolder } from "../../../common/ImagesFolder.js";
 
 const cachePath = `./data/img-cache/`;
 
@@ -22,17 +21,16 @@ export default class ImageConverterService {
     @Inject
     tempFileService: TempFileService;
 
-    async getImage(file: LocalFile, pageNumber?) {
+    async getImage(file: LocalFile, pageNumber?, retry = true) {
 
         let outputFile: LocalFile;
-        let folder: TempFolder;
         let copy: LocalFile;
 
         if (/^image\//.test(file.contentType)) {
 
             if (/\.bmp$/i.test(file.fileName)) {
-                folder = new TempFolder();
-                copy = folder.get(file.fileName, file.contentType);
+                using f1 = new TempFolder();
+                copy = await f1.copy(file.fileName, file, file.contentType);
                 outputFile = await this.tempFileService.createTempFile(".bmp", "bmp", "image/bmp");
                 await spawnPromise("convert", [
                     copy.path,
@@ -45,10 +43,9 @@ export default class ImageConverterService {
         }
 
 
-        folder = new TempFolder();
-        copy = folder.get(file.fileName, file.contentType);
+        using folder = new TempFolder();
+        copy = await folder.copy(file.fileName, file, file.contentType);
         outputFile = await this.tempFileService.createTempFile(".png", "png", "image/png");
-        await file.copyTo(copy);
 
         if (/^video\//.test(file.contentType)) {
             // this is a video..
@@ -68,6 +65,7 @@ export default class ImageConverterService {
                 args.push("-f");
                 args.push(Number(pageNumber).toString());
             }
+
             await spawnPromise("pdftoppm", args, {
                 cwd: folder.folder
             });
@@ -75,18 +73,15 @@ export default class ImageConverterService {
             const isPng = /\.png$/i;
 
             for (const child of await readdir(folder.folder, { withFileTypes: true})) {
-                const output = join(child.path, child.name);
+                const output = join(child.parentPath, child.name);
                 if (isPng.test(child.name)) {
                     await copyFile(output, outputFile.path);
                     return outputFile;
                 }
             }
 
-            if (!existsSync(outputFile.path)) {
-                // copy protected.pdf
-                const src = ContentFolder.file("pdf/protected.pdf");
-                await copyFile(src, outputFile.path);
-                return outputFile;
+            if (!outputFile.exists) {
+                return ImagesFolder.localFile("png", "protected.png");
             }
         }
 
@@ -129,6 +124,9 @@ export default class ImageConverterService {
         }
 
         file = await this.getImage(file, args?.[2] ?? void 0);
+        if (!file.exists) {
+            file = ImagesFolder.localFile("png", "unavailable.png");
+        }
 
         const { default: fx } = await import("./formats/" + fileName + ".js");
         let r: sharp.Sharp = await fx(file, ... args);