@social-mail/social-mail-web-server 1.8.371 → 1.8.373

package/package.json

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

package/src/WebServer.ts

@@ -228,6 +228,10 @@ export default class WebServer {
             return server;
         } catch (error) {
             console.error(error);
+            // if create fails...
+            // we need to kill the current process
+            // we will throw this error again
+            throw error;
         }
     }
 

package/src/common/globalEnv.ts

@@ -44,7 +44,10 @@ export const globalEnv = {
     ips: (process.env.SOCIAL_MAIL_IPS ?? "").split(",").map((x) => x.trim()).filter((x) => x),
     senderEmailForNotification: process.env.SOCIAL_MAIL_SENDER_EMAIL_FOR_NOTIFICATION,
     cdn,
-    cdnOrHost: cdn ?? host,
+    hosts:{
+        cdnOrHost: cdn ?? host,
+        emailContentHost: process.env.SOCIAL_MAIL_HOSTS_EMAIL_CONTENT || ""
+    },
     path: process.env.SOCIAL_MAIL_PATH || "/",
     links: {
         login: process.env.SOCIAL_MAIL_LINKS_LOGIN || process.env.SOCIAL_MAIL_EXTERNAL_LOGIN,

package/src/server/services/channels/ChannelUrlService.ts

@@ -28,7 +28,7 @@ export default class ChannelUrlService {
         eDomain
     }: IFileUrlOptions): string {
         const cid = this.ecs.general.encrypt(file.fileContentID.toString());
-        return `https://${globalEnv.cdnOrHost}/social-mail/video-player/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
+        return `https://${globalEnv.hosts.cdnOrHost}/social-mail/video-player/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
     }
 
     toWebMUrl({
@@ -38,7 +38,7 @@ export default class ChannelUrlService {
     }: IFileUrlOptions): string {
         const cid = this.ecs.general.encrypt(file.fileContentID.toString());
         if (eDomain) {
-            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
+            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/webm-branded/${cid}/${file.name}.b1.webm`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);
@@ -78,7 +78,7 @@ export default class ChannelUrlService {
             name = `${file.name}.i1-${ext}`;
         }
         if (eDomain) {
-            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
+            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);
@@ -98,7 +98,7 @@ export default class ChannelUrlService {
         const method = "view";
         const name = file.name;
         if(eDomain) {
-            return `https://${globalEnv.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
+            return `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/e/${eDomain}/${method}/${cid}/${name}`;
         }
         if (publicRead) {
             this.ss.injectPublicKey(file);

package/src/server/smtp/services/CachedEmailService.ts

@@ -10,6 +10,7 @@ import EmailLogService from "../../services/email-logs/EmailLogService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import BlogContentTransformer from "../../services/dom/BlogContentTransformer.js";
+import { globalEnv } from "../../../common/globalEnv.js";
 
 @RegisterScoped
 export default class CachedEmailService {
@@ -69,12 +70,16 @@ export default class CachedEmailService {
             }
             const htmlService = ServiceProvider.resolve(this, BlogContentTransformer);
             if (status !== "draft") {
+                const { emailContentHost } = globalEnv.hosts;
+                const prefix = emailContentHost
+                    ? `/api/emails/d/${ei}/${emailID}/`
+                    : `https://${emailContentHost}/api/emails/d/${ei}/${emailID}/`;
                 html = await htmlService.sanitizeExternalResources({
                     html,
                     emailID,
                     messageID: void 0,
                     senderDomain,
-                    prefix: `/api/emails/d/${ei}/${emailID}/`,
+                    prefix,
                     blog
                 });
             }

package/src/server/storage/LockFile.ts

@@ -4,6 +4,7 @@ import { existsSync, mkdirSync, unlinkSync, statSync, utimesSync, writeFileSync
 import { createHash } from "node:crypto";
 import sleep from "../../common/sleep.js";
 import { globalEnv } from "../../common/globalEnv.js";
+import TimeoutError from "../../common/errors/TimeoutError.js";
 
 const tmpdir = globalEnv.tmpDir;
 
@@ -56,7 +57,8 @@ export default class LockFile implements Disposable {
         }while(now < till);
 
         if (throwOnFail) {
-            throw new Error(`Could not acquire lock ${lastError?.stack ?? lastError?.toString()}`);
+            lastError ??= new TimeoutError("lock timed out");
+            throw new Error(`Could not acquire lock ${lockFile}, Reason: ${lastError?.stack ?? lastError?.toString()}`);
         }
 
         return {

package/src/server/workflows/smtp/MailDispatcherService.ts

@@ -109,9 +109,9 @@ export default class MailDispatcherService {
 
                 const downloadLink = /^video\//i.test(ea.contentType)
                     ? (listID
-                        ? `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/webm-branded/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`
-                        : `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/webm/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`)
-                    : `https://${globalEnv.cdnOrHost}/social-mail/c/d/${domainName}/view/${postID}/${ea.appFileID}/2-${fileName}`;
+                        ? `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/webm-branded/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`
+                        : `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/webm/${postID}/${ea.appFileID}/2-${fileName}/${fileName}.3.webm`)
+                    : `https://${globalEnv.hosts.cdnOrHost}/social-mail/c/d/${domainName}/view/${postID}/${ea.appFileID}/2-${fileName}`;
 
                 return {
                     content: downloadLink,