@nsshunt/stsappframework 3.1.118 → 3.1.121

package/dist/redisMessageHandler.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redisMessageHandler.test.js","sourceRoot":"","sources":["../src/redisMessageHandler.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,mCAAqE;AAErE,+DAA2D;AAE3D,gDAAqE;AAErE,kDAA0B;AAE1B,+BAAoC;AAEpC,mDAAkD;AAElD,IAAA,iBAAQ,EAAC,4BAA4B,EAAE,GAAG,EAAE;IAExC,IAAI,gBAAqB,CAAC;IAC1B,IAAI,0BAA0B,GAAG,EAAE,CAAC;IAEpC,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QACjB,2FAA2F;QAE3F,gBAAgB,GAAG,MAAM,IAAI,iCAAgB,CAAC,OAAO,CAAC;aACjD,gBAAgB,CAAC,IAAI,CAAC;aACtB,KAAK,EAAE,CAAC;QACb,0BAA0B,GAAG,WAAW,gBAAgB,CAAC,OAAO,EAAE,IAAI,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;IACjH,CAAC,CAAC,CAAC;IAEH,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAChB,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAClC,CAAC;IACL,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,MAAM,MAAM;QACR,GAAG,CAAsB;QAEzB;YACI,IAAI,CAAC,GAAG,GAAG,IAAI,yCAAmB,CAAC;gBAC/B,MAAM,EAAE,wBAAa;gBACrB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,0BAA0B,EAAE,uCAAuC;gBAC7E,SAAS,EAAE,0BAA0B;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YAEjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,QAAa,EAAE,EAAE;gBACvF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,0BAA0B,IAAI,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC;gBAC5F,iBAAiB;gBACjB,QAAQ,CAAC,EAAC,MAAM,EAAE,2DAA2D,IAAI,IAAI,IAAI,IAAI,IAAI,EAAE,EAAC,CAAC,CAAA;YACzG,CAAC,CAAC,CAAC;QACP,CAAC;QAED,KAAK,GAAG,KAAK,EAAE,iBAAyB,EAAE,UAAkB,EAAE,KAAa,EAAE,EAAE;YAC3E,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC;;;;;;;;kBAQE;gBAGF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,+CAA+C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;gBAChH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,CAAC,QAAa,EAAE,EAAE;oBACzD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,yCAAyC,QAAQ,CAAC,MAAM,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;oBACjI,IAAA,eAAM,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;gBAEH,MAAM,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACL,CAAC,CAAA;QAED,IAAI,GAAG,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACpB,CAAC,CAAA;KACJ;IAED,MAAM,MAAM;QACR,GAAG,CAAsB;QAEzB;YACI,IAAI,CAAC,GAAG,GAAG,IAAI,yCAAmB,CAAC;gBAC/B,MAAM,EAAE,wBAAa;gBACrB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,0BAA0B,EAAE,uCAAuC;gBAC7E,SAAS,EAAE,0BAA0B;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YAEjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAAgB,EAAE,QAAa,EAAE,EAAE;gBAChE,aAAa;gBACb,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,2BAA2B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5F,QAAQ,CAAC,EAAC,MAAM,EAAE,SAAS,OAAO,CAAC,GAAG,+DAA+D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAC,CAAC,CAAA;YACjI,CAAC,CAAC,CAAC;QACP,CAAC;QAED,KAAK,GAAG,KAAK,EAAE,UAAkB,EAAE,KAAa,EAAE,EAAE;YAChD,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC,MAAM,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;gBACpB;;;;;kBAKE;gBAEF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3F,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,QAAa,EAAE,EAAE;oBAC/D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,GAAG,iCAAiC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzG,CAAC,CAAC,CAAC;gBACH,MAAM,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACL,CAAC,CAAA;QAED,IAAI,GAAG,GAAG,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACpB,CAAC,CAAA;KACJ;IAGD,IAAA,aAAI,EAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QAEtB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,CAAC,CAAC;QACrB,MAAM,KAAK,GAAG,GAAG,CAAC;QAElB,eAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE9B,+BAA+B;QAC/B,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAa,EAAG,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;QAC/B,CAAC;QAED,mGAAmG;QACnG,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;QAElB,yBAAyB;QACzB,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC7C,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QAEjD,wBAAwB;QACxB,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;QAElB,kBAAkB;QAClB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/B,MAAM,CAAC,IAAI,EAAE,CAAC;IAClB,CAAC,EAAE,KAAK,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}

package/dist/testing/app.js

@@ -12,6 +12,9 @@ const ipcMessageProcessorWorker_1 = require("./../ipcMessageProcessorWorker");
 const stsutils_1 = require("@nsshunt/stsutils");
 const ipcMessageProcessorPrimary_1 = require("./../ipcMessageProcessorPrimary");
 const chalk_1 = __importDefault(require("chalk"));
+const uuid_1 = require("uuid");
+const redisMessageHandler_1 = require("./../redisMessageHandler");
+const stsconfig_1 = require("@nsshunt/stsconfig");
 const sleepVal = 0;
 const maxLoop = 100;
 const zzz = async () => {
@@ -34,8 +37,7 @@ const zzz = async () => {
         console.log(chalk_1.default.green(JSON.stringify(retVal)));
     }
 };
-if (node_cluster_1.default.isPrimary) {
-    new __1.MasterProcessBase((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
+const StartTestPrimary = () => {
     setTimeout(async () => {
         for (const id in node_cluster_1.default.workers) {
             const p1 = new ipcMessageProcessorPrimary_1.IPCMessageProcessorPrimary({
@@ -82,9 +84,8 @@ if (node_cluster_1.default.isPrimary) {
         }
         zzz();
     }, 1000);
-}
-else {
-    new appWorkerWSS_1.WorkerProcess((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
+};
+const StartTestWorker = () => {
     const w1 = new ipcMessageProcessorWorker_1.IPCMessageProcessorWorker({
         logger: stsutils_1.defaultLogger,
         namespace: 'test1',
@@ -153,5 +154,111 @@ else {
             await (0, stsutils_1.Sleep)(sleepVal);
         }
     }, 1000);
+};
+const iterations = 100;
+const delay = 100;
+if (node_cluster_1.default.isPrimary) {
+    new __1.MasterProcessBase((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
+    //StartTestPrimary();
+    setTimeout(() => {
+        const p = {};
+        /*
+        for (const id in cluster.workers) {
+            const worker = cluster.workers[id] as Worker;
+
+            const p1: IPCMessageHandler = new IPCMessageHandler({
+                logger: defaultLogger,
+                requestResponseMessageTimeout: 5000,
+                namespace: 'aabbcc'
+            });
+            p1.Start(worker);
+
+            p1.on('fromworker', (arg1: string, arg2: number, arg3: string, callback: any) => {
+                //callback(null);
+                callback({status: `response message from event = fromworker with args ${arg1} ${arg2} ${arg3}`})
+            });
+
+            p[worker.id] = p1;
+        }
+        */
+        const r1 = new redisMessageHandler_1.RedisMessageHandler({
+            logger: stsutils_1.defaultLogger,
+            role: 'SERVER',
+            redisUrl: stsconfig_1.goptions.imRedisMessageProcessorUrl,
+            namespace: 'mytestapp'
+        });
+        r1.Start();
+        r1.on('fromworkerredis', (arg1, arg2, arg3, callback) => {
+            console.log(chalk_1.default.magenta(`${process.pid}: fromworkerredis.ON: [${arg1} ${arg2} ${arg3}]`));
+            //callback(null);
+            callback({ status: `response message from event = fromworkerredis with args ${arg1} ${arg2} ${arg3}` });
+        });
+        setTimeout(async () => {
+            for (let i = 0; i < iterations; i++) {
+                /*
+                Object.keys(p).forEach(async (pKey) => {
+                    const emitobj = { i: i, a: 'a', b: 'b', worker: pKey };
+                    console.log(chalk.green(`${process.pid}: emit event to worker: [${pKey}] fromprimary: [${JSON.stringify(emitobj)}`));
+                    p[pKey].emit('fromprimary', emitobj, (response: any) => {
+                        console.log(chalk.green(`${process.pid}: ${JSON.stringify(response)}`));
+                    });
+                });
+                */
+                const emitobj = { i: i, a: 'a', b: 'b' };
+                console.log(chalk_1.default.cyan(`${process.pid}: emit event fromprimaryredis fromprimary: [${JSON.stringify(emitobj)}`));
+                r1.emit('fromprimaryredis', emitobj, (response) => {
+                    console.log(chalk_1.default.cyan(`${process.pid}: Response(fromprimaryredis): [${JSON.stringify(response)}]`));
+                });
+                await (0, stsutils_1.Sleep)(delay);
+            }
+        }, 1000);
+    }, 1000);
+}
+else {
+    new appWorkerWSS_1.WorkerProcess((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
+    //StartTestWorker();
+    setTimeout(async () => {
+        /*
+        const w1: IPCMessageHandler = new IPCMessageHandler({
+            logger: defaultLogger,
+            requestResponseMessageTimeout: 5000,
+            namespace: 'aabbcc'
+        });
+        w1.Start();
+
+        w1.on('fromprimary', (arg1: JSONObject, callback: any) => {
+            //callback();
+            callback({status: `response message from event = fromprimary with args ${JSON.stringify(arg1)}`})
+        });
+        */
+        const r1 = new redisMessageHandler_1.RedisMessageHandler({
+            logger: stsutils_1.defaultLogger,
+            role: 'CLIENT',
+            redisUrl: stsconfig_1.goptions.imRedisMessageProcessorUrl,
+            namespace: 'mytestapp'
+        });
+        r1.Start();
+        r1.on('fromprimaryredis', (arg1, callback) => {
+            //callback();
+            console.log(chalk_1.default.yellow(`${process.pid}: fromprimaryredis.ON: [${JSON.stringify(arg1)}]`));
+            callback({ status: `PID: [${process.pid}]: response message from event = fromprimaryredis with args ${JSON.stringify(arg1)}` });
+        });
+        setTimeout(async () => {
+            for (let i = 0; i < iterations; i++) {
+                const id = (0, uuid_1.v4)();
+                /*
+                console.log(chalk.yellow(`${process.pid}: emit event fromworker: [${id} ${i} Hello]`));
+                w1.emit('fromworker', id, i, 'Hello', (response: any) => {
+                    console.log(chalk.yellow(`${process.pid}: ${JSON.stringify(response)}`));
+                });
+                */
+                console.log(chalk_1.default.green(`${process.pid}: emit event fromworkerredis: [${id} ${i} Hello]`));
+                r1.emit('fromworkerredis', id, i, 'Hello', (response) => {
+                    console.log(chalk_1.default.green(`${process.pid}: Response(fromworkerredis): [${JSON.stringify(response)}]`));
+                });
+                await (0, stsutils_1.Sleep)(delay);
+            }
+        }, 1000);
+    }, 1000);
 }
 //# sourceMappingURL=app.js.map

package/dist/testing/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.118",
+  "version": "3.1.121",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -34,8 +34,8 @@
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "^9.0.6",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
+    "@typescript-eslint/parser": "^7.9.0",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
     "testcontainers": "^10.9.0",
@@ -44,14 +44,14 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.10.7",
+    "@grpc/grpc-js": "^1.10.8",
     "@grpc/proto-loader": "^0.7.13",
     "@influxdata/influxdb-client": "^1.33.2",
     "@influxdata/influxdb-client-apis": "^1.33.2",
-    "@nsshunt/stsconfig": "^1.25.130",
-    "@nsshunt/stsdatamanagement": "^1.18.41",
-    "@nsshunt/stsobservability": "^1.0.28",
-    "@nsshunt/stsutils": "^1.16.59",
+    "@nsshunt/stsconfig": "^1.25.131",
+    "@nsshunt/stsdatamanagement": "^1.18.42",
+    "@nsshunt/stsobservability": "^1.0.29",
+    "@nsshunt/stsutils": "^1.16.60",
     "@socket.io/cluster-adapter": "^0.2.2",
     "@socket.io/redis-streams-adapter": "^0.2.2",
     "@types/on-headers": "^1.0.3",
@@ -76,7 +76,7 @@
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.7.5",
     "supports-color": "^9.4.0",
-    "systeminformation": "^5.22.8",
+    "systeminformation": "^5.22.9",
     "tiny-emitter": "^2.1.0",
     "tough-cookie": "^4.1.4",
     "uuid": "^9.0.1",

package/runtest2.sh

@@ -6,7 +6,7 @@ STSENVFILE=$STS_PROJ_ROOT/stsglobalresources/.env \
 REST01_PORT=3003 \
 REST01_HOST_PORT=3003 \
 REST01_ENDPOINT="https://stscore.stsmda.org" \
-MAX_CPU=2 \
+MAX_CPU=4 \
 AS_ENDPOINT=https://stscore.stsmda.org \
 AS_HOST_PORT=3002 \
 AS_PORT=3002 \

package/src/commonTypes.ts

@@ -268,6 +268,7 @@ export interface IIPCMessageProcessorIPCPayload {
     header: string
     messageId: string
     senderId: string
+    senderRole: string
     requestPayload: JSONObject
     responsePayload: JSONObject
     pid: string

package/src/ipcMessageHandler.ts

@@ -0,0 +1,181 @@
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */  // --> OFF */  // --> OFF
+import { TinyEmitter } from "tiny-emitter";
+import cluster, { Worker } from 'node:cluster'
+import { ISTSLogger, JSONObject, defaultLogger } from '@nsshunt/stsutils'
+
+import { IIPCMessageProcessorIPCPayload } from './commonTypes'
+
+import { IPCMessageManager, IPCMessageManagerOptions } from './ipcMessageManager'
+
+export interface IPCMessageHandlerOptions {
+    logger: ISTSLogger
+    requestResponseMessageTimeout: number
+    namespace: string
+    //processPayload?: (payload: IIPCMessageProcessorIPCPayload, options: any) => Promise<JSONObject>
+}
+
+export class IPCMessageHandler extends TinyEmitter {
+    #ipcMessageManager: IPCMessageManager | null = null;
+    #options: IPCMessageHandlerOptions;
+    #worker: Worker | null = null;
+    #events: JSONObject = { };
+
+    constructor(options: IPCMessageHandlerOptions) {
+        super();
+        this.#options = options;
+        if (cluster.isPrimary) {
+            this.SetupPrimary();
+        } else {
+            this.SetupWorker();
+        }
+    }
+
+    get __events() {
+        return this.#events;
+    }
+
+    SetupPrimary = () => {
+        const ipcMessageManagerOptions: IPCMessageManagerOptions = {
+            logger: defaultLogger,
+            requestResponseMessageTimeout: 2000,
+            namespace: this.#options.namespace,
+            role: 'SERVER',
+            messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
+                (options.worker as any).send(payload);
+            },
+            ProcessRequestMessage: async (payload: IIPCMessageProcessorIPCPayload, options: any): Promise<JSONObject> => {
+                return this.#processPayload(payload, options);
+            },
+            messageReceiverStart: (options: any) => {
+                // Receive a message to process from a worker
+                const worker = (options.worker as Worker);
+                worker.on('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, { worker }));
+            },
+            messageReceiverStop: (options: any) => {
+                const worker = (options.worker as Worker);
+                worker.off('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, { worker }));
+            }
+        }
+        this.#ipcMessageManager = new IPCMessageManager(ipcMessageManagerOptions);
+    }
+
+    SetupWorker = () => {
+        const ipcMessageManagerOptions: IPCMessageManagerOptions = {
+            logger: defaultLogger,
+            requestResponseMessageTimeout: this.#options.requestResponseMessageTimeout,
+            namespace: this.#options.namespace,
+            role: 'CLIENT',
+            // eslint-disable-next-line  @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
+            messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
+                // Options not required for sending payloads to the master process
+                (process as any).send(payload);
+            },
+            ProcessRequestMessage: async (payload: IIPCMessageProcessorIPCPayload, options: any): Promise<JSONObject> => {
+                return this.#processPayload(payload, options);
+            },
+            messageReceiverStart: (options: any) => {
+                // Receive a message response back from the primary thread
+                process.on('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, options));
+            },
+            messageReceiverStop: (options: any) => {
+                process.off('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, options));
+            }
+        }
+        this.#ipcMessageManager = new IPCMessageManager(ipcMessageManagerOptions);
+    }
+
+    SendMessage = async (payload: JSONObject): Promise<JSONObject> => {
+        if (this.#ipcMessageManager) {
+            if (this.#worker) {
+                return this.#ipcMessageManager?.SendMessage(payload, { worker: this.#worker });
+            } else {
+                return this.#ipcMessageManager?.SendMessage(payload, { });
+            }
+        } else {
+            // Error state - no #ipcMessageManager set
+            return { };
+        }
+    }
+
+    #processPayload = (payload: IIPCMessageProcessorIPCPayload, options: any): Promise<JSONObject> => {
+        // check the event name from the collection and invoke that function
+        return new Promise<JSONObject>((resolve, reject) => {
+            if (payload.messageType.localeCompare('REQUEST') === 0) {
+                if (payload.requestPayload['__eventName']) {
+                    const eventName = payload.requestPayload['__eventName'];
+                    if (this.#events[eventName]) {
+                        try {
+                            //const retVal = this.#events[eventName].callback(payload.requestPayload.args, payload, options, this.#events[eventName].ctx);
+                            this.#events[eventName].callback(...payload.requestPayload.args, (responseMessage: any) => {
+                                resolve(responseMessage);
+                            });
+                        } catch (error) {
+                            reject(error);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    // p.on('fromworker', (arg1: number, arg2: string, callback: any) => {
+    override on(event: string, callback: any, ctx?: any): this {
+        if (this.#events[event]) {
+            // Update the event with the same name
+            delete this.#events[event];
+        }
+        const eventObject = {
+            event,
+            callback,
+            ctx
+        }
+        this.#events[eventObject.event] = eventObject;
+        return this;
+        //return super.on(event, callback, ctx);
+    }
+
+    override off(event: string, callback?: any): this {
+        if (this.#events[event]) {
+            delete this.#events[event];
+        }
+        return this;
+        //return super.off(event, callback);
+    }
+
+    Start = (worker?: Worker) => {
+        if (worker) {
+            this.#ipcMessageManager?.Start({ worker });
+            this.#worker = worker;
+        } else {
+            this.#ipcMessageManager?.Start({ });
+        }
+    }
+
+    Stop = () => {
+        if (this.#worker) {
+            this.#ipcMessageManager?.Stop({ worker: this.#worker });
+            this.#worker = null;
+        } else {
+            this.#ipcMessageManager?.Stop({ });
+        }
+    }
+
+    get worker(): Worker | null {
+        return this.#worker;
+    }
+
+    override emit(event: string, ...args: any[]): this {
+        
+        const sendMessage = async () => {
+            const retVal = await this.SendMessage({
+                __eventName: event,
+                args: args.slice(0, args.length-1)
+            });
+            // Invoke the response callback
+            args[args.length-1](retVal);
+        };
+        sendMessage();
+        return this;
+        //return super.emit(event, ...args);
+    }
+}

package/src/ipcMessageManager.ts

@@ -11,6 +11,7 @@ export interface IPCMessageManagerOptions {
     logger: ISTSLogger
     requestResponseMessageTimeout: number
     namespace: string
+    role: 'SERVER' | 'CLIENT'
     messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => void
     ProcessRequestMessage: (payload: IIPCMessageProcessorIPCPayload, options: any) => Promise<JSONObject>
     ProcessResponseMessage?: (reesponses: Record<string, IIPCMessageProcessorIPCPayload>, options: any) => Promise<boolean>
@@ -48,7 +49,7 @@ export class IPCMessageManager
         // Override in subclass if required
     }
 
-    SendMessage = (payload: JSONObject, options: any): Promise<JSONObject> => {
+    SendMessage = (payload: JSONObject, options?: any): Promise<JSONObject> => {
         return new Promise((resolve, reject) => {
             this.#SendMessage(payload, options,
                 (payload: IIPCMessageProcessorIPCPayload) => {
@@ -69,6 +70,7 @@ export class IPCMessageManager
             header: this.#messageHeader,
             messageId,
             senderId: this.#id,
+            senderRole: this.#options.role,
             requestPayload: payload,
             responsePayload: { },
             pid: process.pid.toString(),
@@ -77,6 +79,7 @@ export class IPCMessageManager
         const messageRecord = {
             messageId,
             senderId: this.#id,
+            senderRole: this.#options.role,
             requestPayload,
             responses: { }, // record
             startTime: performance.now(),
@@ -105,26 +108,33 @@ export class IPCMessageManager
                 let completed = true; // Defaults to true
                 if (this.#options.ProcessResponseMessage) {
                     completed = await this.#options.ProcessResponseMessage(inFlightMessageRecord.responses, options);
-                }
-                if (completed) {
+                    if (completed) {
+                        inFlightMessageRecord.endTime = performance.now();
+                        clearTimeout(inFlightMessageRecord.timeout as NodeJS.Timer);
+                        inFlightMessageRecord.callBack({
+                            responsePayload: Object.values(inFlightMessageRecord.responses).map(r => r.responsePayload)
+                        } as any, options) // 
+                        delete this.#inflightMessages[message.messageId];
+                    }
+                } else if (completed) {
                     inFlightMessageRecord.endTime = performance.now();
                     clearTimeout(inFlightMessageRecord.timeout as NodeJS.Timer);
-                    //this.#LogDebugMessage(chalk.green(`received: [${JSON.stringify(message)}]`));
-                    inFlightMessageRecord.callBack(message, options)
+                    inFlightMessageRecord.callBack(message, options) // inFlightMessageRecord.responses
+                    //@@inFlightMessageRecord.callBack(Object.values(inFlightMessageRecord.responses), options) // 
                     delete this.#inflightMessages[message.messageId];
                 }
             } else {
-                throw new Error(`Could not find Request/Response message with id: [${message.messageId}]`);
+                //throw new Error(`Could not find Request/Response message with id: [${message.messageId}]`); //@@
             }
         }
     }
 
-    Start = (options: any) => {
+    Start = (options?: any) => {
         this.#messageHeader = `__STS__${this.#options.namespace}__${uuidv4()}`;
         this.#options.messageReceiverStart(options);
     }
 
-    Stop = (options: any) => {
+    Stop = (options?: any) => {
         // Kill in-flight messages
         this.#options.messageReceiverStop(options);
 
@@ -139,7 +149,7 @@ export class IPCMessageManager
     // Process a message recieved from a worker
     ProcessMessage = async (msg: any, options: any) => {
         if (msg.header) {
-            const checkName = `__STS__${this.#options.namespace}__`;
+            const checkName = `__STS__${this.#options.namespace}__`; //@@ this is a broadcast becuase the unique uuid is not part of the header test
             if ((msg.header as string).includes(checkName)) {
                 const message = (msg as IIPCMessageProcessorIPCPayload);
                 if (msg.messageType.localeCompare('REQUEST') === 0) {

package/src/ipcMessageProcessorPrimary.ts

@@ -23,6 +23,7 @@ export class IPCMessageProcessorPrimary
             logger: defaultLogger,
             requestResponseMessageTimeout: 2000,
             namespace: classOptions.namespace,
+            role: 'SERVER',
             messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
                 (options.worker as any).send(payload);
             },

package/src/ipcMessageProcessorWorker.ts

@@ -20,6 +20,7 @@ export class IPCMessageProcessorWorker {
             logger: defaultLogger,
             requestResponseMessageTimeout: classOptions.requestResponseMessageTimeout,
             namespace: classOptions.namespace,
+            role: 'CLIENT',
             // eslint-disable-next-line  @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
             messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
                 // Options not required for sending payloads to the master process