@social-mail/social-mail-web-server 1.16.52 → 1.16.53

package/dist/WebCluster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AAMtG,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC;WAEvD,KAAK,CAAC,GAAG,GAAE,OAAO,SAAqB;cAKrC,UAAU,CAAC,GAAG,EAAE,OAAO,SAAS;cAwBhC,SAAS,CAAC,GAAG,EAAE,OAAO,SAAS;CASlD"}
+{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AAQtG,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC;WAEvD,KAAK,CAAC,GAAG,GAAE,OAAO,SAAqB;cAKrC,UAAU,CAAC,GAAG,EAAE,OAAO,SAAS;cAwBhC,SAAS,CAAC,GAAG,EAAE,OAAO,SAAS;CAkBlD"}

package/dist/WebCluster.js

@@ -4,6 +4,8 @@ import WebServer from './WebServer.js';
 import ClusterInstance from "@entity-access/server-pages/dist/ClusterInstance.js";
 import { globalEnv } from './common/globalEnv.js';
 import SmtpReceiver from './SmtpReceiver.js';
+import { globalServices } from './globalServices.js';
+import CertificateFetcher from './server/smtp/CertificateFetcher.js';
 const numCPUs = globalEnv.numCPUs;
 export default class WebCluster extends ClusterInstance {
     static start(arg = WebServer) {
@@ -33,7 +35,15 @@ export default class WebCluster extends ClusterInstance {
         console.log(`Worker started`);
         const ws = new arg();
         await ws.create();
-        await SmtpReceiver.create({});
+        const fetcher = globalServices.resolve(CertificateFetcher);
+        await SmtpReceiver.create({
+            SNICallback: (servername, cb) => {
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                fetcher.getCert(servername).then((r) => {
+                    cb(null, r);
+                }, (error) => cb(error));
+            }
+        });
     }
 }
 //# sourceMappingURL=WebCluster.js.map

package/dist/WebCluster.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAE7C,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAiC;IAE9D,MAAM,CAAC,KAAK,CAAC,MAAwB,SAAS;QACjD,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,GAAqB;QAE5C,UAAU;QACV,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7B,OAAM,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,EAAsB,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,UAAU,CAAC,CAAC;YACnD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,CAAC;YAED,oBAAoB;YACpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;QACL,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,GAAqB;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAGlB,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;CAEJ"}
+{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,kBAAkB,MAAM,qCAAqC,CAAC;AAErE,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAiC;IAE9D,MAAM,CAAC,KAAK,CAAC,MAAwB,SAAS;QACjD,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,GAAqB;QAE5C,UAAU;QACV,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7B,OAAM,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,EAAsB,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,UAAU,CAAC,CAAC;YACnD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,CAAC;YAED,oBAAoB;YACpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;QACL,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,GAAqB;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAElB,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAG3D,MAAM,YAAY,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE;gBAC5B,mEAAmE;gBACnE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;oBACxC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChB,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7B,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;CAEJ"}

package/dist/server/smtp/CertificateFetcher.d.ts

@@ -0,0 +1,8 @@
+import { SecureContext } from "node:tls";
+import { ICacheContainer, ObjectCache } from "../../common/cacheFor.js";
+export default class CertificateFetcher implements ICacheContainer<CertificateFetcher> {
+    cache: ObjectCache<CertificateFetcher>;
+    getCert(servername: string): Promise<SecureContext>;
+    readFile(servername: string): Promise<SecureContext>;
+}
+//# sourceMappingURL=CertificateFetcher.d.ts.map

package/dist/server/smtp/CertificateFetcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CertificateFetcher.d.ts","sourceRoot":"","sources":["../../../src/server/smtp/CertificateFetcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMlF,MAAM,CAAC,OAAO,OAAO,kBAAmB,YAAW,eAAe,CAAC,kBAAkB,CAAC;IAElF,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAI1B,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAsB1D,QAAQ,CAAC,UAAU,EAAE,MAAM;CAYpC"}

package/dist/server/smtp/CertificateFetcher.js

@@ -0,0 +1,53 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { createSecureContext } from "node:tls";
+import { cacheFor } from "../../common/cacheFor.js";
+import sleep from "../../common/sleep.js";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+let CertificateFetcher = class CertificateFetcher {
+    async getCert(servername) {
+        if (!servername) {
+            throw new Error("Invalid domain name");
+        }
+        await fetch(`https://${servername}`);
+        for (let i = 0; i < 30; i++) {
+            await sleep(1000);
+            // check if we have certificate...
+            const context = await this.readFile(servername);
+            if (context) {
+                return context;
+            }
+        }
+        return null;
+    }
+    async readFile(servername) {
+        const certPath = `/cache/certs/${servername}/cert.pem`;
+        const keyPath = `/cache/certs/${servername}/key.pem`;
+        if (!existsSync(certPath) || !existsSync(keyPath)) {
+            return null;
+        }
+        const cert = await readFile(certPath, "utf-8");
+        const key = await readFile(certPath, "utf-8");
+        return createSecureContext({ cert, key });
+    }
+};
+__decorate([
+    cacheFor(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], CertificateFetcher.prototype, "getCert", null);
+CertificateFetcher = __decorate([
+    RegisterSingleton
+], CertificateFetcher);
+export default CertificateFetcher;
+//# sourceMappingURL=CertificateFetcher.js.map

package/dist/server/smtp/CertificateFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CertificateFetcher.js","sourceRoot":"","sources":["../../../src/server/smtp/CertificateFetcher.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAiB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAgC,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG7B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAMtB,AAAN,KAAK,CAAC,OAAO,CAAC,UAAkB;QAEnC,IAAG,CAAC,UAAU,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,KAAK,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;QAGrC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAElB,kCAAkC;YAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAChD,IAAG,OAAO,EAAE,CAAC;gBACT,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB;QAC7B,MAAM,QAAQ,GAAG,gBAAgB,UAAU,WAAW,CAAC;QACvD,MAAM,OAAO,GAAG,gBAAgB,UAAU,UAAU,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,mBAAmB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,CAAC;CAGJ,CAAA;AAlCgB;IADZ,QAAQ,EAAE;;;;iDAqBV;AA1BgB,kBAAkB;IADtC,iBAAiB;GACG,kBAAkB,CAwCtC;eAxCoB,kBAAkB"}

package/package.json

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

package/src/WebCluster.ts

@@ -4,6 +4,8 @@ import WebServer from './WebServer.js';
 import ClusterInstance, { RecycledWorker } from "@entity-access/server-pages/dist/ClusterInstance.js";
 import { globalEnv } from './common/globalEnv.js';
 import SmtpReceiver from './SmtpReceiver.js';
+import { globalServices } from './globalServices.js';
+import CertificateFetcher from './server/smtp/CertificateFetcher.js';
 
 const numCPUs = globalEnv.numCPUs;
 
@@ -43,8 +45,17 @@ export default class WebCluster extends ClusterInstance<typeof WebServer> {
         const ws = new arg();
         await ws.create();
 
+        const fetcher = globalServices.resolve(CertificateFetcher);
 
-        await SmtpReceiver.create({});
+
+        await SmtpReceiver.create({
+            SNICallback: (servername, cb) => {
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                fetcher.getCert(servername).then((r: any) => {
+                    cb(null, r);
+                }, (error) => cb(error));
+            }
+        });
     }
 
 }

package/src/server/smtp/CertificateFetcher.ts

@@ -0,0 +1,49 @@
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { createSecureContext, SecureContext } from "node:tls";
+import { cacheFor, ICacheContainer, ObjectCache } from "../../common/cacheFor.js";
+import sleep from "../../common/sleep.js";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+
+@RegisterSingleton
+export default class CertificateFetcher implements ICacheContainer<CertificateFetcher> {
+
+    cache: ObjectCache<CertificateFetcher>;
+
+
+    @cacheFor()
+    public async getCert(servername: string): Promise<SecureContext> {
+
+        if(!servername) {
+            throw new Error("Invalid domain name");
+        }
+
+        await fetch(`https://${servername}`);
+
+
+        for(let i=0;i<30;i++) {
+            await sleep(1000);
+
+            // check if we have certificate...
+            const context = await this.readFile(servername);
+            if(context) {
+                return context;
+            }
+        }
+
+        return null;
+    }
+
+    async readFile(servername: string) {
+        const certPath = `/cache/certs/${servername}/cert.pem`;
+        const keyPath = `/cache/certs/${servername}/key.pem`;
+        if (!existsSync(certPath) || !existsSync(keyPath)) {
+            return null;
+        }
+        const cert = await readFile(certPath, "utf-8");
+        const key = await readFile(certPath, "utf-8");
+        return createSecureContext({ cert, key });
+    }
+
+
+}