@nsshunt/stsappframework 3.0.187 → 3.1.2

package/dist/{testing → vitesttesting}/singleservertest.test.js

@@ -32,7 +32,8 @@ const debug = (0, debug_1.default)(`proc:${process.pid}:singleservertest.test`);
 const chalk_1 = __importDefault(require("chalk"));
 const axios_1 = __importDefault(require("axios"));
 const stsutils_1 = require("@nsshunt/stsutils");
-const __1 = require("./..");
+//import { SingleProcessBase, MasterProcessBase } from './..'
+const appSingleWSS_1 = require("./appSingleWSS");
 const appConfig_1 = require("./appConfig");
 const stsconfig_1 = require("@nsshunt/stsconfig");
 const goptions = (0, stsconfig_1.$Options)();
@@ -40,17 +41,7 @@ const https = __importStar(require("node:https"));
 const vitest_1 = require("vitest");
 const stssocketio_client_1 = require("@nsshunt/stssocketio-client");
 const index_1 = require("./../index");
-//import { TimeSeriesBucketTimestamp } from 'redis';
 (0, vitest_1.describe)("Single Server Test", () => {
-    /*
-    const kafka = new Kafka({
-        clientId: 'my-app',
-        brokers: ['192.168.14.92:9092']
-        //brokers: ['localhost:9092', 'kafka2:9092'],
-    })
-    let producer: any;
-    let environment: any;
-    */
     let app = null;
     let httpsAgent = null;
     const endpoint = 'https://localhost';
@@ -64,8 +55,6 @@ const index_1 = require("./../index");
             rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
         }
     };
-    // Use ServerToClientEvents<true> when the client will pass a request to server with a call back expected with a timeout
-    //@@const socketUtils = new SocketIoClientHelper<ServerToClientEvents<true>, ClientToServerEvents>(socketUtilsoptions);
     const socketUtils = new stssocketio_client_1.SocketIoClientHelper(socketUtilsoptions);
     const instrumentManagerAddress = `${endpoint}:${goptions.rest01port}/${index_1.STSNamespace.STSMonitor}/`;
     const LogInfoMessage = (message) => console.log(message);
@@ -123,105 +112,17 @@ const index_1 = require("./../index");
             return null;
         }
     };
-    /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars */
-    /*
-    const socketDetail: ISocketDetail = socketUtils.SetupClientSideSocket('STSUITerm', instrumentManagerAddress, [
-        {
-            eventName: 'hello',
-            eventCb: (socket: any, data: any): void =>  {
-                debug(`Received: [hello:${data}]`);
-            }
-        },
-        {
-            eventName: 'goodbye',
-            eventCb: (socket: any, data: any) => {
-                debug(`Received: [goodbye:${data}]`);
-            }
-        },
-        {
-            eventName: 'registerEcho',
-            eventCb: (socket: any, data: any) => {
-                debug(`Received: [registerEcho:${JSON.stringify(data)}]`);
-            }
-        },
-        {
-            eventName: STSEvent.connect,
-            eventCb: (socket: STSClientSocket, data: any) => {
-                socket.emit('joinRoom', STSRoom.STSInstrumentDataRoom);
-            }
-        },
-        {
-            eventName: 'sts_connect_reply',
-            eventCb: (socket: STSClientSocket, data: any) => {
-                debug(`Received: [sts_connect_reply:${JSON.stringify(data)}]`);
-            }
-        }
-    ]);
-    */
     (0, vitest_1.beforeAll)(async () => {
-        /*
-        const composeFilePath = "/home/marcusbettens/projects/stsappframework/src/testing";
-        const composeFile = "docker-compose.yml";
-        try {
-            environment = await new DockerComposeEnvironment(composeFilePath, composeFile)
-                .withWaitStrategy("kafka", Wait.forLogMessage("[KafkaServer id=1001] started (kafka.server.KafkaServer)"))
-                .withPullPolicy(new AlwaysPullPolicy())
-                .up()
-        } catch (error) {
-            this.#LogErrorMessage(error)
-            throw error;
-        }
-
-        */
-        /*
-        producer = kafka.producer()
-        await producer.connect()
-        */
-        /*
-        process.env.AS_ENDPOINT = testHelper.authHost;
-        process.env.AS_HOST_PORT = testHelper.authPort;
-        process.env.AS_PORT = testHelper.authPort;
-
-        $ResetOptions();
-        //goptions = $Options()
-
-        //goptions.asendpoint = testHelper.authHost;
-        //goptions.asport = testHelper.authPort;
-        */
-        const clusterMode = true;
-        if (clusterMode) {
-            const appOptions = (0, appConfig_1.ServiceConfigOptions)(clusterMode, true);
-            appOptions.processExitOnTerminate = false;
-            app = new __1.MasterProcessBase(appOptions);
-        }
-        else {
-            const appOptions = (0, appConfig_1.ServiceConfigOptions)(clusterMode, true);
-            appOptions.processExitOnTerminate = false;
-            app = new __1.SingleProcessBase(appOptions);
-        }
-        const appOptions = (0, appConfig_1.ServiceConfigOptions)(true, true);
+        const appOptions = (0, appConfig_1.ServiceConfigOptions)(false, true);
         appOptions.processExitOnTerminate = false;
-        //app = new SingleProcessBase(appOptions)
-        app = new __1.MasterProcessBase(appOptions);
+        app = new appSingleWSS_1.AppSingleWSS(appOptions);
         await app.SetupServer();
         await (0, stsutils_1.Sleep)(3000);
     }, 60000);
     (0, vitest_1.afterAll)(async () => {
         await (0, stsutils_1.Sleep)(500);
-        // Kafka disconnect
-        //await producer.disconnect()
-        //@@await environment.down();
-        //await (app as SingleProcessBase).TerminateApplication();
         await (0, stsutils_1.Sleep)(1000);
         app = null;
-        /*
-
-        await testHelper.StopAuthService();
-        await testHelper.StopDatabase();
-        await testHelper.StopNetwork();
-
-        await Sleep(2000);
-        */
     }, 15000);
     (0, vitest_1.test)('Testing Module', async () => {
         vitest_1.expect.assertions(1);
@@ -231,14 +132,6 @@ const index_1 = require("./../index");
         const num = 50;
         vitest_1.expect.assertions(num * 2);
         for (let i = 0; i < num; i++) {
-            /*
-            const retValKafka = await producer.send({
-                topic: 'topic-name2',
-                messages: [
-                    { key: 'key1', value: `hello world - ${i}` },
-                ],
-            })
-            */
             const retVal = await getLatency();
             const retValObj = retVal?.data.data;
             (0, vitest_1.expect)(retValObj).toMatch('Ping Completed At:');
@@ -252,6 +145,7 @@ const index_1 = require("./../index");
         // 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) => {
             debug(chalk_1.default.green(`connected - 1`));
             (0, vitest_1.expect)(1).toEqual(1);

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

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

package/dist/vitesttesting/wsevents.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=wsevents.js.map

package/dist/vitesttesting/wsevents.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wsevents.js","sourceRoot":"","sources":["../../src/vitesttesting/wsevents.ts"],"names":[],"mappings":""}

package/dist/workerprocessbase.js

@@ -13,6 +13,7 @@ const commonTypes_1 = require("./commonTypes");
 const server_1 = require("./server");
 const serverprocessbase_1 = require("./serverprocessbase");
 const uuid_1 = require("uuid");
+const stsTransportLoggerWinston_1 = require("./stsTransportLoggerWinston");
 /**
  * todo
  * @typedef {Object} options - todo
@@ -25,7 +26,12 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
         super(options);
     }
     WorkerStarted() {
-        return null;
+        const transport = new stsTransportLoggerWinston_1.STSTransportLoggerWinston({
+            stsApp: this
+        });
+        setTimeout(() => {
+            this.options.logger.add(transport);
+        }, 0);
     }
     // eslint-disable-next-line  @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
     ReceivedMessageFromMaster(msg) {

package/dist/workerprocessbase.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAEjD,kDAA0B;AAE1B,oEAA6E;AAG7E,+CAAiH;AACjH,qCAA4C;AAC5C,2DAAuD;AAEvD,+BAAoC;AAEpC,2EAAuE;AAEvE;;;;GAIG;AACH,MAAa,iBAAkB,SAAQ,qCAAiB;IAEpD,gBAAgB,GAAgB,EAAG,CAAA;IACnC,8BAA8B,GAAG,IAAI,CAAC,CAAC,WAAW;IAElD,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,aAAa;QACT,MAAM,SAAS,GAAG,IAAI,qDAAyB,CAAC;YAC5C,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QACH,UAAU,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,MAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC,EAAE,CAAC,CAAC,CAAC;IACV,CAAC;IAED,kGAAkG;IAClG,yBAAyB,CAAC,GAAQ;QAC9B,mCAAmC;IACvC,CAAC;IAEQ,0BAA0B;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACtD,+DAA+D;YAC/D,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,sBAAsB,EAAE;gBAChD,GAAG,EAAE,KAAK;aACe,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,2BAA2B,GAAG,CAAC,OAA0B,EAAuB,EAAE;QAC9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,qBAAqB,OAAO,CAAC,EAAE,+DAA+D,CAAC,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG;oBAChC,iBAAiB,EAAE,EAAE,GAAG,OAAO,EAAE;oBACjC,EAAE,EAAE,GAAG,EAAE;wBACL,MAAM,MAAM,GAAe,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,cAA4B,CAAA;wBAC3G,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxD,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,KAAK,CAAC,eAAK,CAAC,KAAK,CAAC,wCAAwC,OAAO,CAAC,EAAE,4CAA4C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;wBACzL,OAAO,CAAC,MAAM,CAAC,CAAC;oBACpB,CAAC;oBACD,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;wBACrB,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,gCAAgC,IAAI,CAAC,8BAA8B,yBAAyB,OAAO,CAAC,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC/M,MAAM,CAAC,+CAA+C,CAAC,CAAC;oBAC5D,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC,8BAA8B;iBACzE,CAAA;gBACD,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,6BAA6B,OAAO,CAAC,EAAE,0CAA0C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5K,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,+DAA+D;IAC/D,SAAS,GAAG,KAAK,EAAE,OAAY,EAAmB,EAAE;QAChD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE;gBACX,OAAO;aACV;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAA;IAED,+DAA+D;IAC/D,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAY,EAAuB,EAAE;QACzE,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,YAAY;YACvC,aAAa,EAAE;gBACX,OAAO;gBACP,QAAQ;aACX;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,kBAAkB,GAAG,KAAK,IAAmB,EAAE;QAC3C,OAAO;IACX,CAAC,CAAA;IAED,WAAW,GAAG,KAAK,IAAI,EAAE;QAErB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC,CAAA;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;YACzF,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAEjG,+DAA+D;QAC/D,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YACrC,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;gBACtB,MAAM,iBAAiB,GAAsB,GAAwB,CAAC;gBACtE,IAAI,iBAAiB,CAAC,EAAE,EAAE,CAAC;oBACvB,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC9C,MAAM,eAAe,GAAe,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;wBAChF,eAAe,CAAC,iBAAiB,CAAC,cAAc,GAAG,EAAE,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAA;wBAC1F,eAAe,CAAC,EAAE,EAAE,CAAC;oBACzB,CAAC;yBAAM,CAAC;wBACJ,MAAM,IAAI,KAAK,CAAC,qDAAqD,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;oBAClG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAClG,CAAC;gBACD,OAAO;YACX,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,cAAc;aAC/B,CAAC;gBACG,QAAQ,GAAG,CAAC,OAAO,EACnB,CAAC;oBACD,KAAK,WAAW;wBACZ,IAAI,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBACrG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,2EAA2E;wBAC9G,MAAM;oBACV,KAAK,kBAAkB;wBACnB,IAAI,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBACrG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACjC,MAAM;oBACV,KAAK,SAAS;wBACV,qGAAqG;wBACrG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACzC,MAAM;oBACV,KAAK,UAAU,EAAG,iDAAiD;wBAC/D,GAAG,CAAC,OAAO,CAAA;gBACf,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,eAAe;QACf,6CAA6C;QAC7C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAE7B,IAAI,CAAC,KAAK,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAE5B,IAAI,CAAC,KAAK,CAAC,sCAAsC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAChE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,KAAK,CAAC,eAAK,CAAC,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC;CACL;AAzKD,8CAyKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.0.187",
+  "version": "3.1.2",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",

package/src/authutilsnode.ts

@@ -11,7 +11,7 @@ const goptions = $Options()
 
 import debugModule from 'debug'
 
-import { GetErrorPayload, ISTSLogger, JSONObject } from '@nsshunt/stsutils'
+import { GetErrorPayload, JSONObject } from '@nsshunt/stsutils'
 
 import { AppFrameworkErrorCode } from './validation/errors'
 
@@ -54,28 +54,18 @@ export interface IGetAPITokenFromAuthServerUsingScopeOptions {
     instrumentController?: PublishInstrumentControllerV2
 }
 
-export interface IAuthUtilsNodeOptions {
-    logger: ISTSLogger
-}
-
-export class AuthUtilsNode {
-    #options: IAuthUtilsNodeOptions;
+export class AuthUtilsNode
+{
     #cookiejar: tough.CookieJar;
     #httpsAgent: https.Agent | null = null;
     #debug = debugModule(`proc:${process.pid}:AuthUtilsNode`);
     // Regular expression to match the origin
     #originRegex = /^(api:\/\/\w+)/;
 
-    constructor(options: IAuthUtilsNodeOptions) {
-        this.#options = options;
+    constructor() {
         this.#cookiejar = new tough.CookieJar();
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    #LogDebugMessage(message: any) {
-        this.#options.logger.debug(message);
-    }
-
     #GetHttpsAgent = () =>
     {
         if (this.#httpsAgent === null) {
@@ -223,7 +213,7 @@ export class AuthUtilsNode {
         const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
 
         const invokeErrorCb = (error: Error) => {
-            this.#LogDebugMessage(error);
+            this.#debug(error);
             if (instrumentController) {
                 instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, { // auth error
                     Inc: 1
@@ -286,7 +276,7 @@ export class AuthUtilsNode {
             if (retVal.status) {
                 if (retVal.status !== 200) {
                     // Just provide a warning here
-                    this.#LogDebugMessage(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
+                    this.#debug(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
                 }
             } else {
                 invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
@@ -359,7 +349,7 @@ export class AuthUtilsNode {
 				//,socketPath: '/var/run/sts/stsrest01.sock'
 			});
 			duration = (performance.now() - processStart).toFixed(4);
-			if (publishDebug) this.#LogDebugMessage(`AuthUtilsNode.LoginNode request duration: [${duration}]`);
+			if (publishDebug) debug(`AuthUtilsNode.LoginNode request duration: [${duration}]`);
 			loginData = retVal.data.detail;
 
 
@@ -374,7 +364,7 @@ export class AuthUtilsNode {
 			return loginData;
 		} catch (error)
 		{
-			if (publishDebug) this.#LogDebugMessage(chalk.red(`Error (AuthUtilsNode:LoginNode): ${error}`));
+			if (publishDebug) debug(chalk.red(`Error (AuthUtilsNode:LoginNode): ${error}`));
 			throw error;
 		}
 	}
@@ -404,12 +394,12 @@ export class AuthUtilsNode {
 				//,socketPath: '/var/run/sts/stsrest01.sock'
 			});
 			duration = (performance.now() - processStart).toFixed(4);
-			if (publishDebug) this.#LogDebugMessage(`AuthUtilsNode.RefreshAuthTokenBrowser request duration: [${duration}]`);
+			if (publishDebug) debug(`AuthUtilsNode.RefreshAuthTokenBrowser request duration: [${duration}]`);
 			loginData = retVal.data.detail;
 			await this.SetCookiesToJar(retVal.headers);
 			return loginData;
 		} catch (error) {
-			if (publishDebug) this.#LogDebugMessage(chalk.red(`Error (AuthUtilsNode:RefreshAuthTokenBrowser): ${error}`));
+			if (publishDebug) debug(chalk.red(`Error (AuthUtilsNode:RefreshAuthTokenBrowser): ${error}`));
 			throw error;
 		}
 	}

package/src/commonTypes.ts

@@ -77,7 +77,7 @@ export interface ISingleProcessBase extends IProcessBase {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     get httpServer(): any
     CollectAdditionalTelemetry(): void
-    ProcessStarted(): any
+    ProcessStarted(): void
     get io(): any
     ProcessTerminating(): Promise<void>
     get expressServer(): any // STSExpressServer - need to put interface in common types - circular reference
@@ -88,7 +88,7 @@ export interface ISingleProcessBase extends IProcessBase {
 
 export interface IWorkerProcessBase extends IProcessBase {
     get httpServer(): any
-    WorkerStarted(): any
+    WorkerStarted(): void
     // eslint-disable-next-line  @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
     ReceivedMessageFromMaster(msg: any): void
     CollectAdditionalTelemetry(): void

package/src/index.ts

@@ -20,5 +20,5 @@ export * from './influxdb/influxDBManagerService'
 export * from './influxdb/influxDBManagerAgent'
 export * from './publishertransports/publishTransportUtils'
 export * from './instrumentationsubscriber'
-export * from './stsTransportDebuggerWinston'
-export * from './stsTransportLoggerWinston'
+export * from './stsTransportWinston'
+export * from './stsAppFrameworkTransportWinston'

package/src/influxdb/influxDBManager.ts

@@ -283,25 +283,21 @@ export class InfluxDBManager
         this.#options.logger.error(message);
     }
 
-    #LogDebugMessage(message: any) {
-        this.#options.logger.debug(message);
-    }
-
     #BoostrapInfluxDB = async(): Promise<void> => {
         const tasksAPI = new TasksAPI(this.#client);
         const tasks: Tasks = await tasksAPI.getTasks({
             org: 'my-org'
         });
         if (tasks.tasks) {
-            this.#LogDebugMessage(chalk.cyan(`[InfluxDB Tasks] - Count: [${tasks.tasks.length}]`));
+            debug(chalk.cyan(`[InfluxDB Tasks] - Count: [${tasks.tasks.length}]`));
             tasks.tasks.forEach((task: Task) => {
-                this.#LogDebugMessage(chalk.cyan(`-- [ Start Task Definition ]--`));
-                this.#LogDebugMessage(chalk.green(`${JSON.stringify(task)}`));
-                this.#LogDebugMessage(chalk.yellow(`authorizationID: [${task.authorizationID}]`));
-                this.#LogDebugMessage(chalk.cyan(`-- [ End Task Definition ]--`));
+                debug(chalk.cyan(`-- [ Start Task Definition ]--`));
+                debug(chalk.green(`${JSON.stringify(task)}`));
+                debug(chalk.yellow(`authorizationID: [${task.authorizationID}]`));
+                debug(chalk.cyan(`-- [ End Task Definition ]--`));
             });
         } else {
-            this.#LogDebugMessage(chalk.magenta(`[InfluxDB Tasks] - Could not get tasks from the InfluxDB API`));
+            debug(chalk.magenta(`[InfluxDB Tasks] - Could not get tasks from the InfluxDB API`));
         }
     }
 
@@ -332,7 +328,7 @@ export class InfluxDBManager
 
     Terminate = async () => {
         if (this.#shuttingDown) {
-            this.#LogDebugMessage(chalk.yellow(`${_logPrefix}Terminate: Terminate already called. Ignoring.`));
+            debug(chalk.yellow(`${_logPrefix}Terminate: Terminate already called. Ignoring.`));
         } else {
             this.#shuttingDown = true;
             if (this.#writeClient) {
@@ -351,7 +347,7 @@ export class InfluxDBManager
 
                     this.#writeClient = null;
 
-                    this.#LogDebugMessage(chalk.yellow(`ProducerDisconnect`));
+                    debug(chalk.yellow(`ProducerDisconnect`));
                 } catch (error) {
                     this.#LogErrorMessage(chalk.red(`${_logPrefix}#Terminate: Error: [${error}]`));
                 }
@@ -446,15 +442,15 @@ export class InfluxDBManager
                 // ... there are more write options that can be customized, see
                 // https://influxdata.github.io/influxdb-client-js/influxdb-client.writeoptions.html and
                 // https://influxdata.github.io/influxdb-client-js/influxdb-client.writeretryoptions.html
-                writeFailed: (error, lines, attempt, expires) => {
-                    this.#LogDebugMessage(chalk.red(`writeOptions:writeSuccess(): Error: [${error}], Attempt: [${attempt}], Expires: [${expires}], Lines: [${lines}]`));
+                writeFailed(error, lines, attempt, expires) {
+                    debug(chalk.red(`writeOptions:writeSuccess(): Error: [${error}], Attempt: [${attempt}], Expires: [${expires}], Lines: [${lines}]`));
                 },
-                writeSuccess: (lines) => {
+                writeSuccess(lines) {
                     // Needs option
-                    //@@this.#LogDebugMessage(chalk.green(`writeOptions:writeSuccess(): Lines: [${lines}]`));
+                    //@@debug(chalk.green(`writeOptions:writeSuccess(): Lines: [${lines}]`));
                 },
-                writeRetrySkipped: (entry) => {
-                    this.#LogDebugMessage(chalk.magenta(`writeOptions:writeSuccess(): Expires: [${entry.expires}], Lines: [${entry.lines}]`));
+                writeRetrySkipped(entry) {
+                    debug(chalk.magenta(`writeOptions:writeSuccess(): Expires: [${entry.expires}], Lines: [${entry.lines}]`));
                 }
             }
     
@@ -474,7 +470,7 @@ export class InfluxDBManager
                             await this.#writeClient.flush();
                             const end = performance.now();
                             // Needs option
-                            //@@this.#LogDebugMessage(chalk.gray(`InfluxDB Flush time: [${end-start}]`));
+                            //@@debug(chalk.gray(`InfluxDB Flush time: [${end-start}]`));
                             attemptCount = 0;
                             StartWriteClient(normalFlushDelay); 
                         } catch (error) {

package/src/influxdb/influxDBManagerAgent.ts

@@ -133,10 +133,6 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
         this.options.logger.error(message);
     }
 
-    #LogDebugMessage(message: any) {
-        this.options.logger.debug(message);
-    }
-
     // Queries --------------------------------------------------------------------------------------------------------
 
     // Counter metrics
@@ -148,7 +144,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
             |> filter(fn: (r) => r["_measurement"] == "${measurement}" ${filterClause})`;
 
             if (showOutput) {
-                this.#LogDebugMessage(`GetSTSCountGenericAgent(): query: [${query}]`);
+                debug(`GetSTSCountGenericAgent(): query: [${query}]`);
             }
 
             return this.queryApi.collectRows(query)

package/src/influxdb/influxDBManagerService.ts

@@ -146,10 +146,6 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
         this.options.logger.error(message);
     }
 
-    #LogDebugMessage(message: any) {
-        this.options.logger.debug(message);
-    }
-
     override get modelType(): string {
         return 'service'
     }
@@ -187,7 +183,7 @@ data
             union(tables: [r1, r2])`;
 
             if (showOutput) {
-                this.#LogDebugMessage(`InfluxDBManagerService:GetSTSCountGenericService(): query: [${query}]`);
+                debug(`InfluxDBManagerService:GetSTSCountGenericService(): query: [${query}]`);
             }
 
             return this.queryApi.collectRows(query)

package/src/kafka/IMKafkaManager.ts

@@ -61,10 +61,6 @@ export class IMKafkaManager {
         this.#options.logger.error(message);
     }
 
-    #LogDebugMessage(message: any) {
-        this.#options.logger.debug(message);
-    }
-
     #RaiseError = (msg: string, errorCb: (error: any) => void) => {
         this.#LogErrorMessage(chalk.red(msg));
         errorCb(msg);
@@ -84,10 +80,10 @@ export class IMKafkaManager {
     Terminate = async (errorCb: (error: any) => void): Promise<void> => {
         try {
             if (this.#shuttingDown) {
-                this.#LogDebugMessage(chalk.yellow(`${process.pid}:IMKafkaManager:Terminate: Terminate already called. Ignoring.`));
+                debug(chalk.yellow(`${process.pid}:IMKafkaManager:Terminate: Terminate already called. Ignoring.`));
             } else {
                 this.#shuttingDown = true;
-                this.#LogDebugMessage(chalk.yellow(`${process.pid}:ProducerDisconnect`));
+                debug(chalk.yellow(`${process.pid}:ProducerDisconnect`));
                 if (this.#producer) {
                     await this.#producer.Disconnect((error) => {
                         this.#RaiseError(`${process.pid}:IMKafkaManager:Terminate(): Error in producer.Disconnect: [${error}]`, errorCb);
@@ -103,7 +99,7 @@ export class IMKafkaManager {
         const topic = topicRaw.toLowerCase();
         try {
             if (!this.#topics[topic]) {
-                this.#LogDebugMessage(chalk.yellow(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Starting`));
+                debug(chalk.yellow(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Starting`));
                 this.#topics[topic] = true;
 
                 let createTopicError = false;
@@ -113,9 +109,9 @@ export class IMKafkaManager {
                 });
                 if (!createTopicError) {
                     if (result) {
-                        this.#LogDebugMessage(chalk.yellow(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Completed`));
+                        debug(chalk.yellow(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Completed`));
                     } else {
-                        this.#LogDebugMessage(chalk.cyan(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Completed - topic already exists`));
+                        debug(chalk.cyan(`${process.pid}:IMKafkaManager:OutputLogsToKafkaTopic(): Setting up kafka topic: [${topic}] Completed - topic already exists`));
                     }
                 }
             }

package/src/masterprocessbase.ts

@@ -30,6 +30,7 @@ import { IMasterProcessBase } from './commonTypes';
 import { InstrumentDefinitions } from '@nsshunt/stspublisherserver'
 import { IPCMessagePayload, IPCMessageCommand } from './commonTypes'
 
+import { STSTransportLoggerWinston } from './stsTransportLoggerWinston'
 
 export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
 {
@@ -426,7 +427,12 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
     };
 
     MasterStarted(): void { // eslint-disable @typescript-eslint/no-empty-function
-
+        const transport = new STSTransportLoggerWinston({
+            stsApp: this
+        });
+        setTimeout(() => {
+            (this.options.logger as any).add(transport);
+        }, 0);
     }
 
     override get shuttingDown(): boolean {

package/src/middleware/serverNetworkMiddleware.ts

@@ -5,7 +5,7 @@ import { Socket } from 'node:net'
 import { TinyEmitter } from 'tiny-emitter';
 
 import debugModule from 'debug'
-import { STSOptionsBase } from '@nsshunt/stsutils';
+import { ISTSLogger, STSOptionsBase } from '@nsshunt/stsutils';
 const debug = debugModule(`proc:${process.pid}`);
 
 import { v4 as uuidv4 } from 'uuid';
@@ -33,6 +33,7 @@ export type ServerNetworkMiddlewareEventFunc = (data: ISocketRecord) => void;
 export interface IServerNetworkMiddleware {
     name: string
     outputDebug: boolean
+    logger: ISTSLogger
 }
 
 export class ServerNetworkMiddleware extends STSOptionsBase
@@ -46,39 +47,7 @@ export class ServerNetworkMiddleware extends STSOptionsBase
     }
 
     #LogDebugMessage(message: any) {
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        setImmediate(() => {
-            if (this.options) {
-                try {
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    this.options?.logger.debug(message)
-                } catch (error) {
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.log(`*********************************************************************************`)
-                    console.error(error);
-                }
-            }
-        });
+        this.options?.logger.debug(message);
     }
 
     on(eventName: ServerNetworkMiddlewareEventName, callBackFn: ServerNetworkMiddlewareEventFunc) {
@@ -265,30 +234,6 @@ export class ServerNetworkMiddleware extends STSOptionsBase
         // This event is the one where bytesRead is generally recorded
         this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
 
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-        console.log(`*********************************************************************************`)
-
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-        debug('*****************************************************************************')
-
         next();
     }
 }