@nsshunt/stsappframework 3.1.233 → 3.1.235

package/.github/workflows/npm-publish.yml

@@ -1,6 +1,5 @@
 # This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
 # For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
 name: Node.js Package
 
 on:
@@ -16,12 +15,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
-          cache: 'npm'
-      - run: npm ci
-      - run: npm run lint
-      - run: npm run build
-      - run: npm test
+          node-version: 23
+          cache: 'yarn'
+          #cache: 'npm'
+      - run: yarn install --frozen-lockfile
+      - run: yarn lint
+      - run: yarn test
+      #- run: npm ci
+      #- run: npm run lint
+      #- run: npm test
 
   publish-npm:
     needs: build
@@ -30,28 +32,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
-          cache: 'npm'
+          node-version: 23
+          cache: 'yarn'
+          #cache: 'npm' 
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm run build
-      - run: npm publish --access public
+      - run: yarn install --frozen-lockfile
+      - run: yarn build
+      - run: yarn publish --access public          
+      #- run: npm ci
+      #- run: npm run build
+      #- run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
-
-#  publish-gpr:
-#    needs: build
-#    runs-on: ubuntu-latest
-#    permissions:
-#      contents: read
-#      packages: write
-#    steps:
-#      - uses: actions/checkout@v2
-#      - uses: actions/setup-node@v2
-#        with:
-#          node-version: 17
-#          registry-url: https://npm.pkg.github.com/
-#      - run: npm ci
-#      - run: npm publish
-#        env:
-#          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/build.sh

@@ -1,25 +1,28 @@
 #!/bin/sh
-echo Remove build files
 rm -rf dist
 rm -rf types
-echo Install npm modules
-npm i
-echo Build
-npm run build
+#npm i --verbose
+yarn install
+#npm run build
+yarn build
 RESULT=$?
 if [ $RESULT -eq 0 ]; then
   echo success build
-  npm run lint
+  #npm run lint
+  yarn lint
     RESULT=$?
     if [ $RESULT -eq 0 ]; then
         echo success lint
-        npm run test
+        yarn test
+        #npm run test
         RESULT=$?
         if [ $RESULT -eq 0 ]; then
             echo success test
             git commit -a -m "changed"
-            npm version patch
-            npm i
+            yarn version --patch
+            #npm version patch
+            yarn install
+            #npm i --verbose
             git commit -a -m "changed"
             git push
         else

package/eslint.config.mjs

@@ -44,5 +44,12 @@ export default [{
         "no-mixed-spaces-and-tabs": [2],
         "@typescript-eslint/no-var-requires": "warn",
         "@typescript-eslint/no-this-alias": "warn",
+        "@typescript-eslint/no-unused-expressions": [
+            "error",
+            {
+                "allowTernary": true,
+                "allowTaggedTemplates": true
+            }
+        ]
     },
 }];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.233",
+  "version": "3.1.235",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -25,31 +25,28 @@
   },
   "homepage": "https://github.com/nsshunt/stsappframework#readme",
   "devDependencies": {
-    "@babel/preset-env": "^7.26.0",
-    "@babel/preset-typescript": "^7.26.0",
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.13.0",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.15.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/cookie-parser": "^1.4.7",
     "@types/debug": "^4.1.12",
     "@types/express": "^4.17.21",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.12.1",
-    "@typescript-eslint/parser": "^8.12.1",
-    "eslint": "^9.13.0",
-    "globals": "^15.11.0",
-    "jest": "^29.7.0",
-    "testcontainers": "^10.13.1",
+    "@typescript-eslint/eslint-plugin": "^8.15.0",
+    "@typescript-eslint/parser": "^8.15.0",
+    "eslint": "^9.15.0",
+    "globals": "^15.12.0",
+    "testcontainers": "^10.14.0",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10",
-    "vitest": "^2.1.4"
+    "vite": "^5.4.11",
+    "vitest": "^2.1.5"
   },
   "dependencies": {
-    "@nsshunt/stsconfig": "^1.25.167",
-    "@nsshunt/stsdatamanagement": "^1.18.83",
-    "@nsshunt/stsobservability": "^1.0.84",
-    "@nsshunt/stssocketioutils": "^1.0.3",
-    "@nsshunt/stsutils": "^1.16.91",
+    "@nsshunt/stsconfig": "^1.27.4",
+    "@nsshunt/stsdatamanagement": "^1.18.85",
+    "@nsshunt/stsobservability": "^1.0.89",
+    "@nsshunt/stssocketioutils": "^1.1.5",
+    "@nsshunt/stsutils": "^1.19.7",
     "@socket.io/cluster-adapter": "^0.2.2",
     "@socket.io/redis-adapter": "^8.3.0",
     "@socket.io/redis-streams-adapter": "^0.2.2",
@@ -57,10 +54,10 @@
     "@types/pidusage": "^2.0.5",
     "axios": "^1.7.7",
     "chalk": "^4.1.2",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "debug": "^4.3.7",
-    "express": "^4.19.1",
+    "express": "^4.21.1",
     "http-status-codes": "^2.3.0",
     "jayson": "^4.1.2",
     "on-headers": "^1.0.2",
@@ -72,6 +69,6 @@
     "systeminformation": "^5.23.5",
     "tiny-emitter": "^2.1.0",
     "uuid": "^10.0.0",
-    "winston": "^3.14.2"
+    "winston": "^3.17.0"
   }
 }

package/.eslintrc.json

@@ -1,27 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true,
-        "node": true,
-        "jest": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "ignorePatterns": ["temp.js", "**/k6scripts/*.js", "**/public/*", "**/dist/*", "**/types/*"],
-    "rules": {
-        "indent": ["error", 4],
-        "no-mixed-spaces-and-tabs": [2],
-        "@typescript-eslint/no-var-requires": "warn",
-        "@typescript-eslint/no-this-alias": "warn"
-    }
-}

package/babel.config.json

@@ -1,6 +0,0 @@
-{
-    "presets": [
-      ["@babel/preset-env", {"targets": {"node": "current"}}],
-      "@babel/preset-typescript"
-    ]
-  }

package/dist/commonTypes.js

@@ -1,69 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.iss = exports.IPCMessageCommand = void 0;
-exports.CreateServiceProcessContext = CreateServiceProcessContext;
-const stsutils_1 = require("@nsshunt/stsutils");
-function CreateServiceProcessContext(serviceName, serviceVersion, serviceInstanceId, hostName, processId, parentProcessId) {
-    const checkParams = [
-        ['servicename', serviceName],
-        ['serviceversion', serviceVersion],
-        ['hostname', hostName],
-        ['serviceInstanceId', serviceInstanceId]
-    ];
-    // CHeck for invalid strings
-    (0, stsutils_1.CheckValidChar)(checkParams);
-    return {
-        nid: `\
-${serviceName}${stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR}${serviceVersion}\
-${stsutils_1.ModelDelimeter.SEPERATOR}\
-${serviceInstanceId}${stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR}${hostName}\
-${stsutils_1.ModelDelimeter.NID_SEPERATOR}\
-${processId.toString()}${stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR}${parentProcessId.toString()}`,
-        serviceName,
-        serviceVersion,
-        serviceInstanceId,
-        hostName,
-        processId: processId.toString(),
-        parentProcessId: parentProcessId.toString()
-    };
-}
-var IPCMessageCommand;
-(function (IPCMessageCommand) {
-    IPCMessageCommand["AddWorker"] = "AddWorker";
-    IPCMessageCommand["DeleteWorker"] = "DeleteWorker";
-    IPCMessageCommand["GetConfig"] = "GetConfig";
-})(IPCMessageCommand || (exports.IPCMessageCommand = IPCMessageCommand = {}));
-// -----------------------------------------------------------------------------
-/*
-export interface IInfluxDBManagerOptions {
-    token: string // API access token
-    url: string // end-pont for API
-    org: string // organisation
-    bucket: string // bucket to store results
-    agent?: {
-        influxDB_keepAlive: boolean
-        influxDB_maxSockets?: number
-        influxDB_maxTotalSockets?: number
-        influxDB_maxFreeSockets?: number
-        influxDB_timeout?: number
-        influxDB_rejectUnauthorized?: boolean
-    }
-    logger: ISTSLogger
-}
-*/
-/*
-export type ConsumeMessageCB = (topic: string, partition: number, message: KafkaMessage, heartbeat: () => Promise<void>, pause: () => () => void) => void;
-export type ConsumeMessageErrorCB = (error: any) => void;
-
-export interface IKafkaConsumer {
-    get consumer(): Consumer
-    get id(): string
-    Connect(errorCb: (error: any) => void): Promise<void>
-    Disconnect(errorCb: (error: any) => void): Promise<void>
-    Subscribe: (topics: string[], fromBeginning: boolean, errorCb: (error: any) => void) => Promise<void>
-    Stop: (errorCb: (error: any) => void) => Promise<void>
-    StartConsumingMessages: (autoCommit: boolean, cb: ConsumeMessageCB, errorCb: ConsumeMessageErrorCB) => Promise<void>
-}
-*/
-exports.iss = `https://stscore.stsmda.org/oauth2/v2.0`;
-//# sourceMappingURL=commonTypes.js.map

package/dist/commonTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;;AAiCA,kEA2BC;AAzDD,gDAA0F;AA8B1F,SAAgB,2BAA2B,CAAC,WAAmB,EAAE,cAAsB,EAAE,iBAAyB,EAC9G,QAAgB,EAAE,SAAiB,EAAE,eAAuB;IAE5D,MAAM,WAAW,GAAG;QAChB,CAAE,aAAa,EAAE,WAAW,CAAE;QAC9B,CAAE,gBAAgB,EAAE,cAAc,CAAE;QACpC,CAAE,UAAU,EAAE,QAAQ,CAAE;QACxB,CAAE,mBAAmB,EAAE,iBAAiB,CAAE;KAC7C,CAAC;IAEF,4BAA4B;IAC5B,IAAA,yBAAc,EAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,yBAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,yBAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,yBAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,yBAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,yBAAc,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,CAAA;AACL,CAAC;AAED,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;IAC7B,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,iCAAjB,iBAAiB,QAI5B;AA6GD,gFAAgF;AAEhF;;;;;;;;;;;;;;;;EAgBE;AAEF;;;;;;;;;;;;;EAaE;AAEW,QAAA,GAAG,GAAG,wCAAwC,CAAC"}

package/dist/controller/stscontrollerbase.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.STSControllerBase = void 0;
-class STSControllerBase {
-    #stsApp;
-    constructor(stsApp) {
-        this.#stsApp = stsApp;
-    }
-    get stsApp() {
-        return this.#stsApp;
-    }
-}
-exports.STSControllerBase = STSControllerBase;
-//# sourceMappingURL=stscontrollerbase.js.map

package/dist/controller/stscontrollerbase.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stscontrollerbase.js","sourceRoot":"","sources":["../../src/controller/stscontrollerbase.ts"],"names":[],"mappings":";;;AAGA,MAAsB,iBAAiB;IACnC,OAAO,CAAM;IAEb,YAAY,MAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAVD,8CAUC"}

package/dist/controller/stslatencycontroller.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.STSLatencyController = void 0;
-/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
-const http_status_codes_1 = require("http-status-codes");
-const stscontrollerbase_1 = require("./stscontrollerbase");
-class STSLatencyController extends stscontrollerbase_1.STSControllerBase {
-    constructor(stsApp) {
-        super(stsApp);
-    }
-    // curl http://localhost:3000/api/v1/latency/latency
-    async stslatency(req, res) {
-        try {
-            const retVal = {
-                data: `Ping Completed At: ${Date.now()}`,
-                pid: process.pid,
-                ppid: process.ppid
-            };
-            return res.status(http_status_codes_1.StatusCodes.OK).send(retVal);
-        }
-        catch (error) {
-            this.stsApp.LogErrorMessage(error);
-            return res.status(http_status_codes_1.StatusCodes.INTERNAL_SERVER_ERROR).send({ status: http_status_codes_1.StatusCodes.INTERNAL_SERVER_ERROR, error: 'Operation was not successful', detail: error });
-        }
-    }
-}
-exports.STSLatencyController = STSLatencyController;
-//# sourceMappingURL=stslatencycontroller.js.map

package/dist/controller/stslatencycontroller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stslatencycontroller.js","sourceRoot":"","sources":["../../src/controller/stslatencycontroller.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,yDAA+C;AAC/C,2DAAuD;AAGvD,MAAa,oBAAqB,SAAQ,qCAAiB;IACvD,YAAY,MAAoB;QAC5B,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,oDAAoD;IACpD,KAAK,CAAC,UAAU,CAAC,GAAQ,EAAE,GAAQ;QAE/B,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;YACF,OAAO,GAAG,CAAC,MAAM,CAAC,+BAAW,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC,MAAM,CAAC,+BAAW,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAE,EAAE,MAAM,EAAE,+BAAW,CAAC,qBAAqB,EAAE,KAAK,EAAE,8BAA8B,EAAE,MAAM,EAAE,KAAK,EAAE,CAAE,CAAC;QACrK,CAAC;IACL,CAAC;CACJ;AApBD,oDAoBC"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,8DAA2C;AAC3C,wDAAqC;AACrC,8DAA2C;AAC3C,8DAA2C;AAC3C,8DAA2C;AAC3C,iEAA8C;AAC9C,oEAAiD;AACjD,0DAAuC;AACvC,wDAAqC;AACrC,8EAA2D;AAC3D,qEAAkD;AAClD,+DAA4C"}

package/dist/logger/stsTransportLoggerWinston.js

@@ -1,22 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.STSTransportLoggerWinston = void 0;
-/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
-const winston_transport_1 = __importDefault(require("winston-transport"));
-class STSTransportLoggerWinston extends winston_transport_1.default {
-    #options;
-    constructor(opts) {
-        super(opts);
-        this.#options = opts;
-    }
-    log(info, callback) {
-        this.#options.stsApp.LogMessageToLoggerInstrument(info.message);
-        this.emit('logged', info);
-        callback();
-    }
-}
-exports.STSTransportLoggerWinston = STSTransportLoggerWinston;
-//# sourceMappingURL=stsTransportLoggerWinston.js.map

package/dist/logger/stsTransportLoggerWinston.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stsTransportLoggerWinston.js","sourceRoot":"","sources":["../../src/logger/stsTransportLoggerWinston.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,0EAAqE;AAQrE,MAAa,yBAA0B,SAAQ,2BAAS;IAEpD,QAAQ,CAAoC;IAE5C,YAAY,IAAuC;QAC/C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;IACf,CAAC;CACJ;AAdD,8DAcC"}

package/dist/logger/stsTransportWinston.js

@@ -1,43 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.STSTransportWinston = void 0;
-exports.UpdateSTSTransportWithDebugger = UpdateSTSTransportWithDebugger;
-/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
-const winston_transport_1 = __importDefault(require("winston-transport"));
-function UpdateSTSTransportWithDebugger(logger, newDebugger) {
-    const stsTransport = logger.transports.find((transport) => {
-        return transport instanceof STSTransportWinston;
-    });
-    if (stsTransport) {
-        stsTransport.debugger = newDebugger;
-    }
-}
-class STSTransportWinston extends winston_transport_1.default {
-    #options;
-    constructor(opts) {
-        super(opts);
-        this.#options = opts;
-    }
-    get debugger() {
-        return this.#options.debugger;
-    }
-    set debugger(newDebugger) {
-        this.#options.debugger = newDebugger;
-    }
-    log(info, callback) {
-        //setImmediate(() => {
-        if (info[Symbol.for('level')] == 'debug') {
-            if (this.#options.debugger) {
-                this.#options.debugger(info.message);
-            }
-        }
-        this.emit('logged', info);
-        callback();
-        //});
-    }
-}
-exports.STSTransportWinston = STSTransportWinston;
-//# sourceMappingURL=stsTransportWinston.js.map

package/dist/logger/stsTransportWinston.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../../src/logger/stsTransportWinston.ts"],"names":[],"mappings":";;;;;;AAUA,wEAOC;AAjBD,kDAAkD,CAAE,UAAU;AAC9D,0EAAqE;AASrE,SAAgB,8BAA8B,CAAC,MAAW,EAAE,WAAgB;IACxE,MAAM,YAAY,GAA0B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE;QAClF,OAAO,SAAS,YAAY,mBAAmB,CAAA;IACnD,CAAC,CAAC,CAAC;IACH,IAAI,YAAY,EAAE,CAAC;QACd,YAAoC,CAAC,QAAQ,GAAG,WAAW,CAAA;IAChE,CAAC;AACL,CAAC;AAED,MAAa,mBAAoB,SAAQ,2BAAS;IAE9C,QAAQ,CAA8B;IAEtC,YAAY,IAAiC;QACzC,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ,CAAC,WAAiC;QAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,WAAW,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,sBAAsB;QACtB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;QACX,KAAK;IACT,CAAC;CACJ;AA5BD,kDA4BC"}

package/dist/middleware/serverNetworkMiddleware.js

@@ -1,199 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerNetworkMiddleware = exports.ServerNetworkMiddlewareEventName = void 0;
-/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
-const chalk_1 = __importDefault(require("chalk")); // Note: Do NOT upgrade beyond 4.1.2 as the ESM version (5.0.0+) breaks this entire codebase
-const tiny_emitter_1 = require("tiny-emitter");
-const stsutils_1 = require("@nsshunt/stsutils");
-const uuid_1 = require("uuid");
-const on_headers_1 = __importDefault(require("on-headers"));
-var ServerNetworkMiddlewareEventName;
-(function (ServerNetworkMiddlewareEventName) {
-    ServerNetworkMiddlewareEventName["UpdateInstrument_SERVER_NET_VAL"] = "UpdateInstrument_SERVER_NET_VAL"; // request net stats
-})(ServerNetworkMiddlewareEventName || (exports.ServerNetworkMiddlewareEventName = ServerNetworkMiddlewareEventName = {}));
-class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
-    #tinyEmitter = new tiny_emitter_1.TinyEmitter();
-    #socketCollection = {};
-    #id = '';
-    constructor(options) {
-        super(options);
-    }
-    #LogSillyMessage(message) {
-        this.options?.logger.silly(message);
-    }
-    #LogErrorMessage(message) {
-        this.options?.logger.error(message);
-    }
-    on(eventName, callBackFn) {
-        this.#tinyEmitter.on(eventName, callBackFn);
-    }
-    GetSocketRecord = (socket) => {
-        for (const [, socketRecord] of Object.entries(this.#socketCollection)) {
-            if (socketRecord.socket === socket) {
-                return socketRecord;
-            }
-        }
-        return null;
-    };
-    UpdateNetworkStats = (workingSocketRecord, eventName, req) => {
-        workingSocketRecord.originalUrl = req.originalUrl;
-        workingSocketRecord.eventName = eventName;
-        workingSocketRecord.currentBytesRead = req.socket.bytesRead;
-        workingSocketRecord.currentBytesWritten = req.socket.bytesWritten;
-        workingSocketRecord.requestBytesRead = workingSocketRecord.currentBytesRead - workingSocketRecord.lastBytesRead;
-        workingSocketRecord.requestBytesWritten = workingSocketRecord.currentBytesWritten - workingSocketRecord.lastBytesWritten;
-        //this.#LogDebugMessage(chalk.gray(`totalBytesRead: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesRead}]`));
-        //this.#LogDebugMessage(chalk.gray(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`));
-        const workingSocketEventRecord = { ...workingSocketRecord };
-        delete workingSocketEventRecord.socket;
-        this.#LogSillyMessage(chalk_1.default.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
-        this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
-        workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
-        workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
-    };
-    #GetRequestContentSize = (req) => {
-        try {
-            let contentLength = 0;
-            if (req['_contentLength']) {
-                contentLength = req['_contentLength'];
-            }
-            else {
-                if (req.headers['content-length']) {
-                    contentLength = parseInt(req.headers['content-length']);
-                }
-            }
-            return contentLength;
-        }
-        catch (error) {
-            this.#LogErrorMessage(chalk_1.default.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
-            return 0;
-        }
-    };
-    Middleware = (req, res, next) => {
-        let workingSocketRecord = null;
-        workingSocketRecord = this.GetSocketRecord(req.socket);
-        if (!workingSocketRecord) {
-            this.#id = (0, uuid_1.v4)();
-            workingSocketRecord = {
-                id: `${this.options.name}_${this.#id.toString()}`,
-                socket: req.socket,
-                currentBytesRead: 0,
-                currentBytesWritten: 0,
-                lastBytesRead: 0,
-                lastBytesWritten: 0,
-                requestBytesRead: 0,
-                requestBytesWritten: 0,
-                originalUrl: req.originalUrl,
-                eventName: '',
-            };
-            this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
-            this.#LogSillyMessage(chalk_1.default.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
-            workingSocketRecord.socket.on('data', () => {
-                const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
-                if (socketRecord) {
-                    this.#LogSillyMessage(chalk_1.default.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                    this.UpdateNetworkStats(socketRecord, 'socket_data', req);
-                }
-                else {
-                    this.#LogSillyMessage(chalk_1.default.magenta(`Socket data event: Could not find socket within recordset`));
-                }
-            });
-            workingSocketRecord.socket.on('close', () => {
-                const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
-                if (socketRecord) {
-                    this.#LogSillyMessage(chalk_1.default.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                    this.UpdateNetworkStats(socketRecord, 'socket_close', req);
-                    delete this.#socketCollection[socketRecord.id];
-                    this.#LogSillyMessage(chalk_1.default.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                }
-                else {
-                    this.#LogSillyMessage(chalk_1.default.magenta(`Socket close event: Could not find socket within recordset`));
-                }
-            });
-            workingSocketRecord.socket.on('end', () => {
-                const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
-                if (socketRecord) {
-                    this.#LogSillyMessage(chalk_1.default.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                    this.UpdateNetworkStats(socketRecord, 'socket_end', req);
-                }
-                else {
-                    this.#LogSillyMessage(chalk_1.default.magenta(`Socket end event: Could not find socket within recordset`));
-                }
-            });
-        }
-        // The following gets the payload size from adding _contentLength or content-length to the header size.
-        // From brief observations, this appears to be about 80 bytes short from what is reported by the socket writtenBytes.
-        (0, on_headers_1.default)(res, () => {
-            let contentLength = 0;
-            if (res['_contentLength']) {
-                contentLength = res['_contentLength'];
-            }
-            else {
-                if (res.hasHeader('content-length')) {
-                    contentLength = parseInt(res.getHeader('content-length'));
-                }
-            }
-            // Ensure that the client does NOT cache the response
-            res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate'); // HTTP 1.1
-            res.setHeader('Pragma', 'no-cache'); // HTTP 1.0
-            res.setHeader('Expires', '0'); // Proxies
-            const headerLength = JSON.stringify(res.getHeaders()).length;
-            const totalSize = contentLength + headerLength;
-            this.#LogSillyMessage(chalk_1.default.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
-        });
-        // This event is the one where bytesWritten is generally recorded
-        req.on('end', () => {
-            const socketRecord = this.GetSocketRecord(req.socket);
-            if (socketRecord) {
-                this.#LogSillyMessage(chalk_1.default.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                this.UpdateNetworkStats(socketRecord, 'req_end', req);
-            }
-            else {
-                this.#LogSillyMessage(chalk_1.default.magenta(`Request end event: Could not find socket within recordset`));
-            }
-        });
-        req.on('close', () => {
-            const socketRecord = this.GetSocketRecord(req.socket);
-            if (socketRecord) {
-                this.#LogSillyMessage(chalk_1.default.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
-                this.UpdateNetworkStats(socketRecord, 'req_close', req);
-            }
-            else {
-                this.#LogSillyMessage(chalk_1.default.magenta(`Request close event: Could not find socket within recordset`));
-            }
-        });
-        /* These methods are also available but from testing they provide no specific value add, i.e. the calculated numbers are always 0.
-        req.on('data', () => {
-            workingSocketRecord = this.GetSocketRecord(req.socket);
-            if (workingSocketRecord) {
-                this.#LogDebugMessage(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
-                this.UpdateNetworkStats(workingSocketRecord, 'data', req);
-            } else {
-                this.#LogDebugMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
-            }
-        });
-
-        req.on('readable', () => {
-            workingSocketRecord = this.GetSocketRecord(req.socket);
-            if (workingSocketRecord) {
-                this.#LogDebugMessage(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
-                this.UpdateNetworkStats(workingSocketRecord, 'readable', req);
-            } else {
-                this.#LogDebugMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
-            }
-        });
-        */
-        const inHeadersLength = JSON.stringify(req.headers).length;
-        const inContentLength = this.#GetRequestContentSize(req);
-        const inTotal = inHeadersLength + inContentLength;
-        this.#LogSillyMessage(chalk_1.default.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
-        // This event is the one where bytesRead is generally recorded
-        this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
-        next();
-    };
-}
-exports.ServerNetworkMiddleware = ServerNetworkMiddleware;
-//# sourceMappingURL=serverNetworkMiddleware.js.map

package/dist/middleware/serverNetworkMiddleware.js.map

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