@nsshunt/stsappframework 3.3.186 → 4.0.1

package/dist/plugins/pgpoolmanager.js

@@ -0,0 +1,186 @@
+/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
+import chalk from "chalk";
+import cluster from "cluster";
+//const pg = require('pg');
+//pg.types.setTypeParser(20, BigInt); // Type Id 20 = BIGINT | BIGSERIAL
+// https://stackoverflow.com/questions/39168501/pg-promise-returns-integers-as-strings
+import { Pool } from "pg";
+import { TinyEmitter } from "tiny-emitter";
+import { Gauge } from "@nsshunt/stsobservability";
+import { STSMetricsPluginToken } from "./stsmetricsplugin.js";
+import { STSLoggerPluginToken } from "./stsloggerplugin.js";
+import { inject } from "@nsshunt/stsutils";
+export var IDBAccessLayerEvents;
+(function (IDBAccessLayerEvents) {
+    IDBAccessLayerEvents["UpdateInstruments"] = "UpdateInstruments";
+})(IDBAccessLayerEvents || (IDBAccessLayerEvents = {}));
+export class PGPoolManager extends TinyEmitter {
+    #options;
+    #observer = null;
+    #pools = {};
+    #keyPrefix = "__STS__";
+    currentReadOnlyPoolIndex = 0;
+    logger = inject(STSLoggerPluginToken);
+    metrics = inject(STSMetricsPluginToken);
+    constructor(options) {
+        super();
+        this.#options = options;
+    }
+    #LogDebugMessage(message) {
+        this.logger.debug(message);
+    }
+    #LogErrorMessage(message) {
+        this.logger.error(message);
+    }
+    Start = async () => {
+        const poolConnectionStrings = this.#options.poolConnectionString.split(",");
+        for (let i = 0; i < poolConnectionStrings.length; i++) {
+            this.#CreatePool(i, poolConnectionStrings[i]);
+        }
+        this.#AttachInstruments();
+    };
+    #CreatePool = (poolIndex, poolConnectionString) => {
+        // https://mylifedigital.co.uk/securing-node-postgres-with-ssl/
+        const pool = new Pool({
+            connectionString: poolConnectionString,
+            ssl: this.#options.ssl,
+            max: this.#options.poolSize, // Default is 10 - This will be the number in a pool per thread (worker)
+            // Consideration needs to be given for the max number of connections at the database.
+            // Max connections calculation = max pool size * max workers (threads) per instance/node * max instances in a cluster (k3s, k8s, swarm mode etc.)
+            /*
+          ssl: {
+            // rejectUnauthorized: true,   // Make this true for PROD
+            rejectUnauthorized: false,
+            //ca: fs.readFileSync('/path/to/server-certificates/root.crt').toString(),
+            //key: fs.readFileSync('/path/to/client-key/postgresql.key').toString(),
+            //cert: fs.readFileSync('/path/to/client-certificates/postgresql.crt').toString(),
+          }
+          */
+        });
+        const re = new RegExp("//(.*)@").exec(poolConnectionString);
+        let usernamepassword = "";
+        if (re) {
+            usernamepassword = re[1];
+        }
+        const sep = usernamepassword.split(":");
+        const usernamepasswordReplacement = usernamepassword.replace(sep[1], "*****************************");
+        const safeConnectionString = poolConnectionString.replace(usernamepassword, usernamepasswordReplacement);
+        this.#pools[this.#GetPoolKey(poolIndex)] = {
+            connectionString: poolConnectionString,
+            safeConnectionString,
+            pool,
+        };
+        if (cluster.isPrimary) {
+            this.#LogDebugMessage(chalk.yellow(`Created Database Pool with Master Thread, PID: [${process.pid}]`));
+        }
+        else {
+            this.#LogDebugMessage(chalk.yellow(`Created Database Pool with Worker Thread, PID: [${process.pid}]`));
+        }
+        this.#LogDebugMessage(chalk.yellow(`Created Database Pool: Master Thread`));
+        this.#LogDebugMessage(chalk.yellow(`  Connection URI: [${safeConnectionString}]`));
+        this.#LogDebugMessage(chalk.yellow(`  Maximum Pool Size: [${this.#options.poolSize}]`));
+        this.#LogDebugMessage(chalk.yellow(`  SSL Connection: [${this.#options.ssl}]`));
+        // the pool will emit an error on behalf of any idle clients
+        // it contains if a backend error or network partition happens
+        pool.on("error", (error) => {
+            this.#LogDebugMessage(chalk.red(`[${safeConnectionString}]: pool error`));
+            this.#LogErrorMessage(chalk.red(`Unexpected error on idle client: [${error}], connection: [${safeConnectionString}]`));
+        });
+        pool.on("connect", () => {
+            //this.#LogDebugMessage(chalk.green(`[${safeConnectionString}]: pool connect`));
+            this.#UpdateInstruments();
+        });
+        pool.on("acquire", () => {
+            //this.#LogDebugMessage(chalk.green(`[${safeConnectionString}]: pool acquire`));
+            this.#UpdateInstruments();
+        });
+        pool.on("release", (error) => {
+            if (error) {
+                this.#LogDebugMessage(chalk.red(`[${safeConnectionString}]: pool release`));
+                this.#LogErrorMessage(chalk.red(`Unexpected error on client release from pool: [${error}], connection: [${safeConnectionString}]`));
+            }
+            //this.#LogDebugMessage(chalk.green(`[${safeConnectionString}]: pool release`));
+            this.#UpdateInstruments();
+        });
+        pool.on("remove", () => {
+            //this.#LogDebugMessage(chalk.green(`[${safeConnectionString}]: pool remove`));
+            this.#UpdateInstruments();
+        });
+    };
+    EndPool = async (poolItem) => {
+        this.#LogDebugMessage(chalk.cyan(`Ending database for process PID: ${process.pid}`));
+        if (poolItem) {
+            this.#LogDebugMessage(chalk.cyan(`ending pool with connection string: [${poolItem.safeConnectionString}]`));
+            this.#LogDebugMessage(chalk.cyan(`pool details (before end), Total: [${poolItem.pool.totalCount}], Idle: [${poolItem.pool.idleCount}], Waiting: [${poolItem.pool.waitingCount}]`));
+            await poolItem.pool.end();
+            this.#LogDebugMessage(chalk.cyan(`pool details (after end), Total: [${poolItem.pool.totalCount}], Idle: [${poolItem.pool.idleCount}], Waiting: [${poolItem.pool.waitingCount}]`));
+            this.#LogDebugMessage(chalk.green(`Database pool ended for PID: ${process.pid}`));
+            poolItem.pool.removeAllListeners();
+            this.#LogDebugMessage(chalk.green(`Removed all listeners: ${process.pid}`));
+        }
+        else {
+            this.#LogDebugMessage(chalk.yellow(`Database pool was not defined - not ended for PID: ${process.pid}`));
+        }
+    };
+    Stop = async () => {
+        this.#LogDebugMessage(chalk.cyan(`Ending database for process PID: ${process.pid}`));
+        for (const [, pool] of Object.entries(this.#pools)) {
+            await this.EndPool(pool);
+        }
+        this.#DetachInstruments();
+    };
+    #GetPoolKey(index) {
+        return `${this.#keyPrefix}${index}`;
+    }
+    async GetReadWritePoolClient() {
+        return this.#pools[this.#GetPoolKey(0)].pool.connect();
+    }
+    async GetReadOnlyPoolClient() {
+        const poolLength = Object.keys(this.#pools).length;
+        if (poolLength > 1) {
+            this.currentReadOnlyPoolIndex++;
+            if (this.currentReadOnlyPoolIndex >= poolLength) {
+                this.currentReadOnlyPoolIndex = 1;
+            }
+            return this.#pools[this.#GetPoolKey(this.currentReadOnlyPoolIndex)].pool.connect();
+        }
+        else {
+            return this.GetReadWritePoolClient();
+        }
+    }
+    #UpdateInstruments = () => {
+        const data = {
+            totalCount: 0,
+            idleCount: 0,
+            waitingCount: 0,
+        };
+        for (const [, poolItem] of Object.entries(this.#pools)) {
+            data.totalCount += poolItem.pool.totalCount;
+            data.idleCount += poolItem.pool.idleCount;
+            data.waitingCount += poolItem.pool.waitingCount;
+        }
+        this.emit(IDBAccessLayerEvents.UpdateInstruments, data);
+        this.#UpdatePGPoolManagerInstrument(data);
+    };
+    #UpdatePGPoolManagerInstrument = (data) => {
+        this.metrics.UpdateInstrument(Gauge.CONNECTION_POOL_TOTAL_GAUGE, {
+            val: data.totalCount,
+        });
+        this.metrics.UpdateInstrument(Gauge.CONNECTION_POOL_IDLE_GAUGE, {
+            val: data.idleCount,
+        });
+        this.metrics.UpdateInstrument(Gauge.CONNECTION_POOL_WAITING_GAUGE, {
+            val: data.waitingCount,
+        });
+    };
+    #AttachInstruments = (interval = 1000) => {
+        this.#observer = setInterval(() => {
+            this.#UpdateInstruments();
+        }, interval).unref();
+    };
+    #DetachInstruments = () => {
+        clearInterval(this.#observer);
+        this.#observer = null;
+    };
+}
+//# sourceMappingURL=pgpoolmanager.js.map

package/dist/plugins/pgpoolmanager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgpoolmanager.js","sourceRoot":"","sources":["../../src/plugins/pgpoolmanager.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,2BAA2B;AAC3B,wEAAwE;AACxE,sFAAsF;AACtF,OAAO,EAAE,IAAI,EAA0B,MAAM,IAAI,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,KAAK,EAA4B,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAN,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC5B,+DAAuC,CAAA;AAC3C,CAAC,EAFW,oBAAoB,KAApB,oBAAoB,QAE/B;AAqBD,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC1C,QAAQ,CAAuB;IAC/B,SAAS,GAA0B,IAAI,CAAC;IACxC,MAAM,GAA8B,EAAE,CAAC;IACvC,UAAU,GAAW,SAAS,CAAC;IAEvB,wBAAwB,GAAW,CAAC,CAAC;IAE5B,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACtC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAEzD,YAAY,OAA6B;QACrC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,GAAG,KAAK,IAAmB,EAAE;QAC9B,MAAM,qBAAqB,GACvB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC,CAAC;IAEF,WAAW,GAAG,CAAC,SAAiB,EAAE,oBAA4B,EAAE,EAAE;QAC9D,+DAA+D;QAC/D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;YAClB,gBAAgB,EAAE,oBAAoB;YACtC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;YACtB,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,wEAAwE;YACrG,qFAAqF;YACrF,iJAAiJ;YACjJ;;;;;;;;YAQN;SACiB,CAAC,CAAC;QAEjB,MAAM,EAAE,GAA2B,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CACzD,oBAAoB,CACvB,CAAC;QACF,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,EAAE,EAAE,CAAC;YACL,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;QACD,MAAM,GAAG,GAAa,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,2BAA2B,GAAW,gBAAgB,CAAC,OAAO,CAChE,GAAG,CAAC,CAAC,CAAC,EACN,+BAA+B,CAClC,CAAC;QACF,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,OAAO,CACrD,gBAAgB,EAChB,2BAA2B,CAC9B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG;YACvC,gBAAgB,EAAE,oBAAoB;YACtC,oBAAoB;YACpB,IAAI;SACP,CAAC;QAEF,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CACR,mDAAmD,OAAO,CAAC,GAAG,GAAG,CACpE,CACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CACR,mDAAmD,OAAO,CAAC,GAAG,GAAG,CACpE,CACJ,CAAC;QACN,CAAC;QACD,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,sCAAsC,CAAC,CACvD,CAAC;QACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,sBAAsB,oBAAoB,GAAG,CAAC,CAC9D,CAAC;QACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,yBAAyB,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,CACnE,CAAC;QACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,sBAAsB,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAC3D,CAAC;QAEF,4DAA4D;QAC5D,8DAA8D;QAC9D,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YAC9B,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,GAAG,CAAC,IAAI,oBAAoB,eAAe,CAAC,CACrD,CAAC;YACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,GAAG,CACL,qCAAqC,KAAK,mBAAmB,oBAAoB,GAAG,CACvF,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACpB,gFAAgF;YAChF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACpB,gFAAgF;YAChF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,SAAgB,EAAE,CAAC,KAAY,EAAE,EAAE;YACvC,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,GAAG,CAAC,IAAI,oBAAoB,iBAAiB,CAAC,CACvD,CAAC;gBACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,GAAG,CACL,kDAAkD,KAAK,mBAAmB,oBAAoB,GAAG,CACpG,CACJ,CAAC;YACN,CAAC;YACD,gFAAgF;YAChF,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACnB,+EAA+E;YAC/E,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEM,OAAO,GAAG,KAAK,EAAE,QAAmB,EAAiB,EAAE;QAC3D,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,IAAI,CAAC,oCAAoC,OAAO,CAAC,GAAG,EAAE,CAAC,CAChE,CAAC;QACF,IAAI,QAAQ,EAAE,CAAC;YACX,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,IAAI,CACN,wCAAwC,QAAQ,CAAC,oBAAoB,GAAG,CAC3E,CACJ,CAAC;YACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,IAAI,CACN,sCAAsC,QAAQ,CAAC,IAAI,CAAC,UAAU,aAAa,QAAQ,CAAC,IAAI,CAAC,SAAS,gBAAgB,QAAQ,CAAC,IAAI,CAAC,YAAY,GAAG,CAClJ,CACJ,CAAC;YACF,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,IAAI,CACN,qCAAqC,QAAQ,CAAC,IAAI,CAAC,UAAU,aAAa,QAAQ,CAAC,IAAI,CAAC,SAAS,gBAAgB,QAAQ,CAAC,IAAI,CAAC,YAAY,GAAG,CACjJ,CACJ,CAAC;YACF,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,KAAK,CAAC,gCAAgC,OAAO,CAAC,GAAG,EAAE,CAAC,CAC7D,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACnC,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,KAAK,CAAC,0BAA0B,OAAO,CAAC,GAAG,EAAE,CAAC,CACvD,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CACR,sDAAsD,OAAO,CAAC,GAAG,EAAE,CACtE,CACJ,CAAC;QACN,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,GAAG,KAAK,IAAmB,EAAE;QAC7B,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,IAAI,CAAC,oCAAoC,OAAO,CAAC,GAAG,EAAE,CAAC,CAChE,CAAC;QACF,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC,CAAC;IAEF,WAAW,CAAC,KAAa;QACrB,OAAO,GAAG,IAAI,CAAC,UAAU,GAAG,KAAK,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QACnD,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,wBAAwB,IAAI,UAAU,EAAE,CAAC;gBAC9C,IAAI,CAAC,wBAAwB,GAAG,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CACd,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAClD,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;IAED,kBAAkB,GAAG,GAAG,EAAE;QACtB,MAAM,IAAI,GAAG;YACT,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;SAClB,CAAC;QACF,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;YAC5C,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,8BAA8B,GAAG,CAAC,IAAS,EAAE,EAAE;QAC3C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,2BAA2B,EAAE;YAC7D,GAAG,EAAE,IAAI,CAAC,UAAU;SACK,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,0BAA0B,EAAE;YAC5D,GAAG,EAAE,IAAI,CAAC,SAAS;SACM,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,6BAA6B,EAAE;YAC/D,GAAG,EAAE,IAAI,CAAC,YAAY;SACG,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,kBAAkB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAAE,EAAE;QACrC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;YAC9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9B,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC,CAAC;IAEF,kBAAkB,GAAG,GAAG,EAAE;QACtB,aAAa,CAAC,IAAI,CAAC,SAA2B,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC,CAAC;CACL"}

package/dist/{process → plugins}/servertypes/serverUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverUtils.js","sourceRoot":"","sources":["../../../src/process/servertypes/serverUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,kBAA2B,EAC3B,0BAAmC,EACzB,EAAE;IACZ,IAAI,kBAAkB,IAAI,0BAA0B,EAAE,CAAC;QACnD,OAAO;YACH,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC;YACxC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC;SACpD,CAAC;IACN,CAAC;IACD,MAAM,IAAI,KAAK,CACX,gGAAgG,CACnG,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"serverUtils.js","sourceRoot":"","sources":["../../../src/plugins/servertypes/serverUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,MAAM,CAAC,MAAM,aAAa,GAAG,CACzB,kBAA2B,EAC3B,0BAAmC,EACzB,EAAE;IACZ,IAAI,kBAAkB,IAAI,0BAA0B,EAAE,CAAC;QACnD,OAAO;YACH,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC;YACxC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC;SACpD,CAAC;IACN,CAAC;IACD,MAAM,IAAI,KAAK,CACX,gGAAgG,CACnG,CAAC;AACN,CAAC,CAAC"}

package/dist/{process → plugins}/servertypes/stsexpressserver.js

@@ -5,25 +5,30 @@ import cookieParser from "cookie-parser";
 import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName, } from "@nsshunt/stsinstrumentmanagerclient";
 import { goptions } from "@nsshunt/stsconfig";
 import { GetTLSOptions } from "./serverUtils.js";
-import { PrometheusManager } from "./../prometheusmanager.js";
-import { STSLoggerToken, PublishInstrumentControllerToken, } from "./../../commonTypes.js";
 import { Gauge, } from "@nsshunt/stsobservability";
 import { ServerNetworkMiddleware, ServerNetworkMiddlewareEventName, } from "./../../middleware/serverNetworkMiddleware.js";
 import chalk from "chalk";
 import { inject } from "@nsshunt/stsutils";
 import { createServer as createServerHttps, } from "node:https";
 import { createServer as createServerHttp, } from "node:http";
+import { STSLoggerPluginToken } from "./../stsloggerplugin.js";
+import { STSInstrumentControllerPluginToken } from "./../stsinstrumentmanagerplugin.js";
 export class STSExpressServer {
     #options;
     #ERROR_THRESHOLD_TIMEOUT = 1000;
     httpServer;
     #attributes = {};
-    publishInstrumentController = inject(PublishInstrumentControllerToken);
-    logger = inject(STSLoggerToken);
+    #routes = express.Router();
+    draining = false;
+    publishInstrumentController = inject(STSInstrumentControllerPluginToken);
+    logger = inject(STSLoggerPluginToken);
     constructor(options) {
         this.#options = options;
         this.#SetupHTTPServerFromExpressServer(this.#SetupExpressServer());
     }
+    IsDraining = () => {
+        return this.draining;
+    };
     #SetupRequestLoggerMiddleware = () => {
         // Standard RequestLoggerMiddleware for all STS services
         const requestLoggerMiddleware = new RequestLoggerMiddleware({
@@ -106,17 +111,11 @@ export class STSExpressServer {
         }))
             .use(express.json({ limit: goptions.maxPayloadSize }))
             .use(this.#SetupRequestLoggerMiddleware().Middleware)
-            .use(this.#SetupNetworkMiddleware().Middleware);
-        // Allow the static SPA to also be servered by this app
-        //app.use('/static', express.static(path.join(__dirname, 'public')))
-        if (this.#options.expressServerRouteStaticFactory) {
-            this.#options.expressServerRouteStaticFactory(app);
-        }
-        if (this.#options.expressServerRouteFactory) {
-            this.#options.expressServerRouteFactory(app);
-        }
-        // Express error handling fall-back
-        app.use(function (err, req, res, next) {
+            .use(this.#SetupNetworkMiddleware().Middleware)
+            // Everything dynamically registered goes here
+            .use(this.#routes)
+            // Express error handling fall-back
+            .use(function (err, _req, res, next) {
             if (err) {
                 res.status(err.status).send(err);
             }
@@ -126,6 +125,9 @@ export class STSExpressServer {
         });
         return app;
     };
+    Use(router) {
+        this.#routes.use(router);
+    }
     #SetupHTTPServerFromExpressServer = (app) => {
         if (this.#options.useTls) {
             this.httpServer = createServerHttps(GetTLSOptions(this.#options.httpsServerKeyPath, this.#options.httpsServerCertificatePath), app);
@@ -133,9 +135,11 @@ export class STSExpressServer {
         else {
             this.httpServer = createServerHttp(app);
         }
+        /*
         if (this.#options.prometheusSupport === true) {
             new PrometheusManager().SetupPrometheusForMaster();
         }
+        */
         // https://stackoverflow.com/questions/21342828/node-express-unix-domain-socket-permissions
         //@@httpServer.listen('/tmp/stsrest01.sock').on('listening', () =>
         //@@httpServer.listen('/var/run/sts/stsrest01.sock').on('listening', () =>
@@ -145,11 +149,32 @@ export class STSExpressServer {
         });
     };
     Stop = async () => {
-        if (this.httpServer) {
-            const logPrefix = `STSExpressServer:Stop():${process.pid}:`;
-            this.logger.info(`${logPrefix} Closing httpServer.`);
-            this.httpServer.close();
+        if (!this.httpServer) {
+            return;
         }
+        this.draining = true;
+        const closePromise = new Promise((resolve) => {
+            if (this.httpServer) {
+                this.httpServer.close(() => {
+                    resolve();
+                });
+            }
+            else {
+                resolve();
+            }
+        });
+        const timeoutPromise = new Promise((resolve) => {
+            setTimeout(() => {
+                if (this.httpServer) {
+                    this.httpServer.closeAllConnections();
+                    resolve();
+                }
+                else {
+                    resolve();
+                }
+            }, 5000).unref();
+        });
+        await Promise.race([closePromise, timeoutPromise]);
     };
     GetAttributes() {
         return this.#attributes;

package/dist/plugins/servertypes/stsexpressserver.js.map

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

package/dist/{process → plugins}/servertypes/stsjsonrpcserver.js

@@ -1,11 +1,10 @@
-/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
-import { STSLoggerToken, } from "./../../commonTypes.js";
 import jayson from "jayson";
 import { inject } from "@nsshunt/stsutils";
 import { GetTLSOptions } from "./serverUtils.js";
+import { STSLoggerPluginToken } from "./../stsloggerplugin.js";
 export class STSJsonRPCServer {
     options;
-    logger = inject(STSLoggerToken);
+    logger = inject(STSLoggerPluginToken);
     httpServer;
     #attributes = {};
     constructor(options) {

package/dist/plugins/servertypes/stsjsonrpcserver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stsjsonrpcserver.js","sourceRoot":"","sources":["../../../src/plugins/servertypes/stsjsonrpcserver.ts"],"names":[],"mappings":"AASA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAE/D,MAAM,OAAO,gBAAgB;IACR,OAAO,CAA2B;IAClC,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAC/C,UAAU,CAAoB;IACtC,WAAW,GAAwB,EAAE,CAAC;IAEtC,YAAY,OAAiC;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAED,mBAAmB,GAAG,GAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QACzC,mDAAmD;QACnD,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,IAAS,EAAE,QAAa;YACzD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,GAAG,CAC9B,aAAa,CACT,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAC/B,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAC1C,CACJ,CAAC;QACD,IAAI,CAAC,UAAyB,CAAC,EAAE,CAC9B,kBAAkB,EAClB,IAAI,CAAC,eAAe,CACvB,CAAC;QACF,IAAI,CAAC,UAAU;aACV,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE;YAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,yCAAyC;gBACrC,IAAI,CAAC,OAAO,CAAC,UAAU;gBACvB,GAAG,CACV,CAAC;QACN,CAAC,CAAC;aACD,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,wBAAwB,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CACpG,CAAC;QACN,CAAC,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,eAAe,GAAG,CAAC,MAAkB,EAAQ,EAAE;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,aAAa;YACT,MAAM,CAAC,aAAa;YACpB,GAAG;YACH,MAAM,CAAC,UAAU;YACjB,GAAG;YACH,OAAO,CAAC,GAAG,CAClB,CAAC;QAEF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAS,EAAE,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,UAAU;gBACN,MAAM,CAAC,aAAa;gBACpB,GAAG;gBACH,MAAM,CAAC,UAAU;gBACjB,GAAG;gBACH,OAAO,CAAC,GAAG,CAClB,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAS,EAAE,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,IAAI,GAAG,KAAK,IAAmB,EAAE;QAC7B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,SAAS,GAAG,2BAA2B,OAAO,CAAC,GAAG,GAAG,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,sBAAsB,CAAC,CAAC;YACrD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC,CAAC;IAEF,aAAa;QACT,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,aAAa;QACT,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;CACJ"}

package/dist/{process → plugins}/servertypes/stsserverfactory.js

@@ -1,5 +1,5 @@
-import { STSExpressServer, } from "./stsexpressserver.js";
-import { STSJsonRPCServer, } from "./stsjsonrpcserver.js";
+import { STSExpressServer } from "./stsexpressserver.js";
+import { STSJsonRPCServer } from "./stsjsonrpcserver.js";
 import { STSRPCRawServer } from "./ststcprawserver.js";
 export const CreateSTSServer = ({ serverType, options, }) => {
     switch (serverType) {

package/dist/plugins/servertypes/stsserverfactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stsserverfactory.js","sourceRoot":"","sources":["../../../src/plugins/servertypes/stsserverfactory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAkBvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC5B,UAAU,EACV,OAAO,GACc,EAAc,EAAE;IACrC,QAAQ,UAAU,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,aAAa;YACd,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEzC,KAAK,YAAY;YACb,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QAExC,KAAK,cAAc;YACf,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;AACL,CAAC,CAAC"}

package/dist/{process → plugins}/servertypes/ststcprawserver.js

@@ -1,12 +1,12 @@
 /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
 import chalk from "chalk";
-import { STSLoggerToken, } from "./../../commonTypes.js";
 import tls from "node:tls";
 import { inject } from "@nsshunt/stsutils";
 import { GetTLSOptions } from "./serverUtils.js";
+import { STSLoggerPluginToken } from "./../stsloggerplugin.js";
 export class STSRPCRawServer {
     options;
-    logger = inject(STSLoggerToken);
+    logger = inject(STSLoggerPluginToken);
     httpServer;
     sockets = [];
     #attributes = {};

package/dist/plugins/servertypes/ststcprawserver.js.map

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

package/dist/plugins/stsclusterworkermanagerplugin.js

@@ -0,0 +1,54 @@
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
+import { InjectionToken } from "@nsshunt/stsutils";
+import { inject } from "@nsshunt/stsutils";
+import { STSLoggerPluginToken } from "./stsloggerplugin.js";
+import { ClusterWorkerManager, } from "./clusterworkermanager.js";
+import { STSConfigPluginToken } from "./stsconfigplugin.js";
+import os from "node:os";
+export const STSClusterWorkerManagerPluginToken = new InjectionToken("__STSPlugin__ClusterWorkerManager");
+// STSOptions
+export class STSClusterWorkerManagerPlugin {
+    logger = inject(STSLoggerPluginToken);
+    config = inject(STSConfigPluginToken);
+    clusterWorkerManager;
+    install = (injector, options) => {
+        if (!options) {
+            throw new Error("STSClusterWorkerManagerPlugin requires options");
+        }
+        this.clusterWorkerManager = new ClusterWorkerManager(options);
+        injector.register({
+            provide: STSClusterWorkerManagerPluginToken,
+            useValue: this.clusterWorkerManager,
+        });
+    };
+    _GetNumCPUs = async () => {
+        const numOSCpus = os.availableParallelism();
+        let numCPUs = 2;
+        if (this.config.useCPUs > 0) {
+            if (this.config.useCPUs >= 1) {
+                numCPUs = this.config.useCPUs;
+            }
+            else {
+                numCPUs = Math.round(numOSCpus * this.config.useCPUs);
+            }
+        }
+        else {
+            numCPUs = numOSCpus;
+        }
+        return numCPUs;
+    };
+    Start = async () => {
+        this.logger.info(`${process.pid} STSClusterWorkerManagerPlugin: Start() Starting ...`);
+        const numCPUs = await this._GetNumCPUs();
+        for (let i = 0; i < numCPUs; i++) {
+            this.clusterWorkerManager?.SpawnWorker();
+        }
+        this.logger.info(`${process.pid} STSClusterWorkerManagerPlugin: Start() Started`);
+    };
+    Stop = async () => {
+        this.logger.info(`${process.pid} STSClusterWorkerManagerPlugin: Stop() Stopping ...`);
+        this.clusterWorkerManager?.KillWorkers("SIGTERM", false);
+        this.logger.info(`${process.pid} STSClusterWorkerManagerPlugin: Stop() Stopped`);
+    };
+}
+//# sourceMappingURL=stsclusterworkermanagerplugin.js.map

package/dist/plugins/stsclusterworkermanagerplugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stsclusterworkermanagerplugin.js","sourceRoot":"","sources":["../../src/plugins/stsclusterworkermanagerplugin.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAY,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EACH,oBAAoB,GAEvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,CAAC,MAAM,kCAAkC,GAC3C,IAAI,cAAc,CACd,mCAAmC,CACtC,CAAC;AAEN,aAAa;AACb,MAAM,OAAO,6BAA6B;IACrB,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACtC,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAE/C,oBAAoB,CAAwB;IAEpD,OAAO,GAAG,CACN,QAAkB,EAClB,OAAsC,EAClC,EAAE;QACN,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE9D,QAAQ,CAAC,QAAQ,CAAC;YACd,OAAO,EAAE,kCAAkC;YAC3C,QAAQ,EAAE,IAAI,CAAC,oBAAoB;SACtC,CAAC,CAAC;IACP,CAAC,CAAC;IAEM,WAAW,GAAG,KAAK,IAAqB,EAAE;QAC9C,MAAM,SAAS,GAAG,EAAE,CAAC,oBAAoB,EAAE,CAAC;QAE5C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;gBAC3B,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1D,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,SAAS,CAAC;QACxB,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;IAEF,KAAK,GAAG,KAAK,IAAI,EAAE;QACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,sDAAsD,CACvE,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC,oBAAoB,EAAE,WAAW,EAAE,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,iDAAiD,CAClE,CAAC;IACN,CAAC,CAAC;IAEF,IAAI,GAAG,KAAK,IAAI,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,qDAAqD,CACtE,CAAC;QAEF,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAEzD,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,gDAAgD,CACjE,CAAC;IACN,CAAC,CAAC;CACL"}

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

@@ -1,12 +1,12 @@
 /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
 import { InjectionToken } from "@nsshunt/stsutils";
 import { goptions } from "@nsshunt/stsconfig";
-export const STSConfigToken = new InjectionToken("__STS__Config");
+export const STSConfigPluginToken = new InjectionToken("__STSPlugin__Config");
 // STSOptions
 export class STSConfigPlugin {
     install = (injector, options) => {
         injector.register({
-            provide: STSConfigToken,
+            provide: STSConfigPluginToken,
             useValue: goptions,
         });
     };

package/dist/plugins/stsconfigplugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stsconfigplugin.js","sourceRoot":"","sources":["../../src/plugins/stsconfigplugin.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,OAAO,EAAc,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,cAAc,CAClD,qBAAqB,CACxB,CAAC;AAEF,aAAa;AACb,MAAM,OAAO,eAAe;IACxB,OAAO,GAAG,CAAC,QAAkB,EAAE,OAA6B,EAAQ,EAAE;QAClE,QAAQ,CAAC,QAAQ,CAAC;YACd,OAAO,EAAE,oBAAoB;YAC7B,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC,CAAC;IACF,KAAK,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IACvB,IAAI,GAAG,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;CACzB"}

package/dist/plugins/stsexpresscontrollerplugin.js

@@ -0,0 +1,47 @@
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
+/* eslint @typescript-eslint/no-empty-object-type: 0 */
+import { InjectionToken } from "@nsshunt/stsutils";
+import { inject } from "@nsshunt/stsutils";
+import { STSLoggerPluginToken } from "./stsloggerplugin.js";
+import { STSServerPluginToken } from "./stsserverplugin.js";
+import express from "express";
+export const STSExpressControllerPluginToken = new InjectionToken("__STSPlugin__ExpressController");
+// STSOptions
+export class STSExpressControllerPlugin {
+    logger = inject(STSLoggerPluginToken);
+    server = inject(STSServerPluginToken);
+    expressController = {};
+    #RunInInjectionContext = (injector, handler) => {
+        return (req, res, next) => {
+            return injector.runInContext(() => handler(req, res, next));
+        };
+    };
+    install = (injector, options) => {
+        if (!options) {
+            throw new Error("STSExpressControllerPlugin requires options");
+        }
+        if (!(this.server.GetServerType() === "EXPRESS" ||
+            this.server.GetServerType() === "EXPRESS_TLS")) {
+            throw new Error(`STSExpressControllerPlugin: Server type: [${this.server.GetServerType()}] must be an express server`);
+        }
+        const router = express.Router();
+        for (const route of options.routes) {
+            const handlers = route.handlers.map((handler) => this.#RunInInjectionContext(injector, handler));
+            router[route.method](route.mountPath, ...handlers);
+        }
+        this.server.Use(router);
+        injector.register({
+            provide: STSExpressControllerPluginToken,
+            useValue: this.expressController,
+        });
+    };
+    Start = async () => {
+        this.logger.info(`${process.pid} STSExpressControllerPlugin: Start() Starting ...`);
+        this.logger.info(`${process.pid} STSExpressControllerPlugin: Start() Started`);
+    };
+    Stop = async () => {
+        this.logger.info(`${process.pid} STSServerPlugin: Stop() Stopping ...`);
+        this.logger.info(`${process.pid} STSServerPlugin: Stop() Stopped`);
+    };
+}
+//# sourceMappingURL=stsexpresscontrollerplugin.js.map

package/dist/plugins/stsexpresscontrollerplugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stsexpresscontrollerplugin.js","sourceRoot":"","sources":["../../src/plugins/stsexpresscontrollerplugin.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,uDAAuD;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,EAAY,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,OAA2B,MAAM,SAAS,CAAC;AAElD,MAAM,CAAC,MAAM,+BAA+B,GACxC,IAAI,cAAc,CAAwB,gCAAgC,CAAC,CAAC;AAYhF,aAAa;AACb,MAAM,OAAO,0BAA0B;IAClB,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACtC,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAEtC,iBAAiB,GAA0B,EAAE,CAAC;IAE/D,sBAAsB,GAAG,CACrB,QAAkB,EAClB,OAAuB,EACT,EAAE;QAChB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtB,OAAO,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,OAAO,GAAG,CACN,QAAkB,EAClB,OAA4C,EACxC,EAAE;QACN,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;QAED,IACI,CAAC,CACG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,SAAS;YACzC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,aAAa,CAChD,EACH,CAAC;YACC,MAAM,IAAI,KAAK,CACX,6CAA6C,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,6BAA6B,CACxG,CAAC;QACN,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAEhC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5C,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CACjD,CAAC;YACF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;QACvD,CAAC;QACA,IAAI,CAAC,MAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE9C,QAAQ,CAAC,QAAQ,CAAC;YACd,OAAO,EAAE,+BAA+B;YACxC,QAAQ,EAAE,IAAI,CAAC,iBAAiB;SACnC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,KAAK,GAAG,KAAK,IAAI,EAAE;QACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,mDAAmD,CACpE,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,OAAO,CAAC,GAAG,8CAA8C,CAC/D,CAAC;IACN,CAAC,CAAC;IAEF,IAAI,GAAG,KAAK,IAAI,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,uCAAuC,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,kCAAkC,CAAC,CAAC;IACvE,CAAC,CAAC;CACL"}

package/dist/{process/plugins/stsmetricsplugin.js → plugins/stsinstrumentmanagerplugin.js}

@@ -1,35 +1,48 @@
+import { InjectionToken } from "@nsshunt/stsutils";
 import { createAgentManager, inject } from "@nsshunt/stsutils";
-import { STSLoggerToken } from "./../../commonTypes.js";
 import http from "node:http";
 import https from "node:https";
-import { STSConfigToken } from "./stsconfigplugin.js";
-import { PublishInstrumentController, TransportType, GetInstruments, } from "@nsshunt/stsinstrumentmanagerclient";
-export class STSMetricsPlugin {
-    config = inject(STSConfigToken);
+import { STSConfigPluginToken } from "./stsconfigplugin.js";
+import { PublishInstrumentController, TransportType, } from "@nsshunt/stsinstrumentmanagerclient";
+import { STSLoggerPluginToken } from "./stsloggerplugin.js";
+export const STSInstrumentControllerPluginToken = new InjectionToken("__STSPlugin__InstrumentController");
+export class STSInstrumentControllerPlugin {
+    config = inject(STSConfigPluginToken);
+    logger = inject(STSLoggerPluginToken);
     options;
     publishInstrumentController;
     agentManager;
+    // defaults
+    _INSTRUMENTATION_OBSERVATION_INTERVAL = 1000;
+    _INSTRUMENTATION_TIME_WINDOW = 600;
+    _PUBLISH_POST_FAIL_INTERVAL = 5000;
+    _PUBLISH_INTERVAL = 1000;
+    _AUTO_START = true;
     install = (injector, options) => {
         if (!options) {
             throw new Error("STSLoggerPlugin requires options");
         }
-        injector.register({
-            provide: STSLoggerToken,
-            useValue: options.logger,
-        });
         this.options = options;
-    };
-    Start = async () => {
-        console.log(`STSMetricsPlugin: Start()`);
         this.agentManager = this.#CreateAgentManager();
         this.publishInstrumentController =
             this.#CreatePublishInstrumentController();
+        injector.register({
+            provide: STSInstrumentControllerPluginToken,
+            useValue: this.publishInstrumentController,
+        });
+    };
+    Start = async () => {
+        console.log(`${process.pid} STSMetricsPlugin: Start()`);
     };
     Stop = async () => {
-        console.log(`STSMetricsPlugin: Stop()`);
+        this.logger.info(`${process.pid} STSMetricsPlugin: Stop() Stopping ...`);
+        //@@ may not be required
+        this.publishInstrumentController?.StopInstruments();
         await this.publishInstrumentController?.EndPublish();
-        this.options.logger.close();
+        //@@ this close() should NOT be here - needs to handle better ...
+        //@@(this.options!.logger as winston.Logger).close();
         this.agentManager.Terminate();
+        this.logger.info(`${process.pid} STSMetricsPlugin: Stop() Stopped`);
     };
     #CreateAgentManager = () => {
         return createAgentManager({
@@ -60,7 +73,7 @@ export class STSMetricsPlugin {
                 url: `${this.config.imendpoint}:${this.config.import}${this.config.imapiroot}/publishmessage`,
                 agentManager: this.agentManager,
                 // Use this for sockets: socketPath: '/var/run/sts/stsrest01.sock'
-                logger: this.options.publisherLogger,
+                logger: this.options.logger, // logger, // publisherLogger,
             };
         }
         else {
@@ -74,16 +87,16 @@ export class STSMetricsPlugin {
             consoleLogging: this.options.consoleLogging,
             instrumentLogging: this.options.instrumentLogging,
             httpServer,
-            instrumentationObservationInterval: this.options.instrumentationObservationInterval,
-            instrumentationTimeWindow: this.options.instrumentationTimeWindow,
-            logger: this.options.publisherLogger,
-            publishInterval: this.options.publishInterval,
-            publishPostFailInterval: 5000, //@@
-            instrumentDefinitions: GetInstruments("service"),
+            instrumentationObservationInterval: this._INSTRUMENTATION_OBSERVATION_INTERVAL,
+            instrumentationTimeWindow: this._INSTRUMENTATION_TIME_WINDOW,
+            logger: this.options.logger, // logger, //publisherLogger,
+            publishInterval: this._PUBLISH_INTERVAL,
+            publishPostFailInterval: this._PUBLISH_POST_FAIL_INTERVAL,
+            instrumentDefinitions: this.options.instrumentDefinitions, // GetInstruments("service"),
             publishTransportBaseOptions: publishTransportOptions,
-            autoStart: true,
+            autoStart: this._AUTO_START,
         };
         return new PublishInstrumentController(instrumentControllerOptions);
     };
 }
-//# sourceMappingURL=stsmetricsplugin.js.map
+//# sourceMappingURL=stsinstrumentmanagerplugin.js.map