npm - @nsshunt/stsappframework - Versions diffs - 2.19.147 → 2.19.149 - Mend

@nsshunt/stsappframework 2.19.147 → 2.19.149

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/masterprocessbase.js +2 -1
package/dist/masterprocessbase.js.map +1 -1
package/dist/processbase.js +27 -3
package/dist/processbase.js.map +1 -1
package/dist/server.js +34 -2
package/dist/server.js.map +1 -1
package/dist/singleprocessbase.js +3 -2
package/dist/singleprocessbase.js.map +1 -1
package/dist/workerprocessbase.js +3 -2
package/dist/workerprocessbase.js.map +1 -1
package/masterprocessbase.ts +2 -1
package/package.json +4 -4
package/processbase.ts +28 -2
package/server.ts +43 -3
package/singleprocessbase.ts +3 -2
package/types/masterprocessbase.d.ts.map +1 -1
package/types/processbase.d.ts +1 -0
package/types/processbase.d.ts.map +1 -1
package/types/server.d.ts +2 -1
package/types/server.d.ts.map +1 -1
package/types/singleprocessbase.d.ts.map +1 -1
package/types/workerprocessbase.d.ts.map +1 -1
package/workerprocessbase.ts +3 -2

package/dist/masterprocessbase.js CHANGED Viewed

@@ -474,7 +474,8 @@ class MasterProcessBase extends processbase_1.ProcessBase {
                     this.KillWorkers(signal);
                     if (this.options.useDatabase) {
                         LogEx(`Ending database connections and pools.`);
-                        yield this.accessLayer.enddatabase();
+                        yield this.TerminateDatabase();
+                        //await this.accessLayer.enddatabase();
                     }
                     // Now allow some time for the workers to die and send any remaining messages ...
                     if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {

package/dist/masterprocessbase.js.map CHANGED Viewed

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

package/dist/processbase.js CHANGED Viewed

@@ -22,7 +22,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _ProcessBase_instrumentController, _ProcessBase_systemInformationInterval, _ProcessBase_socketIoHelper, _ProcessBase_accessLayer, _ProcessBase_logEx, _ProcessBase_ServiceCollectorWorkerFactory, _ProcessBase_ServiceBrokerWorkerFactory;
+var _ProcessBase_instrumentController, _ProcessBase_systemInformationInterval, _ProcessBase_socketIoHelper, _ProcessBase_accessLayer, _ProcessBase_poolManager, _ProcessBase_logEx, _ProcessBase_ServiceCollectorWorkerFactory, _ProcessBase_ServiceBrokerWorkerFactory, _ProcessBase_UpdatePGPoolManagerInstrument;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProcessBase = void 0;
 const pidusage_1 = __importDefault(require("pidusage"));
@@ -46,6 +46,7 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
         _ProcessBase_systemInformationInterval.set(this, null);
         _ProcessBase_socketIoHelper.set(this, null);
         _ProcessBase_accessLayer.set(this, null);
+        _ProcessBase_poolManager.set(this, null);
         _ProcessBase_logEx.set(this, null);
         /*
         CreateServiceProcessContext(serviceName: string, serviceVersion: string, serviceInstanceId: string,
@@ -150,6 +151,19 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
             clearInterval(__classPrivateFieldGet(this, _ProcessBase_systemInformationInterval, "f"));
             __classPrivateFieldSet(this, _ProcessBase_systemInformationInterval, null, "f");
         });
+        _ProcessBase_UpdatePGPoolManagerInstrument.set(this, (data) => {
+            if (stsutils_1.$stsgd.app) {
+                this.UpdateInstrument(stsinstrumentation_1.Gauge.CONNECTION_POOL_TOTAL_GAUGE, {
+                    val: data.totalCount
+                });
+                this.UpdateInstrument(stsinstrumentation_1.Gauge.CONNECTION_POOL_IDLE_GAUGE, {
+                    val: data.idleCount
+                });
+                this.UpdateInstrument(stsinstrumentation_1.Gauge.CONNECTION_POOL_WAITING_GAUGE, {
+                    val: data.waitingCount
+                });
+            }
+        });
         if (options.serviceName) {
             this.options.serviceProcessContext = (0, stspublisherserver_1.CreateServiceProcessContext)(options.serviceName, options.serviceVersion, options.serviceInstanceId, os_1.default.hostname(), process.pid, options.isMaster ? process.pid : process.ppid);
         }
@@ -204,10 +218,19 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
     set socketIoHelper(value) {
         __classPrivateFieldSet(this, _ProcessBase_socketIoHelper, value, "f");
     }
+    TerminateDatabase() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (__classPrivateFieldGet(this, _ProcessBase_accessLayer, "f")) {
+                __classPrivateFieldGet(this, _ProcessBase_poolManager, "f").off(stsdatamanagement_1.PGPoolManagerEventName.UpdateInstruments, __classPrivateFieldGet(this, _ProcessBase_UpdatePGPoolManagerInstrument, "f"));
+                yield __classPrivateFieldGet(this, _ProcessBase_accessLayer, "f").enddatabase();
+            }
+        });
+    }
     get accessLayer() {
         if (this.options.useDatabase) {
             if (__classPrivateFieldGet(this, _ProcessBase_accessLayer, "f") === null) {
-                __classPrivateFieldSet(this, _ProcessBase_accessLayer, new stsdatamanagement_1.PGAccessLayer(new stsdatamanagement_1.PGPoolManager()), "f");
+                __classPrivateFieldSet(this, _ProcessBase_poolManager, new stsdatamanagement_1.PGPoolManager(), "f");
+                __classPrivateFieldSet(this, _ProcessBase_accessLayer, new stsdatamanagement_1.PGAccessLayer(__classPrivateFieldGet(this, _ProcessBase_poolManager, "f")), "f");
                 (() => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const retVal = yield this.accessLayer.getResourceCount();
@@ -224,6 +247,7 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
                         (0, process_1.exit)(1);
                     }
                 }))();
+                __classPrivateFieldGet(this, _ProcessBase_poolManager, "f").on(stsdatamanagement_1.PGPoolManagerEventName.UpdateInstruments, __classPrivateFieldGet(this, _ProcessBase_UpdatePGPoolManagerInstrument, "f"));
             }
             return __classPrivateFieldGet(this, _ProcessBase_accessLayer, "f");
         }
@@ -231,5 +255,5 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
     }
 }
 exports.ProcessBase = ProcessBase;
-_ProcessBase_instrumentController = new WeakMap(), _ProcessBase_systemInformationInterval = new WeakMap(), _ProcessBase_socketIoHelper = new WeakMap(), _ProcessBase_accessLayer = new WeakMap(), _ProcessBase_logEx = new WeakMap(), _ProcessBase_ServiceCollectorWorkerFactory = new WeakMap(), _ProcessBase_ServiceBrokerWorkerFactory = new WeakMap();
+_ProcessBase_instrumentController = new WeakMap(), _ProcessBase_systemInformationInterval = new WeakMap(), _ProcessBase_socketIoHelper = new WeakMap(), _ProcessBase_accessLayer = new WeakMap(), _ProcessBase_poolManager = new WeakMap(), _ProcessBase_logEx = new WeakMap(), _ProcessBase_ServiceCollectorWorkerFactory = new WeakMap(), _ProcessBase_ServiceBrokerWorkerFactory = new WeakMap(), _ProcessBase_UpdatePGPoolManagerInstrument = new WeakMap();
 //# sourceMappingURL=processbase.js.map

package/dist/processbase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"processbase.js","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA+B;AAC/B,qCAA2C;AAC3C,0DAA6B;AAE7B,oEAAiI;AAEjI,~~kEAAyE~~;~~AAEzE~~,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAC3B,MAAM,EAAE,yBAAyB,EAAE,GAAG,QAAQ,CAAC;AAG/C,gDAAsE;AACtE,yDAA+C;AAC/C,+BAAwC;AAGxC,oEAC8J;AAE9J,mDAAwC;AAExC,4CAAoB;AAEpB,MAAsB,WAAY,SAAQ,yBAAc;~~IAQpD~~,YAAY,OAAuB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAC;~~QARnB~~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~~QAjLG~~,IAAI,OAAO,CAAC,WAAW,EAAE;YACrB,IAAI,CAAC,OAAO,CAAC,qBAAqB,GAAG,IAAA,gDAA2B,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,iBAAiB,EACnI,YAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACjF;IACL,CAAC;IAED,IAAa,OAAO;QAChB,OAAO,KAAK,CAAC,OAAyB,CAAC;IAC3C,CAAC;IAgED,oBAAoB;QAEhB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE;YACrC,OAAO;SACV;QAED,MAAM,2BAA2B,GAAwC;YACrE,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YAClD,WAAW,EAAE,0CAAqB,CAAC,OAAO;YAC1C,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACnC,kCAAkC,EAAE,IAAI,CAAC,OAAO,CAAC,kCAAkC;YACnF,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;YACjE,qBAAqB,EAAE,IAAI,CAAC,wBAAwB,EAAE;YACtD,sBAAsB,EAAE,uBAAA,IAAI,kDAA+B;YAC3D,mBAAmB,EAAE,uBAAA,IAAI,+CAA4B;YACrD,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;SACpE,CAAA;QAED,uBAAA,IAAI,qCAAyB,IAAI,gDAA2B,CAAC,2BAA2B,CAAC,MAAA,CAAC;IAC9F,CAAC;IAED,wBAAwB;QACpB,OAAO,EAAG,CAAC;IACf,CAAC;IAED,0BAA0B;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAiDD,IAAI,oBAAoB;QACpB,OAAO,uBAAA,IAAI,yCAAsB,CAAC;IACtC,CAAC;IAaD,gBAAgB,CAAC,cAAqB;QAElC,IAAI,uBAAA,IAAI,yCAAsB,EAAE;YAC5B,OAAO,uBAAA,IAAI,yCAAsB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;SACtE;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAQD;;;OAGA;IACA,eAAe;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,cAAc;QAEd,OAAO,uBAAA,IAAI,mCAAgB,CAAC;IAChC,CAAC;IAED,IAAI,cAAc,CAAC,KAAqB;QAEpC,uBAAA,IAAI,+BAAmB,KAAK,MAAA,CAAC;IACjC,CAAC;IAED,IAAI,WAAW;QAEX,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YAC1B,IAAI,uBAAA,IAAI,gCAAa,KAAK,IAAI,EAAE;gBAC5B,uBAAA,IAAI,4BAAgB,IAAI,iCAAa,CAAC,IAAI,iCAAa,~~EAAE~~,CAAC,MAAA,CAAC;~~gBAC3D~~,CAAC,GAAS,EAAE;oBACR,IAAI;wBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;wBACzD,IAAI,MAAM,CAAC,MAAM,KAAK,+BAAW,CAAC,EAAE,EAAE;4BAClC,IAAI,CAAC,KAAK,CAAC,wEAAwE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;4BAClH,IAAA,cAAI,EAAC,CAAC,CAAC,CAAC;yBACX;6BAAM;4BACH,IAAI,CAAC,KAAK,CAAC,+CAA+C,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;yBAC3F;qBACJ;oBAAC,OAAO,KAAK,EAAE;wBACZ,IAAI,CAAC,KAAK,CAAC,+EAA+E,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;wBACxG,IAAA,cAAI,EAAC,CAAC,CAAC,CAAC;qBACX;gBACL,CAAC,CAAA,CAAC,EAAE,CAAC;~~aACR~~;YACD,OAAO,uBAAA,IAAI,gCAAa,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;~~AAzOD~~,~~kCAyOC~~"}
1	+ {"version":3,"file":"processbase.js","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"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"}

package/dist/server.js CHANGED Viewed

@@ -22,13 +22,45 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const stspublisherserver_1 = require("@nsshunt/stspublisherserver");
 const stsconfig_1 = require("@nsshunt/stsconfig");
 const goptions = (0, stsconfig_1.$Options)();
+const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
 class STSExpressServer {
-    constructor(options) {
+    constructor(options, stsApp) {
         _STSExpressServer_app.set(this, null);
         // Standard RequestLoggerMiddleware for all STS services
         const requestLoggerMiddleware = new stspublisherserver_1.RequestLoggerMiddleware({
             ignoresocketio: goptions.ignoresocketio
-            //} as RequestLoggerMiddlewareOptions);
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
+            stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE, {
+                Inc: 1
+            });
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_AR_DEC, () => {
+            stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE, {
+                Dec: 1
+            });
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_DH_VAL, (timeInMs) => {
+            stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.DURATION_HISTOGRAM_GAUGE, {
+                val: timeInMs
+            });
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL, (timeInMs) => {
+            stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.DURATION_GAUGE, {
+                val: timeInMs
+            });
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_RC_INC, () => {
+            stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.REQUEST_COUNT_GAUGE, {
+                Inc: 1
+            });
+        });
+        requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_V_INC, () => {
+            if (stsApp.InstrumentExists(stsinstrumentation_1.Gauge.VELOCITY_GAUGE)) {
+                stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.VELOCITY_GAUGE, {
+                    Inc: 1
+                });
+            }
         });
         const app = (0, express_1.default)();
         __classPrivateFieldSet(this, _STSExpressServer_app, app, "f");

package/dist/server.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"server.js","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,gDAAwB;AACxB,kEAAyC;AAEzC,~~oEAAqE~~;~~AAIrE~~,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;~~AAE3B~~,MAAa,gBAAgB;IAIzB,YAAY,OAAuB;~~QAFnC~~,gCAAO,IAAI,EAAC;QAIR,wDAAwD;QACxD,MAAM,uBAAuB,GAAG,IAAI,4CAAuB,CAAC;YACxD,cAAc,EAAE,QAAQ,CAAC,cAAc;~~YACvC~~,~~uCAAuC~~;~~SAC1C~~,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACtB,uBAAA,IAAI,yBAAQ,GAAG,MAAA,CAAC;QAEhB,+HAA+H;QAC/H,uDAAuD;QACvD,0DAA0D;QAC1D,MAAM,UAAU,GAAG;YACf,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,IAAI;SACf,CAAC;QAEF,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,UAAU,CAAC,CAAC,CAAC;QAE1B,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAA;QAEvB,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAEjF,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAC,CAAC,CAAC,CAAC;QAExD,uDAAuD;QACvD,oEAAoE;QACpE,IAAI,OAAO,CAAC,+BAA+B,EAAE;YACzC,OAAO,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;SAChD;QAED,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;QAE1E,IAAI,OAAO,CAAC,yBAAyB,EAAE;YACnC,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;SAC1C;QAED,mCAAmC;QACnC,GAAG,CAAC,GAAG,CAAC,UAAS,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI;YAChC,2DAA2D;YAC3D,IAAI,GAAG,EAAE;gBACL,qBAAqB;gBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACpC;iBAAM;gBACH,IAAI,EAAE,CAAC;aACV;YACD;;;;;;cAMP;QACG,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,GAAG;QAEH,OAAO,uBAAA,IAAI,6BAAK,CAAC;IACrB,CAAC;CACJ;~~AAlED~~,~~4CAkEC~~"}
1	+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"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"}

package/dist/singleprocessbase.js CHANGED Viewed

@@ -71,7 +71,7 @@ class SingleProcessBase extends processbase_1.ProcessBase {
         this.SetupServerEx = () => __awaiter(this, void 0, void 0, function* () {
             this.ProcessStartup();
             if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
-                __classPrivateFieldSet(this, _SingleProcessBase_expressServer, new server_1.STSExpressServer(this.options), "f");
+                __classPrivateFieldSet(this, _SingleProcessBase_expressServer, new server_1.STSExpressServer(this.options, this), "f");
             }
             const LogEx = this.LogEx;
             /*
@@ -158,7 +158,8 @@ class SingleProcessBase extends processbase_1.ProcessBase {
                     }
                     if (this.options.useDatabase) {
                         LogEx(`Ending database connections and pools.`);
-                        yield this.accessLayer.enddatabase();
+                        yield this.TerminateDatabase();
+                        //await this.accessLayer.enddatabase();
                     }
                     // Now allow some time for the workers to die and send any remaining messages ...
                     if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {

package/dist/singleprocessbase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../singleprocessbase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,0EAAkC,CAAC,gCAAgC;AAEnE,4CAAoB;AACpB,MAAM,OAAO,GAAG,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;AAEjC,yCAAkD;AAElD,iCAAyD;AACzD,+BAAmC;AAEnC,gDAA0C;AAE1C,oDAA2B;AAE3B,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAC3B,MAAM,EAAE,qBAAqB,EAAE,kCAAkC,EAAE,yBAAyB,EAAE,GAAG,QAAQ,CAAC;AAE1G,oEAAiH;AAGjH,+CAA4C;AAI5C,6CAAwD;AAExD,gDAA0C;AAE1C,qCAA2C;AAI3C,MAAa,iBAAkB,SAAQ,yBAAW;IAa9C;;;OAGA;IACA,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAA;QAhBlB,mDAAyB,qBAAqB,EAAC;QAC/C,gCAAM,IAAI,EAAC;QACX,2CAAiB,IAAI,EAAC;QACtB,0CAAgB,KAAK,EAAC;QACtB,mDAAyB,IAAI,EAAC;QAC9B,2CAAiB;YACb,WAAW,EAAE,aAAa;SAC7B,EAAA;QACD,wCAAc,IAAI,EAAC;QACnB,uCAAa,IAAI,EAAC;QA2ElB;;;;;;;;UAQD;QAEC,kBAAa,GAAG,GAAS,EAAE;YACvB,IAAI,CAAC,cAAc,EAAE,CAAC;YAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE;gBACxF,uBAAA,IAAI,oCAAkB,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAA,CAAC;~~aAC5D~~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~~WAAW~~,~~CAAC,WAAW,~~EAAE,CAAC;~~qBACxC~~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~~IAhTD~~,CAAC;IAED,IAAI,UAAU;QAEV,OAAO,uBAAA,IAAI,qCAAY,CAAC;IAC5B,CAAC;IAED,0BAA0B;QACtB,2BAAE,CAAC,GAAG,CAAC,uBAAA,IAAI,wCAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpC,iBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,0BAAK,CAAC,qBAAqB,EAAE;gBACrD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;aACR,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,wBAAwB;QAC7B,OAAO;YACH,CAAE,0BAAK,CAAC,qBAAqB,EAAE,+BAAU,CAAC,gBAAgB,EAAE;oBACxD,QAAQ,EAAE,kCAAkC;oBAC5C,UAAU,EAAE,yBAAyB;iBACd,CAAC;SAC/B,CAAA;IACL,CAAC;IAED;;;OAGA;IACS,eAAe;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,EAAE;QACF,OAAO,uBAAA,IAAI,6BAAI,CAAC;IACpB,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,aAAa;QACb,OAAO,uBAAA,IAAI,wCAAe,CAAC;IAC/B,CAAC;IAED,WAAW;QAEP,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI;gBACA,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,UAAU,CAAC,GAAS,EAAE;oBAClB,IAAI;wBACA,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjB;oBAAC,OAAO,KAAK,EAAE;wBACZ,MAAM,CAAC,KAAK,CAAC,CAAC;qBACjB;gBACL,CAAC,CAAA,EAAE,GAAG,CAAC,CAAC;aACX;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;~~IAiPK~~,SAAS;;YAEX,MAAM,uBAAA,IAAI,oCAAW,MAAf,IAAI,EAAY,QAAQ,CAAC,CAAC;YAChC,uBAAA,IAAI,gCAAc,IAAI,MAAA,CAAC;QAC3B,CAAC;KAAA;CACJ;~~AA1UD~~,~~8CA0UC~~"}
1	+ {"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../singleprocessbase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,0EAAkC,CAAC,gCAAgC;AAEnE,4CAAoB;AACpB,MAAM,OAAO,GAAG,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;AAEjC,yCAAkD;AAElD,iCAAyD;AACzD,+BAAmC;AAEnC,gDAA0C;AAE1C,oDAA2B;AAE3B,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAC3B,MAAM,EAAE,qBAAqB,EAAE,kCAAkC,EAAE,yBAAyB,EAAE,GAAG,QAAQ,CAAC;AAE1G,oEAAiH;AAGjH,+CAA4C;AAI5C,6CAAwD;AAExD,gDAA0C;AAE1C,qCAA2C;AAI3C,MAAa,iBAAkB,SAAQ,yBAAW;IAa9C;;;OAGA;IACA,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAA;QAhBlB,mDAAyB,qBAAqB,EAAC;QAC/C,gCAAM,IAAI,EAAC;QACX,2CAAiB,IAAI,EAAC;QACtB,0CAAgB,KAAK,EAAC;QACtB,mDAAyB,IAAI,EAAC;QAC9B,2CAAiB;YACb,WAAW,EAAE,aAAa;SAC7B,EAAA;QACD,wCAAc,IAAI,EAAC;QACnB,uCAAa,IAAI,EAAC;QA2ElB;;;;;;;;UAQD;QAEC,kBAAa,GAAG,GAAS,EAAE;YACvB,IAAI,CAAC,cAAc,EAAE,CAAC;YAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE;gBACxF,uBAAA,IAAI,oCAAkB,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAA,CAAC;aAClE;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAEzB;;;;;cAKJ;YAEI,KAAK,CAAC,4CAA4C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;YACrF,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC;YAE/C,MAAM,QAAQ,GAAG,IAAA,qCAAwB,GAAE,CAAC;YAC5C,IAAI,QAAQ,KAAK,IAAI,EACrB;gBACI,KAAK,CAAC,iBAAiB,QAAQ,EAAE,CAAC,CAAC;aACtC;iBAAM;gBACH,KAAK,CAAC,uBAAuB,CAAC,CAAC;aAClC;YAED,KAAK,CAAC,wBAAwB,OAAO,gBAAgB,CAAC,CAAC;YAEvD,gCAAgC;YAChC,MAAM,WAAW,GAAG;gBAChB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;gBACX,GAAG,EAAE,GAAG;gBACR,GAAG,EAAE,GAAG;aACX,CAAA;YAED,MAAM,OAAO,GAAG,MAAM,2BAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEzC,KAAK,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;YAC/B,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACnD,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACpD,KAAK,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7C,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhD,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,EAAE;gBAE/B,IAAI,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,MAAM,KAAK,QAAQ,EACvB;oBACI,QAAQ,GAAG,gBAAM,CAAC,MAAM,CAAC;iBAC5B;qBAAM;oBACH,QAAQ,GAAG,gBAAM,CAAC,GAAG,CAAC;iBACzB;gBACD,OAAO,QAAQ,CAAC;YACpB,CAAC,CAAC;YAEF,uBAAA,IAAI,iCAAe,IAAI,MAAA,CAAC;YAExB,sBAAsB;YACtB,sCAAsC;YACtC,sBAAsB;YACtB,8BAA8B;YAC9B,iCAAiC;YACjC,YAAY;YACZ,2BAA2B;YAC3B,MAAM,SAAS,GAAG,CAAO,MAAM,EAAE,EAAE;gBAE/B,IAAI,uBAAA,IAAI,uCAAc,KAAK,KAAK,EAChC;oBACI,uBAAA,IAAI,mCAAiB,IAAI,MAAA,CAAC;oBAE1B,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBAE9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAE1B,IAAI,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EACnC;wBACI,KAAK,CAAC,wCAAwC,CAAC,CAAC;wBAChD,IAAI,CAAC,eAAe,EAAE,CAAC,SAAS,EAAE,CAAC;qBACtC;oBAED,IAAI,MAAM,EAAE;wBACR,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,iCAAiC,OAAO,CAAC,GAAG,qBAAqB,MAAM,EAAE,CAAC,CAAC,CAAC;qBAC7G;yBAAM;wBACH,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,iCAAiC,OAAO,CAAC,GAAG,qCAAqC,CAAC,CAAC,CAAC;qBACnH;oBAED,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBACjC,yBAAyB;oBAEzB,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAC/B,sCAAsC;oBAEtC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,IAAI,uBAAA,IAAI,6BAAI,KAAK,IAAI,EACxD;wBACI,KAAK,CAAC,qBAAqB,CAAC,CAAC;wBAC7B,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE;4BAC9B,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;yBAC3C;6BAAM;4BACH,uBAAA,IAAI,6BAAI,CAAC,iBAAiB,EAAE,CAAC;yBAChC;wBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;wBAC3B,uBAAA,IAAI,yBAAO,IAAI,MAAA,CAAC;qBACnB;oBAED,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;wBAClC,KAAK,CAAC,qBAAqB,CAAC,CAAC;wBAC7B,MAAM,uBAAA,IAAI,qCAAY,CAAC,KAAK,EAAE,CAAC;qBAClC;oBAED,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;wBAC1B,KAAK,CAAC,wCAAwC,CAAC,CAAC;wBAChD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;wBAC/B,uCAAuC;qBAC1C;oBAED,iFAAiF;oBACjF,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC3E,KAAK,CAAC,mBAAmB,CAAC,CAAC;wBAC3B,UAAU,CAAC,GAAG,EAAE;4BACZ,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;wBACpD,CAAC,EAAE,GAAG,CAAC,CAAC;qBACX;oBAED,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,mCAAmC;oBAEtD,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE;wBACrF,UAAU,CAAC,GAAG,EAAE;4BACZ,KAAK,CAAC,6BAA6B,CAAC,CAAC;4BACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACpB,CAAC,EAAE,uBAAA,IAAI,gDAAuB,CAAC,CAAC,CAAC,gDAAgD;qBACpF;yBAAM;wBACH,KAAK,CAAC,yCAAyC,CAAC,CAAC;qBACpD;iBACJ;gBACD,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACvC,CAAC,CAAA,CAAA;YAED,uBAAA,IAAI,gCAAc,SAAS,MAAA,CAAC;YAE5B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAS,EAAE;gBAE5B,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC,CAAA,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;gBAE7B,MAAM,SAAS,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC,CAAA,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAExB,IAAI,IAAI,KAAK,CAAC,EACd;oBACI,KAAK,CAAC,iBAAiB,OAAO,CAAC,GAAG,qCAAqC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;iBACxF;qBAAM;oBACH,KAAK,CAAC,iBAAiB,OAAO,CAAC,GAAG,0BAA0B,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;iBAC3E;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;gBAClC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE;oBACnC,MAAM,OAAO,GAAG;wBACZ,GAAG,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;wBACrD,IAAI,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC;qBACjE,CAAC;oBACF,uBAAA,IAAI,iCAAe,IAAA,oBAAiB,EAAC,OAAO,EAAE,uBAAA,IAAI,wCAAe,CAAC,GAAG,CAAC,MAAA,CAAC;iBAC1E;qBAAM;oBACH,uBAAA,IAAI,iCAAe,IAAA,mBAAY,EAAC,uBAAA,IAAI,wCAAe,CAAC,GAAG,CAAC,MAAA,CAAC;iBAC5D;gBAED,uCAAuC;gBAEvC,4DAA4D;gBAC5D,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;oBACjC,YAAY;oBACZ,YAAY;oBACZ,MAAM,OAAO,GAA2B;wBACpC,UAAU,EAAE,CAAE,WAAW,CAAE,CAAC,oFAAoF;wBAChH,iCAAiC;wBACjC,0DAA0D;wBAC1D,eAAe;qBAClB,CAAC;oBAEF,uBAAA,IAAI,yBAAO,IAAI,kBAAM,CAAC,uBAAA,IAAI,qCAAY,EAAE,OAAO,CAAC,MAAA,CAAC;oBAEjD,kEAAkE;oBAClE,6CAA6C;oBAC7C,0BAA0B;oBAC1B,4BAA4B;oBAE5B,uBAAA,IAAI,6BAAI,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;wBAC3C,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,qBAAqB;wBAC1C,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAK,gCAAgC;wBACrD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAE,sDAAsD;wBAC3E,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAE,gCAAgC;oBACzD,CAAC,CAAC,CAAC;iBACN;gBAED,IAAI;oBACA,2FAA2F;oBAC3F,kEAAkE;oBAClE,0EAA0E;oBAC1E,uBAAA,IAAI,qCAAY,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE;wBAClD,+BAA+B;oBACnC,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;wBAEpB,KAAK,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;oBAChG,CAAC,CAAC,CAAC;iBACN;gBAAC,OAAO,KAAK,EACd;oBACI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,KAAK,CAAC;iBACf;aAEJ;YAED;;;;;;cAMJ;YAEI,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC,CAAA,CAAA;IAjTD,CAAC;IAED,IAAI,UAAU;QAEV,OAAO,uBAAA,IAAI,qCAAY,CAAC;IAC5B,CAAC;IAED,0BAA0B;QACtB,2BAAE,CAAC,GAAG,CAAC,uBAAA,IAAI,wCAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpC,iBAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,0BAAK,CAAC,qBAAqB,EAAE;gBACrD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;aACR,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,wBAAwB;QAC7B,OAAO;YACH,CAAE,0BAAK,CAAC,qBAAqB,EAAE,+BAAU,CAAC,gBAAgB,EAAE;oBACxD,QAAQ,EAAE,kCAAkC;oBAC5C,UAAU,EAAE,yBAAyB;iBACd,CAAC;SAC/B,CAAA;IACL,CAAC;IAED;;;OAGA;IACS,eAAe;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,EAAE;QACF,OAAO,uBAAA,IAAI,6BAAI,CAAC;IACpB,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,aAAa;QACb,OAAO,uBAAA,IAAI,wCAAe,CAAC;IAC/B,CAAC;IAED,WAAW;QAEP,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI;gBACA,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,UAAU,CAAC,GAAS,EAAE;oBAClB,IAAI;wBACA,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjB;oBAAC,OAAO,KAAK,EAAE;wBACZ,MAAM,CAAC,KAAK,CAAC,CAAC;qBACjB;gBACL,CAAC,CAAA,EAAE,GAAG,CAAC,CAAC;aACX;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,CAAC,KAAK,CAAC,CAAC;aACjB;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAkPK,SAAS;;YAEX,MAAM,uBAAA,IAAI,oCAAW,MAAf,IAAI,EAAY,QAAQ,CAAC,CAAC;YAChC,uBAAA,IAAI,gCAAc,IAAI,MAAA,CAAC;QAC3B,CAAC;KAAA;CACJ;AA3UD,8CA2UC"}

package/dist/workerprocessbase.js CHANGED Viewed

@@ -159,7 +159,7 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
         this.SetupServerEx = () => __awaiter(this, void 0, void 0, function* () {
             this.ProcessStartup();
             if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
-                __classPrivateFieldSet(this, _WorkerProcessBase_expressServer, new server_1.STSExpressServer(this.options), "f");
+                __classPrivateFieldSet(this, _WorkerProcessBase_expressServer, new server_1.STSExpressServer(this.options, this), "f");
             }
             const LogEx = this.LogEx;
             /*
@@ -195,7 +195,8 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
                     }
                     if (this.options.useDatabase) {
                         LogEx(`Ending database connections and pools.`);
-                        yield this.accessLayer.enddatabase();
+                        yield this.TerminateDatabase();
+                        //await this.accessLayer.enddatabase();
                     }
                     LogEx(`Performing exit value: [${performExit}]`);
                     if (performExit) {

package/dist/workerprocessbase.js.map CHANGED Viewed

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

package/masterprocessbase.ts CHANGED Viewed

@@ -559,7 +559,8 @@ export class MasterProcessBase extends ProcessBase
                 if (this.options.useDatabase) {
                     LogEx(`Ending database connections and pools.`);
-                    await this.accessLayer.enddatabase();
+                    await this.TerminateDatabase();
+                    //await this.accessLayer.enddatabase();
                 }
                 // Now allow some time for the workers to die and send any remaining messages ...

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "2.19.147",
+  "version": "2.19.149",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -29,16 +29,16 @@
     "@types/jest": "^29.5.0",
     "@typescript-eslint/eslint-plugin": "^5.57.1",
     "@typescript-eslint/parser": "^5.57.1",
-    "eslint": "^8.37.0",
+    "eslint": "^8.38.0",
     "jest": "^29.5.0",
     "supertest": "^6.3.3",
     "typescript": "^5.0.4"
   },
   "dependencies": {
     "@nsshunt/stsconfig": "^1.25.36",
-    "@nsshunt/stsdatamanagement": "^1.17.72",
+    "@nsshunt/stsdatamanagement": "^1.17.77",
     "@nsshunt/stsinstrumentation": "^6.11.79",
-    "@nsshunt/stspublisherserver": "^1.15.35",
+    "@nsshunt/stspublisherserver": "^1.15.37",
     "@nsshunt/stsutils": "^1.15.43",
     "@socket.io/cluster-adapter": "^0.2.2",
     "@types/pidusage": "^2.0.2",

package/processbase.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { Gauge, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry } from '@nsshunt/stsinstrumentation'
-import { PGAccessLayer, PGPoolManager } from '@nsshunt/stsdatamanagement'
+import { PGAccessLayer, PGPoolManager, PGPoolManagerEventName } from '@nsshunt/stsdatamanagement'
 import { $Options } from '@nsshunt/stsconfig'
 const goptions = $Options()
@@ -29,6 +29,7 @@ export abstract class ProcessBase extends STSOptionsBase
     #systemInformationInterval: NodeJS.Timer = null;
     #socketIoHelper: SocketIoHelper = null;
     #accessLayer: PGAccessLayer = null;
+    #poolManager: PGPoolManager = null;
     #logEx: logFunction = null;
     constructor(options: ProcessOptions)
@@ -232,11 +233,35 @@ export abstract class ProcessBase extends STSOptionsBase
         this.#socketIoHelper = value;
     }
+    #UpdatePGPoolManagerInstrument = (data) => {
+        if ($stsgd.app) {
+            this.UpdateInstrument(Gauge.CONNECTION_POOL_TOTAL_GAUGE, {
+                val: data.totalCount
+            } as InstrumentGaugeTelemetry);
+            this.UpdateInstrument(Gauge.CONNECTION_POOL_IDLE_GAUGE, {
+                val: data.idleCount
+            } as InstrumentGaugeTelemetry);
+            this.UpdateInstrument(Gauge.CONNECTION_POOL_WAITING_GAUGE, {
+                val: data.waitingCount
+            } as InstrumentGaugeTelemetry);
+        }
+    }
+    async TerminateDatabase() {
+        if (this.#accessLayer) {
+            this.#poolManager.off(PGPoolManagerEventName.UpdateInstruments, this.#UpdatePGPoolManagerInstrument)
+            await this.#accessLayer.enddatabase();
+        }
+    }
     get accessLayer(): PGAccessLayer
     {
         if (this.options.useDatabase) {
             if (this.#accessLayer === null) {
-                this.#accessLayer = new PGAccessLayer(new PGPoolManager());
+                this.#poolManager = new PGPoolManager();
+                this.#accessLayer = new PGAccessLayer(this.#poolManager);
                 (async () => {
                     try {
                         const retVal = await this.accessLayer.getResourceCount();
@@ -251,6 +276,7 @@ export abstract class ProcessBase extends STSOptionsBase
                         exit(1);
                     }
                 })();
+                this.#poolManager.on(PGPoolManagerEventName.UpdateInstruments, this.#UpdatePGPoolManagerInstrument)
             }
             return this.#accessLayer;
         }

package/server.ts CHANGED Viewed

@@ -2,23 +2,63 @@ import express from 'express';
 import cors from 'cors';
 import cookieParser from 'cookie-parser';
-import { RequestLoggerMiddleware } from '@nsshunt/stspublisherserver'
+import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName } from '@nsshunt/stspublisherserver'
 import { ProcessOptions } from './processoptions'
 import { $Options } from '@nsshunt/stsconfig'
 const goptions = $Options()
+import { ProcessBase } from './processbase'
+import { Gauge, InstrumentGaugeTelemetry, InstrumentHistogramTelemetry, InstrumentVelocityTelemetry } from '@nsshunt/stsinstrumentation'
 export class STSExpressServer
 {
     #app = null;
-    constructor(options: ProcessOptions)
+    constructor(options: ProcessOptions, stsApp: ProcessBase)
     {
         // Standard RequestLoggerMiddleware for all STS services
         const requestLoggerMiddleware = new RequestLoggerMiddleware({
             ignoresocketio: goptions.ignoresocketio
-            //} as RequestLoggerMiddlewareOptions);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
+            stsApp.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
+                Inc: 1
+            } as InstrumentGaugeTelemetry);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_DEC, () => {
+            stsApp.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
+                Dec: 1
+            } as InstrumentGaugeTelemetry);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_DH_VAL, (timeInMs) => {
+            stsApp.UpdateInstrument(Gauge.DURATION_HISTOGRAM_GAUGE, {
+                val: timeInMs
+            } as InstrumentHistogramTelemetry);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL, (timeInMs) => {
+            stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
+                val: timeInMs
+            } as InstrumentHistogramTelemetry);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_RC_INC, () => {
+            stsApp.UpdateInstrument(Gauge.REQUEST_COUNT_GAUGE, {
+                Inc: 1
+            } as InstrumentGaugeTelemetry);
+        });
+        requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_V_INC, () => {
+            if (stsApp.InstrumentExists(Gauge.VELOCITY_GAUGE)) {
+                stsApp.UpdateInstrument(Gauge.VELOCITY_GAUGE, {
+                    Inc: 1
+                } as InstrumentVelocityTelemetry);
+            }
         });
         const app = express();

package/singleprocessbase.ts CHANGED Viewed

@@ -132,7 +132,7 @@ export class SingleProcessBase extends ProcessBase
         this.ProcessStartup();
         if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
-            this.#expressServer = new STSExpressServer(this.options);
+            this.#expressServer = new STSExpressServer(this.options, this);
         }
         const LogEx = this.LogEx;
@@ -242,7 +242,8 @@ export class SingleProcessBase extends ProcessBase
                 if (this.options.useDatabase) {
                     LogEx(`Ending database connections and pools.`);
-                    await this.accessLayer.enddatabase();
+                    await this.TerminateDatabase();
+                    //await this.accessLayer.enddatabase();
                 }
                 // Now allow some time for the workers to die and send any remaining messages ...

package/types/masterprocessbase.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../masterprocessbase.ts"],"names":[],"mappings":";;;;AA8BA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,qBAAa,iBAAkB,SAAQ,WAAW;;gBAkBlC,OAAO,EAAE,cAAc;IAW1B,0BAA0B;IAQ1B,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IAEA,kBAAkB,CAAC,GAAG,EAAE,GAAG;IAuI3B,WAAW,sBAMV;IAoBD,UAAU,OAAQ,MAAM,UAAU,OAAO,OAAO,WAAuB,GAAG,eAAe,OAAO,gBAAgB,OAAO,KAAG,OAAO,CAwBhI;IAED,WAAW,WAAY,OAAO,OAAO,KAAG,IAAI,CAgB3C;IAUD,UAAU,QAAO,IAAI,CAIpB;IAED,UAAU,QAAO,IAAI,CAIpB;IAGD,SAAS,YAAa,GAAG,KAAG,MAAM,CAOjC;IA+BD,WAAW,wBAAyB,GAAG,KAAG,MAAM,CAiC9C;IAEF,aAAa;IAIb,aAAa,~~sBA2NZ~~;IAED,sBAAsB,oCAarB;CACJ"}
1	+ {"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../masterprocessbase.ts"],"names":[],"mappings":";;;;AA8BA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,qBAAa,iBAAkB,SAAQ,WAAW;;gBAkBlC,OAAO,EAAE,cAAc;IAW1B,0BAA0B;IAQ1B,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IAEA,kBAAkB,CAAC,GAAG,EAAE,GAAG;IAuI3B,WAAW,sBAMV;IAoBD,UAAU,OAAQ,MAAM,UAAU,OAAO,OAAO,WAAuB,GAAG,eAAe,OAAO,gBAAgB,OAAO,KAAG,OAAO,CAwBhI;IAED,WAAW,WAAY,OAAO,OAAO,KAAG,IAAI,CAgB3C;IAUD,UAAU,QAAO,IAAI,CAIpB;IAED,UAAU,QAAO,IAAI,CAIpB;IAGD,SAAS,YAAa,GAAG,KAAG,MAAM,CAOjC;IA+BD,WAAW,wBAAyB,GAAG,KAAG,MAAM,CAiC9C;IAEF,aAAa;IAIb,aAAa,sBA4NZ;IAED,sBAAsB,oCAarB;CACJ"}

package/types/processbase.d.ts CHANGED Viewed

@@ -24,6 +24,7 @@ export declare abstract class ProcessBase extends STSOptionsBase {
     GetUIController(): any;
     get socketIoHelper(): SocketIoHelper;
     set socketIoHelper(value: SocketIoHelper);
+    TerminateDatabase(): Promise<void>;
     get accessLayer(): PGAccessLayer;
 }
 //# sourceMappingURL=processbase.d.ts.map

package/types/processbase.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAuD,MAAM,6BAA6B,CAAA;AAEjI,OAAO,EAAE,aAAa,~~EAAiB~~,MAAM,4BAA4B,CAAA;~~AAMzE~~,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAU,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAC2B,MAAM,6BAA6B,CAAA;AAM9J,8BAAsB,WAAY,SAAQ,cAAc;;~~gBAQxC~~,OAAO,EAAE,cAAc;IAUnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAgED,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,gCAEvB;IAED,KAAK,yBASJ;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAIf;IAED;;;OAGA;IACA,eAAe;IAIf,IAAI,cAAc,IAAI,cAAc,CAGnC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAGvC;~~IAED~~,IAAI,WAAW,IAAI,aAAa,~~CAuB~~/B;CACJ"}
1	+ {"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAuD,MAAM,6BAA6B,CAAA;AAEjI,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAMjG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAU,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAC2B,MAAM,6BAA6B,CAAA;AAM9J,8BAAsB,WAAY,SAAQ,cAAc;;gBASxC,OAAO,EAAE,cAAc;IAUnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAgED,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,gCAEvB;IAED,KAAK,yBASJ;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAIf;IAED;;;OAGA;IACA,eAAe;IAIf,IAAI,cAAc,IAAI,cAAc,CAGnC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,cAAc,EAGvC;IAkBK,iBAAiB;IAOvB,IAAI,WAAW,IAAI,aAAa,CAyB/B;CACJ"}

package/types/server.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 import { ProcessOptions } from './processoptions';
+import { ProcessBase } from './processbase';
 export declare class STSExpressServer {
     #private;
-    constructor(options: ProcessOptions);
+    constructor(options: ProcessOptions, stsApp: ProcessBase);
     get App(): any;
 }
 //# sourceMappingURL=server.d.ts.map

package/types/server.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,qBAAa,gBAAgB;;gBAIb,OAAO,EAAE,cAAc;~~IA0DnC~~,IAAI,GAAG,QAGN;CACJ"}
1	+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAKjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,qBAAa,gBAAgB;;gBAIb,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW;IA+FxD,IAAI,GAAG,QAGN;CACJ"}

package/types/singleprocessbase.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../singleprocessbase.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAQnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,KAAK,IAAI,CAAA;AAE5C,qBAAa,iBAAkB,SAAQ,WAAW;;IAa9C;;;OAGA;gBACY,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAGb;IAED,0BAA0B;IAQjB,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IACS,eAAe;IAIxB,cAAc;IAId,IAAI,EAAE,QAEL;IAED,kBAAkB;IAIlB,IAAI,aAAa,QAEhB;IAED,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IA6B/B,aAAa,~~sBAmOZ~~;IAEK,SAAS;CAKlB"}
1	+ {"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../singleprocessbase.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAQnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,KAAK,IAAI,CAAA;AAE5C,qBAAa,iBAAkB,SAAQ,WAAW;;IAa9C;;;OAGA;gBACY,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAGb;IAED,0BAA0B;IAQjB,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IACS,eAAe;IAIxB,cAAc;IAId,IAAI,EAAE,QAEL;IAED,kBAAkB;IAIlB,IAAI,aAAa,QAEhB;IAED,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IA6B/B,aAAa,sBAoOZ;IAEK,SAAS;CAKlB"}

package/types/workerprocessbase.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../workerprocessbase.ts"],"names":[],"mappings":"AASA,OAAO,EAAU,UAAU,EAAS,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAa5C;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;gBAQlC,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAEb;IAED,aAAa;IAKb,yBAAyB,CAAC,GAAG,EAAE,GAAG;IAIlC,0BAA0B;IAS1B,IAAI,EAAE,QAEL;IAiCD,SAAS,YAAmB,GAAG,KAAG,QAAQ,MAAM,CAAC,CAUhD;IAGD,YAAY,aAAoB,MAAM,WAAW,GAAG,KAAG,QAAQ,UAAU,CAAC,CAWzE;IAED,kBAAkB;IAkDlB,IAAI,aAAa,QAEhB;IAED,WAAW,sBAMV;IAED,aAAa,~~sBA0NX~~;CACL"}
1	+ {"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../workerprocessbase.ts"],"names":[],"mappings":"AASA,OAAO,EAAU,UAAU,EAAS,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAa5C;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;gBAQlC,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAEb;IAED,aAAa;IAKb,yBAAyB,CAAC,GAAG,EAAE,GAAG;IAIlC,0BAA0B;IAS1B,IAAI,EAAE,QAEL;IAiCD,SAAS,YAAmB,GAAG,KAAG,QAAQ,MAAM,CAAC,CAUhD;IAGD,YAAY,aAAoB,MAAM,WAAW,GAAG,KAAG,QAAQ,UAAU,CAAC,CAWzE;IAED,kBAAkB;IAkDlB,IAAI,aAAa,QAEhB;IAED,WAAW,sBAMV;IAED,aAAa,sBA2NX;CACL"}

package/workerprocessbase.ts CHANGED Viewed

@@ -190,7 +190,7 @@ export class WorkerProcessBase extends ProcessBase
         this.ProcessStartup();
         if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
-            this.#expressServer = new STSExpressServer(this.options);
+            this.#expressServer = new STSExpressServer(this.options, this);
         }
         const LogEx = this.LogEx;
@@ -239,7 +239,8 @@ export class WorkerProcessBase extends ProcessBase
                 if (this.options.useDatabase) {
                     LogEx(`Ending database connections and pools.`);
-                    await this.accessLayer.enddatabase();
+                    await this.TerminateDatabase();
+                    //await this.accessLayer.enddatabase();
                 }
                 LogEx(`Performing exit value: [${performExit}]`);