@nsshunt/stsappframework 3.3.184 → 4.0.1

package/dist/commonTypes.js

@@ -1,4 +1,4 @@
-import { ModelDelimeter, CheckValidChar, InjectionToken, } from "@nsshunt/stsutils";
+import { ModelDelimeter, CheckValidChar, } from "@nsshunt/stsutils";
 export function CreateServiceProcessContext(serviceName, serviceVersion, serviceInstanceId, hostName, processId, parentProcessId) {
     const checkParams = [
         ["servicename", serviceName],
@@ -23,15 +23,4 @@ ${processId.toString()}${ModelDelimeter.COMPONENT_SEPERATOR}${parentProcessId.to
         parentProcessId: parentProcessId.toString(),
     };
 }
-export const AgentManagerToken = new InjectionToken("__STS__AgentManager");
-export const PublishInstrumentControllerToken = new InjectionToken("__STS__PublishInstrumentController");
-export const ProcessOptionsToken = new InjectionToken("__STS__ProcessOptions");
-export const DataManagerToken = new InjectionToken("__STS__DataManager");
-export const STSLoggerToken = new InjectionToken("__STS__STSLogger");
-export const LogManagerToken = new InjectionToken("__STS__LogManager");
-export const STSServerToken = new InjectionToken("__STS__STSServer");
-export const ProcessBaseToken = new InjectionToken("__STS__ProcessBase");
-export const ProcessMetricsToken = new InjectionToken("__STS__ProcessMetrics");
-export const STSTransportLoggerWinstonToken = new InjectionToken("__STS__STSTransportLoggerWinston");
-export const LatencyManagerToken = new InjectionToken("__STS__LatencyManager");
 //# sourceMappingURL=commonTypes.js.map

package/dist/commonTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAQA,OAAO,EAEH,cAAc,EACd,cAAc,EAEd,cAAc,GACjB,MAAM,mBAAmB,CAAC;AA2C3B,MAAM,UAAU,2BAA2B,CACvC,WAAmB,EACnB,cAAsB,EACtB,iBAAyB,EACzB,QAAgB,EAChB,SAAiB,EACjB,eAAuB;IAEvB,MAAM,WAAW,GAAG;QAChB,CAAC,aAAa,EAAE,WAAW,CAAC;QAC5B,CAAC,gBAAgB,EAAE,cAAc,CAAC;QAClC,CAAC,UAAU,EAAE,QAAQ,CAAC;QACtB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;KAC3C,CAAC;IAEF,4BAA4B;IAC5B,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,cAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,cAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,cAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,cAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC,mBAAmB,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE;QAClF,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC/B,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;KAC9C,CAAC;AACN,CAAC;AAuUD,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,cAAc,CAC/C,qBAAqB,CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,cAAc,CAEhE,oCAAoC,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,uBAAuB,CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAC9C,oBAAoB,CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAC5C,kBAAkB,CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,cAAc,CAC7C,mBAAmB,CACtB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAC5C,kBAAkB,CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAC9C,oBAAoB,CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,uBAAuB,CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,cAAc,CAC5D,kCAAkC,CACrC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,uBAAuB,CAC1B,CAAC"}
+{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAMA,OAAO,EACH,cAAc,EACd,cAAc,GAGjB,MAAM,mBAAmB,CAAC;AAkC3B,MAAM,UAAU,2BAA2B,CACvC,WAAmB,EACnB,cAAsB,EACtB,iBAAyB,EACzB,QAAgB,EAChB,SAAiB,EACjB,eAAuB;IAEvB,MAAM,WAAW,GAAG;QAChB,CAAC,aAAa,EAAE,WAAW,CAAC;QAC5B,CAAC,gBAAgB,EAAE,cAAc,CAAC;QAClC,CAAC,UAAU,EAAE,QAAQ,CAAC;QACtB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;KAC3C,CAAC;IAEF,4BAA4B;IAC5B,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,cAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,cAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,cAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,cAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC,mBAAmB,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE;QAClF,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC/B,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;KAC9C,CAAC;AACN,CAAC"}

package/dist/exampleapp/app.js

@@ -0,0 +1,238 @@
+// processbase.ts
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
+import os from "node:os";
+import { randomUUID } from "node:crypto";
+import cluster from "node:cluster";
+import chalk from "chalk";
+import { StatusCodes } from "http-status-codes";
+import { inject, emptyLogger, SetInjectionContextStore, } from "@nsshunt/stsutils";
+import { NodeInjectionContextStore } from "@nsshunt/stsutils/node";
+import { GetInstruments } from "@nsshunt/stsinstrumentmanagerclient";
+import { goptions } from "@nsshunt/stsconfig";
+import { STSConfigPlugin, STSLoggerPlugin, STSMetricsPlugin, STSServerPlugin, STSLatencyPlugin, STSInstrumentControllerPlugin, STSLoggerPluginToken, CreateServiceProcessContext, STSClusterWorkerManagerPlugin, STSExpressControllerPlugin, STSPGPoolManagerPlugin, STSLifeCyclePlugin, STSApp, } from "./../index.js";
+// curl -k https://192.168.0.80:3003/stsrest01/v1
+// curl -k https://192.168.0.80:3003/stsrest01/v1/latency
+let pickedCol = undefined;
+const randomColour = () => {
+    if (!pickedCol) {
+        const r = Math.floor(Math.random() * 256);
+        const g = Math.floor(Math.random() * 256);
+        const b = Math.floor(Math.random() * 256);
+        pickedCol = chalk.rgb(r, g, b);
+    }
+    return pickedCol;
+};
+let randomFreq = Math.floor(Math.random() * 900) + 100;
+const outputLogs = (app) => {
+    let intv = undefined;
+    let indent = 0;
+    let direction = 1;
+    intv = setInterval(() => {
+        app.run(() => {
+            const logger = inject(STSLoggerPluginToken);
+            logger.info(randomColour()(`[${process.pid}] ${" ".repeat(indent)}[${indent.toString().padStart(2, " ")}] W: ==> Hello World 2`));
+            indent += direction;
+            if (indent === 10) {
+                direction = -1;
+            }
+            if (indent === 0) {
+                direction = 1;
+            }
+        });
+    }, randomFreq).unref();
+    app.on("Terminate", () => {
+        clearInterval(intv);
+    });
+};
+// IMPORTANT
+// We are in nodejs, so use the async local storage version of the injector. This ensure that we
+// can use inject in async code before or after any awaits
+SetInjectionContextStore(new NodeInjectionContextStore());
+if (cluster.isPrimary) {
+    const serviceProcessContext = CreateServiceProcessContext(goptions.rest01servicename, goptions.rest01serviceversion, randomUUID(), os.hostname(), process.pid, process.pid);
+    const app = new STSApp();
+    app.use(app.createPlugin(STSConfigPlugin));
+    app.use(app.createPlugin(STSLoggerPlugin), {
+        serviceInstanceId: serviceProcessContext.serviceInstanceId,
+        serviceName: serviceProcessContext.serviceName,
+        serviceVersion: serviceProcessContext.serviceVersion,
+        name: `${process.pid}[P]Logger`,
+    });
+    app.use(app.createPlugin(STSLifeCyclePlugin));
+    const instrumentControllerPluginOptions = {
+        consoleLogging: true,
+        instrumentDefinitions: GetInstruments("service"),
+        instrumentLogging: true,
+        serviceProcessContext: serviceProcessContext,
+        logger: emptyLogger,
+    };
+    app.use(app.createPlugin(STSInstrumentControllerPlugin), instrumentControllerPluginOptions);
+    app.use(app.createPlugin(STSMetricsPlugin), {
+        serviceName: goptions.rest01servicename,
+    });
+    // Use for single thread server
+    //@@app.use(app.createPlugin(STSServerPlugin), expressServerOptions);
+    app.use(app.createPlugin(STSLatencyPlugin), {
+        apiRoot: goptions.rest01apiroot,
+        endpoint: goptions.rest01endpoint,
+        port: parseInt(goptions.rest01hostport),
+    });
+    app.use(app.createPlugin(STSClusterWorkerManagerPlugin), {
+        workerEnvironmentVars: {
+            serviceInstanceId: serviceProcessContext.serviceInstanceId,
+        },
+    });
+    outputLogs(app);
+    await app.Start();
+}
+else {
+    const workerEnvironmentVars = JSON.parse(process.env["STS_GSD_SII"]);
+    const _serviceInstanceId = workerEnvironmentVars.serviceInstanceId;
+    const serviceProcessContext = CreateServiceProcessContext(goptions.rest01servicename, goptions.rest01serviceversion, _serviceInstanceId, os.hostname(), process.pid, process.ppid);
+    const expressServerOptions = {
+        httpsServerKeyPath: goptions.httpsserverkeypath,
+        httpsServerCertificatePath: goptions.httpsservercertpath,
+        listenPort: parseInt(goptions.rest01hostport),
+        endpoint: goptions.rest01endpoint,
+        apiRoot: goptions.rest01apiroot,
+        logger: emptyLogger,
+        serviceName: goptions.rest01servicename,
+        useTls: false,
+        prometheusSupport: false,
+        wssServer: false,
+        wssCustomPath: "",
+        useSocketIoRedisAdaptor: false,
+        socketIoRedisAdaptorUrl: goptions.socketIoRedisAdaptorUrl,
+        clusterMode: true,
+    };
+    const instrumentControllerPluginOptions = {
+        consoleLogging: true,
+        instrumentDefinitions: GetInstruments("service"),
+        instrumentLogging: true,
+        serviceProcessContext: serviceProcessContext,
+        logger: emptyLogger,
+    };
+    const app = new STSApp();
+    app.use(app.createPlugin(STSConfigPlugin));
+    app.use(app.createPlugin(STSLoggerPlugin), {
+        serviceInstanceId: serviceProcessContext.serviceInstanceId,
+        serviceName: serviceProcessContext.serviceName,
+        serviceVersion: serviceProcessContext.serviceVersion,
+        name: `${process.pid}[W]Logger`,
+    });
+    app.use(app.createPlugin(STSLifeCyclePlugin));
+    app.use(app.createPlugin(STSInstrumentControllerPlugin), instrumentControllerPluginOptions);
+    app.use(app.createPlugin(STSMetricsPlugin), {
+        serviceName: serviceProcessContext.serviceName,
+    });
+    const GetPoolConnectionString = (useDefaultDatabase) => {
+        if (goptions.dbhost) {
+            const hosts = goptions.dbhost.split(",");
+            if (useDefaultDatabase) {
+                return hosts
+                    .map((host) => {
+                    return `postgresql://${goptions.dbuser}:${goptions.dbpassword}@${host}/postgres`;
+                })
+                    .join(",");
+            }
+            else {
+                return hosts
+                    .map((host) => {
+                    return `postgresql://${goptions.dbuser}:${goptions.dbpassword}@${host}/${goptions.database}`;
+                })
+                    .join(",");
+            }
+        }
+    };
+    app.use(app.createPlugin(STSPGPoolManagerPlugin), {
+        ssl: false,
+        poolSize: 1,
+        poolConnectionString: GetPoolConnectionString(false),
+    });
+    app.use(app.createPlugin(STSServerPlugin), expressServerOptions);
+    // Use below for debugging only ...
+    /*
+    const stslatencyMiddlewareController: RequestHandler = async (
+        req,
+        res,
+        next
+    ) => {
+        try {
+            // IMPORTANT
+            // For the nodejs injector, use the below so we can safely use inject after async await code
+            // SetInjectionContextStore(new NodeInjectionContextStore());
+
+            // If we do not do the SetInjectionContextStore at startup time, the injector will be the browser/synchronous version
+            // In that case, we need to use inject before any awaits to ensure that the current injection context is always set correctly
+            //const logger = inject(STSLoggerPluginToken);
+            //const server = inject(STSServerPluginToken);
+
+            console.log(process.pid, "MIDDLEWARE ENTER", req.originalUrl);
+
+            await Sleep(500);
+
+            // This is only safe here in the nodejs injector becuase we are using the async local storage version
+            // and becuase of that, during startup (before new App() we need to do this;
+            // SetInjectionContextStore(new NodeInjectionContextStore());
+            const logger = inject(STSLoggerPluginToken);
+            const server = inject(STSServerPluginToken);
+
+            if ((server as STSExpressServer).IsDraining()) {
+                res.status(503).send({
+                    error: "Service shutting down",
+                });
+                return;
+            }
+
+            console.log(process.pid, "MIDDLEWARE RESUMED", req.originalUrl);
+
+            if (logger) {
+                logger.debug(
+                    `${req.method} ${req.url} ${req.baseUrl} ${req.originalUrl}`
+                );
+            }
+
+            console.log(process.pid, "MIDDLEWARE NEXT");
+
+            next();
+        } catch (error) {
+            console.error(error);
+            next(error);
+        }
+    };
+    */
+    const stslatencyController = async (_req, res, next) => {
+        try {
+            const retVal = {
+                data: `Ping Completed At: ${Date.now()}`,
+                pid: process.pid,
+                ppid: process.ppid,
+            };
+            return res.status(StatusCodes.OK).send(retVal);
+        }
+        catch (error) {
+            next(error);
+        }
+    };
+    app.use(app.createPlugin(STSExpressControllerPlugin), {
+        routes: [
+            {
+                method: "get",
+                mountPath: `${goptions.rest01apiroot}/`,
+                handlers: [stslatencyController],
+            },
+            {
+                method: "get",
+                mountPath: `${goptions.rest01apiroot}/latency`,
+                handlers: [
+                    // Use below for debugging only ...
+                    //stslatencyMiddlewareController,
+                    stslatencyController,
+                ],
+            },
+        ],
+    });
+    outputLogs(app);
+    app.Start();
+}
+//# sourceMappingURL=app.js.map

package/dist/exampleapp/app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/exampleapp/app.ts"],"names":[],"mappings":"AAAA,iBAAiB;AACjB,wFAAwF,CAAC,UAAU;AACnG,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACH,MAAM,EACN,WAAW,EACX,wBAAwB,GAE3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACH,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,6BAA6B,EAE7B,oBAAoB,EACpB,2BAA2B,EAE3B,6BAA6B,EAC7B,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,MAAM,GACT,MAAM,eAAe,CAAC;AAEvB,iDAAiD;AACjD,yDAAyD;AAEzD,IAAI,SAAS,GAAQ,SAAS,CAAC;AAE/B,MAAM,YAAY,GAAG,GAAG,EAAE;IACtB,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC1C,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;AAEvD,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE;IAC/B,IAAI,IAAI,GAAQ,SAAS,CAAC;IAC1B,IAAI,MAAM,GAAW,CAAC,CAAC;IACvB,IAAI,SAAS,GAAW,CAAC,CAAC;IAE1B,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE;QACpB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAE5C,MAAM,CAAC,IAAI,CACP,YAAY,EAAE,CACV,IAAI,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,wBAAwB,CACvG,CACJ,CAAC;YAEF,MAAM,IAAI,SAAS,CAAC;YACpB,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;gBAChB,SAAS,GAAG,CAAC,CAAC,CAAC;YACnB,CAAC;YACD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;gBACf,SAAS,GAAG,CAAC,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;IAEvB,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QACrB,aAAa,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,YAAY;AACZ,gGAAgG;AAChG,0DAA0D;AAC1D,wBAAwB,CAAC,IAAI,yBAAyB,EAAE,CAAC,CAAC;AAE1D,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IACpB,MAAM,qBAAqB,GAAG,2BAA2B,CACrD,QAAQ,CAAC,iBAAiB,EAC1B,QAAQ,CAAC,oBAAoB,EAC7B,UAAU,EAAE,EACZ,EAAE,CAAC,QAAQ,EAAE,EACb,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,GAAG,CACd,CAAC;IAEF,MAAM,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;IAEzB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAE3C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QACvC,iBAAiB,EAAE,qBAAqB,CAAC,iBAAiB;QAC1D,WAAW,EAAE,qBAAqB,CAAC,WAAW;QAC9C,cAAc,EAAE,qBAAqB,CAAC,cAAc;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,WAAW;KAClC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE9C,MAAM,iCAAiC,GACnC;QACI,cAAc,EAAE,IAAI;QACpB,qBAAqB,EAAE,cAAc,CAAC,SAAS,CAAC;QAChD,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,qBAAqB;QAC5C,MAAM,EAAE,WAAW;KACtB,CAAC;IAEN,GAAG,CAAC,GAAG,CACH,GAAG,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAC/C,iCAAiC,CACpC,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE;QACxC,WAAW,EAAE,QAAQ,CAAC,iBAAiB;KAC1C,CAAC,CAAC;IAEH,+BAA+B;IAC/B,qEAAqE;IAErE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE;QACxC,OAAO,EAAE,QAAQ,CAAC,aAAa;QAC/B,QAAQ,EAAE,QAAQ,CAAC,cAAc;QACjC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC;KAC1C,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAAE;QACrD,qBAAqB,EAAE;YACnB,iBAAiB,EAAE,qBAAqB,CAAC,iBAAiB;SAC7D;KACJ,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,CAAC;IAEhB,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC;KAAM,CAAC;IACJ,MAAM,qBAAqB,GAAe,IAAI,CAAC,KAAK,CAChD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAW,CACzB,CAAC;IAEhB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,iBAAiB,CAAC;IAEnE,MAAM,qBAAqB,GAAG,2BAA2B,CACrD,QAAQ,CAAC,iBAAiB,EAC1B,QAAQ,CAAC,oBAAoB,EAC7B,kBAAkB,EAClB,EAAE,CAAC,QAAQ,EAAE,EACb,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,IAAI,CACf,CAAC;IAEF,MAAM,oBAAoB,GAA6B;QACnD,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;QAC/C,0BAA0B,EAAE,QAAQ,CAAC,mBAAmB;QACxD,UAAU,EAAE,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC;QAC7C,QAAQ,EAAE,QAAQ,CAAC,cAAc;QACjC,OAAO,EAAE,QAAQ,CAAC,aAAa;QAC/B,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,QAAQ,CAAC,iBAAiB;QACvC,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,KAAK;QACxB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,EAAE;QACjB,uBAAuB,EAAE,KAAK;QAC9B,uBAAuB,EAAE,QAAQ,CAAC,uBAAuB;QACzD,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,MAAM,iCAAiC,GACnC;QACI,cAAc,EAAE,IAAI;QACpB,qBAAqB,EAAE,cAAc,CAAC,SAAS,CAAC;QAChD,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,qBAAqB;QAC5C,MAAM,EAAE,WAAW;KACtB,CAAC;IAEN,MAAM,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;IAEzB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAE3C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE;QACvC,iBAAiB,EAAE,qBAAqB,CAAC,iBAAiB;QAC1D,WAAW,EAAE,qBAAqB,CAAC,WAAW;QAC9C,cAAc,EAAE,qBAAqB,CAAC,cAAc;QACpD,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,WAAW;KAClC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE9C,GAAG,CAAC,GAAG,CACH,GAAG,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAC/C,iCAAiC,CACpC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE;QACxC,WAAW,EAAE,qBAAqB,CAAC,WAAW;KACjD,CAAC,CAAC;IAEH,MAAM,uBAAuB,GAAG,CAAC,kBAA2B,EAAE,EAAE;QAC5D,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEzC,IAAI,kBAAkB,EAAE,CAAC;gBACrB,OAAO,KAAK;qBACP,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACV,OAAO,gBAAgB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,IAAI,WAAW,CAAC;gBACrF,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACJ,OAAO,KAAK;qBACP,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACV,OAAO,gBAAgB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,IAAI,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACjG,CAAC,CAAC;qBACD,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,sBAAsB,CAAC,EAAE;QAC9C,GAAG,EAAE,KAAK;QACV,QAAQ,EAAE,CAAC;QACX,oBAAoB,EAAE,uBAAuB,CAAC,KAAK,CAAC;KACvD,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAEjE,mCAAmC;IACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiDE;IAEF,MAAM,oBAAoB,GAAmB,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnE,IAAI,CAAC;YACD,MAAM,MAAM,GAAG;gBACX,IAAI,EAAE,sBAAsB,IAAI,CAAC,GAAG,EAAE,EAAE;gBACxC,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,OAAO,CAAC,IAAI;aACrB,CAAC;YAEF,OAAO,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;IACL,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,0BAA0B,CAAC,EAAE;QAClD,MAAM,EAAE;YACJ;gBACI,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,GAAG,QAAQ,CAAC,aAAa,GAAG;gBACvC,QAAQ,EAAE,CAAC,oBAAoB,CAAC;aACnC;YACD;gBACI,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,GAAG,QAAQ,CAAC,aAAa,UAAU;gBAC9C,QAAQ,EAAE;oBACN,mCAAmC;oBACnC,iCAAiC;oBAEjC,oBAAoB;iBACvB;aACJ;SACJ;KACJ,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,CAAC;IAEhB,GAAG,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC"}

package/dist/index.js

@@ -1,15 +1,19 @@
 export * from "./commonTypes.js";
-export * from "./process/masterprocessbase.js";
-export * from "./process/processbase.js";
-export * from "./process/serverprocessbase.js";
-export * from "./process/singleprocessbase.js";
-export * from "./process/workerprocessbase.js";
-export * from "./process/datamanager.js";
 export * from "./controller/stslatencycontroller.js";
 export * from "./route/stslatencyroute.js";
-export * from "./publishertransports/publishTransportUtils.js";
 export * from "./logger/stsTransportLoggerWinston.js";
 export * from "./logger/stsTransportWinston.js";
 export * from "./logger/stsTransportLoggerSocket.js";
 export * from "./logger/socketClientLogPublisher.js";
+export * from "./plugins/stsclusterworkermanagerplugin.js";
+export * from "./plugins/stsconfigplugin.js";
+export * from "./plugins/stsexpresscontrollerplugin.js";
+export * from "./plugins/stsinstrumentmanagerplugin.js";
+export * from "./plugins/stslatencyplugin.js";
+export * from "./plugins/stslifecycleplugin.js";
+export * from "./plugins/stsloggerplugin.js";
+export * from "./plugins/stsmetricsplugin.js";
+export * from "./plugins/stspgpoolmanagerplugin.js";
+export * from "./plugins/stsserverplugin.js";
+export * from "./stsapp.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sCAAsC,CAAC;AACrD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,sCAAsC,CAAC;AACrD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,sCAAsC,CAAC;AAErD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qCAAqC,CAAC;AACpD,cAAc,8BAA8B,CAAC;AAE7C,cAAc,aAAa,CAAC"}

package/dist/logger/stsTransportLoggerSocket.js

@@ -25,5 +25,10 @@ export class STSTransportLoggerSocket extends Transport {
         this.emit("logged", info);
         callback();
     }
+    close() {
+        if (this.#socketIoClient) {
+            this.#socketIoClient.Disconnect();
+        }
+    }
 }
 //# sourceMappingURL=stsTransportLoggerSocket.js.map

package/dist/logger/stsTransportLoggerSocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"stsTransportLoggerSocket.js","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,SAAqC,MAAM,mBAAmB,CAAC;AAQtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAQzE,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACnD,QAAQ,CAAmC;IAC3C,eAAe,CAGb;IAEF,YAAY,IAAsC;QAC9C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,wBAAwB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5E,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAC7B,iBAAiB,EACjB,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB;YACI,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;aACvB;SACJ,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;IACf,CAAC;CACJ"}
+{"version":3,"file":"stsTransportLoggerSocket.js","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerSocket.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,SAAqC,MAAM,mBAAmB,CAAC;AAQtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAQzE,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACnD,QAAQ,CAAmC;IAC3C,eAAe,CAGb;IAEF,YAAY,IAAsC;QAC9C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,wBAAwB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5E,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,IAAI,CAC7B,iBAAiB,EACjB,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB;YACI,OAAO,EAAE,YAAY;YACrB,OAAO,EAAE;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;aACvB;SACJ,CACJ,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;IACf,CAAC;IAEM,KAAK;QACR,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;QACtC,CAAC;IACL,CAAC;CACJ"}

package/dist/{process → plugins}/clusterworkermanager.js

@@ -4,18 +4,19 @@ import cluster from "node:cluster";
 import { goptions } from "@nsshunt/stsconfig";
 import chalk from "chalk";
 import { Gauge } from "@nsshunt/stsobservability";
-import { ProcessMetricsToken, LogManagerToken, } from "./../commonTypes.js";
-import { ProcessOptionsToken } from "./../commonTypes.js";
 import { inject } from "@nsshunt/stsutils";
 import { TinyEmitter } from "tiny-emitter";
+import { STSLoggerPluginToken } from "./stsloggerplugin.js";
+import { STSMetricsPluginToken } from "./stsmetricsplugin.js";
 export class ClusterWorkerManager extends TinyEmitter {
     #killWorkers = {};
     #workers = 1; // Start at 1 becuase of main thread
-    metrics = inject(ProcessMetricsToken);
-    options = inject(ProcessOptionsToken);
-    loggerManager = inject(LogManagerToken);
-    constructor() {
+    metrics = inject(STSMetricsPluginToken);
+    options;
+    loggerManager = inject(STSLoggerPluginToken);
+    constructor(options) {
         super();
+        this.options = options;
         cluster.setupPrimary({
             serialization: "advanced",
         });
@@ -24,33 +25,33 @@ export class ClusterWorkerManager extends TinyEmitter {
     #SetupClusterEvents = () => {
         cluster.on("listening", (worker, address) => {
             this.emit("clusterListening", worker, address);
-            this.loggerManager.LogInfoMessage(`Worker process ${worker.process.pid} is listening at address: ${JSON.stringify(address)}`);
+            this.loggerManager.info(`Worker process ${worker.process.pid} is listening at address: ${JSON.stringify(address)}`);
         });
         //Setting up lifecycle event listeners for worker processes
         cluster.on("online", (worker) => {
             this.emit("clusterOnline", worker);
-            this.loggerManager.LogInfoMessage(`Worker process ${worker.process.pid} is online`);
+            this.loggerManager.info(`Worker process ${worker.process.pid} is online`);
         });
         cluster.on("exit", (worker, code, signal) => {
             this.emit("clusterExit", worker, code, signal);
             if ((code !== null && code === 0) || signal === "SIGINT") {
-                this.loggerManager.LogInfoMessage(chalk.green(`Process ${worker.process.pid} terminated gracefully with code: ${code}, signal: ${signal}`));
+                this.loggerManager.info(chalk.green(`${process.pid} Process ${worker.process.pid} terminated gracefully with code: ${code}, signal: ${signal}`));
                 this.DecWorkers();
             }
             else if ((code !== null && code === 15) || signal === "SIGTERM") {
                 this.DecWorkers();
-                this.loggerManager.LogInfoMessage(chalk.red(`Process ${worker.process.pid} terminated with code: ${code}, signal: ${signal}`));
+                this.loggerManager.info(chalk.red(`${process.pid} Process ${worker.process.pid} terminated with code: ${code}, signal: ${signal}`));
             }
             else {
                 this.DecWorkers();
-                this.loggerManager.LogInfoMessage(chalk.red(`worker ${worker.process.pid} died`));
-                this.loggerManager.LogInfoMessage(chalk.red(`code: ${code}`));
-                this.loggerManager.LogInfoMessage(chalk.red(`signal: ${signal}`));
-                this.loggerManager.LogInfoMessage(chalk.red("process terminated in an error state"));
+                this.loggerManager.info(chalk.red(`${process.pid} worker ${worker.process.pid} died`));
+                this.loggerManager.info(chalk.red(`code: ${code}`));
+                this.loggerManager.info(chalk.red(`signal: ${signal}`));
+                this.loggerManager.info(chalk.red(`${process.pid} process terminated in an error state`));
                 //if (goptions.respawnOnFail === true && !this.shuttingDown) {
                 //@@ check shutdown
                 if (goptions.respawnOnFail === true) {
-                    this.loggerManager.LogInfoMessage(chalk.magenta(`Attemping to respawn worker`));
+                    this.loggerManager.info(chalk.magenta(`${process.pid} Attemping to respawn worker`));
                     return this.SpawnWorker();
                 }
             }
@@ -61,7 +62,7 @@ export class ClusterWorkerManager extends TinyEmitter {
             if (cluster.workers && cluster.workers[id]) {
                 const worker = cluster.workers[id];
                 if (worker.process) {
-                    this.loggerManager.LogInfoMessage(chalk.grey(`Sending terminate message `) +
+                    this.loggerManager.info(chalk.grey(`Sending terminate message `) +
                         chalk.yellow(`(initiated by ${signal})`) +
                         chalk.grey(` for worker PID: ${worker.process.pid}`));
                     const command = killProcess
@@ -72,23 +73,23 @@ export class ClusterWorkerManager extends TinyEmitter {
                         //worker.process.send( { command } );
                     }
                     catch (error) {
-                        this.loggerManager.LogInfoMessage(chalk.red(`MasterProcessBase:#_KillWorker() (1): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
+                        this.loggerManager.info(chalk.red(`${process.pid} MasterProcessBase:#_KillWorker() (1): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
                         return false;
                     }
                     return true;
                 }
                 else {
-                    this.loggerManager.LogInfoMessage(chalk.red(`MasterProcessBase:#_KillWorker(): Could not kill worker with id: [${id}]. The process does not exists`));
+                    this.loggerManager.info(chalk.red(`${process.pid} MasterProcessBase:#_KillWorker(): Could not kill worker with id: [${id}]. The process does not exists`));
                     return false;
                 }
             }
             else {
-                this.loggerManager.LogInfoMessage(chalk.red(`MasterProcessBase:#_KillWorker(): Could not kill worker with id: [${id}]. Worker does not exist within workers collection`));
+                this.loggerManager.info(chalk.red(`${process.pid} MasterProcessBase:#_KillWorker(): Could not kill worker with id: [${id}]. Worker does not exist within workers collection`));
                 return false;
             }
         }
         catch (error) {
-            this.loggerManager.LogInfoMessage(chalk.red(`MasterProcessBase:#_KillWorker() (2): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
+            this.loggerManager.info(chalk.red(`${process.pid} MasterProcessBase:#_KillWorker() (2): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
             return false;
         }
     };
@@ -117,19 +118,19 @@ export class ClusterWorkerManager extends TinyEmitter {
                 }
             }
             else {
-                this.loggerManager.LogInfoMessage(chalk.yellow(`MasterProcessBase:KillWorker(): Not allowed to kill the last worker process.`));
+                this.loggerManager.info(chalk.yellow(`${process.pid} MasterProcessBase:KillWorker(): Not allowed to kill the last worker process.`));
                 return false;
             }
         }
         catch (error) {
-            this.loggerManager.LogInfoMessage(chalk.red(`MasterProcessBase:KillWorker(): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
+            this.loggerManager.info(chalk.red(`${process.pid} MasterProcessBase:KillWorker(): id: [${id}], signal: [${signal}], killProcess: [${killProcess}], error: [${error}]`));
             return false;
         }
     };
     KillWorkers = (signal, keepOne) => {
-        const logPrefix = `MasterProcessBase:KillWorkers():${process.pid}:`;
+        const logPrefix = `${process.pid} MasterProcessBase:KillWorkers():`;
         try {
-            this.loggerManager.LogInfoMessage(`${logPrefix} Killing Workers.`);
+            this.loggerManager.info(`${logPrefix} Killing Workers.`);
             const keepOneAlive = keepOne ? keepOne : false;
             let skippedFirst = false;
             const sortedIdList = [];
@@ -146,7 +147,7 @@ export class ClusterWorkerManager extends TinyEmitter {
             });
         }
         catch (error) {
-            this.loggerManager.LogInfoMessage(chalk.red(`${logPrefix} signal: [${signal}], keepOne: [${keepOne}], error: [${error}]`));
+            this.loggerManager.info(chalk.red(`${logPrefix} signal: [${signal}], keepOne: [${keepOne}], error: [${error}]`));
         }
     };
     #UpdateWorkersInstrument = () => {
@@ -158,19 +159,19 @@ export class ClusterWorkerManager extends TinyEmitter {
     };
     IncWorkers = () => {
         this.#workers++;
-        this.loggerManager.LogDebugMessage(`  Inc Workers. Total thread count: [${this.#workers}]`);
+        this.loggerManager.info(`  Inc Workers. Total thread count: [${this.#workers}]`);
         this.#UpdateWorkersInstrument();
     };
     DecWorkers = () => {
         this.#workers--;
-        this.loggerManager.LogDebugMessage(`  Dec Workers. Total thread count: [${this.#workers}]`);
+        this.loggerManager.info(`${process.pid}   Dec Workers. Total thread count: [${this.#workers}]`);
         this.#UpdateWorkersInstrument();
     };
     AddWorker = (options) => {
         const workerId = this.SpawnWorker(options);
-        this.loggerManager.LogDebugMessage(chalk.yellow(`  Spawned worker with id: [${workerId}]`));
+        this.loggerManager.info(chalk.yellow(`${process.pid}   Spawned worker with id: [${workerId}]`));
         if (options) {
-            this.loggerManager.LogDebugMessage(chalk.yellow(`  Options: [${JSON.stringify(options)}]`));
+            this.loggerManager.info(chalk.yellow(`${process.pid}   Options: [${JSON.stringify(options)}]`));
         }
         return workerId;
     };
@@ -180,7 +181,7 @@ export class ClusterWorkerManager extends TinyEmitter {
         // Remove the assigned loggers (this will need to be re-created in the worker thread)
         delete tempOptions.logger;
         delete tempOptions.publisherLogger;
-        workerEnv["STS_GSD_SII"] = JSON.stringify(tempOptions);
+        workerEnv["STS_GSD_SII"] = JSON.stringify(this.options.workerEnvironmentVars);
         if (spawnWorkerOptions) {
             workerEnv["STS_GSD_OPTIONS"] = JSON.stringify(spawnWorkerOptions);
         }
@@ -189,19 +190,19 @@ export class ClusterWorkerManager extends TinyEmitter {
         worker.on("exit", (code, signal) => {
             this.emit("workerExit", code, signal);
             if (signal) {
-                this.loggerManager.LogInfoMessage(`Worker: ${worker.process.pid} was killed by signal: ${signal}`);
+                this.loggerManager.info(`${process.pid} Worker: ${worker.process.pid} was killed by signal: ${signal}`);
             }
             else if (code !== 0) {
-                this.loggerManager.LogInfoMessage(`Worker: ${worker.process.pid} exited with error code: ${code}`);
+                this.loggerManager.info(`${process.pid} Worker: ${worker.process.pid} exited with error code: ${code}`);
             }
             else {
-                this.loggerManager.LogInfoMessage(`Worker: ${worker.process.pid} exited successfully, code: ${code}, signal: ${signal}`);
+                this.loggerManager.info(`${process.pid} Worker: ${worker.process.pid} exited successfully, code: ${code}, signal: ${signal}`);
             }
         });
         worker.on("error", (error) => {
             this.emit("workerError", error);
-            const message = chalk.red(`#SpawnWorker():worker.on('error'): Error: [${error}]`);
-            this.loggerManager.LogErrorMessage(message);
+            const message = chalk.red(`${process.pid} #SpawnWorker():worker.on('error'): Error: [${error}]`);
+            this.loggerManager.info(message);
         });
         this.emit("workerAdded", worker.id);
         return worker.id;
@@ -215,7 +216,7 @@ export class ClusterWorkerManager extends TinyEmitter {
                 worker.send({ command, data });
             }
             catch (error) {
-                this.loggerManager.LogErrorMessage(`ClusterWorkerManager:BroadcastDataToWorkers(): Unable to send message to worker ${worker.id}: ${error}`);
+                this.loggerManager.info(`${process.pid} ClusterWorkerManager:BroadcastDataToWorkers(): Unable to send message to worker ${worker.id}: ${error}`);
             }
         }
     };

package/dist/plugins/clusterworkermanager.js.map

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