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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.72",
+  "version": "1.5.73",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/common/ImagesFolder.ts

@@ -2,19 +2,23 @@ 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),
-    localFile: (name: string) => new LocalFile(join(contentFolder, name), name.split("/").pop(), void 0, () => void 0)
-};
+    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/`;
 
@@ -81,12 +80,8 @@ export default class ImageConverterService {
                 }
             }
 
-            if (!existsSync(outputFile.path)) {
-                // copy protected.pdf
-                if (retry) {
-                    const src = ContentFolder.localFile("pdf/protected.pdf");
-                    return await this.getImage(src, pageNumber, false);
-                }
+            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);