@nsshunt/stsappframework 3.1.231 → 3.1.232

package/dist/vitesttesting/singleservertest.test.js

@@ -20,6 +20,7 @@ const testcontainers_1 = require("testcontainers");
     let app = null;
     let ioRedisMessageProcessorUrl = '';
     let ioRedisContainer = null;
+    let network;
     const agentManager = new stsconfig_1.AgentManager({});
     const endpoint = 'https://localhost';
     const socketUtilsoptions = {
@@ -76,29 +77,37 @@ const testcontainers_1 = require("testcontainers");
             return null;
         }
     };
+    const StartNetwork = async () => {
+        network = await new testcontainers_1.Network().start();
+    };
+    const StopNetwork = async () => {
+        await network.stop();
+    };
     const StartRedis = async () => {
         ioRedisContainer = await new testcontainers_1.GenericContainer("redis/redis-stack-server")
             .withEnvironment({
             REDIS_ARGS: "--save \"\" --appendonly no",
         })
             .withExposedPorts(6379)
-            //.withNetwork(this.#network)
-            //.withNetworkAliases("redisstackserver")
+            .withNetwork(network)
+            .withNetworkAliases("redisstackserver")
             //.withWaitStrategy(Wait.forLogMessage(`Ready to accept connections tcp`))
             .start();
         ioRedisMessageProcessorUrl = `redis://${ioRedisContainer.getHost()}:${ioRedisContainer.getMappedPort(6379)}`;
         await (0, stsutils_1.Sleep)(2000);
         //expect(goptions.imRedisMessageProcessorUrl).toEqual('redis://localhost:6379');
         // IM_REDIS_MESSAGE_PROCESSOR_URL
-        console.log(chalk_1.default.green(`redis/redis-stack-server Started. Server Details: ioRedisMessageProcessorUrl: [${ioRedisMessageProcessorUrl}]`));
+        console.log(chalk_1.default.green(`redis/redis-stack-server Started. docker  [${ioRedisMessageProcessorUrl}]`));
     };
     const StopRedis = async () => {
         await ioRedisContainer.stop();
         await (0, stsutils_1.Sleep)(200);
     };
     (0, vitest_1.beforeAll)(async () => {
+        await StartNetwork();
         await StartRedis();
         process.env.IM_REDIS_MESSAGE_PROCESSOR_URL = ioRedisMessageProcessorUrl;
+        process.env.SOCKET_IO_REDIS_ADAPTOR_URL = ioRedisMessageProcessorUrl;
         (0, stsconfig_1.$ResetOptions)();
         const appOptions = (0, appConfig_1.ServiceConfigOptions)(false, true);
         appOptions.processExitOnTerminate = false;
@@ -110,9 +119,11 @@ const testcontainers_1 = require("testcontainers");
         agentManager.Terminate();
         await (0, stsutils_1.Sleep)(500);
         await app?.TerminateApplication();
-        await (0, stsutils_1.Sleep)(1000);
+        await (0, stsutils_1.Sleep)(2000);
         app = null;
         await StopRedis();
+        await StopNetwork();
+        await (0, stsutils_1.Sleep)(2000);
     }, 120000);
     (0, vitest_1.test)('Testing Module', async () => {
         vitest_1.expect.assertions(1);
@@ -129,66 +140,147 @@ const testcontainers_1 = require("testcontainers");
         }
     }, 10000);
     (0, vitest_1.test)('client socket testing', async () => {
-        vitest_1.expect.assertions(8);
-        let complete = false;
-        const socket = socketUtils.SetupClientSideSocket('STSUITerm', 
-        // The address defines the namespace to connect to (i.e. io.of('/address'))
-        instrumentManagerAddress, 
-        // Connected call back
-        // eslint-disable-next-line  @typescript-eslint/no-unused-vars
-        (socket) => {
-            LogDebugMessage(chalk_1.default.green(`connected - 1`));
-            (0, vitest_1.expect)(1).toEqual(1);
-        }, 
-        // Custom Events
-        (socket) => {
-            socket.on('subscribeAck', (data) => {
-                LogDebugMessage(chalk_1.default.yellow('subscribeAck'));
-                (0, vitest_1.expect)(data.data).toMatch(/(subject01|subject02)/i);
-            });
-            socket.on('unsubscribeAck', (data) => {
-                LogDebugMessage(chalk_1.default.yellow('unsubscribeAck'));
-                (0, vitest_1.expect)(data.data).toMatch(/(subject02)/i);
+        vitest_1.expect.assertions(29);
+        let connectCount = 0;
+        let subscribeAckCount = 0;
+        let unsubscribeAckCount = 0;
+        let subscribeKeepAliveAckCount = 0;
+        let doneAckCount = 0;
+        const SetupClient = async (clientName, joinRooms) => {
+            const socket = socketUtils.SetupClientSideSocket('STSUITerm', 
+            // The address defines the namespace to connect to (i.e. io.of('/address'))
+            instrumentManagerAddress, 
+            // Connected call back
+            // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+            (socket) => {
+                LogDebugMessage(chalk_1.default.green(`${clientName}: connected - 1`));
+                connectCount++;
+                (0, vitest_1.expect)(1).toEqual(1);
+            }, 
+            // Custom Events
+            (socket) => {
+                socket.on('subscribeAck', (data) => {
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: subscribeAck`));
+                    subscribeAckCount++;
+                    (0, vitest_1.expect)(data.data).toMatch(/(subject01|subject02)/i);
+                });
+                socket.on('unsubscribeAck', (data) => {
+                    unsubscribeAckCount++;
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: unsubscribeAck`));
+                    (0, vitest_1.expect)(data.data).toMatch(/(subject02)/i);
+                });
+                socket.on('subscribeKeepAliveAck', (data) => {
+                    subscribeKeepAliveAckCount++;
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: subscribeKeepAliveAck`));
+                    (0, vitest_1.expect)(data.data).toMatch(/(ok)/i);
+                });
+                socket.on('doneAck', async () => {
+                    doneAckCount++;
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: doneAck`));
+                    (0, vitest_1.expect)(1).toEqual(1);
+                });
+                socket.on('compute3', async (arg, cb) => {
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: compute3`));
+                    cb({ arg, clientName });
+                });
+                socket.on('ServiceCommandGetThreads', async (arg) => {
+                    LogDebugMessage(chalk_1.default.yellow(`${clientName}: ServiceCommandGetThreads: [${JSON.stringify(arg)}]`));
+                });
+                socket.on('ServiceCommandGetThreadsEx', async (arg, cb) => {
+                    LogDebugMessage(chalk_1.default.green(`${clientName}: ServiceCommandGetThreadsEx: [${JSON.stringify(arg)}]`));
+                    cb({ arg, clientName });
+                });
+                socket.on('GetThreadDetailsFromService', async (arg, cb) => {
+                    LogDebugMessage(chalk_1.default.green(`${clientName}: ServiceCommandGetThreadsEx: [${JSON.stringify(arg)}]`));
+                    cb({
+                        threadData: { id: 'someid', extraData: 'someextradata' },
+                        arg,
+                        clientName
+                    });
+                });
+            }, (error) => {
+                LogErrorMessage(`${clientName}: SetupClientSideSocket call back: [${error}]`);
             });
-            socket.on('subscribeKeepAliveAck', (data) => {
-                LogDebugMessage(chalk_1.default.yellow('subscribeKeepAliveAck'));
-                (0, vitest_1.expect)(data.data).toMatch(/(ok)/i);
+            socket.emit('__STSjoinRoom', joinRooms);
+            socket.emit('__STSjoinRoom', ['room1']).emit('__STSjoinRoom', ['room2']);
+            socket.emit('subscribe', { data: 'subject01 ' });
+            socket.emit('subscribe', { data: 'subject02 ' });
+            socket.emit('unsubscribe', { data: 'subject02 ' });
+            socket.emit('subscribeKeepAlive', { data: 'ok' });
+            socket.timeout(250).emit('compute', 10, (err, arg) => {
+                if (err) {
+                    LogInfoMessage(err);
+                }
+                else {
+                    console.log(`${clientName}: compute: [${chalk_1.default.magenta(JSON.stringify(arg))}]`);
+                    (0, vitest_1.expect)(arg).toEqual('20');
+                }
             });
-            socket.on('doneAck', async () => {
-                LogDebugMessage(chalk_1.default.yellow('doneAck'));
-                (0, vitest_1.expect)(1).toEqual(1);
-                await (0, stsutils_1.Sleep)(500);
-                complete = true;
+            socket.timeout(250).emit('compute2', 10, (err, arg) => {
+                if (err) {
+                    LogInfoMessage(err);
+                }
+                else {
+                    console.log(`${clientName}: compute2: [${chalk_1.default.magenta(JSON.stringify(arg))}]`);
+                    (0, vitest_1.expect)(arg.data).toEqual(20);
+                }
             });
-        }, (error) => {
-            LogErrorMessage(`SetupClientSideSocket call back: [${error}]`);
-        });
-        socket.emit('__STSjoinRoom', ['room1']).emit('__STSjoinRoom', ['room2']);
-        socket.emit('subscribe', { data: 'subject01 ' });
-        socket.emit('subscribe', { data: 'subject02 ' });
-        socket.emit('unsubscribe', { data: 'subject02 ' });
-        socket.emit('subscribeKeepAlive', { data: 'ok' });
-        socket.emit('__STSsendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 } });
-        //socket.emit('done');
-        socket.timeout(250).emit('compute', 10, (err, arg) => {
-            if (err) {
-                LogInfoMessage(err);
-            }
-            else {
-                (0, vitest_1.expect)(arg).toEqual('20');
-            }
-        });
-        socket.timeout(250).emit('compute2', 10, (err, arg) => {
-            if (err) {
-                LogInfoMessage(err);
-            }
-            else {
-                (0, vitest_1.expect)(arg.data).toEqual(20);
-            }
+            return socket;
+        };
+        const client1 = await SetupClient('client1', ['service']);
+        const client2 = await SetupClient('client2', ['service', 'service_instance1']);
+        const client3 = await SetupClient('client3', ['service', 'service_instance2']);
+        await (0, stsutils_1.Sleep)(1000);
+        //client1.emit('broadcast');
+        //client2.emit('__STSsendToRoom', ['service'], { command: 'ServiceCommandGetThreads', payload: { room: 'service', somedata: 1 }});
+        client2.emit('__STSsendToRoomWithCB', ['service_instance1'], { command: 'ServiceCommandGetThreadsEx', payload: { room: 'service_instance1', somedata: 1 } });
+        client3.emit('GetThreadDetails', {
+            room: 'service_instance1',
+            threadInput: 500
+        }, (data) => {
+            console.log(chalk_1.default.magenta(JSON.stringify(data)));
         });
-        while (!complete) {
+        const start = performance.now();
+        const promArray = [];
+        for (let i = 0; i < 20; i++) {
+            const prom = new Promise((res, rej) => {
+                try {
+                    client1.emit('GetThreadDetails', {
+                        room: 'service',
+                        threadInput: 500,
+                        iteration: i
+                    }, (data) => {
+                        console.log(chalk_1.default.rgb(100, 240, 20)(JSON.stringify(data)));
+                        res(data);
+                    });
+                }
+                catch (error) {
+                    rej(error);
+                }
+            });
+            promArray.push(prom);
+        }
+        await Promise.all(promArray);
+        const end = performance.now();
+        console.log(chalk_1.default.magenta(`Total Time: [${end - start}]`));
+        await (0, stsutils_1.Sleep)(1000);
+        client1.emit('__STSsendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 } });
+        //while (!complete) {
+        while (doneAckCount < 3) {
             await (0, stsutils_1.Sleep)(100);
         }
-    }, 3000);
+        await (0, stsutils_1.Sleep)(500);
+        console.log(chalk_1.default.green(`connectCount: [${connectCount}]`));
+        console.log(chalk_1.default.green(`subscribeAckCount: [${subscribeAckCount}]`));
+        console.log(chalk_1.default.green(`unsubscribeAckCount: [${unsubscribeAckCount}]`));
+        console.log(chalk_1.default.green(`subscribeKeepAliveAckCount: [${subscribeKeepAliveAckCount}]`));
+        console.log(chalk_1.default.green(`doneAckCount: [${doneAckCount}]`));
+        (0, vitest_1.expect)(connectCount).toEqual(3);
+        (0, vitest_1.expect)(subscribeAckCount).toEqual(6);
+        (0, vitest_1.expect)(unsubscribeAckCount).toEqual(3);
+        (0, vitest_1.expect)(subscribeKeepAliveAckCount).toEqual(3);
+        (0, vitest_1.expect)(doneAckCount).toEqual(3);
+        console.log(chalk_1.default.green(`All Done...`));
+    }, 60000);
 });
 //# sourceMappingURL=singleservertest.test.js.map

package/dist/vitesttesting/singleservertest.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/vitesttesting/singleservertest.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,kDAAyD;AAEzD,gDAAyC;AACzC,6DAA6D;AAE7D,iDAA6C;AAE7C,2CAAkD;AAElD,kDAA0F;AAE1F,mCAAqE;AAErE,gEAA8F;AAE9F,sCAAyC;AAKzC,mEAAmE;AACnE,mDAAkD;AAElD,IAAA,iBAAQ,EAAC,oBAAoB,EAAE,GAAG,EAAE;IAEhC,IAAI,GAAG,GAAwB,IAAI,CAAC;IACpC,IAAI,0BAA0B,GAAG,EAAE,CAAC;IACpC,IAAI,gBAAgB,GAAQ,IAAI,CAAC;IAEjC,MAAM,YAAY,GAAG,IAAI,wBAAY,CAAC,EAAE,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG,mBAAmB,CAAA;IAEpC,MAAM,kBAAkB,GAAiC;QACrD,YAAY,EAAE;YACV,SAAS,EAAE,oBAAQ,CAAC,SAAS;YAC7B,UAAU,EAAE,oBAAQ,CAAC,UAAU;YAC/B,eAAe,EAAE,oBAAQ,CAAC,eAAe;YACzC,cAAc,EAAE,oBAAQ,CAAC,cAAc;YACvC,OAAO,EAAE,KAAK,EAAE,WAAW;YAC3B,kBAAkB,EAAE,oBAAQ,CAAC,YAAY,CAAC,qDAAqD;SAClG;KACJ,CAAA;IAED,MAAM,WAAW,GAAG,IAAI,uCAAoB,CAA6C,kBAAkB,CAAC,CAAC;IAE7G,MAAM,wBAAwB,GAC1B,GAAG,QAAQ,IAAI,oBAAQ,CAAC,UAAU,IAAI,oBAAY,CAAC,UAAU,GAAG,CAAC;IAErE,MAAM,cAAc,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,SAAS,OAAO,EAAE,CAAC,CAAC,CAAC;IACtF,MAAM,eAAe,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC;IACxF,MAAM,eAAe,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC;IAEvF,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE;QAC/B,eAAe,CAAC,eAAK,CAAC,GAAG,CAAC,0BAA0B,KAAK,GAAG,CAAC,CAAC,CAAC;QAC/D,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAe,KAAK,CAAC;YACrC,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACtB,eAAe,CAAC,eAAK,CAAC,GAAG,CAAC,kCAAkC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC5F,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAC9B,cAAc,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC7F,CAAC;gBACD,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAC3B,cAAc,CAAC,eAAK,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBACvF,CAAC;gBACD,IAAI,CAAC;oBACD,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;wBAC7B,cAAc,CAAC,eAAK,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC3F,CAAC;gBACL,CAAC;gBAAC,OAAO,UAAe,EAAE,CAAC;oBACvB,cAAc,CAAC,eAAK,CAAC,GAAG,CAAC,4CAA4C,UAAU,GAAG,CAAC,CAAC,CAAC;gBACzF,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,eAAe,CAAC,eAAK,CAAC,GAAG,CAAC,iCAAiC,UAAU,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;IACL,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,KAAK,IAAmC,EAAE;QACzD,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,oBAAQ,CAAC,UAAU,GAAG,oBAAQ,CAAC,aAAa,UAAU,CAAC;QAClF,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC,IAAI,0BAAc,CAAC,GAAG,EAAE,KAAK,CAAC;iBACpD,kBAAkB,EAAE;iBACpB,gBAAgB,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;YAC5C,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,WAAW,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;QAC1B,gBAAgB,GAAG,MAAM,IAAI,iCAAgB,CAAC,0BAA0B,CAAC;aACpE,eAAe,CAAC;YACb,UAAU,EAAE,6BAA6B;SAC5C,CAAC;aACD,gBAAgB,CAAC,IAAI,CAAC;YACvB,6BAA6B;YAC7B,yCAAyC;YACzC,0EAA0E;aACzE,KAAK,EAAE,CAAC;QAEb,0BAA0B,GAAG,WAAW,gBAAgB,CAAC,OAAO,EAAE,IAAI,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QAE7G,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;QAClB,gFAAgF;QAChF,iCAAiC;QAEjC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,kFAAkF,0BAA0B,GAAG,CAAC,CAAC,CAAC;IAC9I,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;QACzB,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAA;IAED,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QAEjB,MAAM,UAAU,EAAE,CAAC;QAEnB,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,0BAA0B,CAAC;QAExE,IAAA,yBAAa,GAAE,CAAC;QAEhB,MAAM,UAAU,GAAG,IAAA,gCAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACrD,UAAU,CAAC,sBAAsB,GAAG,KAAK,CAAC;QAC1C,GAAG,GAAG,IAAI,2BAAY,CAAC,UAAU,CAAC,CAAA;QAClC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;IACtB,CAAC,EAAE,MAAM,CAAC,CAAC;IAEX,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAChB,YAAY,CAAC,SAAS,EAAE,CAAC;QACzB,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,EAAE,oBAAoB,EAAE,CAAC;QAClC,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;QAClB,GAAG,GAAG,IAAI,CAAC;QAEX,MAAM,SAAS,EAAE,CAAC;IACtB,CAAC,EAAE,MAAM,CAAC,CAAC;IAEX,IAAA,aAAI,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,eAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,IAAA,eAAM,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,eAAM,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC;YACpC,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAChD,IAAA,eAAM,EAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;IACL,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,aAAI,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,eAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAErB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,MAAM,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC,WAAW;QACxD,2EAA2E;QAC3E,wBAAwB;QACxB,sBAAsB;QACtB,8DAA8D;QAC9D,CAAC,MAA0D,EAAE,EAAE;YAC3D,eAAe,CAAC,eAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;YAC9C,IAAA,eAAM,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,gBAAgB;QAChB,CAAC,MAA0D,EAAE,EAAE;YAC3D,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAS,EAAE,EAAE;gBACpC,eAAe,CAAC,eAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC9C,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,IAAS,EAAE,EAAE;gBACtC,eAAe,CAAC,eAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAChD,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,IAAS,EAAE,EAAE;gBAC7C,eAAe,CAAC,eAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC;gBACvD,IAAA,eAAM,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;gBAC5B,eAAe,CAAC,eAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;gBACzC,IAAA,eAAM,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBACrB,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC;gBACjB,QAAQ,GAAG,IAAI,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,EACD,CAAC,KAAY,EAAE,EAAE;YACb,eAAe,CAAC,qCAAqC,KAAK,GAAG,CAAC,CAAC;QACnE,CAAC,CACJ,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAEzE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC,CAAC;QAEhD,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,YAAY,EAAC,CAAC,CAAC;QAElD,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;QAEjD,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAC,CAAC,CAAA;QAC1F,sBAAsB;QAEtB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACjD,IAAI,GAAG,EAAE,CAAC;gBACN,cAAc,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,IAAA,eAAM,EAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClD,IAAI,GAAG,EAAE,CAAC;gBACN,cAAc,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,IAAA,eAAM,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAA,gBAAK,EAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IAEL,CAAC,EAAE,IAAI,CAAC,CAAC;AACb,CAAC,CAAC,CAAC"}
+{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/vitesttesting/singleservertest.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.231",
+  "version": "3.1.232",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -47,9 +47,10 @@
   "dependencies": {
     "@nsshunt/stsconfig": "^1.25.167",
     "@nsshunt/stsdatamanagement": "^1.18.83",
-    "@nsshunt/stsobservability": "^1.0.80",
+    "@nsshunt/stsobservability": "^1.0.83",
     "@nsshunt/stsutils": "^1.16.91",
     "@socket.io/cluster-adapter": "^0.2.2",
+    "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-streams-adapter": "^0.2.2",
     "@types/on-headers": "^1.0.3",
     "@types/pidusage": "^2.0.5",

package/src/commonTypes.ts

@@ -251,6 +251,7 @@ export interface ISocketIoServerHelper<ClientToServerEvents extends STSDefaultCl
     GetSTSSocketIONamespaces: () => STSSocketIONamespaces
     DisconnectSockets: () => void
     SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>
+    CloseAdaptors: () => Promise<void>
 }
 
 /*

package/src/process/serverprocessbase.ts

@@ -5,9 +5,6 @@ import { goptions } from '@nsshunt/stsconfig'
 
 import fs from 'node:fs'
 
-import { createAdapter as clusterCreateAdapter } from '@socket.io/cluster-adapter'
-import { createAdapter } from "@socket.io/redis-streams-adapter";
-
 import { JSONObject, Sleep } from '@nsshunt/stsutils'
 
 import { ProcessOptions, IServerProcessBase } from './../commonTypes'
@@ -24,12 +21,21 @@ import { Server, ServerOptions } from "socket.io";
 import { STSExpressServer } from './../stsexpressserver'
 import { Express } from 'express'
 
+import { createAdapter as clusterCreateAdapter } from '@socket.io/cluster-adapter'
+import { createAdapter } from "@socket.io/redis-streams-adapter";
+//import { ClusterAdapterWithHeartbeat } from 'socket.io-adaptor';
+
+//import { createAdapter } from "@socket.io/redis-adapter";
+
 import { createClient, RedisClientType } from 'redis';
+import { Redis } from 'ioredis';
 
 import jayson from 'jayson'
 
 import { STSTransportLoggerWinston } from './../logger/stsTransportLoggerWinston'
 
+import { STSNamespace } from './../commonTypes'
+
 /**
  * todo
  * @typedef {Object} options - todo
@@ -39,7 +45,7 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
 {
     #masterProcessExitTime = goptions.masterProcessExitTime;
     #io: Server | null = null;
-    #redisClient: RedisClientType | null = null;
+    #redisClient: RedisClientType | Redis | null = null;
     #httpServer: any = null;
     #expressServer: STSExpressServer | null = null;
     #sockets: net.Socket[] = [ ];
@@ -163,25 +169,29 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         //this.#io = require("socket.io")(this.#httpServer, options);
         this.#io = new Server(this.#httpServer, options);
 
-        if (this.options.clusterMode) {
-            if (this.options.useSocketIoRedisAdaptor) {
-                this.LogInfoMessage(`Using Redis for socket.io cluster management (worker)`);
-                if (this.options.socketIoRedisAdaptorUrl) {
-                    this.LogInfoMessage(`Redis url: [${this.options.socketIoRedisAdaptorUrl}]`);
-                    this.#redisClient = createClient({url: this.options.socketIoRedisAdaptorUrl});
-                } else {
-                    this.LogInfoMessage(`Redis url: [localhost]`);
-                    this.#redisClient = createClient();
-                }
-                await this.#redisClient.connect();
-                this.#io.adapter(createAdapter(this.#redisClient) as any);
-                this.LogInfoMessage(`Redis successfully connected.`);
+        if (this.options.useSocketIoRedisAdaptor) {
+            this.LogInfoMessage(`Using Redis for socket.io cluster management (worker)`);
+            if (this.options.socketIoRedisAdaptorUrl) {
+                this.LogInfoMessage(`Redis url: [${this.options.socketIoRedisAdaptorUrl}]`);
+                this.#redisClient = createClient({url: this.options.socketIoRedisAdaptorUrl});
             } else {
+                this.LogInfoMessage(`Redis url: [localhost]`);
+                this.#redisClient = createClient();
+            }
+            await this.#redisClient.connect();
+
+            //this.#redisClient = new Redis(this.options.socketIoRedisAdaptorUrl as string);
+
+            this.#io.adapter(createAdapter(this.#redisClient));
+
+            this.LogInfoMessage(`Redis successfully connected.`);
+        } else {
+            if (this.options.clusterMode) {
                 this.#io.adapter(clusterCreateAdapter() as any);
                 this.LogInfoMessage(`Using nodejs cluster mode for socket.io cluster management`);
+            } else {
+                this.LogInfoMessage(`Not using any adaptors for socket.io cluster management.}`);
             }
-        } else {
-            this.LogInfoMessage(`Not using any adaptors for socket.io cluster management.}`);
         }
 
         // To use a seperate socket server, the code below can be applied.
@@ -255,18 +265,31 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         return this.#shuttingDown;
     }
 
-    TerminateSocketIO = () => {
+    TerminateSocketIO = async (): Promise<void> => {
         if (this.options.wssServer === true && this.#io !== null) {
             const logPrefix = `ServerProcessBase:TerminateSockets():${process.pid}:`;
             this.LogInfoMessage(`${logPrefix} Disconnect SocketIO Sockets.`);
+            await Sleep(250);
+            await this.#io?.of('/').adapter.close();
             if (this.socketIoServerHelper !== null) {
-                this.socketIoServerHelper.DisconnectSockets();
+                await this.socketIoServerHelper.CloseAdaptors();
+                await Sleep(50);
+                if (this.#redisClient) {
+                    this.#redisClient.disconnect();
+                    await Sleep(50);
+                }
+                this.LogInfoMessage(`${logPrefix} this.socketIoServerHelper.DisconnectSockets()`);
+                await this.socketIoServerHelper.DisconnectSockets();
             } else {
+                this.LogInfoMessage(`${logPrefix} this.#io.disconnectSockets()`);
+                if (this.#redisClient) {
+                    this.#redisClient.disconnect();
+                    await Sleep(50);
+                }
                 this.#io.disconnectSockets();
             }
             this.socketIoServerHelper = null;
             this.#io = null;
-            // Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
         }
     }
 
@@ -308,7 +331,7 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
 
             this.TerminateUIController();
 
-            this.TerminateSocketIO();
+            await this.TerminateSocketIO();
 
             await this.TerminateHTTPServer();
             

package/src/process/singleprocessbase.ts

@@ -57,8 +57,7 @@ export class SingleProcessBase extends ServerProcessBase implements ISingleProce
         return true;
     }
 
-    async TerminateApplication()
-    {
+    async TerminateApplication() {
         await this.Terminate(false, 'SIGINT');
     }
 }

package/src/vitesttesting/appConfig.ts

@@ -82,7 +82,9 @@ export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): P
             instrumentationObservationInterval: goptions.instrumentationObservationInterval,
             instrumentationTimeWindow: goptions.instrumentationTimeWindow,
 
-            useSocketIoRedisAdaptor: false,
+            useSocketIoRedisAdaptor: true,
+            socketIoRedisAdaptorUrl: goptions.socketIoRedisAdaptorUrl,
+            //socketIoRedisAdaptorUrl: 'redis://192.168.50.5:6379',
             //workerExec: './dist/testing/app.js',
 
             logger: logger,