@nsshunt/stsappframework 3.1.213 → 3.1.215

package/dist/stslatencyroute.js.map

@@ -1 +1 @@
-{"version":3,"file":"stslatencyroute.js","sourceRoot":"","sources":["../src/stslatencyroute.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAC/C,iEAA6D;AAG7D,MAAa,eAAgB,SAAQ,6BAAa;IAE9C,YAAY,MAAoB;QAE5B,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,MAAM,iBAAiB,GAAG,IAAI,2CAAoB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB;IACvF,CAAC;CACJ;AAXD,0CAWC"}
+{"version":3,"file":"stslatencyroute.js","sourceRoot":"","sources":["../src/stslatencyroute.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAC/C,iEAA6D;AAG7D,MAAa,eAAgB,SAAQ,6BAAa;IAC9C,YAAY,MAAoB;QAE5B,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,MAAM,iBAAiB,GAAG,IAAI,2CAAoB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,EAAE,UAAU,EAAE,GAAG,iBAAiB,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB;IACvF,CAAC;CACJ;AAVD,0CAUC"}

package/dist/stsrouterbase.js.map

@@ -1 +1 @@
-{"version":3,"file":"stsrouterbase.js","sourceRoot":"","sources":["../src/stsrouterbase.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,qCAAiC;AAGjC,MAAsB,aAAa;IAE/B,OAAO,CAAS;IAChB,OAAO,CAAM;IAEb,YAAY,MAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAA,gBAAM,GAAE,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAjBD,sCAiBC"}
+{"version":3,"file":"stsrouterbase.js","sourceRoot":"","sources":["../src/stsrouterbase.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,qCAAiC;AAGjC,MAAsB,aAAa;IAC/B,OAAO,CAAS;IAChB,OAAO,CAAM;IAEb,YAAY,MAAoB;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAA,gBAAM,GAAE,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;CACJ;AAhBD,sCAgBC"}

package/dist/vitesttesting/appSingleWSS.js

@@ -7,10 +7,11 @@ exports.AppSingleWSS = void 0;
 /* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
 const chalk_1 = __importDefault(require("chalk"));
 const index_1 = require("./../index");
+const stsobservability_1 = require("@nsshunt/stsobservability");
 class AppSingleWSS extends index_1.SingleProcessBase {
     constructor(options) {
         super(options);
-        this.socketIoServerHelper = new index_1.SocketIoServerHelper({
+        this.socketIoServerHelper = new stsobservability_1.SocketIoServerHelper({
             logger: this.options.logger
         });
     }

package/dist/vitesttesting/appSingleWSS.js.map

@@ -1 +1 @@
-{"version":3,"file":"appSingleWSS.js","sourceRoot":"","sources":["../../src/vitesttesting/appSingleWSS.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,sCAAiI;AAQjI,MAAa,YAAa,SAAQ,yBAAiB;IAE/C,YAAY,OAAuB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,oBAAoB,GAAG,IAAI,4BAAoB,CAA6C;YAC7F,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;SAC9B,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CAAC,OAAY;QACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAEQ,cAAc;QACnB,KAAK,CAAC,cAAc,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAS,EAAE,oBAAY,CAAC,UAAU;YAC5E,uBAAuB;YACvB;gBACI,eAAO,CAAC,qBAAqB;gBAC7B,eAAO,CAAC,aAAa;gBACrB,OAAO;aACV,EACD,IAAI,EAAE,oEAAoE;YAE1E,2CAA2C;YAC3C,CAAC,MAA6E,EAAE,EAAE;gBAC9E,IAAI,CAAC,eAAe,CAAC,eAAK,CAAC,IAAI,CAAC,+CAA+C,MAAM,CAAC,EAAE,wBAAwB,CAAC,CAAC,CAAC;YACvH,CAAC;YAED,iCAAiC;YACjC,CAAC,MAA6E,EAAE,EAAE;gBAC9E,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAS,EAAE,EAAE;oBACjC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;gBACtC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAS,EAAE,EAAE;oBACnC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAS,EAAE,EAAE;oBAC1C,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACnB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAW,EAAE,EAAE,EAAE,EAAE;oBACrC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;oBACpB,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;oBAC9B,EAAE,CAAC,EAAC,IAAI,EAAE,GAAG,GAAC,CAAC,EAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAA;QACV,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;QACjF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB;QACnB,IAAI,IAAI,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,oBAAY,CAAC,UAAU,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAlED,oCAkEC"}
+{"version":3,"file":"appSingleWSS.js","sourceRoot":"","sources":["../../src/vitesttesting/appSingleWSS.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,sCAA2G;AAC3G,gEAAgE;AAQhE,MAAa,YAAa,SAAQ,yBAAiB;IAE/C,YAAY,OAAuB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,oBAAoB,GAAG,IAAI,uCAAoB,CAA6C;YAC7F,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;SAC9B,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CAAC,OAAY;QACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAEQ,cAAc;QACnB,KAAK,CAAC,cAAc,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAS,EAAE,oBAAY,CAAC,UAAU;YAC5E,uBAAuB;YACvB;gBACI,eAAO,CAAC,qBAAqB;gBAC7B,eAAO,CAAC,aAAa;gBACrB,OAAO;aACV,EACD,IAAI,EAAE,oEAAoE;YAE1E,2CAA2C;YAC3C,CAAC,MAA6E,EAAE,EAAE;gBAC9E,IAAI,CAAC,eAAe,CAAC,eAAK,CAAC,IAAI,CAAC,+CAA+C,MAAM,CAAC,EAAE,wBAAwB,CAAC,CAAC,CAAC;YACvH,CAAC;YAED,iCAAiC;YACjC,CAAC,MAA6E,EAAE,EAAE;gBAC9E,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAS,EAAE,EAAE;oBACjC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;gBACtC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,IAAS,EAAE,EAAE;oBACnC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAS,EAAE,EAAE;oBAC1C,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBACnB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAW,EAAE,EAAE,EAAE,EAAE;oBACrC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;oBACpB,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;oBAC9B,EAAE,CAAC,EAAC,IAAI,EAAE,GAAG,GAAC,CAAC,EAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAA;QACV,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;QACjF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,mBAAmB;QACnB,IAAI,IAAI,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,CAAC,oBAAY,CAAC,UAAU,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAlED,oCAkEC"}

package/dist/workerprocessbase.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,gEAA2E;AAE3E,+CAAiI;AACjI,2DAAuD;AAEvD,+BAAoC;AAEpC,kDAA6C;AAE7C,0EAAkC,CAAC,gCAAgC;AACnE,uCAAoD;AAEpD;;;;GAIG;AACH,MAAa,iBAAkB,SAAQ,qCAAiB;IACpD,gBAAgB,GAAgB,EAAG,CAAA;IACnC,8BAA8B,GAAG,IAAI,CAAC,CAAC,WAAW;IAClD,YAAY,GAA0B,IAAI,CAAC;IAE3C,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,8DAA8D;IAC9D,yBAAyB,CAAC,GAAQ;QAC9B,mCAAmC;IACvC,CAAC;IAEQ,0BAA0B;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACtD,+DAA+D;YAC/D,IAAI,CAAC,gBAAgB,CAAC,wBAAK,CAAC,sBAAsB,EAAE;gBAChD,GAAG,EAAE,KAAK;aACe,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,2BAA2B,GAAG,CAAC,OAA0B,EAAuB,EAAE;QAC9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,qBAAqB,OAAO,CAAC,EAAE,+DAA+D,CAAC,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG;oBAChC,iBAAiB,EAAE,EAAE,GAAG,OAAO,EAAE;oBACjC,EAAE,EAAE,GAAG,EAAE;wBACL,MAAM,MAAM,GAAe,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,cAA4B,CAAA;wBAC3G,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxD,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,2MAA2M;wBAC3M,OAAO,CAAC,MAAM,CAAC,CAAC;oBACpB,CAAC;oBACD,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;wBACrB,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,iOAAiO;wBACjO,MAAM,CAAC,+CAA+C,CAAC,CAAC;oBAC5D,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC,8BAA8B;iBACzE,CAAC;gBACF,+LAA+L;gBAC9L,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAGD,SAAS,GAAG,KAAK,EAAE,OAAY,EAAmB,EAAE;QAChD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE;gBACX,OAAO;aACV;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAA;IAED,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAY,EAAuB,EAAE;QACzE,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,YAAY;YACvC,aAAa,EAAE;gBACX,OAAO;gBACP,QAAQ;aACX;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,uBAAuB,GAAG,KAAK,IAAyB,EAAE;QACtD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE,EAAG;SACrB,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,UAAU,GAAG,KAAK,IAAqB,EAAE;QACrC,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,GAAG,EAAE,GAAG;SACX,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,2BAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,oBAAQ,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,oBAAQ,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,GAAG,oBAAQ,CAAC,OAAO,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,oBAAQ,CAAC,OAAO,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QACxC,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC,CAAA;IAED,kBAAkB,GAAG,KAAK,IAAI,EAAE;QAC5B,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,MAAM,EAAE,GAAG;YACX,MAAM,EAAE,GAAG;YACX,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;YACR,UAAU,EAAE,GAAG;YACf,oBAAoB;YACpB,gBAAgB,EAAE,GAAG;SACxB,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,2BAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAA,kCAAwB,GAAE,CAAC;QAE5C,MAAM,SAAS,GAAmB,EAAG,CAAC;QAEtC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAmB,EAAE,EAAE;YACrD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,2BAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG;YACZ,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YACzD,QAAQ;YACR,OAAO;YACP,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,oBAAoB;SACvB,CAAA;QAED,OAAO,OAAO,CAAC;IACnB,CAAC,CAAA;IAEQ,aAAa,GAAG,KAAK,IAAsB,EAAE;QAClD,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;QAE5B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YACrC,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;gBACtB,MAAM,iBAAiB,GAAsB,GAAwB,CAAC;gBACtE,IAAI,iBAAiB,CAAC,EAAE,EAAE,CAAC;oBACvB,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC9C,MAAM,eAAe,GAAe,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;wBAChF,eAAe,CAAC,iBAAiB,CAAC,cAAc,GAAG,EAAE,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAA;wBAC1F,eAAe,CAAC,EAAE,EAAE,CAAC;oBACzB,CAAC;yBAAM,CAAC;wBACJ,MAAM,IAAI,KAAK,CAAC,qDAAqD,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;oBAClG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAClG,CAAC;gBACD,OAAO;YACX,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,cAAc;aAC/B,CAAC;gBACG,QAAQ,GAAG,CAAC,OAAO,EACnB,CAAC;oBACD,KAAK,WAAW;wBACZ,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBAC9G,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,2EAA2E;wBAC9G,MAAM;oBACV,KAAK,kBAAkB;wBACnB,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBAC9G,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACjC,MAAM;oBACV,KAAK,SAAS;wBACV,8GAA8G;wBAC9G,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACzC,MAAM;oBACV,KAAK,UAAU,CAAE,CAAC,iDAAiD;oBAC/D,aAAa;gBACjB,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEO,gBAAgB;QACrB,kCAAkC;QAClC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,KAAK,CAAC,gBAAgB,EAAE,CAAC;IACpC,CAAC;CACJ;AA3MD,8CA2MC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.213",
+  "version": "3.1.215",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -37,8 +37,8 @@
     "@types/jest": "^29.5.13",
     "@types/jsonwebtoken": "^9.0.7",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.9.0",
-    "@typescript-eslint/parser": "^8.9.0",
+    "@typescript-eslint/eslint-plugin": "^8.10.0",
+    "@typescript-eslint/parser": "^8.10.0",
     "eslint": "^9.11.1",
     "globals": "^15.11.0",
     "jest": "^29.7.0",
@@ -51,11 +51,10 @@
     "@grpc/grpc-js": "^1.12.2",
     "@grpc/proto-loader": "^0.7.13",
     "@influxdata/influxdb-client": "^1.35.0",
-    "@influxdata/influxdb-client-apis": "^1.35.0",
     "@nsshunt/stsconfig": "^1.25.149",
     "@nsshunt/stsdatamanagement": "^1.18.78",
-    "@nsshunt/stsmessaging": "^1.0.8",
-    "@nsshunt/stsobservability": "^1.0.69",
+    "@nsshunt/stsmessaging": "^1.0.9",
+    "@nsshunt/stsobservability": "^1.0.71",
     "@nsshunt/stsutils": "^1.16.86",
     "@socket.io/cluster-adapter": "^0.2.2",
     "@socket.io/redis-streams-adapter": "^0.2.2",

package/src/commonTypes.ts

@@ -255,6 +255,7 @@ export interface ISocketIoServerHelper<ClientToServerEvents extends STSDefaultCl
     SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>
 }
 
+/*
 export interface IInfluxDBManagerOptions {
     token: string // API access token
     url: string // end-pont for API
@@ -270,6 +271,7 @@ export interface IInfluxDBManagerOptions {
     }
     logger: ISTSLogger
 }
+*/
 
 export type ConsumeMessageCB = (topic: string, partition: number, message: KafkaMessage, heartbeat: () => Promise<void>, pause: () => () => void) => void;
 export type ConsumeMessageErrorCB = (error: any) => void;

package/src/index.ts

@@ -1,22 +1,16 @@
 export * from './commonTypes'
-export * from './authDefs'
 export * from './authutilsnode'
 export * from './stsrouterbase'
 export * from './stscontrollerbase'
 export * from './singleprocessbase'
 export * from './masterprocessbase'
 export * from './workerprocessbase'
-export * from './socketIoServerHelper'
+//export * from './socketIoServerHelper'
 export * from './stslatencycontroller'
 export * from './stslatencyroute'
 export * from './kafka/kafkamanager'
 export * from './kafka/kafkaproducer'
 export * from './kafka/kafkaconsumer'
-export * from './influxdb/influxDBManager'
-export * from './influxdb/influxDBManagerBase'
-export * from './influxdb/influxDBManagerService'
-export * from './influxdb/influxDBManagerAgent'
-export * from './influxdb/influxDBManagerLambda'
 export * from './publishertransports/publishTransportUtils'
 export * from './stsTransportWinston'
 export * from './stsTransportLoggerWinston'

package/src/masterprocessbase.ts

@@ -28,6 +28,8 @@ import { IPCMessagePayload, IPCMessageCommand } from './commonTypes'
 
 import { STSTransportLoggerWinston } from './stsTransportLoggerWinston'
 
+import { Sleep } from '@nsshunt/stsutils'
+
 //import { GetFirstNetworkInterface } from './network';
 
 export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
@@ -291,7 +293,9 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
     }
 
     KillWorkers = (signal: NodeJS.Signals, keepOne?: boolean): void => {
+        const logPrefix = `MasterProcessBase:KillWorkers():${process.pid}:`;
         try {
+            this.LogInfoMessage(`${logPrefix} Killing Workers.`);
             const keepOneAlive = (keepOne ? keepOne : false);
             let skippedFirst = false;
             const sortedIdList: number[] = [ ];
@@ -306,7 +310,7 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
                 }
             });
         } catch (error) {
-            this.LogInfoMessage(chalk.red(`MasterProcessBase:KillWorkers(): signal: [${signal}], keepOne: [${keepOne}], error: [${error}]`));
+            this.LogInfoMessage(chalk.red(`${logPrefix} signal: [${signal}], keepOne: [${keepOne}], error: [${error}]`));
         }
     }
 
@@ -520,6 +524,22 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
             }
         });
 
+        const TerminateLatency = () => {
+            if (this.#checkLatency) {
+                clearInterval(this.#checkLatency);
+                this.#checkLatency = null;
+            }
+        }
+
+        const TerminateHTTPServer = async (): Promise<void> => {
+            if (this.#httpServer !== null) {
+                const logPrefix = `ServerProcessBase:TerminateHTTPServer():${process.pid}:`;
+                this.LogInfoMessage(`${logPrefix} Closing httpServer.`);
+                await this.#httpServer.close();
+                this.#httpServer = null;
+            }
+        }
+
         // Terminate in order;
         // forked worker threads (send signal)
         // De-Register service
@@ -527,73 +547,40 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
         // instrument timers (gauge etc.)
         // publisher
         // terminate UI (if loaded)
-        const Terminate = async (signal: any) =>
-        {
-            if (this.#shuttingDown === false)
-            {
+        const Terminate = async (signal: any): Promise<void> => {
+            const logPrefix = `MasterProcessBase:Terminate():${process.pid}:`;
+            if (this.#shuttingDown === false) {
                 this.#shuttingDown = true;
 
-                if (this.#checkLatency) {
-                    clearInterval(this.#checkLatency);
-                    this.#checkLatency = null;
-                }
-
-                await this.ProcessTerminate();
-
-                if (this.GetUIController() !== null)
-                {
-                    this.LogInfoMessage('Destroy the user interface controller.');
-                    this.GetUIController().DestroyUI();
-                }
-
                 if (signal) {
-                    this.LogInfoMessage(this.GetSignalColour(signal)(`Main Process (masterprocess): ${process.pid} received signal: ${signal}`));
+                    this.LogInfoMessage(this.GetSignalColour(signal)(`${logPrefix} Received signal: ${signal}`));
                 } else {
-                    this.LogInfoMessage(this.GetSignalColour(null)(`Main Process (masterprocess): ${process.pid} received Terminate without signal.`));
+                    this.LogInfoMessage(this.GetSignalColour(null)(`${logPrefix} Received Terminate without signal.`));
                 }
 
-                this.LogInfoMessage(`De-Registering service.`);
-                //@@ De-register here ...
+                TerminateLatency();
 
-                if (this.#httpServer !== null) {
-                    this.LogInfoMessage(`Closing httpServer.`);
-                    await this.#httpServer.close();
-                    this.#httpServer = null;
-                }
-				
-                this.LogInfoMessage(`Stopping instruments.`);
-                //@@StopInstruments(this.instruments);
+                await this.ProcessTerminate();
 
-                //@@endpublish was here (and working ...)
+                this.TerminateUIController();
+    
+                this.LogInfoMessage(`${logPrefix} De-Registering service.`);
+                //@@ De-register here ...
+
+                await TerminateHTTPServer();
 
-                this.LogInfoMessage('Killing Workers.');
                 this.KillWorkers(signal);
 
-                if (this.options.useDatabase) {
-                    this.LogInfoMessage(`Ending database connections and pools.`);
-                    await this.TerminateDatabase();
-                    //await this.accessLayer.enddatabase();
-                }
+                await this.TerminateDatabase();
 
-                // Now allow some time for the workers to die and send any remaining messages ...
-                //if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {
-                if (this.InstrumentController) {
-                    this.LogInfoMessage(`Ending publisher.`);
-                    setTimeout(() => {
-                        if (this.InstrumentController) {
-                            this.InstrumentController.EndPublish();
-                        }
-                    }, 100);
-                }
+                this.TerminateInstrumentController();
 
-                if (this.options.processExitOnTerminate && this.options.processExitOnTerminate === true) {
-                    setTimeout(() => {
-                        this.LogInfoMessage(`Performing process.exit(0).`);
-                        process.exit(0);
-                    }, this.#childProcessExitTime + this.#masterProcessExitTime); // Give the workers time to terminate gracefully
-                } else {
-                    this.LogInfoMessage(`Performing process.exit(0) - Immediate.`);
-                }
+                await Sleep(1000);
+
+                this.ProcessExit(this.#childProcessExitTime + this.#masterProcessExitTime);
+
+            } else {
+                this.LogInfoMessage(`${logPrefix} Process already terminating.`);
             }
         }
 

package/src/processbase.ts

@@ -275,6 +275,28 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
         }
     }
 
+    ProcessExit = (processExitDelay: number) => {
+        if (this.options.processExitOnTerminate && this.options.processExitOnTerminate === true) {
+            setTimeout(() => {
+                this.LogInfoMessage(`Performing process.exit(0).`);
+                process.exit(0);
+            }, processExitDelay); // Give the workers time to terminate gracefully
+        } else {
+            this.LogInfoMessage(`Performing process.exit(0) - Immediate.`);
+        }
+    }
+
+    TerminateInstrumentController = () => {
+        if (this.InstrumentController) {
+            this.LogInfoMessage(`ProcessBase:TerminateInstrumentController()`);
+            setTimeout(() => {
+                if (this.InstrumentController) {
+                    this.InstrumentController.EndPublish();
+                }
+            }, 100);
+        }
+    }
+
     get InstrumentController(): PublishInstrumentController | null {
         return this.#instrumentController;
     }
@@ -287,6 +309,13 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
         return false;
     }
 
+    TerminateUIController = () => {
+        if (this.GetUIController() !== null) {
+            this.LogInfoMessage('ProcessBase:TerminateUIController(): Destroy the user interface controller.');
+            this.GetUIController().DestroyUI();
+        }
+    }
+
     async ProcessTerminate(): Promise<void> {
         this.emit('ProcessTerminate');
 
@@ -330,8 +359,10 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
         } as InstrumentGaugeTelemetry);
     }
 
-    async TerminateDatabase() {
+    async TerminateDatabase(): Promise<void> {
         if (this.#accessLayer) {
+            const logPrefix = `ProcessBase:TerminateDatabase():${process.pid}:`;
+            this.LogInfoMessage(`${logPrefix} Ending database connections and pools.`);
             this.#accessLayer.off(IDBAccessLayerEvents.UpdateInstruments, this.#UpdatePGPoolManagerInstrument)
             await this.#accessLayer.EndDatabase();
         }

package/src/serverprocessbase.ts

@@ -21,7 +21,7 @@ import tls from 'node:tls'
 import net from 'node:net'
 
 import { Server, ServerOptions } from "socket.io";
-import { STSExpressServer } from './server';
+import { STSExpressServer } from './stsexpressserver'
 import { Express } from 'express'
 
 import { createClient, RedisClientType } from 'redis';
@@ -221,8 +221,7 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         //@@httpServer.listen('/var/run/sts/stsrest01.sock').on('listening', () =>
         this.#httpServer.listen(this.options.listenPort, () => { 
             //@@chmodSync(this.options.port, 511);
-        }).on('listening', () =>
-        {
+        }).on('listening', () => {
             this.LogInfoMessage(`live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
         });
     }
@@ -232,8 +231,7 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         this.#httpServer = tls.createServer(this.#GetTLSOptions(), this.#SetupTLSServer);
         this.#httpServer.listen(this.options.listenPort, 'stscore.stsmda.org', () => { 
             this.LogInfoMessage('TCP Server is running on port ' + this.options.listenPort + '.');
-        }).on('listening', () =>
-        {
+        }).on('listening', () => {
             this.LogInfoMessage(`TCP live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
         });
     }
@@ -248,8 +246,7 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         (this.#httpServer as tls.Server).on('secureConnection', this.#SetupRPCServer);
         this.#httpServer.listen(this.options.listenPort, 'stscore.stsmda.org', () => { 
             this.LogInfoMessage('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
-        }).on('listening', () =>
-        {
+        }).on('listening', () => {
             this.LogInfoMessage(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
         });
     }
@@ -258,6 +255,37 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
         return this.#shuttingDown;
     }
 
+    TerminateSocketIO = () => {
+        if (this.options.wssServer === true && this.#io !== null) {
+            const logPrefix = `ServerProcessBase:TerminateSockets():${process.pid}:`;
+            this.LogInfoMessage(`${logPrefix} Disconnect SocketIO Sockets.`);
+            if (this.socketIoServerHelper !== null) {
+                this.socketIoServerHelper.DisconnectSockets();
+            } else {
+                this.#io.disconnectSockets();
+            }
+            this.socketIoServerHelper = null;
+            this.#io = null;
+            // Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
+        }
+    }
+
+    TerminateHTTPServer = async (): Promise<void> => {
+        const logPrefix = `ServerProcessBase:TerminateHTTPServer():${process.pid}:`;
+        if (this.#httpServer !== null) {
+            if (this.options.serverType === STSServerType.TCPRAW_TLS) {
+                this.#sockets.forEach((socket: net.Socket, index, array) => {
+                    this.LogInfoMessage(chalk.yellow(`${logPrefix} TCP Socket destroy, remote address: [${socket.remoteAddress}], remote port: [${socket.remotePort}]`));
+                    socket.destroy();
+                    //socket.end();
+                });
+            }
+            this.LogInfoMessage(`${logPrefix} Closing httpServer.`);
+            await this.#httpServer.close();
+            this.#httpServer = null;
+        }
+    }
+
     // Terminate in order;
     // forked worker threads (send signal)
     // De-Register service
@@ -266,75 +294,37 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
     // publisher
     // terminate UI (if loaded)
     Terminate = async (clusterPerformExit: boolean, signal?: any): Promise<void> => {
+        const logPrefix = `ServerProcessBase:Terminate():${process.pid}:`;
         if (this.#shuttingDown === false) {
             this.#shuttingDown = true;
 
+            if (signal) {
+                this.LogInfoMessage(this.GetSignalColour(signal)(`${logPrefix} Received signal: ${signal}`));
+            } else {
+                this.LogInfoMessage(this.GetSignalColour(null)(`${logPrefix} Received Terminate without signal.`));
+            }
+
             await this.ProcessTerminate();
 
-            if (!this.options.clusterMode) {
-                if (this.GetUIController() !== null)
-                {
-                    this.LogInfoMessage('Destroy the user interface controller.');
-                    this.GetUIController().DestroyUI();
-                }
-        
-                if (signal) {
-                    this.LogInfoMessage(this.GetSignalColour(signal)(`Main Process (singleprocess): ${process.pid} received signal: ${signal}`));
-                } else {
-                    this.LogInfoMessage(this.GetSignalColour(null)(`Main Process (singleprocess): ${process.pid} received Terminate without signal.`));
-                }
-            }
+            this.TerminateUIController();
 
-            if (this.options.wssServer === true && this.#io !== null)
-            {
-                this.LogInfoMessage(`Disconnect Sockets.`);
-                if (this.socketIoServerHelper !== null) {
-                    this.socketIoServerHelper.DisconnectSockets();
-                } else {
-                    this.#io.disconnectSockets();
-                }
-                this.socketIoServerHelper = null;
-                this.#io = null;
-                // Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
-            }
+            this.TerminateSocketIO();
 
-            if (this.#httpServer) {
-                if (this.options.serverType === STSServerType.TCPRAW_TLS) {
-                    this.#sockets.forEach((socket: net.Socket, index, array) => {
-                        this.LogInfoMessage(chalk.yellow(`TCP Socket destroy, remote address: [${socket.remoteAddress}], remote port: [${socket.remotePort}]`));
-                        socket.destroy();
-                        //socket.end();
-                    });
-                }
-                this.LogInfoMessage(`Closing httpServer.`);
-                await this.#httpServer.close();
-            }
+            await this.TerminateHTTPServer();
             
-            if (this.options.useDatabase) {
-                this.LogInfoMessage(`Ending database connections and pools.`);
-                await this.TerminateDatabase();
-                //await this.accessLayer.enddatabase();
-            }
+            await this.TerminateDatabase();
 
+            // Output final messages here (before TerminateInstrumentController)
             if (this.options.clusterMode) {
-                this.LogInfoMessage(`Performing exit value: [${clusterPerformExit}]`);
+                this.LogInfoMessage(`${logPrefix} clusterPerformExit value: [${clusterPerformExit}]`);
                 if (clusterPerformExit) {
-                    this.LogInfoMessage(`Process will self terminate with process.exit(0).`);
+                    this.LogInfoMessage(`${logPrefix} Process will self terminate with process.exit(0).`);
                 } else {
-                    this.LogInfoMessage(`Child process will not self terminate. Terminate will be handled by master process.`);
+                    this.LogInfoMessage(`${logPrefix} Child process will not self terminate. Terminate will be handled by master process.`);
                 }
             }
 
-            //if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {
-            if (this.InstrumentController) {
-                this.LogInfoMessage(`Ending publisher.`);
-                setTimeout(() => {
-                    //if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {
-                    if (this.InstrumentController) {
-                        this.InstrumentController.EndPublish();
-                    }
-                }, 100);
-            }
+            this.TerminateInstrumentController();
 
             //@@ always return here appears to always cleanly exit
             // and cleanly exit from socket.io cluster adaptor
@@ -344,24 +334,17 @@ export abstract class ServerProcessBase extends ProcessBase implements IServerPr
 
             await Sleep(1000); // Allow socket.io time to clean-up
 
-            if (this.options.clusterMode) {
-                if (clusterPerformExit) {
+            if (this.options.clusterMode === true) {
+                if (clusterPerformExit === true) {
                     setTimeout(() => {
                         process.exit(0);
                     }, 0);
                 } 
             } else {
-                if (this.options.processExitOnTerminate && this.options.processExitOnTerminate === true) {
-                    setTimeout(() => {
-                        this.LogInfoMessage(`Performing process.exit(0).`);
-                        process.exit(0);
-                    }, this.#masterProcessExitTime); // Give the workers time to terminate gracefully
-                } else {
-                    this.LogInfoMessage(`Performing process.exit(0) - Immediate.`);
-                }
+                this.ProcessExit(this.#masterProcessExitTime);
             }
         } else {
-            this.LogInfoMessage(`Process already terminating.`);
+            this.LogInfoMessage(`${logPrefix} Process already terminating.`);
         }
     }
 

package/src/{socketIoServerHelper.ts → socketIoServerHelper.ts_bak}

@@ -152,8 +152,7 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
         return this.#namespace;
     }
 
-    DisconnectSockets = (): void =>
-    {
+    DisconnectSockets = (): void => {
         for (const [, namespace] of Object.entries(this.#namespace)) {
             namespace.socketionamespace.disconnectSockets();
         }

package/src/stscontrollerbase.ts

@@ -1,8 +1,7 @@
 /* eslint @typescript-eslint/no-explicit-any: 0 */  // --> OFF
 import { IProcessBase } from './commonTypes';
 
-export abstract class STSControllerBase
-{
+export abstract class STSControllerBase {
     #stsApp: any;
 
     constructor(stsApp: IProcessBase) {

package/src/{server.ts → stsexpressserver.ts}

@@ -13,8 +13,7 @@ import { Gauge, InstrumentGaugeTelemetry, InstrumentHistogramTelemetry, Instrume
 
 import { ISocketRecord, ServerNetworkMiddleware, ServerNetworkMiddlewareEventName } from './middleware/serverNetworkMiddleware'
 
-export class STSExpressServer
-{
+export class STSExpressServer {
     #app: Express;
 
     constructor(options: ProcessOptions, stsApp: IProcessBase)

package/src/stslatencycontroller.ts

@@ -3,8 +3,7 @@ import { StatusCodes } from 'http-status-codes'
 import { STSControllerBase } from './stscontrollerbase'
 import { IProcessBase } from './commonTypes'
 
-export class STSLatencyController extends STSControllerBase
-{
+export class STSLatencyController extends STSControllerBase {
     constructor(stsApp: IProcessBase) {
         super(stsApp);
     }

package/src/stslatencyroute.ts

@@ -2,8 +2,7 @@ import { STSRouterBase } from './stsrouterbase'
 import { STSLatencyController } from './stslatencycontroller'
 import { IProcessBase } from './commonTypes'
 
-export class STSLatencyRoute extends STSRouterBase
-{
+export class STSLatencyRoute extends STSRouterBase {
     constructor(stsApp: IProcessBase)
     {
         super(stsApp);

package/src/stsrouterbase.ts

@@ -2,8 +2,7 @@
 import { Router } from 'express';
 import { IProcessBase } from './commonTypes';
 
-export abstract class STSRouterBase
-{
+export abstract class STSRouterBase {
     #router: Router;
     #stsApp: any;
 

package/src/vitesttesting/appSingleWSS.ts

@@ -1,7 +1,8 @@
 /* eslint @typescript-eslint/no-explicit-any: 0 */  // --> OFF
 import chalk from 'chalk';
 
-import { SingleProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace, ProcessOptions } from './../index'
+import { SingleProcessBase, STSNamespace, STSRoom, STSSocketIONamespace, ProcessOptions } from './../index'
+import { SocketIoServerHelper } from '@nsshunt/stsobservability'
 
 import { Socket } from "socket.io";
 

package/src/workerprocessbase.ts

@@ -18,8 +18,7 @@ import { GetFirstNetworkInterface } from './network'
  * @typedef {Object} options - todo
  * @property {boolean} [wssServer=false] - Create a web socket server on this worker instance
  */
-export class WorkerProcessBase extends ServerProcessBase implements IWorkerProcessBase
-{
+export class WorkerProcessBase extends ServerProcessBase implements IWorkerProcessBase {
     #inFlightMessage: IPCMessages = { }
     #requestResponseMessageTimeout = 5000; //@@ config
     #pingTimeout: NodeJS.Timeout | null = null;