@social-mail/social-mail-web-server 1.7.232 → 1.7.233

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.232",
+  "version": "1.7.233",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.402",
-    "@entity-access/server-pages": "^1.1.403",
+    "@entity-access/entity-access": "^1.0.403",
+    "@entity-access/server-pages": "^1.1.404",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

package/src/WebServer.ts

@@ -49,7 +49,6 @@ import { fileAccessTypes } from "./server/model/entities/AppFile.js";
 import EntityContext from "@entity-access/entity-access/dist/model/EntityContext.js";
 import AppKeyProvider from "./server/services/AppKeyProvider.js";
 import KeyProvider from "@entity-access/server-pages/dist/services/KeyProvider.js";
-import GlobalEvents from "./common/GlobalEvents.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 import RootCertificates from "./server/services/root-certs/RootCertificates.js";
 import TlsSessionKeys from "./common/tls/TlsSessionKeys.js";
@@ -117,8 +116,6 @@ export default class WebServer {
         globalServices.resolve(WorkflowContext);
         globalServices.resolve(CertificateStore).folder = "/data/certs";
 
-        globalServices.resolve(GlobalEvents).startListener();
-
         try {
 
             if (seedDb) {

package/src/common/GlobalEvents.ts

@@ -1,249 +1,249 @@
-/* eslint-disable no-console */
-import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
-import cluster from "cluster";
-import { existsSync, unlinkSync } from "fs";
-import { platform } from "os";
-import { isMainThread } from "worker_threads";
-import { WebSocketServer, WebSocket,  }  from "ws";
-
-const socketPath = /win32/i.test(platform()) ? `\\\\.\\pipe\\social-mail-ipc-sock.sock` :  `/tmp/social-mail-ipc-sock.sock`;
-
-let pid = 1;
-
-@RegisterSingleton
-export default class GlobalEvents {
-
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    private listeners = new Map<string, Function[]>();
-
-    private client: Promise<WebSocket>;
-
-    public on(m: "refresh-dns", fx: (m1: "refresh-dns", value: { serverID }) => any);
-    public on(m: "dkim-added", fx: (m1: "dkim-added", value: { serverID, host, publicKey, name, keyType }) => any);
-    public on(m: "host-added", fx: (m1: "host-added", value: { serverID, host: string }) => any);
-    public on(m: "html-to-image" | "html-to-image-result", value: any);
-    public on(message: any, value: (msg: any, data:any) => any) {
-        let list = this.listeners.get(message);
-        if(!list) {
-            list = [];
-            this.listeners.set(message, list);
-        }
-        list.push(value);
-        this.connectClient().catch(console.error);
-        return {
-            [Symbol.dispose]: () => {
-                const index = list.indexOf(value);
-                if (index !== -1) {
-                    list.splice(index, 1);
-                }
-            }
-        };
-    }
-
-    public onPost(m: "html-to-image", fx: (v) => Promise<any>) {
-        this.on(m, (m1, v) => {
-            const { id } = v;
-            try {
-                fx(v).then(
-                    (value) => this.notify(id, { value } as any),
-                    (error) => this.notify(id, { error } as any));
-            } catch (e) {
-                this.notify(id, { error: e} as any);
-            }
-        });
-    }
-
-    public post(m: "html-to-image", value: any): Promise<any>;
-    public async post(m: any, p: any): Promise<any> {
-        const id = `${m}-${pid++}`;
-        return new Promise<any>((resolve, reject) => {
-            const d = this.on("html-to-image", ({ value, error }) => {
-                d[Symbol.dispose]();
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve(value);
-                }
-            });
-            p.id = id;
-            this.notify(m, p);
-        });
-    }
-
-    public notify(m: "refresh-dns", value: { serverID });
-    public notify(m: "dkim-added", value: { serverID, host, publicKey, name, keyType });
-    public notify(m: "host-added", value: { serverID, host: string });
-    public notify(message: any, value: any) {
-        this.notifyInternal(message, value).catch(console.error);
-    }
-
-    startListener() {
-        if(!cluster.isPrimary) {
-            return;
-        }
-        if(!isMainThread) {
-            return;
-        }
-        this.startListenerInternal().catch(console.error);
-    }
-
-    private async notifyInternal(message: string, value: string) {
-        try {
-            const client = await this.connectClient();
-            const json = JSON.stringify({ message, value });
-            const data = Buffer.from(json, "utf-8");
-            client.send(data, { binary: true },  (error) => {
-                if (error) {
-                    try {
-                        client.close();
-                    } catch {
-                        // do nothing
-                    }
-                    this.client = null;
-                    return;
-                }
-            });
-            // console.log(`Notify success ${json}`);
-        } catch (error) {
-            console.error(error);
-            this.client?.then((c) => {
-                try {
-                    c.close();
-                } catch {
-                    // do nothing
-                }
-                this.client = null;
-            }).catch(console.error);
-            this.client = null;
-        }
-    }
-
-    private connectClient() {
-        this.client ??= (async () =>  {
-            let client: WebSocket;
-            try {
-                client = await new Promise((resolve, reject) => {
-                    const s = new WebSocket(`ws+unix://${socketPath}`);
-                    s.on("open", () => resolve(s));
-                    s.on("error", reject);
-                });
-                client.on("error", (err) => {
-                    console.error(err);
-                    this.client = null;
-                });
-                client.on("end", () => {
-                    this.client = null;
-                });
-                client.on("close", () => {
-                    this.client = null;
-                });
-            } catch (error) {
-                console.error(`No socket is listening on ${socketPath}`);
-                console.error(error.stack ?? error.toString());
-                this.client = null;
-            }
-
-            // start listening...
-            client.on("message", (data: Buffer, isBinary ) => {
-                const text = data.toString("utf-8");
-                // console.log(`Received ${text}`);
-                const { message, value } = JSON.parse(text);
-                const list = this.listeners.get(message);
-                if (!list) {
-                    return;
-                }
-                for (const iterator of list) {
-                    iterator(message, value)?.catch(console.error);
-                }
-            });
-            return client;
-        })();
-        return this.client;
-    }
-
-    private async startListenerInternal() {
-        try {
-            if(existsSync(socketPath)) {
-                unlinkSync(socketPath);
-            }
-
-            const server = new WebSocketServer({
-                port: socketPath as any,
-            }, () => {
-                console.log(`Global Events listening on ${socketPath}`);
-            });
-            server.on("connection", (socket) => {
-                socket.on("message", (data, binary) => {
-                    for (const iterator of server.clients) {
-                        iterator.send(data, { binary }, (error) => {
-                            if (error) {
-                                try { iterator.close(); } catch {
-                                    // so nothing
-                                }
-                            }
-                        });
-                    }
-                });
-            });
-            server.on("error", console.error);
-
-        } catch (error) {
-            console.error(error);
-        }
-    }
-
-    // private async writeToClient(key: Socket,text: Buffer, promise: Promise<void>): Promise<void> {
-    //     await promise;
-    //     try {
-    //         await new Promise<void>((resolve, reject) => {
-    //             key.write(text, (error) => {
-    //                 if (error) {
-    //                     reject(error);
-    //                     return;
-    //                 }
-    //                 resolve();
-    //             });
-    //         });
-    //     } catch (error) {
-    //         try {
-    //             key.end();
-    //         } catch {
-    //             // closing errored socket...
-    //         }
-    //         this.serverClients.delete(key);
-    //     }
-    // }
-
-}
-
-export class TestGlobalEvents extends GlobalEvents {
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    map = new Map<string, Function[]>();
-    on(m, fx){
-        const { map } = this;
-        let list = map.get(m);
-        if(!list) {
-            list = [];
-            map.set(m, list);
-        }
-        list.push(fx);
-        return {
-            [Symbol.dispose]() {
-                // do nothing
-            }
-        };
-    }
-    notify(m, v) {
-        const { map } = this;
-        const list = map.get(m);
-        if(!list) {
-            return list;
-        }
-        for (const iterator of list) {
-            iterator(m, v)?.catch(console.error);
-        }
-    }
-    startListener() {
-        return Promise.resolve();
-    }
-}
+// /* eslint-disable no-console */
+// import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+// import cluster from "cluster";
+// import { existsSync, unlinkSync } from "fs";
+// import { platform } from "os";
+// import { isMainThread } from "worker_threads";
+// import { WebSocketServer, WebSocket,  }  from "ws";
+
+// const socketPath = /win32/i.test(platform()) ? `\\\\.\\pipe\\social-mail-ipc-sock.sock` :  `/tmp/social-mail-ipc-sock.sock`;
+
+// let pid = 1;
+
+// @RegisterSingleton
+// export default class GlobalEvents {
+
+//     // eslint-disable-next-line @typescript-eslint/ban-types
+//     private listeners = new Map<string, Function[]>();
+
+//     private client: Promise<WebSocket>;
+
+//     public on(m: "refresh-dns", fx: (m1: "refresh-dns", value: { serverID }) => any);
+//     public on(m: "dkim-added", fx: (m1: "dkim-added", value: { serverID, host, publicKey, name, keyType }) => any);
+//     public on(m: "host-added", fx: (m1: "host-added", value: { serverID, host: string }) => any);
+//     public on(m: "html-to-image" | "html-to-image-result", value: any);
+//     public on(message: any, value: (msg: any, data:any) => any) {
+//         let list = this.listeners.get(message);
+//         if(!list) {
+//             list = [];
+//             this.listeners.set(message, list);
+//         }
+//         list.push(value);
+//         this.connectClient().catch(console.error);
+//         return {
+//             [Symbol.dispose]: () => {
+//                 const index = list.indexOf(value);
+//                 if (index !== -1) {
+//                     list.splice(index, 1);
+//                 }
+//             }
+//         };
+//     }
+
+//     public onPost(m: "html-to-image", fx: (v) => Promise<any>) {
+//         this.on(m, (m1, v) => {
+//             const { id } = v;
+//             try {
+//                 fx(v).then(
+//                     (value) => this.notify(id, { value } as any),
+//                     (error) => this.notify(id, { error } as any));
+//             } catch (e) {
+//                 this.notify(id, { error: e} as any);
+//             }
+//         });
+//     }
+
+//     public post(m: "html-to-image", value: any): Promise<any>;
+//     public async post(m: any, p: any): Promise<any> {
+//         const id = `${m}-${pid++}`;
+//         return new Promise<any>((resolve, reject) => {
+//             const d = this.on("html-to-image", ({ value, error }) => {
+//                 d[Symbol.dispose]();
+//                 if (error) {
+//                     reject(error);
+//                 } else {
+//                     resolve(value);
+//                 }
+//             });
+//             p.id = id;
+//             this.notify(m, p);
+//         });
+//     }
+
+//     public notify(m: "refresh-dns", value: { serverID });
+//     public notify(m: "dkim-added", value: { serverID, host, publicKey, name, keyType });
+//     public notify(m: "host-added", value: { serverID, host: string });
+//     public notify(message: any, value: any) {
+//         this.notifyInternal(message, value).catch(console.error);
+//     }
+
+//     startListener() {
+//         if(!cluster.isPrimary) {
+//             return;
+//         }
+//         if(!isMainThread) {
+//             return;
+//         }
+//         this.startListenerInternal().catch(console.error);
+//     }
+
+//     private async notifyInternal(message: string, value: string) {
+//         try {
+//             const client = await this.connectClient();
+//             const json = JSON.stringify({ message, value });
+//             const data = Buffer.from(json, "utf-8");
+//             client.send(data, { binary: true },  (error) => {
+//                 if (error) {
+//                     try {
+//                         client.close();
+//                     } catch {
+//                         // do nothing
+//                     }
+//                     this.client = null;
+//                     return;
+//                 }
+//             });
+//             // console.log(`Notify success ${json}`);
+//         } catch (error) {
+//             console.error(error);
+//             this.client?.then((c) => {
+//                 try {
+//                     c.close();
+//                 } catch {
+//                     // do nothing
+//                 }
+//                 this.client = null;
+//             }).catch(console.error);
+//             this.client = null;
+//         }
+//     }
+
+//     private connectClient() {
+//         this.client ??= (async () =>  {
+//             let client: WebSocket;
+//             try {
+//                 client = await new Promise((resolve, reject) => {
+//                     const s = new WebSocket(`ws+unix://${socketPath}`);
+//                     s.on("open", () => resolve(s));
+//                     s.on("error", reject);
+//                 });
+//                 client.on("error", (err) => {
+//                     console.error(err);
+//                     this.client = null;
+//                 });
+//                 client.on("end", () => {
+//                     this.client = null;
+//                 });
+//                 client.on("close", () => {
+//                     this.client = null;
+//                 });
+//             } catch (error) {
+//                 console.error(`No socket is listening on ${socketPath}`);
+//                 console.error(error.stack ?? error.toString());
+//                 this.client = null;
+//             }
+
+//             // start listening...
+//             client.on("message", (data: Buffer, isBinary ) => {
+//                 const text = data.toString("utf-8");
+//                 // console.log(`Received ${text}`);
+//                 const { message, value } = JSON.parse(text);
+//                 const list = this.listeners.get(message);
+//                 if (!list) {
+//                     return;
+//                 }
+//                 for (const iterator of list) {
+//                     iterator(message, value)?.catch(console.error);
+//                 }
+//             });
+//             return client;
+//         })();
+//         return this.client;
+//     }
+
+//     private async startListenerInternal() {
+//         try {
+//             if(existsSync(socketPath)) {
+//                 unlinkSync(socketPath);
+//             }
+
+//             const server = new WebSocketServer({
+//                 port: socketPath as any,
+//             }, () => {
+//                 console.log(`Global Events listening on ${socketPath}`);
+//             });
+//             server.on("connection", (socket) => {
+//                 socket.on("message", (data, binary) => {
+//                     for (const iterator of server.clients) {
+//                         iterator.send(data, { binary }, (error) => {
+//                             if (error) {
+//                                 try { iterator.close(); } catch {
+//                                     // so nothing
+//                                 }
+//                             }
+//                         });
+//                     }
+//                 });
+//             });
+//             server.on("error", console.error);
+
+//         } catch (error) {
+//             console.error(error);
+//         }
+//     }
+
+//     // private async writeToClient(key: Socket,text: Buffer, promise: Promise<void>): Promise<void> {
+//     //     await promise;
+//     //     try {
+//     //         await new Promise<void>((resolve, reject) => {
+//     //             key.write(text, (error) => {
+//     //                 if (error) {
+//     //                     reject(error);
+//     //                     return;
+//     //                 }
+//     //                 resolve();
+//     //             });
+//     //         });
+//     //     } catch (error) {
+//     //         try {
+//     //             key.end();
+//     //         } catch {
+//     //             // closing errored socket...
+//     //         }
+//     //         this.serverClients.delete(key);
+//     //     }
+//     // }
+
+// }
+
+// export class TestGlobalEvents extends GlobalEvents {
+//     // eslint-disable-next-line @typescript-eslint/ban-types
+//     map = new Map<string, Function[]>();
+//     on(m, fx){
+//         const { map } = this;
+//         let list = map.get(m);
+//         if(!list) {
+//             list = [];
+//             map.set(m, list);
+//         }
+//         list.push(fx);
+//         return {
+//             [Symbol.dispose]() {
+//                 // do nothing
+//             }
+//         };
+//     }
+//     notify(m, v) {
+//         const { map } = this;
+//         const list = map.get(m);
+//         if(!list) {
+//             return list;
+//         }
+//         for (const iterator of list) {
+//             iterator(m, v)?.catch(console.error);
+//         }
+//     }
+//     startListener() {
+//         return Promise.resolve();
+//     }
+// }

package/src/common/globalEnv.ts

@@ -76,6 +76,17 @@ export const globalEnv = {
         user: process.env.SOCIAL_MAIL_DB_USER ?? "postgres",
         password: process.env.SOCIAL_MAIL_DB_PASSWORD ?? "abcd123",
     },
+
+    pgEvents: {
+        server: process.env.SOCIAL_MAIL_EVENTS_DB_SERVER ?? process.env.SOCIAL_MAIL_DB_SERVER ?? "postgres",
+        database: process.env.SOCIAL_MAIL_EVENTS_DB_DATABASE ?? process.env.SOCIAL_MAIL_DB_DATABASE ?? "SocialMails",
+        host: process.env.SOCIAL_MAIL_EVENTS_DB_HOST ?? process.env.SOCIAL_MAIL_DB_HOST ?? "localhost",
+        port: Number(process.env.SOCIAL_MAIL_EVENTS_DB_PORT ?? process.env.SOCIAL_MAIL_DB_PORT ?? 5432),
+        ssl: JSON.parse(process.env.SOCIAL_MAIL_EVENTS_DB_SSL ?? process.env.SOCIAL_MAIL_DB_SSL ?? "true"),
+        user: process.env.SOCIAL_MAIL_EVENTS_DB_USER ?? process.env.SOCIAL_MAIL_DB_USER ?? "postgres",
+        password: process.env.SOCIAL_MAIL_EVENTS_DB_PASSWORD ?? process.env.SOCIAL_MAIL_DB_PASSWORD ?? "abcd123",
+    },
+
     numCPUs: isTestMode
         ? 2
         : (process.env.SOCIAL_MAIL_CLUSTER_WORKERS

package/src/server/model/events/DomainKeyEvents.ts

@@ -6,8 +6,6 @@ import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di
 import CryptoService from "../../services/CryptoService.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import SocialMailContext from "../SocialMailContext.js";
-import GlobalEvents from "../../../common/GlobalEvents.js";
-import { globalEnv } from "../../../common/globalEnv.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 
@@ -19,9 +17,6 @@ export default class DomainKeyEvents extends AuthenticatedEvents<DomainKey> {
     @Inject
     private db: SocialMailContext;
 
-    @Inject
-    private globalEvents: GlobalEvents;
-
     filter(query: IEntityQuery<DomainKey>): IEntityQuery<DomainKey> {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

package/src/server/model/events/WebSiteHostEvents.ts

@@ -4,7 +4,6 @@ import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWit
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import ApexDomain from "../../../common/ApexDomain.js";
-import GlobalEvents from "../../../common/GlobalEvents.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
 import { WebSiteHost } from "../entities/WebSiteHost.js";
@@ -12,9 +11,6 @@ import AuthenticatedEvents from "./AuthenticatedEvents.js";
 
 export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
 
-    @Inject
-    private globalEvents: GlobalEvents;
-
     filter(query: IEntityQuery<WebSiteHost>) {
         if (this.sessionUser.isAdmin) {
             return query;

package/src/server/services/message-events/MessagingService.ts

@@ -0,0 +1,43 @@
+/* eslint-disable no-console */
+import Inject, { RegisterSingleton, ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
+import PgEvents from "./PgEvents.js";
+import { globalEnv } from "../../../common/globalEnv.js";
+
+export interface IMessageChannel<T = string> {
+    on(fx: (name: string, data: T) => any);
+    notify(data: T);
+}
+
+@RegisterSingleton
+export default class MessagingService extends ServiceObject {
+
+    channelRefresh: IMessageChannel;
+
+    refreshDns: IMessageChannel<{ serverID }>;
+
+    @Inject
+    private pgEvents: PgEvents;
+
+    postInit() {
+        this.channelRefresh = this.segment(`web-site-channel-host-clear-${globalEnv.serverID}`);
+        this.refreshDns = this.segment("refresh-dns");
+    }
+
+    notify(messageName: string, data: any): any {
+        return this.pgEvents.emit(messageName, JSON.stringify(data ?? ""));
+    }
+
+    listen(messageName: string, fx: (name: string, data: any) => any): any {
+        return this.pgEvents.listen(messageName, (msg, data) => {
+            return fx(msg, JSON.parse(data));
+        });
+    }
+
+    private segment(messageName: string): IMessageChannel<any> {
+        return {
+            on: (fx) => this.listen(messageName, (data) => fx(messageName, data)?.catch?.(console.error)),
+            notify: (data) => this.notify(messageName, data)?.catch?.(console.error),
+        };
+    }
+
+}