@nsshunt/stsappframework 3.3.135 → 3.3.138

package/dist/process/servertypes/stsexpressserver.js

@@ -0,0 +1,291 @@
+/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
+import express from "express";
+import { register, Counter, collectDefaultMetrics, AggregatorRegistry, } from "prom-client";
+import cors from "cors";
+import cookieParser from "cookie-parser";
+import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName, } from "@nsshunt/stsinstrumentmanagerclient";
+import { goptions } from "@nsshunt/stsconfig";
+import { GetTLSOptions } from "./serverUtils.js";
+import { createAdapter as clusterCreateAdapter } from "@socket.io/cluster-adapter";
+import { createAdapter } from "@socket.io/redis-streams-adapter";
+import { Redis } from "ioredis";
+import { STSLoggerToken, PublishInstrumentControllerToken, } from "./../../commonTypes.js";
+import { Gauge, } from "@nsshunt/stsobservability";
+import { Server } from "socket.io";
+import { ServerNetworkMiddleware, ServerNetworkMiddlewareEventName, } from "./../../middleware/serverNetworkMiddleware.js";
+import chalk from "chalk";
+import { inject, Sleep } from "@nsshunt/stsutils";
+import { createServer as createServerHttps, } from "node:https";
+import { createServer as createServerHttp, } from "node:http";
+export class STSExpressServer {
+    #app;
+    #options;
+    #ERROR_THRESHOLD_TIMEOUT = 1000;
+    httpServer;
+    #io = null;
+    #redisClient = null;
+    publishInstrumentController = inject(PublishInstrumentControllerToken);
+    logger = inject(STSLoggerToken);
+    constructor(options) {
+        this.#options = options;
+        this.#SetupExpressServer();
+        this.#SetupServerFromExpressServer();
+    }
+    #SetupExpressServer = () => {
+        // Standard RequestLoggerMiddleware for all STS services
+        const requestLoggerMiddleware = new RequestLoggerMiddleware({
+            ignoresocketio: goptions.ignoresocketio,
+        });
+        const serverNetworkMiddleware = new ServerNetworkMiddleware({
+            name: this.#options.serviceName,
+            outputDebug: false,
+            logger: this.logger,
+        });
+        serverNetworkMiddleware.on(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data) => {
+            //this.#LogInfoMessage(chalk.magenta(`serverNetworkMiddleware: [${JSON.stringify(data)}]`));
+            this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_RX_GAUGE, {
+                Inc: data.requestBytesRead,
+            });
+            this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_TX_GAUGE, {
+                Inc: data.requestBytesWritten,
+            });
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
+            this.publishInstrumentController.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
+                Inc: 1,
+            });
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_DEC, () => {
+            this.publishInstrumentController.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
+                Dec: 1,
+            });
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_DH_VAL, (timeInMs) => {
+            this.publishInstrumentController.UpdateInstrument(Gauge.DURATION_HISTOGRAM_GAUGE, {
+                val: timeInMs,
+            });
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL, (reqDetails) => {
+            const { timeInMs } = reqDetails;
+            this.publishInstrumentController.UpdateInstrument(Gauge.DURATION_GAUGE, {
+                val: timeInMs,
+            });
+            if (timeInMs > this.#ERROR_THRESHOLD_TIMEOUT) {
+                const message = `STSExpressServer:RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL: Request duration larger than: [${this.#ERROR_THRESHOLD_TIMEOUT}], Duration: [${timeInMs}], Request Details: [${JSON.stringify(reqDetails)}]`;
+                if (this.logger) {
+                    this.logger.error(chalk.red(message));
+                    console.error(chalk.red(message));
+                }
+                else {
+                    console.error(chalk.red(message));
+                }
+            }
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_RC_INC, () => {
+            this.publishInstrumentController.UpdateInstrument(Gauge.REQUEST_COUNT_GAUGE, {
+                Inc: 1,
+            });
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_V_INC, () => {
+            if (this.publishInstrumentController.InstrumentExists(Gauge.VELOCITY_GAUGE)) {
+                this.publishInstrumentController.UpdateInstrument(Gauge.VELOCITY_GAUGE, {
+                    Inc: 1,
+                });
+            }
+        });
+        const app = express();
+        this.#app = app;
+        // https://stackoverflow.com/questions/19743396/cors-cannot-use-wildcard-in-access-control-allow-origin-when-credentials-flag-i
+        // See answer from Christoph Hansen is thread above ...
+        // https://expressjs.com/en/resources/middleware/cors.html
+        const corsConfig = {
+            credentials: true,
+            origin: true,
+        };
+        app.use(cors(corsConfig));
+        app.use(cookieParser());
+        app.use(express.urlencoded({
+            extended: false,
+            limit: goptions.maxPayloadSize,
+        }));
+        app.use(express.json({ limit: goptions.maxPayloadSize }));
+        // 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);
+        }
+        app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
+        app.use(serverNetworkMiddleware.Middleware.bind(serverNetworkMiddleware));
+        if (this.#options.expressServerRouteFactory) {
+            this.#options.expressServerRouteFactory(app);
+        }
+        // Express error handling fall-back
+        app.use(function (err, req, res, next) {
+            //@@ add to errors metric here - perhaps break down by type
+            if (err) {
+                //@@this.#LogInfoMessage(err);
+                res.status(err.status).send(err);
+            }
+            else {
+                next();
+            }
+            /*
+            if(err.name === 'UnauthorizedError') {
+                res.status(401).send(err);
+            } else {
+                next();
+            }
+            */
+        });
+    };
+    #SetupServerFromExpressServer = () => {
+        if (this.#options.useTls) {
+            this.httpServer = createServerHttps(GetTLSOptions(this.#options.httpsServerKeyPath, this.#options.httpsServerCertificatePath), this.#app);
+        }
+        else {
+            this.httpServer = createServerHttp(this.#app);
+        }
+        if (this.#app && this.#options.prometheusSupport === true) {
+            this.#SetupPrometheusEndPoints(this.#app);
+        }
+        if (this.#options.wssServer === true) {
+            this.#SetupWSSServer();
+        }
+        // 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', () =>
+        this.httpServer
+            .listen(this.#options.listenPort, () => {
+            //@@chmodSync(this.options.port, 511);
+        })
+            .on("listening", () => {
+            this.logger.info(`live on ${this.#options.endpoint}:${this.#options.listenPort}${this.#options.apiRoot}`);
+        });
+    };
+    // Setup server to Prometheus scrapes:
+    #SetupPrometheusEndPoints = (expressServer) => {
+        // AggregatorRegistry is required here in the worker as well as the master in order for prom-client to work correctly.
+        new AggregatorRegistry();
+        const prefix = "sts_";
+        collectDefaultMetrics({
+            labels: { NODE_APP_INSTANCE: process.pid },
+            prefix: prefix,
+        });
+        const c = new Counter({
+            name: "sts_test_counter",
+            help: "Example of a counter",
+            labelNames: ["code"],
+        });
+        setInterval(() => {
+            c.inc({ code: 200 });
+        }, 1000).unref();
+        setInterval(() => {
+            c.inc({ code: 400 });
+            c.inc({ code: "worker_" + process.pid });
+        }, 500).unref();
+        expressServer.get("/metrics", async (req, res) => {
+            try {
+                res.set("Content-Type", register.contentType);
+                res.end(await register.metrics());
+            }
+            catch (ex) {
+                res.status(500).end(ex);
+            }
+        });
+        expressServer.get("/metrics/counter", async (req, res) => {
+            try {
+                res.set("Content-Type", register.contentType);
+                res.end(await register.getSingleMetricAsString("test_counter"));
+            }
+            catch (ex) {
+                res.status(500).end(ex);
+            }
+        });
+    };
+    #SetupWSSServer = () => {
+        // socket.io
+        // WebSocket
+        const options = {
+            transports: ["websocket"], // or [ "websocket", "polling" ] (to use long-poolling. Note that the order matters)
+            // The default path is /socket.io
+            // This can be changed with the path option as shown below
+            //,path: '/zzz'
+        };
+        if (this.#options.wssCustomPath &&
+            this.#options.wssCustomPath.localeCompare("") !== 0) {
+            options.path = this.#options.wssCustomPath;
+        }
+        //this.#io = require("socket.io")(this.#httpServer, options);
+        this.#io = new Server(this.httpServer, options);
+        if (this.#options.useSocketIoRedisAdaptor) {
+            /*
+            // This uses redis client
+            // Below is commented out becuase the current version of the socketio streams adaptor
+            // uses version 4 of redis not 5 and has problems (bugged)
+            this.LogInfoMessage(`Using Redis for socket.io cluster management (worker)`);
+            if (this.options.socketIoRedisAdaptorUrl) {
+                this.LogInfoMessage(`Redis url: [${this.options.socketIoRedisAdaptorUrl}]`);
+                this.#redisClient = createClient({url: this.options.socketIoRedisAdaptorUrl});
+            } else {
+                this.LogInfoMessage(`Redis url: [localhost]`);
+                this.#redisClient = createClient();
+            }
+            await this.#redisClient.connect();
+            */
+            // This uses ioredis client
+            this.#redisClient = new Redis(this.#options.socketIoRedisAdaptorUrl);
+            this.#io.adapter(createAdapter(this.#redisClient));
+            this.logger.info(`Redis successfully connected.`);
+        }
+        else {
+            if (this.#options.clusterMode) {
+                this.#io.adapter(clusterCreateAdapter());
+                this.logger.info(`Using nodejs cluster mode for socket.io cluster management`);
+            }
+            else {
+                this.logger.info(`Not using any adaptors for socket.io cluster management.}`);
+            }
+        }
+        // To use a seperate socket server, the code below can be applied.
+        // this.#io = require("socket.io")(options);
+        // this.#io.adapter(createAdapter());
+        // this.#io.listen(3006);
+        this.#io.engine.on("connection_error", (err) => {
+            this.logger.info(err.req); // the request object
+            this.logger.info(err.code); // the error code, for example 1
+            this.logger.info(err.message); // the error message, for example "Session ID unknown"
+            this.logger.info(err.context); // some additional error context
+        });
+    };
+    #TerminateSocketIO = async () => {
+        if (this.#options.wssServer === true && this.#io !== null) {
+            const logPrefix = `ServerProcessBase:TerminateSockets():${process.pid}:`;
+            this.logger.info(`${logPrefix} Disconnect SocketIO Sockets (Sleeping...)`);
+            await Sleep(250);
+            this.logger.info(`${logPrefix} this.#io.of('/').adapter.close()`);
+            await this.#io?.of("/").adapter.close();
+            if (this.#redisClient) {
+                this.logger.info(`${logPrefix} this.#redisClient.disconnect()`);
+                this.#redisClient.disconnect();
+                this.logger.info(`${logPrefix} after this.#redisClient.disconnect() (Sleeping...)`);
+                await Sleep(50);
+            }
+            // boot all current connections
+            this.logger.info(`${logPrefix} this.#io.disconnectSockets()`);
+            this.#io.disconnectSockets();
+            // Stop any future connections, close this server (does not close the underlying http(s) server if io server via that method
+            this.logger.info(`${logPrefix} this.#io.close()`);
+            this.#io.close();
+            this.#io = null;
+        }
+    };
+    Stop = async () => {
+        await this.#TerminateSocketIO();
+        if (this.httpServer) {
+            const logPrefix = `STSRPCRawServer:Stop():${process.pid}:`;
+            this.logger.info(`${logPrefix} Closing httpServer.`);
+            this.httpServer.close();
+        }
+    };
+}
+//# sourceMappingURL=stsexpressserver.js.map

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

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

package/dist/process/servertypes/stsjsonrpcserver.js

@@ -0,0 +1,59 @@
+/* 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";
+export class STSJsonRPCServer {
+    options;
+    logger = inject(STSLoggerToken);
+    httpServer;
+    constructor(options) {
+        this.options = options;
+        this.#SetupJSONRPCServer();
+    }
+    #SetupJSONRPCServer = () => {
+        const jaysonServer = new jayson.server();
+        // Supported methods here - move somewhere else ...
+        jaysonServer.method("add", function (args, callback) {
+            callback(null, args[0] + args[1]);
+        });
+        this.httpServer = jaysonServer.tls(GetTLSOptions(this.options.httpsServerKeyPath, this.options.httpsServerCertificatePath));
+        this.httpServer.on("secureConnection", this.#SetupRPCServer);
+        this.httpServer
+            .listen(this.options.listenPort, this.options.coreDomain, () => {
+            this.logger.info("JSON RPC 2.0 Server is running on port " +
+                this.options.listenPort +
+                ".");
+        })
+            .on("listening", () => {
+            this.logger.info(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
+        });
+    };
+    #SetupRPCServer = (socket) => {
+        this.logger.info("CONNECTED: " +
+            socket.remoteAddress +
+            ":" +
+            socket.remotePort +
+            " " +
+            process.pid);
+        socket.on("close", (data) => {
+            this.logger.info("CLOSED: " +
+                socket.remoteAddress +
+                " " +
+                socket.remotePort +
+                " " +
+                process.pid);
+        });
+        socket.on("data", (data) => {
+            this.logger.info("DATA " + socket.remoteAddress + ": " + data);
+        });
+    };
+    Stop = async () => {
+        if (this.httpServer) {
+            const logPrefix = `STSJsonRPCServer:Stop():${process.pid}:`;
+            this.logger.info(`${logPrefix} Closing httpServer.`);
+            this.httpServer.close();
+        }
+    };
+}
+//# sourceMappingURL=stsjsonrpcserver.js.map

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

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

package/dist/process/servertypes/stsserverfactory.js

@@ -0,0 +1,15 @@
+import { STSExpressServer, } from "./stsexpressserver.js";
+import { STSJsonRPCServer, } from "./stsjsonrpcserver.js";
+import { STSRPCRawServer } from "./ststcprawserver.js";
+export const CreateSTSServer = ({ serverType, options, }) => {
+    switch (serverType) {
+        case "EXPRESS":
+        case "EXPRESS_TLS":
+            return new STSExpressServer(options);
+        case "TCPRAW_TLS":
+            return new STSRPCRawServer(options);
+        case "JSONRPC2_TLS":
+            return new STSJsonRPCServer(options);
+    }
+};
+//# sourceMappingURL=stsserverfactory.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stsserverfactory.js","sourceRoot":"","sources":["../../../src/process/servertypes/stsserverfactory.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,gBAAgB,GAEnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,gBAAgB,GAEnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,eAAe,EAA2B,MAAM,sBAAsB,CAAC;AAuBhF,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/servertypes/ststcprawserver.js

@@ -0,0 +1,87 @@
+/* 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";
+export class STSRPCRawServer {
+    options;
+    logger = inject(STSLoggerToken);
+    httpServer;
+    sockets = [];
+    constructor(options) {
+        this.options = options;
+        this.#SetupTCPRawServer();
+    }
+    #SetupTCPRawServer = () => {
+        // The second parameter is the automatic listener for the secureConnection event from the tls.Server class
+        this.httpServer = tls.createServer(GetTLSOptions(this.options.httpsServerKeyPath, this.options.httpsServerCertificatePath), this.#SetupTLSServer);
+        this.httpServer
+            .listen(this.options.listenPort, this.options.coreDomain, () => {
+            this.logger.info("TCP Server is running on port " +
+                this.options.listenPort +
+                ".");
+        })
+            .on("listening", () => {
+            this.logger.info(`TCP live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
+        });
+    };
+    #SetupTLSServer = async (socket) => {
+        // Add a 'close' event handler to this instance of socket
+        this.logger.info("CONNECTED: " +
+            socket.remoteAddress +
+            ":" +
+            socket.remotePort +
+            " " +
+            process.pid);
+        this.sockets.push(socket);
+        //const self = this;
+        socket.on("close", (data) => {
+            const index = this.sockets.findIndex(function (o) {
+                return (o.remoteAddress === socket.remoteAddress &&
+                    o.remotePort === socket.remotePort);
+            });
+            if (index !== -1)
+                this.sockets.splice(index, 1);
+            this.logger.info("CLOSED: " +
+                socket.remoteAddress +
+                " " +
+                socket.remotePort +
+                " " +
+                process.pid);
+        });
+        socket.on("data", (data) => {
+            this.logger.info("DATA " +
+                socket.remoteAddress +
+                ": " +
+                socket.remotePort +
+                ": " +
+                data);
+            socket.write(socket.remoteAddress +
+                ":" +
+                socket.remotePort +
+                " said " +
+                data +
+                "\n");
+            // Write the data back to all the connected, the client will receive it as data from the server
+            /*
+            self.#sockets.forEach(function(socket, index, array) {
+                socket.write(socket.remoteAddress + ':' + socket.remotePort + " said " + data + '\n');
+            });
+
+            */
+        });
+    };
+    Stop = async () => {
+        if (this.httpServer) {
+            const logPrefix = `STSRPCRawServer:Stop():${process.pid}:`;
+            this.sockets.forEach((socket, index, array) => {
+                this.logger.info(chalk.yellow(`${logPrefix} TCP Socket destroy, remote address: [${socket.remoteAddress}], remote port: [${socket.remotePort}]`));
+                socket.destroy();
+            });
+            this.logger.info(`${logPrefix} Closing httpServer.`);
+            this.httpServer.close();
+        }
+    };
+}
+//# sourceMappingURL=ststcprawserver.js.map

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

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

package/dist/process/workerprocessbase.js

@@ -1,6 +1,5 @@
 /* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
 import chalk from "chalk";
-import { Gauge } from "@nsshunt/stsobservability";
 import { IPCMessageCommand, } from "./../commonTypes.js";
 import { ServerProcessBase } from "./serverprocessbase.js";
 import { randomUUID } from "node:crypto";
@@ -23,18 +22,6 @@ export class WorkerProcessBase extends ServerProcessBase {
     ReceivedMessageFromMaster(msg) {
         // Override in subclass if required
     }
-    CollectAdditionalTelemetry() {
-        try {
-            this.httpServer.getConnections((error, count) => {
-                //@@this.instruments[Gauge.CONNECTION_COUNT_GAUGE].val = count;
-                this.UpdateInstrument(Gauge.CONNECTION_COUNT_GAUGE, {
-                    val: count,
-                });
-            });
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        }
-        catch (error) { }
-    }
     #SendMessageToParentProcess = (message) => {
         return new Promise((resolve, reject) => {
             if (this.#inFlightMessage[message.id]) {

package/dist/process/workerprocessbase.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.3.135",
+  "version": "3.3.138",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -43,17 +43,17 @@
     "globals": "^17.12.0",
     "typescript": "^6.0.3",
     "vite": "^8.2.2",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.0"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.14.4",
     "@grpc/proto-loader": "^0.8.1",
-    "@nsshunt/stsconfig": "^1.27.74",
-    "@nsshunt/stsdatamanagement": "^1.18.201",
-    "@nsshunt/stsinstrumentmanagerclient": "^1.0.43",
-    "@nsshunt/stsobservability": "^1.0.165",
-    "@nsshunt/stssocketioutils": "^2.0.56",
-    "@nsshunt/stsutils": "^1.19.137",
+    "@nsshunt/stsconfig": "^1.27.75",
+    "@nsshunt/stsdatamanagement": "^1.18.202",
+    "@nsshunt/stsinstrumentmanagerclient": "^1.0.46",
+    "@nsshunt/stsobservability": "^1.0.166",
+    "@nsshunt/stssocketioutils": "^2.0.57",
+    "@nsshunt/stsutils": "^1.19.139",
     "@socket.io/cluster-adapter": "^0.3.0",
     "@socket.io/redis-streams-adapter": "^0.3.1",
     "@types/on-headers": "^1.0.4",

package/types/commonTypes.d.ts

@@ -1,5 +1,5 @@
 import express from "express";
-import { JSONObject, ISTSLogger, IAgentManager } from "@nsshunt/stsutils";
+import { JSONObject, ISTSLogger, IAgentManager, InjectionToken } from "@nsshunt/stsutils";
 import { InstrumentBaseTelemetry, Gauge } from "@nsshunt/stsobservability";
 import { PublishInstrumentController, InstrumentDefinitions, IContextBase } from "@nsshunt/stsinstrumentmanagerclient";
 import { IDBAccessLayer } from "@nsshunt/stsdatamanagement";
@@ -91,12 +91,7 @@ export interface IMasterProcessBase extends IProcessBase {
     ProcessIPCCommand(iPCMessagePayload: IPCMessagePayload): Promise<IPCMessagePayload>;
 }
 export interface IServerProcessBase extends IProcessBase {
-    get httpServer(): any;
-    get io(): any;
-    get expressServer(): STSExpressServer | null;
-    set expressServer(server: STSExpressServer | null);
     Terminate: (clusterPerformExit: boolean, signal?: any) => Promise<void>;
-    SetupSTSServer: () => Promise<void>;
     CollectAdditionalTelemetry(): void;
     SetupServer(): Promise<boolean>;
     SetupServerEx: () => Promise<boolean>;
@@ -117,7 +112,7 @@ export interface STSExpressServer {
 /**
  * Factory method that adds express routes to the express app object.
  */
-export type ExpressRouteFactory = (app: express.Express, stsApp: IProcessBase) => void;
+export type ExpressRouteFactory = (app: express.Express) => void;
 export interface ProcessOptions {
     /**
      * Is this service worker the master worker (thread).
@@ -249,4 +244,13 @@ export interface ProcessOptions {
     publisherLogger: ISTSLogger;
     publishInterval: number;
 }
+export interface ISTSServer {
+    Stop(): Promise<void>;
+}
+export declare const AgentManagerToken: InjectionToken<IAgentManager>;
+export declare const PublishInstrumentControllerToken: InjectionToken<PublishInstrumentController | undefined>;
+export declare const ProcessOptionsToken: InjectionToken<ProcessOptions>;
+export declare const DBAccessLayerToken: InjectionToken<IDBAccessLayer | null>;
+export declare const STSLoggerToken: InjectionToken<ISTSLogger>;
+export declare const STSServerToken: InjectionToken<ISTSServer>;
 //# sourceMappingURL=commonTypes.d.ts.map