@nsshunt/stsappframework 3.3.180 → 3.3.182
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/process/masterprocessbase.js +9 -5
- package/dist/process/masterprocessbase.js.map +1 -1
- package/dist/process/servertypes/stsexpressserver.js +35 -50
- package/dist/process/servertypes/stsexpressserver.js.map +1 -1
- package/package.json +5 -5
- package/types/process/masterprocessbase.d.ts.map +1 -1
- package/types/process/servertypes/stsexpressserver.d.ts.map +1 -1
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
3
3
|
import si from "systeminformation"; // https://systeminformation.io/
|
|
4
4
|
import chalk from "chalk";
|
|
5
|
-
import { setupPrimary } from "@socket.io/cluster-adapter";
|
|
6
5
|
import { goptions } from "@nsshunt/stsconfig";
|
|
7
6
|
import { Gauge, GaugeTypes, } from "@nsshunt/stsobservability";
|
|
8
7
|
import { ProcessBase } from "./processbase.js";
|
|
@@ -103,17 +102,22 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
103
102
|
this.#logManager.LogInfoMessage(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
104
103
|
const sysInfo = new SysInfo(this.ProcessBaseInjector().get(LogManagerToken));
|
|
105
104
|
sysInfo.LogSystemTelemetry();
|
|
105
|
+
/*
|
|
106
106
|
// socket.io
|
|
107
107
|
// setup connections between the workers
|
|
108
108
|
if (this.options.wssServer === true) {
|
|
109
109
|
if (this.options.useSocketIoRedisAdaptor) {
|
|
110
|
-
this.#logManager.LogInfoMessage(
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
110
|
+
this.#logManager.LogInfoMessage(
|
|
111
|
+
`Using Redis for socket.io cluster management (master)`
|
|
112
|
+
);
|
|
113
|
+
} else {
|
|
114
|
+
this.#logManager.LogInfoMessage(
|
|
115
|
+
`Using nodejs cluster mode for socket.io cluster management`
|
|
116
|
+
);
|
|
114
117
|
setupPrimary();
|
|
115
118
|
}
|
|
116
119
|
}
|
|
120
|
+
*/
|
|
117
121
|
/*
|
|
118
122
|
cluster.setupPrimary({
|
|
119
123
|
serialization: "advanced",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,wFAAwF,CAAC,UAAU;AACnG,OAAO,EAAE,MAAM,mBAAmB,CAAC,CAAC,gCAAgC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,wFAAwF,CAAC,UAAU;AACnG,OAAO,EAAE,MAAM,mBAAmB,CAAC,CAAC,gCAAgC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACH,KAAK,EACL,UAAU,GAGb,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAGH,mBAAmB,EACnB,8BAA8B,EAC9B,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,GAElB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,wBAAwB;AACxB,iEAAiE;AACjE,gEAAgE;AAChE,wCAAwC;AACxC,qCAAqC;AACrC,8DAA8D;AAC9D,0EAA0E;AAE1E,MAAM,OAAO,iBACT,SAAQ,WAAW;IAGnB,sBAAsB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;IACxD,qBAAqB,GAAG,QAAQ,CAAC,oBAAoB,CAAC;IACtD,cAAc,GAAG;QACb,WAAW,EAAE,aAAa;KAC7B,CAAC;IACF,WAAW,GAAQ,IAAI,CAAC,CAAC,sGAAsG;IAC/H,aAAa,GAA0B,IAAI,CAAC;IAC5C,aAAa,GAAG,KAAK,CAAC;IACtB,qBAAqB,CAAwB;IAC7C,WAAW,CAAc;IAEzB,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAEnE,IAAI,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE;YACzC,IAAI,CAAC,qBAAqB,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAC1B,YAAY,EACZ,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC,CACJ,CAAC;QAEF,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC,KAAY,EAAE,EAAE;YAC3D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC,aAAa,EAAE,CAAC,QAAgB,EAAE,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,2BAA2B,GAAG,GAAS,EAAE;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAEpE,OAAO,CAAC,kBAAkB,CAAC,KAAK,IAAmB,EAAE;YACjD,IAAI,CAAC;gBACD,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACtC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,EAAE;wBAClD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;qBACR,CAAC,CAAC;gBACnC,CAAC,CAAC,CAAC;YACP,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEO,wBAAwB;QAC7B,OAAO;YACH;gBACI,KAAK,CAAC,qBAAqB;gBAC3B,UAAU,CAAC,gBAAgB;gBAC3B;oBACI,QAAQ,EAAE,QAAQ,CAAC,kCAAkC;oBACrD,UAAU,EAAE,QAAQ,CAAC,yBAAyB;iBACvB;aAC9B;SACJ,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;;;;;;;;MAmBE;IAEF,aAAa;QACT,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAC5C,8BAA8B,CACjC,CAAC;QACF,UAAU,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,OAAO,CAAC,MAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,CAAC,EAAE,CAAC,CAAC,CAAC;IACV,CAAC;IAED,IAAa,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,WAAW,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,4CAA4C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAChF,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAClD,CAAC;QACF,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAE7B;;;;;;;;;;;;;;;UAeE;QAEF;;;;UAIE;QAEF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC,qBAAsB,CAAC,WAAW,EAAE,CAAC;QAC9C,CAAC;QAED,wBAAwB;QAExB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC3B,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACb,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,KAAK,CAAC,KAAK,CACP,iBAAiB,OAAO,CAAC,GAAG,qCAAqC,IAAI,EAAE,CAC1E,CACJ,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,KAAK,CAAC,GAAG,CACL,iBAAiB,OAAO,CAAC,GAAG,0BAA0B,IAAI,EAAE,CAC/D,CACJ,CAAC;YACN,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;gBAClC,IAAI,CAAC,mBAAmB,EAAE;qBACrB,GAAG,CAAC,mBAAmB,CAAC;qBACxB,YAAY,EAAE,CAAC;YACxB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAEnC,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,KAAK,CAAC,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,CACvD,CAAC;IACN,CAAC,CAAC;IAEM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC9B,CAAC;IACL,CAAC,CAAC;IAEM,mBAAmB,GAAG,KAAK,IAAmB,EAAE;QACpD,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,2CAA2C,OAAO,CAAC,GAAG,GAAG,CAAC;YAC5E,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,SAAS,sBAAsB,CAAC,CAAC;YACpE,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC5B,CAAC;IACL,CAAC,CAAC;IAEF,sBAAsB;IACtB,sCAAsC;IACtC,sBAAsB;IACtB,8BAA8B;IAC9B,iCAAiC;IACjC,YAAY;IACZ,2BAA2B;IACnB,SAAS,GAAG,KAAK,EAAE,MAAW,EAAiB,EAAE;QACrD,MAAM,SAAS,GAAG,iCAAiC,OAAO,CAAC,GAAG,GAAG,CAAC;QAClE,IAAI,IAAI,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAE1B,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CACxB,GAAG,SAAS,qBAAqB,MAAM,EAAE,CAC5C,CACJ,CAAC;YACN,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CACtB,GAAG,SAAS,qCAAqC,CACpD,CACJ,CAAC;YACN,CAAC;YAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAExB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE9B,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,GAAG,SAAS,0BAA0B,CACzC,CAAC;YACF,yBAAyB;YAEzB,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAEjC,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;YAEhD,MAAM,IAAI,CAAC,mBAAmB,EAAE;iBAC3B,GAAG,CAAC,gBAAgB,CAAC;gBACtB,EAAE,iBAAiB,EAAE,CAAC;YAE1B,IAAI,CAAC,6BAA6B,EAAE,CAAC;YAErC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAElB,IAAI,CAAC,WAAW,CACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,sBAAsB,CAC3D,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,GAAG,SAAS,+BAA+B,CAC9C,CAAC;QACN,CAAC;IACL,CAAC,CAAC;CACL"}
|
|
@@ -13,13 +13,7 @@ import chalk from "chalk";
|
|
|
13
13
|
import { inject } from "@nsshunt/stsutils";
|
|
14
14
|
import { createServer as createServerHttps, } from "node:https";
|
|
15
15
|
import { createServer as createServerHttp, } from "node:http";
|
|
16
|
-
//@@ refactor todo items
|
|
17
|
-
//@@ ------------------------------------------------------------
|
|
18
|
-
//@@ move socket io handling into socketioutils - server helper - code here is duplicated in the helper
|
|
19
|
-
//@@ SetupWSSServer moved to helper
|
|
20
|
-
//@@ TerminateSocketIO moved to helper
|
|
21
16
|
export class STSExpressServer {
|
|
22
|
-
#app;
|
|
23
17
|
#options;
|
|
24
18
|
#ERROR_THRESHOLD_TIMEOUT = 1000;
|
|
25
19
|
httpServer;
|
|
@@ -28,28 +22,13 @@ export class STSExpressServer {
|
|
|
28
22
|
logger = inject(STSLoggerToken);
|
|
29
23
|
constructor(options) {
|
|
30
24
|
this.#options = options;
|
|
31
|
-
this.#SetupExpressServer();
|
|
32
|
-
this.#SetupServerFromExpressServer();
|
|
25
|
+
this.#SetupHTTPServerFromExpressServer(this.#SetupExpressServer());
|
|
33
26
|
}
|
|
34
|
-
#
|
|
27
|
+
#SetupRequestLoggerMiddleware = () => {
|
|
35
28
|
// Standard RequestLoggerMiddleware for all STS services
|
|
36
29
|
const requestLoggerMiddleware = new RequestLoggerMiddleware({
|
|
37
30
|
ignoresocketio: goptions.ignoresocketio,
|
|
38
31
|
});
|
|
39
|
-
const serverNetworkMiddleware = new ServerNetworkMiddleware({
|
|
40
|
-
name: this.#options.serviceName,
|
|
41
|
-
outputDebug: false,
|
|
42
|
-
logger: this.logger,
|
|
43
|
-
});
|
|
44
|
-
serverNetworkMiddleware.on(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data) => {
|
|
45
|
-
//this.#LogInfoMessage(chalk.magenta(`serverNetworkMiddleware: [${JSON.stringify(data)}]`));
|
|
46
|
-
this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_RX_GAUGE, {
|
|
47
|
-
Inc: data.requestBytesRead,
|
|
48
|
-
});
|
|
49
|
-
this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_TX_GAUGE, {
|
|
50
|
-
Inc: data.requestBytesWritten,
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
32
|
requestLoggerMiddleware.on(RequestLoggerMiddlewareEventName.UpdateInstrument_AR_INC, () => {
|
|
54
33
|
this.publishInstrumentController.UpdateInstrument(Gauge.ACTIVE_REQUEST_GAUGE, {
|
|
55
34
|
Inc: 1,
|
|
@@ -93,69 +72,75 @@ export class STSExpressServer {
|
|
|
93
72
|
});
|
|
94
73
|
}
|
|
95
74
|
});
|
|
75
|
+
return requestLoggerMiddleware;
|
|
76
|
+
};
|
|
77
|
+
#SetupNetworkMiddleware = () => {
|
|
78
|
+
const serverNetworkMiddleware = new ServerNetworkMiddleware({
|
|
79
|
+
name: this.#options.serviceName,
|
|
80
|
+
outputDebug: false,
|
|
81
|
+
logger: this.logger,
|
|
82
|
+
});
|
|
83
|
+
serverNetworkMiddleware.on(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, (data) => {
|
|
84
|
+
this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_RX_GAUGE, {
|
|
85
|
+
Inc: data.requestBytesRead,
|
|
86
|
+
});
|
|
87
|
+
this.publishInstrumentController.UpdateInstrument(Gauge.NETWORK_TX_GAUGE, {
|
|
88
|
+
Inc: data.requestBytesWritten,
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
return serverNetworkMiddleware;
|
|
92
|
+
};
|
|
93
|
+
#SetupExpressServer = () => {
|
|
96
94
|
const app = express();
|
|
97
|
-
this.#app = app;
|
|
98
95
|
// https://stackoverflow.com/questions/19743396/cors-cannot-use-wildcard-in-access-control-allow-origin-when-credentials-flag-i
|
|
99
96
|
// See answer from Christoph Hansen is thread above ...
|
|
100
97
|
// https://expressjs.com/en/resources/middleware/cors.html
|
|
101
|
-
|
|
98
|
+
app.use(cors({
|
|
102
99
|
credentials: true,
|
|
103
100
|
origin: true,
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
app.use(express.urlencoded({
|
|
101
|
+
}))
|
|
102
|
+
.use(cookieParser())
|
|
103
|
+
.use(express.urlencoded({
|
|
108
104
|
extended: false,
|
|
109
105
|
limit: goptions.maxPayloadSize,
|
|
110
|
-
}))
|
|
111
|
-
|
|
106
|
+
}))
|
|
107
|
+
.use(express.json({ limit: goptions.maxPayloadSize }))
|
|
108
|
+
.use(this.#SetupRequestLoggerMiddleware().Middleware)
|
|
109
|
+
.use(this.#SetupNetworkMiddleware().Middleware);
|
|
112
110
|
// Allow the static SPA to also be servered by this app
|
|
113
111
|
//app.use('/static', express.static(path.join(__dirname, 'public')))
|
|
114
112
|
if (this.#options.expressServerRouteStaticFactory) {
|
|
115
113
|
this.#options.expressServerRouteStaticFactory(app);
|
|
116
114
|
}
|
|
117
|
-
app.use(requestLoggerMiddleware.Middleware.bind(requestLoggerMiddleware));
|
|
118
|
-
app.use(serverNetworkMiddleware.Middleware.bind(serverNetworkMiddleware));
|
|
119
115
|
if (this.#options.expressServerRouteFactory) {
|
|
120
116
|
this.#options.expressServerRouteFactory(app);
|
|
121
117
|
}
|
|
122
118
|
// Express error handling fall-back
|
|
123
119
|
app.use(function (err, req, res, next) {
|
|
124
|
-
//@@ add to errors metric here - perhaps break down by type
|
|
125
120
|
if (err) {
|
|
126
|
-
//@@this.#LogInfoMessage(err);
|
|
127
121
|
res.status(err.status).send(err);
|
|
128
122
|
}
|
|
129
123
|
else {
|
|
130
124
|
next();
|
|
131
125
|
}
|
|
132
|
-
/*
|
|
133
|
-
if(err.name === 'UnauthorizedError') {
|
|
134
|
-
res.status(401).send(err);
|
|
135
|
-
} else {
|
|
136
|
-
next();
|
|
137
|
-
}
|
|
138
|
-
*/
|
|
139
126
|
});
|
|
127
|
+
return app;
|
|
140
128
|
};
|
|
141
|
-
#
|
|
129
|
+
#SetupHTTPServerFromExpressServer = (app) => {
|
|
142
130
|
if (this.#options.useTls) {
|
|
143
|
-
this.httpServer = createServerHttps(GetTLSOptions(this.#options.httpsServerKeyPath, this.#options.httpsServerCertificatePath),
|
|
131
|
+
this.httpServer = createServerHttps(GetTLSOptions(this.#options.httpsServerKeyPath, this.#options.httpsServerCertificatePath), app);
|
|
144
132
|
}
|
|
145
133
|
else {
|
|
146
|
-
this.httpServer = createServerHttp(
|
|
134
|
+
this.httpServer = createServerHttp(app);
|
|
147
135
|
}
|
|
148
|
-
if (this.#
|
|
136
|
+
if (this.#options.prometheusSupport === true) {
|
|
149
137
|
new PrometheusManager().SetupPrometheusForMaster();
|
|
150
138
|
}
|
|
151
139
|
// https://stackoverflow.com/questions/21342828/node-express-unix-domain-socket-permissions
|
|
152
140
|
//@@httpServer.listen('/tmp/stsrest01.sock').on('listening', () =>
|
|
153
141
|
//@@httpServer.listen('/var/run/sts/stsrest01.sock').on('listening', () =>
|
|
154
|
-
this.httpServer
|
|
155
|
-
.listen(this.#options.listenPort, () => {
|
|
142
|
+
this.httpServer.listen(this.#options.listenPort, () => {
|
|
156
143
|
//@@chmodSync(this.options.port, 511);
|
|
157
|
-
})
|
|
158
|
-
.on("listening", () => {
|
|
159
144
|
this.logger.info(`live on ${this.#options.endpoint}:${this.#options.listenPort}${this.#options.apiRoot}`);
|
|
160
145
|
});
|
|
161
146
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsexpressserver.js","sourceRoot":"","sources":["../../../src/process/servertypes/stsexpressserver.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,OAAqD,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"stsexpressserver.js","sourceRoot":"","sources":["../../../src/process/servertypes/stsexpressserver.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,OAAqD,MAAM,SAAS,CAAC;AAE5E,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,EACH,uBAAuB,EACvB,gCAAgC,GACnC,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EACH,cAAc,EACd,gCAAgC,GAInC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACH,KAAK,GAIR,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAEH,uBAAuB,EACvB,gCAAgC,GACnC,MAAM,+CAA+C,CAAC;AACvD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EACH,YAAY,IAAI,iBAAiB,GAEpC,MAAM,YAAY,CAAC;AACpB,OAAO,EACH,YAAY,IAAI,gBAAgB,GAEnC,MAAM,WAAW,CAAC;AAsBnB,MAAM,OAAO,gBAAgB;IACzB,QAAQ,CAA2B;IACnC,wBAAwB,GAAW,IAAI,CAAC;IAChC,UAAU,CAA4B;IAC9C,WAAW,GAAwB,EAAE,CAAC;IAErB,2BAA2B,GAAG,MAAM,CACjD,gCAAgC,CACnC,CAAC;IAEe,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IAEjD,YAAY,OAAiC;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,6BAA6B,GAAG,GAA4B,EAAE;QAC1D,wDAAwD;QACxD,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,CAAC;YACxD,cAAc,EAAE,QAAQ,CAAC,cAAc;SAC1C,CAAC,CAAC;QAEH,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,uBAAuB,EACxD,GAAG,EAAE;YACD,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,oBAAoB,EAC1B;gBACI,GAAG,EAAE,CAAC;aACmB,CAChC,CAAC;QACN,CAAC,CACJ,CAAC;QAEF,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,uBAAuB,EACxD,GAAG,EAAE;YACD,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,oBAAoB,EAC1B;gBACI,GAAG,EAAE,CAAC;aACmB,CAChC,CAAC;QACN,CAAC,CACJ,CAAC;QAEF,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,uBAAuB,EACxD,CAAC,QAAQ,EAAE,EAAE;YACT,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,wBAAwB,EAC9B;gBACI,GAAG,EAAE,QAAQ;aACgB,CACpC,CAAC;QACN,CAAC,CACJ,CAAC;QAEF,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,sBAAsB,EACvD,CAAC,UAAe,EAAE,EAAE;YAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;YAEhC,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,cAAc,EACpB;gBACI,GAAG,EAAE,QAAQ;aACgB,CACpC,CAAC;YAEF,IAAK,QAAmB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBACvD,MAAM,OAAO,GAAG,4GAA4G,IAAI,CAAC,wBAAwB,iBAAiB,QAAQ,wBAAwB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;gBACxO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;oBACtC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,CAAC;qBAAM,CAAC;oBACJ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,CAAC;YACL,CAAC;QACL,CAAC,CACJ,CAAC;QAEF,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,uBAAuB,EACxD,GAAG,EAAE;YACD,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,mBAAmB,EACzB;gBACI,GAAG,EAAE,CAAC;aACmB,CAChC,CAAC;QACN,CAAC,CACJ,CAAC;QAEF,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,sBAAsB,EACvD,GAAG,EAAE;YACD,IACI,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,cAAc,CACvB,EACH,CAAC;gBACC,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,cAAc,EACpB;oBACI,GAAG,EAAE,CAAC;iBACsB,CACnC,CAAC;YACN,CAAC;QACL,CAAC,CACJ,CAAC;QAEF,OAAO,uBAAuB,CAAC;IACnC,CAAC,CAAC;IAEF,uBAAuB,GAAG,GAA4B,EAAE;QACpD,MAAM,uBAAuB,GAAG,IAAI,uBAAuB,CAAC;YACxD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YAC/B,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM;SACtB,CAAC,CAAC;QAEH,uBAAuB,CAAC,EAAE,CACtB,gCAAgC,CAAC,+BAA+B,EAChE,CAAC,IAAmB,EAAE,EAAE;YACpB,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,gBAAgB,EACtB;gBACI,GAAG,EAAE,IAAI,CAAC,gBAAgB;aACD,CAChC,CAAC;YAEF,IAAI,CAAC,2BAA4B,CAAC,gBAAgB,CAC9C,KAAK,CAAC,gBAAgB,EACtB;gBACI,GAAG,EAAE,IAAI,CAAC,mBAAmB;aACJ,CAChC,CAAC;QACN,CAAC,CACJ,CAAC;QAEF,OAAO,uBAAuB,CAAC;IACnC,CAAC,CAAC;IAEF,mBAAmB,GAAG,GAAY,EAAE;QAChC,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QAEtB,+HAA+H;QAC/H,uDAAuD;QACvD,0DAA0D;QAC1D,GAAG,CAAC,GAAG,CACH,IAAI,CAAC;YACD,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,IAAI;SACf,CAAC,CACL;aACI,GAAG,CAAC,YAAY,EAAE,CAAC;aACnB,GAAG,CACA,OAAO,CAAC,UAAU,CAAC;YACf,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,QAAQ,CAAC,cAAc;SACjC,CAAC,CACL;aACA,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;aACrD,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,UAAU,CAAC;aACpD,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,UAAU,CAAC,CAAC;QAEpD,uDAAuD;QACvD,oEAAoE;QACpE,IAAI,IAAI,CAAC,QAAQ,CAAC,+BAA+B,EAAE,CAAC;YAChD,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC;YAC1C,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;QAED,mCAAmC;QACnC,GAAG,CAAC,GAAG,CAAC,UACJ,GAAQ,EACR,GAAY,EACZ,GAAa,EACb,IAAkB;YAElB,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,IAAI,EAAE,CAAC;YACX,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACf,CAAC,CAAC;IAEF,iCAAiC,GAAG,CAAC,GAAY,EAAQ,EAAE;QACvD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAC/B,aAAa,CACT,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAChC,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAC3C,EACD,GAAG,CACN,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAC3C,IAAI,iBAAiB,EAAE,CAAC,wBAAwB,EAAE,CAAC;QACvD,CAAC;QAED,2FAA2F;QAC3F,kEAAkE;QAClE,0EAA0E;QAC1E,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;YAClD,sCAAsC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAC1F,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,IAAI,GAAG,KAAK,IAAmB,EAAE;QAC7B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,MAAM,SAAS,GAAG,2BAA2B,OAAO,CAAC,GAAG,GAAG,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,sBAAsB,CAAC,CAAC;YACrD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC,CAAC;IAEF,aAAa;QACT,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,aAAa;QACT,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,aAAa,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.182",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
"@types/cookie-parser": "^1.4.10",
|
|
36
36
|
"@types/debug": "^4.1.13",
|
|
37
37
|
"@types/express": "^5.0.6",
|
|
38
|
-
"@types/node": "^26.5.
|
|
38
|
+
"@types/node": "^26.5.1",
|
|
39
39
|
"@typescript-eslint/eslint-plugin": "^8.70.0",
|
|
40
40
|
"@typescript-eslint/parser": "^8.70.0",
|
|
41
41
|
"eslint": "^10.10.0",
|
|
42
42
|
"eslint-config-prettier": "^10.1.8",
|
|
43
43
|
"globals": "^17.12.0",
|
|
44
44
|
"typescript": "^6.0.3",
|
|
45
|
-
"vite": "^8.
|
|
45
|
+
"vite": "^8.3.0",
|
|
46
46
|
"vitest": "^5.0.0"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
@@ -50,10 +50,10 @@
|
|
|
50
50
|
"@grpc/proto-loader": "^0.8.1",
|
|
51
51
|
"@nsshunt/stsconfig": "^1.27.76",
|
|
52
52
|
"@nsshunt/stsdatamanagement": "^1.18.203",
|
|
53
|
-
"@nsshunt/stsinstrumentmanagerclient": "^1.0.
|
|
53
|
+
"@nsshunt/stsinstrumentmanagerclient": "^1.0.50",
|
|
54
54
|
"@nsshunt/stsmessaging": "^1.0.81",
|
|
55
55
|
"@nsshunt/stsobservability": "^1.0.167",
|
|
56
|
-
"@nsshunt/stssocketioutils": "^2.0.
|
|
56
|
+
"@nsshunt/stssocketioutils": "^2.0.61",
|
|
57
57
|
"@nsshunt/stsutils": "^1.19.141",
|
|
58
58
|
"@socket.io/cluster-adapter": "^0.3.0",
|
|
59
59
|
"@socket.io/redis-streams-adapter": "^0.3.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACH,kBAAkB,EAClB,cAAc,EAOjB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACH,kBAAkB,EAClB,cAAc,EAOjB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAgB5E,qBAAa,iBACT,SAAQ,WACR,YAAW,kBAAkB;;gBAajB,OAAO,EAAE,cAAc;IAuC1B,wBAAwB,IAAI,qBAAqB;IAkC1D,aAAa,IAAI,IAAI;IASrB,IAAa,YAAY,IAAI,OAAO,CAEnC;IAED,WAAW,sBAoFT;IAEF,OAAO,CAAC,gBAAgB,CAKtB;IAEF,OAAO,CAAC,mBAAmB,CAOzB;IASF,OAAO,CAAC,SAAS,CAgDf;CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsexpressserver.d.ts","sourceRoot":"","sources":["../../../src/process/servertypes/stsexpressserver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stsexpressserver.d.ts","sourceRoot":"","sources":["../../../src/process/servertypes/stsexpressserver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAGH,mBAAmB,EACnB,UAAU,EACV,aAAa,EAChB,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAEH,MAAM,IAAI,WAAW,EACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAEH,MAAM,IAAI,UAAU,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,wBAAwB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,yBAAyB,CAAC,EAAE,mBAAmB,CAAC;IAChD,+BAA+B,CAAC,EAAE,mBAAmB,CAAC;IACtD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,EAAE,OAAO,CAAC;CACxB;AAED,qBAAa,gBAAiB,YAAW,UAAU;;IAG/C,OAAO,CAAC,UAAU,CAAC,CAA2B;IAG9C,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAE1C;IAEF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;gBAErC,OAAO,EAAE,wBAAwB;IAmN7C,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CAM5B;IAEF,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAIpC,aAAa,IAAI,aAAa;IAQ9B,aAAa,IAAI,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS;CAG7E"}
|