@nsshunt/stsappframework 2.19.148 → 2.19.150
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.
- package/dist/processbase.js +2 -2
- package/dist/processbase.js.map +1 -1
- package/dist/server.js +36 -4
- package/dist/server.js.map +1 -1
- package/dist/singleprocessbase.js +1 -1
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/workerprocessbase.js +1 -1
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +4 -4
- package/processbase.ts +3 -3
- package/processoptions.ts +1 -1
- package/server.ts +45 -5
- package/singleprocessbase.ts +1 -1
- package/types/processbase.d.ts.map +1 -1
- package/types/processoptions.d.ts +1 -1
- package/types/processoptions.d.ts.map +1 -1
- package/types/server.d.ts +2 -1
- package/types/server.d.ts.map +1 -1
- package/workerprocessbase.ts +1 -1
package/dist/processbase.js
CHANGED
|
@@ -221,7 +221,7 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
221
221
|
TerminateDatabase() {
|
|
222
222
|
return __awaiter(this, void 0, void 0, function* () {
|
|
223
223
|
if (__classPrivateFieldGet(this, _ProcessBase_accessLayer, "f")) {
|
|
224
|
-
__classPrivateFieldGet(this, _ProcessBase_poolManager, "f").off(
|
|
224
|
+
__classPrivateFieldGet(this, _ProcessBase_poolManager, "f").off(stsdatamanagement_1.PGPoolManagerEventName.UpdateInstruments, __classPrivateFieldGet(this, _ProcessBase_UpdatePGPoolManagerInstrument, "f"));
|
|
225
225
|
yield __classPrivateFieldGet(this, _ProcessBase_accessLayer, "f").enddatabase();
|
|
226
226
|
}
|
|
227
227
|
});
|
|
@@ -247,7 +247,7 @@ class ProcessBase extends stsutils_1.STSOptionsBase {
|
|
|
247
247
|
(0, process_1.exit)(1);
|
|
248
248
|
}
|
|
249
249
|
}))();
|
|
250
|
-
__classPrivateFieldGet(this, _ProcessBase_poolManager, "f").on(
|
|
250
|
+
__classPrivateFieldGet(this, _ProcessBase_poolManager, "f").on(stsdatamanagement_1.PGPoolManagerEventName.UpdateInstruments, __classPrivateFieldGet(this, _ProcessBase_UpdatePGPoolManagerInstrument, "f"));
|
|
251
251
|
}
|
|
252
252
|
return __classPrivateFieldGet(this, _ProcessBase_accessLayer, "f");
|
|
253
253
|
}
|
package/dist/processbase.js.map
CHANGED
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -22,13 +22,45 @@ const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
|
22
22
|
const stspublisherserver_1 = require("@nsshunt/stspublisherserver");
|
|
23
23
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
24
24
|
const goptions = (0, stsconfig_1.$Options)();
|
|
25
|
+
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
25
26
|
class STSExpressServer {
|
|
26
|
-
constructor(options) {
|
|
27
|
+
constructor(options, stsApp) {
|
|
27
28
|
_STSExpressServer_app.set(this, null);
|
|
28
29
|
// Standard RequestLoggerMiddleware for all STS services
|
|
29
30
|
const requestLoggerMiddleware = new stspublisherserver_1.RequestLoggerMiddleware({
|
|
30
31
|
ignoresocketio: goptions.ignoresocketio
|
|
31
|
-
|
|
32
|
+
});
|
|
33
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
|
|
34
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE, {
|
|
35
|
+
Inc: 1
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_AR_DEC, () => {
|
|
39
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE, {
|
|
40
|
+
Dec: 1
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_DH_VAL, (timeInMs) => {
|
|
44
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.DURATION_HISTOGRAM_GAUGE, {
|
|
45
|
+
val: timeInMs
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL, (timeInMs) => {
|
|
49
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.DURATION_GAUGE, {
|
|
50
|
+
val: timeInMs
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_RC_INC, () => {
|
|
54
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.REQUEST_COUNT_GAUGE, {
|
|
55
|
+
Inc: 1
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
requestLoggerMiddleware.on(stspublisherserver_1.RequestLoggerMiddlewareEventName.UpdateInstrument_V_INC, () => {
|
|
59
|
+
if (stsApp.InstrumentExists(stsinstrumentation_1.Gauge.VELOCITY_GAUGE)) {
|
|
60
|
+
stsApp.UpdateInstrument(stsinstrumentation_1.Gauge.VELOCITY_GAUGE, {
|
|
61
|
+
Inc: 1
|
|
62
|
+
});
|
|
63
|
+
}
|
|
32
64
|
});
|
|
33
65
|
const app = (0, express_1.default)();
|
|
34
66
|
__classPrivateFieldSet(this, _STSExpressServer_app, app, "f");
|
|
@@ -46,11 +78,11 @@ class STSExpressServer {
|
|
|
46
78
|
// Allow the static SPA to also be servered by this app
|
|
47
79
|
//app.use('/static', express.static(path.join(__dirname, 'public')))
|
|
48
80
|
if (options.expressServerRouteStaticFactory) {
|
|
49
|
-
options.expressServerRouteStaticFactory(app);
|
|
81
|
+
options.expressServerRouteStaticFactory(app, stsApp);
|
|
50
82
|
}
|
|
51
83
|
app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
|
|
52
84
|
if (options.expressServerRouteFactory) {
|
|
53
|
-
options.expressServerRouteFactory(app);
|
|
85
|
+
options.expressServerRouteFactory(app, stsApp);
|
|
54
86
|
}
|
|
55
87
|
// Express error handling fall-back
|
|
56
88
|
app.use(function (err, req, res, next) {
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,gDAAwB;AACxB,kEAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ class SingleProcessBase extends processbase_1.ProcessBase {
|
|
|
71
71
|
this.SetupServerEx = () => __awaiter(this, void 0, void 0, function* () {
|
|
72
72
|
this.ProcessStartup();
|
|
73
73
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
74
|
-
__classPrivateFieldSet(this, _SingleProcessBase_expressServer, new server_1.STSExpressServer(this.options), "f");
|
|
74
|
+
__classPrivateFieldSet(this, _SingleProcessBase_expressServer, new server_1.STSExpressServer(this.options, this), "f");
|
|
75
75
|
}
|
|
76
76
|
const LogEx = this.LogEx;
|
|
77
77
|
/*
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../singleprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -159,7 +159,7 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
|
|
|
159
159
|
this.SetupServerEx = () => __awaiter(this, void 0, void 0, function* () {
|
|
160
160
|
this.ProcessStartup();
|
|
161
161
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
162
|
-
__classPrivateFieldSet(this, _WorkerProcessBase_expressServer, new server_1.STSExpressServer(this.options), "f");
|
|
162
|
+
__classPrivateFieldSet(this, _WorkerProcessBase_expressServer, new server_1.STSExpressServer(this.options, this), "f");
|
|
163
163
|
}
|
|
164
164
|
const LogEx = this.LogEx;
|
|
165
165
|
/*
|
|
@@ -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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.150",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -29,16 +29,16 @@
|
|
|
29
29
|
"@types/jest": "^29.5.0",
|
|
30
30
|
"@typescript-eslint/eslint-plugin": "^5.57.1",
|
|
31
31
|
"@typescript-eslint/parser": "^5.57.1",
|
|
32
|
-
"eslint": "^8.
|
|
32
|
+
"eslint": "^8.38.0",
|
|
33
33
|
"jest": "^29.5.0",
|
|
34
34
|
"supertest": "^6.3.3",
|
|
35
35
|
"typescript": "^5.0.4"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@nsshunt/stsconfig": "^1.25.36",
|
|
39
|
-
"@nsshunt/stsdatamanagement": "^1.17.
|
|
39
|
+
"@nsshunt/stsdatamanagement": "^1.17.77",
|
|
40
40
|
"@nsshunt/stsinstrumentation": "^6.11.79",
|
|
41
|
-
"@nsshunt/stspublisherserver": "^1.15.
|
|
41
|
+
"@nsshunt/stspublisherserver": "^1.15.37",
|
|
42
42
|
"@nsshunt/stsutils": "^1.15.43",
|
|
43
43
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
44
44
|
"@types/pidusage": "^2.0.2",
|
package/processbase.ts
CHANGED
|
@@ -4,7 +4,7 @@ import path from 'node:path';
|
|
|
4
4
|
|
|
5
5
|
import { Gauge, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry } from '@nsshunt/stsinstrumentation'
|
|
6
6
|
|
|
7
|
-
import { PGAccessLayer, PGPoolManager } from '@nsshunt/stsdatamanagement'
|
|
7
|
+
import { PGAccessLayer, PGPoolManager, PGPoolManagerEventName } from '@nsshunt/stsdatamanagement'
|
|
8
8
|
|
|
9
9
|
import { $Options } from '@nsshunt/stsconfig'
|
|
10
10
|
const goptions = $Options()
|
|
@@ -251,7 +251,7 @@ export abstract class ProcessBase extends STSOptionsBase
|
|
|
251
251
|
|
|
252
252
|
async TerminateDatabase() {
|
|
253
253
|
if (this.#accessLayer) {
|
|
254
|
-
this.#poolManager.off(
|
|
254
|
+
this.#poolManager.off(PGPoolManagerEventName.UpdateInstruments, this.#UpdatePGPoolManagerInstrument)
|
|
255
255
|
await this.#accessLayer.enddatabase();
|
|
256
256
|
}
|
|
257
257
|
}
|
|
@@ -276,7 +276,7 @@ export abstract class ProcessBase extends STSOptionsBase
|
|
|
276
276
|
exit(1);
|
|
277
277
|
}
|
|
278
278
|
})();
|
|
279
|
-
this.#poolManager.on(
|
|
279
|
+
this.#poolManager.on(PGPoolManagerEventName.UpdateInstruments, this.#UpdatePGPoolManagerInstrument)
|
|
280
280
|
}
|
|
281
281
|
return this.#accessLayer;
|
|
282
282
|
}
|
package/processoptions.ts
CHANGED
|
@@ -9,7 +9,7 @@ export interface STSExpressServer {
|
|
|
9
9
|
/**
|
|
10
10
|
* Factory method that adds express routes to the express app object.
|
|
11
11
|
*/
|
|
12
|
-
export type ExpressRouteFactory = (app: express.Express) => void
|
|
12
|
+
export type ExpressRouteFactory = (app: express.Express, stsApp: any) => void
|
|
13
13
|
|
|
14
14
|
//export interface ProcessOptions extends JSONObject {
|
|
15
15
|
export interface ProcessOptions {
|
package/server.ts
CHANGED
|
@@ -2,23 +2,63 @@ import express from 'express';
|
|
|
2
2
|
import cors from 'cors';
|
|
3
3
|
import cookieParser from 'cookie-parser';
|
|
4
4
|
|
|
5
|
-
import { RequestLoggerMiddleware } from '@nsshunt/stspublisherserver'
|
|
5
|
+
import { RequestLoggerMiddleware, RequestLoggerMiddlewareEventName } from '@nsshunt/stspublisherserver'
|
|
6
6
|
|
|
7
7
|
import { ProcessOptions } from './processoptions'
|
|
8
8
|
|
|
9
9
|
import { $Options } from '@nsshunt/stsconfig'
|
|
10
10
|
const goptions = $Options()
|
|
11
11
|
|
|
12
|
+
import { ProcessBase } from './processbase'
|
|
13
|
+
import { Gauge, InstrumentGaugeTelemetry, InstrumentHistogramTelemetry, InstrumentVelocityTelemetry } from '@nsshunt/stsinstrumentation'
|
|
14
|
+
|
|
12
15
|
export class STSExpressServer
|
|
13
16
|
{
|
|
14
17
|
#app = null;
|
|
15
18
|
|
|
16
|
-
constructor(options: ProcessOptions)
|
|
19
|
+
constructor(options: ProcessOptions, stsApp: ProcessBase)
|
|
17
20
|
{
|
|
18
21
|
// Standard RequestLoggerMiddleware for all STS services
|
|
19
22
|
const requestLoggerMiddleware = new RequestLoggerMiddleware({
|
|
20
23
|
ignoresocketio: goptions.ignoresocketio
|
|
21
|
-
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
|
|
27
|
+
stsApp.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
|
|
28
|
+
Inc: 1
|
|
29
|
+
} as InstrumentGaugeTelemetry);
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_DEC, () => {
|
|
33
|
+
stsApp.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
|
|
34
|
+
Dec: 1
|
|
35
|
+
} as InstrumentGaugeTelemetry);
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_DH_VAL, (timeInMs) => {
|
|
39
|
+
stsApp.UpdateInstrument(Gauge.DURATION_HISTOGRAM_GAUGE, {
|
|
40
|
+
val: timeInMs
|
|
41
|
+
} as InstrumentHistogramTelemetry);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_D_VAL, (timeInMs) => {
|
|
45
|
+
stsApp.UpdateInstrument(Gauge.DURATION_GAUGE, {
|
|
46
|
+
val: timeInMs
|
|
47
|
+
} as InstrumentHistogramTelemetry);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_RC_INC, () => {
|
|
51
|
+
stsApp.UpdateInstrument(Gauge.REQUEST_COUNT_GAUGE, {
|
|
52
|
+
Inc: 1
|
|
53
|
+
} as InstrumentGaugeTelemetry);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_V_INC, () => {
|
|
57
|
+
if (stsApp.InstrumentExists(Gauge.VELOCITY_GAUGE)) {
|
|
58
|
+
stsApp.UpdateInstrument(Gauge.VELOCITY_GAUGE, {
|
|
59
|
+
Inc: 1
|
|
60
|
+
} as InstrumentVelocityTelemetry);
|
|
61
|
+
}
|
|
22
62
|
});
|
|
23
63
|
|
|
24
64
|
const app = express();
|
|
@@ -43,13 +83,13 @@ export class STSExpressServer
|
|
|
43
83
|
// Allow the static SPA to also be servered by this app
|
|
44
84
|
//app.use('/static', express.static(path.join(__dirname, 'public')))
|
|
45
85
|
if (options.expressServerRouteStaticFactory) {
|
|
46
|
-
options.expressServerRouteStaticFactory(app);
|
|
86
|
+
options.expressServerRouteStaticFactory(app, stsApp);
|
|
47
87
|
}
|
|
48
88
|
|
|
49
89
|
app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
|
|
50
90
|
|
|
51
91
|
if (options.expressServerRouteFactory) {
|
|
52
|
-
options.expressServerRouteFactory(app);
|
|
92
|
+
options.expressServerRouteFactory(app, stsApp);
|
|
53
93
|
}
|
|
54
94
|
|
|
55
95
|
// Express error handling fall-back
|
package/singleprocessbase.ts
CHANGED
|
@@ -132,7 +132,7 @@ export class SingleProcessBase extends ProcessBase
|
|
|
132
132
|
this.ProcessStartup();
|
|
133
133
|
|
|
134
134
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
135
|
-
this.#expressServer = new STSExpressServer(this.options);
|
|
135
|
+
this.#expressServer = new STSExpressServer(this.options, this);
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
const LogEx = this.LogEx;
|
|
@@ -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,
|
|
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"}
|
|
@@ -6,7 +6,7 @@ export interface STSExpressServer {
|
|
|
6
6
|
/**
|
|
7
7
|
* Factory method that adds express routes to the express app object.
|
|
8
8
|
*/
|
|
9
|
-
export type ExpressRouteFactory = (app: express.Express) => void;
|
|
9
|
+
export type ExpressRouteFactory = (app: express.Express, stsApp: any) => void;
|
|
10
10
|
export interface ProcessOptions {
|
|
11
11
|
/**
|
|
12
12
|
* Is this service worker the master worker (thread).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processoptions.d.ts","sourceRoot":"","sources":["../processoptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,WAAW,gBAAgB;IAChC,IAAI,GAAG,IAAI,OAAO,CAAC,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,KAAK,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"processoptions.d.ts","sourceRoot":"","sources":["../processoptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,MAAM,WAAW,gBAAgB;IAChC,IAAI,GAAG,IAAI,OAAO,CAAC,OAAO,CAAA;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,CAAA;AAG7E,MAAM,WAAW,cAAc;IACvB;;GAED;IACH,QAAQ,EAAE,OAAO,CAAA;IAEjB;;OAEG;IACN,iBAAiB,EAAE,MAAM,CAAA;IAItB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACA,kBAAkB,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACA,0BAA0B,EAAE,MAAM,CAAA;IAElC;;OAEG;IACH,sBAAsB,EAAE,OAAO,CAAA;IAE/B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAA;IAErB;;OAEG;IACA,iBAAiB,EAAE,OAAO,CAAA;IAE7B;;OAEG;IACA,QAAQ,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACA,OAAO,EAAE,MAAM,CAAA;IAEf;;;;;;;;;;;OAWG;IACH,UAAU,EAAE,MAAM,CAAA;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IAEf;;OAEG;IACA,qBAAqB,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACA,WAAW,EAAE,MAAM,CAAA;IAEnB;;OAEA;IACA,cAAc,EAAE,MAAM,CAAA;IAEtB;;OAEG;IACH,cAAc,EAAE,OAAO,CAAA;IAEvB;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAA;IAI1B,qBAAqB,CAAC,EAAE,sBAAsB,CAAA;IAE9C;;;OAGG;IACH,yBAAyB,CAAC,EAAE,mBAAmB,CAAA;IAE/C;;;OAGG;IACH,+BAA+B,CAAC,EAAE,mBAAmB,CAAA;IAErD;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAA;IAEnB;;OAEG;IACH,WAAW,EAAE,OAAO,CAAA;IAEpB;;OAEG;IACH,yBAAyB,EAAE,OAAO,CAAA;IAElC,kCAAkC,EAAE,MAAM,CAAA;IAE1C,yBAAyB,EAAE,MAAM,CAAA;CACpC"}
|
package/types/server.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ProcessOptions } from './processoptions';
|
|
2
|
+
import { ProcessBase } from './processbase';
|
|
2
3
|
export declare class STSExpressServer {
|
|
3
4
|
#private;
|
|
4
|
-
constructor(options: ProcessOptions);
|
|
5
|
+
constructor(options: ProcessOptions, stsApp: ProcessBase);
|
|
5
6
|
get App(): any;
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=server.d.ts.map
|
package/types/server.d.ts.map
CHANGED
|
@@ -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;
|
|
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/workerprocessbase.ts
CHANGED
|
@@ -190,7 +190,7 @@ export class WorkerProcessBase extends ProcessBase
|
|
|
190
190
|
this.ProcessStartup();
|
|
191
191
|
|
|
192
192
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
193
|
-
this.#expressServer = new STSExpressServer(this.options);
|
|
193
|
+
this.#expressServer = new STSExpressServer(this.options, this);
|
|
194
194
|
}
|
|
195
195
|
|
|
196
196
|
const LogEx = this.LogEx;
|