@nsshunt/stsappframework 3.3.148 → 3.3.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/commonTypes.js +2 -6
- package/dist/commonTypes.js.map +1 -1
- package/dist/logger/stsTransportLoggerWinston.js +9 -5
- package/dist/logger/stsTransportLoggerWinston.js.map +1 -1
- package/dist/process/masterprocessbase.js +26 -121
- package/dist/process/masterprocessbase.js.map +1 -1
- package/dist/process/metrics.js +99 -0
- package/dist/process/metrics.js.map +1 -0
- package/dist/process/processbase.js +19 -84
- package/dist/process/processbase.js.map +1 -1
- package/dist/process/serverprocessbase.js +5 -7
- package/dist/process/serverprocessbase.js.map +1 -1
- package/dist/process/singleprocessbase.js +19 -10
- package/dist/process/singleprocessbase.js.map +1 -1
- package/dist/process/workerprocessbase.js +1 -173
- package/dist/process/workerprocessbase.js.map +1 -1
- package/package.json +2 -1
- package/types/commonTypes.d.ts +11 -31
- package/types/commonTypes.d.ts.map +1 -1
- package/types/logger/stsTransportLoggerWinston.d.ts +3 -7
- package/types/logger/stsTransportLoggerWinston.d.ts.map +1 -1
- package/types/process/masterprocessbase.d.ts +0 -8
- package/types/process/masterprocessbase.d.ts.map +1 -1
- package/types/process/metrics.d.ts +17 -0
- package/types/process/metrics.d.ts.map +1 -0
- package/types/process/processbase.d.ts +0 -5
- package/types/process/processbase.d.ts.map +1 -1
- package/types/process/serverprocessbase.d.ts +0 -1
- package/types/process/serverprocessbase.d.ts.map +1 -1
- package/types/process/singleprocessbase.d.ts +1 -1
- package/types/process/singleprocessbase.d.ts.map +1 -1
- package/types/process/workerprocessbase.d.ts +0 -27
- package/types/process/workerprocessbase.d.ts.map +1 -1
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
2
|
-
import pidusage from "pidusage";
|
|
3
|
-
import { memoryUsage } from "process";
|
|
4
1
|
import cluster from "node:cluster";
|
|
5
2
|
import si from "systeminformation"; // https://systeminformation.io/
|
|
6
3
|
import { GetFirstNetworkInterface } from "./../network.js";
|
|
4
|
+
import { STSTransportLoggerWinston } from "./../logger/stsTransportLoggerWinston.js";
|
|
7
5
|
import chalk from "chalk";
|
|
8
6
|
import { Gauge, } from "@nsshunt/stsobservability";
|
|
9
7
|
import { accessLayerType, DBAccessLayerManager, IDBAccessLayerEvents, } from "@nsshunt/stsdatamanagement";
|
|
@@ -13,10 +11,11 @@ import { StatusCodes } from "http-status-codes";
|
|
|
13
11
|
import { PublishInstrumentController, TransportType, GetInstruments, } from "@nsshunt/stsinstrumentmanagerclient";
|
|
14
12
|
import { getCurrentInjector } from "@nsshunt/stsutils";
|
|
15
13
|
import os from "os";
|
|
16
|
-
import { CreateServiceProcessContext, ProcessOptionsToken, DBAccessLayerToken, AgentManagerToken, PublishInstrumentControllerToken, STSLoggerToken, ProcessBaseToken, } from "./../commonTypes.js";
|
|
14
|
+
import { CreateServiceProcessContext, ProcessOptionsToken, DBAccessLayerToken, AgentManagerToken, PublishInstrumentControllerToken, STSLoggerToken, ProcessBaseToken, ProcessMetricsToken, STSTransportLoggerWinstonToken, } from "./../commonTypes.js";
|
|
17
15
|
import { TinyEmitter } from "tiny-emitter";
|
|
18
16
|
import http from "node:http";
|
|
19
17
|
import https from "node:https";
|
|
18
|
+
import { Metrics } from "./metrics.js";
|
|
20
19
|
//@@ refactor todo items
|
|
21
20
|
//@@ ------------------------------------------------------------
|
|
22
21
|
//@@ remove the database stuff
|
|
@@ -24,9 +23,6 @@ import https from "node:https";
|
|
|
24
23
|
//@@ refactor config (and simplify) - needs to be an injectable
|
|
25
24
|
//@@ move LogSystemTelemetry to a seperate metrics class for instrumentation
|
|
26
25
|
export class ProcessBase extends TinyEmitter {
|
|
27
|
-
#systemInformationInterval = null;
|
|
28
|
-
//@@#socketIoServerHelper: ISocketIoServerHelper<STSDefaultClientToServerEvents, STSDefaultServerToClientEvents> | null = null;
|
|
29
|
-
//#redisMessageHandler: RedisMessageHandler | null = null;
|
|
30
26
|
#processBaseInjector;
|
|
31
27
|
constructor(options) {
|
|
32
28
|
super();
|
|
@@ -137,6 +133,16 @@ export class ProcessBase extends TinyEmitter {
|
|
|
137
133
|
return new PublishInstrumentController(instrumentControllerOptions);
|
|
138
134
|
},
|
|
139
135
|
},
|
|
136
|
+
{
|
|
137
|
+
provide: ProcessMetricsToken,
|
|
138
|
+
useFactory: () => {
|
|
139
|
+
return new Metrics();
|
|
140
|
+
},
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
provide: STSTransportLoggerWinstonToken,
|
|
144
|
+
useFactory: () => new STSTransportLoggerWinston(),
|
|
145
|
+
},
|
|
140
146
|
]);
|
|
141
147
|
if (options.serviceName) {
|
|
142
148
|
this.options.serviceProcessContext = CreateServiceProcessContext(options.serviceName, options.serviceVersion, options.serviceInstanceId, os.hostname(), process.pid, options.isMaster ? process.pid : process.ppid);
|
|
@@ -168,11 +174,6 @@ export class ProcessBase extends TinyEmitter {
|
|
|
168
174
|
LogWarnMessage(message) {
|
|
169
175
|
this.options.logger.warn(this.#GetFormattedLogMessage(message));
|
|
170
176
|
}
|
|
171
|
-
LogMessageToLoggerInstrument(message) {
|
|
172
|
-
this.UpdateInstrument(Gauge.LOGGER, {
|
|
173
|
-
LogMessage: this.#GetFormattedLogMessage(message),
|
|
174
|
-
});
|
|
175
|
-
}
|
|
176
177
|
get options() {
|
|
177
178
|
return this.#processBaseInjector.get(ProcessOptionsToken);
|
|
178
179
|
}
|
|
@@ -182,73 +183,15 @@ export class ProcessBase extends TinyEmitter {
|
|
|
182
183
|
GetAdditionalInstruments() {
|
|
183
184
|
return [];
|
|
184
185
|
}
|
|
185
|
-
CollectAdditionalTelemetry() {
|
|
186
|
-
// eslint-disable @typescript-eslint/no-empty-function
|
|
187
|
-
}
|
|
188
186
|
ProcessStartup = () => {
|
|
189
187
|
// use this as well
|
|
190
188
|
// performance.eventLoopUtilization([utilization1[, utilization2]])
|
|
191
189
|
// https://nodejs.org/api/perf_hooks.html#perf_hooksmonitoreventloopdelayoptions
|
|
192
|
-
|
|
193
|
-
const startTime = performance.now();
|
|
194
|
-
if (this.InstrumentController) {
|
|
195
|
-
let useStatsCpu;
|
|
196
|
-
try {
|
|
197
|
-
const stats = await pidusage(process.pid);
|
|
198
|
-
useStatsCpu = stats.cpu;
|
|
199
|
-
if (useStatsCpu < 0.01) {
|
|
200
|
-
useStatsCpu = 0.01; //@@ Endure we record something about 0. 0's are filtered from monitoring tools.
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
catch (error) {
|
|
204
|
-
this.LogWarnMessage(`ProcessBase:ProcessStartup:ExecuteGetStats():pidusage(): Error: [${error}]`);
|
|
205
|
-
useStatsCpu = 0.01; //@@ Endure we record something about 0. 0's are filtered from monitoring tools.
|
|
206
|
-
}
|
|
207
|
-
this.InstrumentController.UpdateInstrument(Gauge.CPU_LOAD_GAUGE, {
|
|
208
|
-
val: useStatsCpu,
|
|
209
|
-
});
|
|
210
|
-
}
|
|
211
|
-
/*
|
|
212
|
-
pidusage(process.pid, (err, stats) => {
|
|
213
|
-
if (this.#instrumentController) {
|
|
214
|
-
let useStatsCpu = stats.cpu;
|
|
215
|
-
if (useStatsCpu < 3) {
|
|
216
|
-
useStatsCpu = 3; //@@ Endure we record something about 0. 0's are filtered from monitoring tools.
|
|
217
|
-
}
|
|
218
|
-
this.#instrumentController.UpdateInstrument(Gauge.CPU_LOAD_GAUGE, {
|
|
219
|
-
val: useStatsCpu
|
|
220
|
-
} as InstrumentGaugeTelemetry);
|
|
221
|
-
}
|
|
222
|
-
});
|
|
223
|
-
*/
|
|
224
|
-
// https://nodejs.org/api/process.html#processmemoryusage
|
|
225
|
-
const usage = memoryUsage();
|
|
226
|
-
const telemetry = {
|
|
227
|
-
r: usage.rss,
|
|
228
|
-
t: usage.heapTotal,
|
|
229
|
-
u: usage.heapUsed,
|
|
230
|
-
x: usage.external,
|
|
231
|
-
a: usage.arrayBuffers,
|
|
232
|
-
};
|
|
233
|
-
this.UpdateInstrument(Gauge.OBJECT_GAUGE, {
|
|
234
|
-
val: telemetry,
|
|
235
|
-
});
|
|
236
|
-
this.CollectAdditionalTelemetry();
|
|
237
|
-
const totalTime = performance.now() - startTime;
|
|
238
|
-
const nextLoopTime = goptions.systemInformationInterval - totalTime;
|
|
239
|
-
this.#systemInformationInterval = setTimeout(ExecuteGetStats, nextLoopTime).unref();
|
|
240
|
-
};
|
|
241
|
-
this.#systemInformationInterval = setTimeout(ExecuteGetStats, goptions.systemInformationInterval).unref();
|
|
190
|
+
this.#processBaseInjector.get(ProcessMetricsToken).Start();
|
|
242
191
|
if (this.options.useDatabase) {
|
|
243
192
|
// Get the accessLayer to force DB connection test
|
|
244
193
|
const accessLayer = this.accessLayer;
|
|
245
194
|
}
|
|
246
|
-
//@@this.LogInfoMessage(`RedisMessageHandler: redisUrl: [${goptions.imRedisMessageProcessorUrl}]`);
|
|
247
|
-
};
|
|
248
|
-
UpdateInstrument = (instrumentName, telemetry) => {
|
|
249
|
-
if (this.InstrumentController) {
|
|
250
|
-
this.InstrumentController.UpdateInstrument(instrumentName, telemetry);
|
|
251
|
-
}
|
|
252
195
|
};
|
|
253
196
|
ProcessExit = (processExitDelay) => {
|
|
254
197
|
if (this.options.processExitOnTerminate &&
|
|
@@ -281,27 +224,19 @@ export class ProcessBase extends TinyEmitter {
|
|
|
281
224
|
get AgentManager() {
|
|
282
225
|
return this.#processBaseInjector.get(AgentManagerToken);
|
|
283
226
|
}
|
|
284
|
-
InstrumentExists(instrumentName) {
|
|
285
|
-
if (this.InstrumentController) {
|
|
286
|
-
return this.InstrumentController.InstrumentExists(instrumentName);
|
|
287
|
-
}
|
|
288
|
-
return false;
|
|
289
|
-
}
|
|
290
227
|
async ProcessTerminate() {
|
|
291
228
|
this.emit("ProcessTerminate");
|
|
292
|
-
|
|
293
|
-
clearTimeout(this.#systemInformationInterval);
|
|
294
|
-
}
|
|
295
|
-
this.#systemInformationInterval = null;
|
|
229
|
+
this.#processBaseInjector.get(ProcessMetricsToken).Stop();
|
|
296
230
|
}
|
|
297
231
|
#UpdatePGPoolManagerInstrument = (data) => {
|
|
298
|
-
this.
|
|
232
|
+
const metrics = this.#processBaseInjector.get(ProcessMetricsToken);
|
|
233
|
+
metrics.UpdateInstrument(Gauge.CONNECTION_POOL_TOTAL_GAUGE, {
|
|
299
234
|
val: data.totalCount,
|
|
300
235
|
});
|
|
301
|
-
|
|
236
|
+
metrics.UpdateInstrument(Gauge.CONNECTION_POOL_IDLE_GAUGE, {
|
|
302
237
|
val: data.idleCount,
|
|
303
238
|
});
|
|
304
|
-
|
|
239
|
+
metrics.UpdateInstrument(Gauge.CONNECTION_POOL_WAITING_GAUGE, {
|
|
305
240
|
val: data.waitingCount,
|
|
306
241
|
});
|
|
307
242
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
2
2
|
import chalk from "chalk";
|
|
3
3
|
import { goptions } from "@nsshunt/stsconfig";
|
|
4
|
-
import { Sleep } from "@nsshunt/stsutils";
|
|
5
|
-
import { STSServerToken, } from "./../commonTypes.js";
|
|
4
|
+
import { inject, Sleep } from "@nsshunt/stsutils";
|
|
5
|
+
import { STSServerToken, STSTransportLoggerWinstonToken, } from "./../commonTypes.js";
|
|
6
6
|
import { ProcessBase } from "./processbase.js";
|
|
7
|
-
import { STSTransportLoggerWinston } from "./../logger/stsTransportLoggerWinston.js";
|
|
8
7
|
import { CreateSTSServer } from "./servertypes/stsserverfactory.js";
|
|
9
8
|
/**
|
|
10
9
|
* todo
|
|
@@ -110,9 +109,7 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
110
109
|
});
|
|
111
110
|
}
|
|
112
111
|
ProcessStarted() {
|
|
113
|
-
const transport =
|
|
114
|
-
stsApp: this,
|
|
115
|
-
});
|
|
112
|
+
const transport = inject(STSTransportLoggerWinstonToken);
|
|
116
113
|
setTimeout(() => {
|
|
117
114
|
this.options.logger.add(transport);
|
|
118
115
|
}, 0);
|
|
@@ -140,11 +137,12 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
140
137
|
}
|
|
141
138
|
});
|
|
142
139
|
this.#serverProcessInjector.get(STSServerToken);
|
|
140
|
+
this.#CollectAdditionalTelemetry();
|
|
143
141
|
this.ProcessStarted();
|
|
144
142
|
this.LogInfoMessage(chalk.green(`ServerProcessBase:SetupServerEx(): Main Process:${process.pid} Started`));
|
|
145
143
|
return true;
|
|
146
144
|
}
|
|
147
|
-
CollectAdditionalTelemetry() {
|
|
145
|
+
#CollectAdditionalTelemetry() {
|
|
148
146
|
/*
|
|
149
147
|
try {
|
|
150
148
|
const stsServer = this.#serverProcessInjector.get(STSServerToken);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverprocessbase.js","sourceRoot":"","sources":["../../src/process/serverprocessbase.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAY,KAAK,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"serverprocessbase.js","sourceRoot":"","sources":["../../src/process/serverprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
2
|
import { goptions } from "@nsshunt/stsconfig";
|
|
3
3
|
import { Gauge, GaugeTypes, } from "@nsshunt/stsobservability";
|
|
4
|
+
import { ProcessMetricsToken, } from "./../commonTypes.js";
|
|
4
5
|
import { ServerProcessBase } from "./serverprocessbase.js";
|
|
5
6
|
import si from "systeminformation"; // https://systeminformation.io/
|
|
6
7
|
export class SingleProcessBase extends ServerProcessBase {
|
|
@@ -11,19 +12,26 @@ export class SingleProcessBase extends ServerProcessBase {
|
|
|
11
12
|
constructor(options) {
|
|
12
13
|
super(options);
|
|
13
14
|
}
|
|
14
|
-
CollectAdditionalTelemetry() {
|
|
15
|
+
#CollectAdditionalTelemetry() {
|
|
15
16
|
try {
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
const metrics = this.ProcessBaseInjector().get(ProcessMetricsToken);
|
|
18
|
+
metrics.AddMetricsProvider(async () => {
|
|
19
|
+
try {
|
|
20
|
+
const siValueObject = {
|
|
21
|
+
currentLoad: "currentLoad",
|
|
22
|
+
};
|
|
23
|
+
si.get(siValueObject).then((data) => {
|
|
24
|
+
metrics.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
25
|
+
val: data.currentLoad.currentLoad,
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
29
|
+
}
|
|
30
|
+
catch (_error) { }
|
|
23
31
|
});
|
|
24
|
-
// eslint-disable-next-line
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
25
33
|
}
|
|
26
|
-
catch (
|
|
34
|
+
catch (_error) { }
|
|
27
35
|
}
|
|
28
36
|
GetAdditionalInstruments() {
|
|
29
37
|
return [
|
|
@@ -39,6 +47,7 @@ export class SingleProcessBase extends ServerProcessBase {
|
|
|
39
47
|
}
|
|
40
48
|
SetupServerEx = async () => {
|
|
41
49
|
await super.SetupServerEx();
|
|
50
|
+
this.#CollectAdditionalTelemetry();
|
|
42
51
|
this.LogSystemTelemetry();
|
|
43
52
|
return true;
|
|
44
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../../src/process/singleprocessbase.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACH,KAAK,EACL,UAAU,GAGb,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../../src/process/singleprocessbase.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACH,KAAK,EACL,UAAU,GAGb,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAGH,mBAAmB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,MAAM,mBAAmB,CAAC,CAAC,gCAAgC;AAIpE,MAAM,OAAO,iBACT,SAAQ,iBAAiB;IAGzB;;;OAGG;IACH,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,2BAA2B;QACvB,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAEpE,OAAO,CAAC,kBAAkB,CAAC,KAAK,IAAmB,EAAE;gBACjD,IAAI,CAAC;oBACD,MAAM,aAAa,GAAG;wBAClB,WAAW,EAAE,aAAa;qBAC7B,CAAC;oBACF,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;wBAChC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,EAAE;4BAClD,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;yBACR,CAAC,CAAC;oBACnC,CAAC,CAAC,CAAC;oBACH,8DAA8D;gBAClE,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC,CAAA,CAAC;YACvB,CAAC,CAAC,CAAC;YACH,8DAA8D;QAClE,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC,CAAA,CAAC;IACvB,CAAC;IAEQ,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;IAEQ,aAAa,GAAG,KAAK,IAAsB,EAAE;QAClD,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;QAE5B,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAEnC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF,KAAK,CAAC,oBAAoB;QACtB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;CACJ"}
|
|
@@ -1,173 +1,14 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
2
|
import chalk from "chalk";
|
|
3
|
-
import { IPCMessageCommand, } from "./../commonTypes.js";
|
|
4
3
|
import { ServerProcessBase } from "./serverprocessbase.js";
|
|
5
|
-
import { randomUUID } from "node:crypto";
|
|
6
|
-
import { goptions } from "@nsshunt/stsconfig";
|
|
7
|
-
import si from "systeminformation"; // https://systeminformation.io/
|
|
8
|
-
import { GetFirstNetworkInterface } from "./../network.js";
|
|
9
|
-
//@@ refactor todo items
|
|
10
|
-
//@@ ------------------------------------------------------------
|
|
11
|
-
//@@ remove ipc message handling and replace with stsmessaging
|
|
12
|
-
/**
|
|
13
|
-
* todo
|
|
14
|
-
* @typedef {Object} options - todo
|
|
15
|
-
* @property {boolean} [wssServer=false] - Create a web socket server on this worker instance
|
|
16
|
-
*/
|
|
17
4
|
export class WorkerProcessBase extends ServerProcessBase {
|
|
18
|
-
#inFlightMessage = {};
|
|
19
|
-
#requestResponseMessageTimeout = 5000; //@@ config
|
|
20
|
-
#pingTimeout = null;
|
|
21
5
|
constructor(options) {
|
|
22
6
|
super(options);
|
|
23
7
|
}
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
25
|
-
ReceivedMessageFromMaster(msg) {
|
|
26
|
-
// Override in subclass if required
|
|
27
|
-
}
|
|
28
|
-
#SendMessageToParentProcess = (message) => {
|
|
29
|
-
return new Promise((resolve, reject) => {
|
|
30
|
-
if (this.#inFlightMessage[message.id]) {
|
|
31
|
-
reject(`Message with id: [${message.id}] already exists within the Request/Response record structure`);
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
this.#inFlightMessage[message.id] = {
|
|
35
|
-
iPCMessagePayload: { ...message },
|
|
36
|
-
cb: () => {
|
|
37
|
-
const detail = this.#inFlightMessage[message.id].iPCMessagePayload.responseDetail;
|
|
38
|
-
clearTimeout(this.#inFlightMessage[message.id].timeout);
|
|
39
|
-
setTimeout(() => {
|
|
40
|
-
delete this.#inFlightMessage[message.id];
|
|
41
|
-
}, 0).unref();
|
|
42
|
-
//this.#LogDebugMessage(chalk.green(`Resolving response message with id: [${message.id}] from parent process via IPC. Details: [${JSON.stringify(this.#inFlightMessage[message.id].iPCMessagePayload)}]`));
|
|
43
|
-
resolve(detail);
|
|
44
|
-
},
|
|
45
|
-
timeout: setTimeout(() => {
|
|
46
|
-
setTimeout(() => {
|
|
47
|
-
delete this.#inFlightMessage[message.id];
|
|
48
|
-
}, 0).unref();
|
|
49
|
-
//this.#LogDebugMessage(chalk.red(`Timeout has occurred after: [${this.#requestResponseMessageTimeout}]ms with message id: [${message.id}]. Details: [${JSON.stringify(this.#inFlightMessage[message.id].iPCMessagePayload)}]`));
|
|
50
|
-
reject("Did not receive response form parent process.");
|
|
51
|
-
}, this.#requestResponseMessageTimeout), // max message timeout allowed
|
|
52
|
-
};
|
|
53
|
-
//this.#LogDebugMessage(chalk.yellow(`Sending message with id: [${message.id}] to parent process via IPC. Details: [${JSON.stringify(this.#inFlightMessage[message.id].iPCMessagePayload)}]`));
|
|
54
|
-
process.send(message);
|
|
55
|
-
}
|
|
56
|
-
});
|
|
57
|
-
};
|
|
58
|
-
AddWorker = async (options) => {
|
|
59
|
-
const workerResponse = await this.#SendMessageToParentProcess({
|
|
60
|
-
requestResponse: true,
|
|
61
|
-
id: randomUUID(),
|
|
62
|
-
command: IPCMessageCommand.AddWorker,
|
|
63
|
-
requestDetail: {
|
|
64
|
-
options,
|
|
65
|
-
},
|
|
66
|
-
});
|
|
67
|
-
return workerResponse.workerId;
|
|
68
|
-
};
|
|
69
|
-
DeleteWorker = async (workerId, options) => {
|
|
70
|
-
const workerResponse = await this.#SendMessageToParentProcess({
|
|
71
|
-
requestResponse: true,
|
|
72
|
-
id: randomUUID(),
|
|
73
|
-
command: IPCMessageCommand.DeleteWorker,
|
|
74
|
-
requestDetail: {
|
|
75
|
-
options,
|
|
76
|
-
workerId,
|
|
77
|
-
},
|
|
78
|
-
});
|
|
79
|
-
return workerResponse;
|
|
80
|
-
};
|
|
81
|
-
GetMasterProcessOptions = async () => {
|
|
82
|
-
const parentResponse = await this.#SendMessageToParentProcess({
|
|
83
|
-
requestResponse: true,
|
|
84
|
-
id: randomUUID(),
|
|
85
|
-
command: IPCMessageCommand.GetConfig,
|
|
86
|
-
requestDetail: {},
|
|
87
|
-
});
|
|
88
|
-
return parentResponse;
|
|
89
|
-
};
|
|
90
|
-
GetNumCPUs = async () => {
|
|
91
|
-
// https://systeminformation.io/
|
|
92
|
-
const valueObject = {
|
|
93
|
-
cpu: "*",
|
|
94
|
-
};
|
|
95
|
-
const sysinfo = await si.get(valueObject);
|
|
96
|
-
let numCPUs = 2;
|
|
97
|
-
if (goptions.useCPUs > 0) {
|
|
98
|
-
if (goptions.useCPUs >= 1) {
|
|
99
|
-
numCPUs = goptions.useCPUs;
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
numCPUs = Math.round(sysinfo.cpu.cores * goptions.useCPUs);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
numCPUs = sysinfo.cpu.physicalCores;
|
|
107
|
-
}
|
|
108
|
-
return numCPUs;
|
|
109
|
-
};
|
|
110
|
-
GetSystemTelemetry = async () => {
|
|
111
|
-
// https://systeminformation.io/
|
|
112
|
-
const valueObject = {
|
|
113
|
-
system: "*",
|
|
114
|
-
osInfo: "*",
|
|
115
|
-
cpu: "*",
|
|
116
|
-
mem: "*",
|
|
117
|
-
dockerInfo: "*",
|
|
118
|
-
//dockerImages: '*',
|
|
119
|
-
dockerContainers: "*",
|
|
120
|
-
};
|
|
121
|
-
const sysinfo = await si.get(valueObject);
|
|
122
|
-
const numCPUs = await this.GetNumCPUs();
|
|
123
|
-
const hostname = sysinfo.osInfo.hostname;
|
|
124
|
-
const hostaddr = GetFirstNetworkInterface();
|
|
125
|
-
const promArray = [];
|
|
126
|
-
sysinfo.dockerContainers.forEach((dc) => {
|
|
127
|
-
const dcs = promArray.push(si.dockerContainerStats(dc.id));
|
|
128
|
-
console.log(dcs);
|
|
129
|
-
});
|
|
130
|
-
const dockerContainerStats = await Promise.all(promArray);
|
|
131
|
-
const sysInfo = {
|
|
132
|
-
serviceInstanceId: this.options.serviceInstanceId,
|
|
133
|
-
serviceProcessContext: this.options.serviceProcessContext,
|
|
134
|
-
hostname,
|
|
135
|
-
numCPUs,
|
|
136
|
-
hostaddr,
|
|
137
|
-
system: sysinfo.system,
|
|
138
|
-
osInfo: sysinfo.osInfo,
|
|
139
|
-
cpu: sysinfo.cpu,
|
|
140
|
-
mem: sysinfo.mem,
|
|
141
|
-
dockerInfo: sysinfo.dockerInfo,
|
|
142
|
-
dockerContainers: sysinfo.dockerContainers,
|
|
143
|
-
dockerContainerStats,
|
|
144
|
-
};
|
|
145
|
-
return sysInfo;
|
|
146
|
-
};
|
|
147
8
|
SetupServerEx = async () => {
|
|
148
9
|
await super.SetupServerEx();
|
|
149
10
|
process.on("message", async (msg) => {
|
|
150
|
-
if (msg.
|
|
151
|
-
const iPCMessagePayload = msg;
|
|
152
|
-
if (iPCMessagePayload.id) {
|
|
153
|
-
if (this.#inFlightMessage[iPCMessagePayload.id]) {
|
|
154
|
-
const responseMessage = this.#inFlightMessage[iPCMessagePayload.id];
|
|
155
|
-
responseMessage.iPCMessagePayload.responseDetail = {
|
|
156
|
-
...iPCMessagePayload.responseDetail,
|
|
157
|
-
};
|
|
158
|
-
responseMessage.cb();
|
|
159
|
-
}
|
|
160
|
-
else {
|
|
161
|
-
throw new Error(`Could not find Request/Response message with id: [${iPCMessagePayload.id}]`);
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
165
|
-
throw new Error(`Message does not have id attribute. [${JSON.stringify(iPCMessagePayload)}]`);
|
|
166
|
-
}
|
|
167
|
-
return;
|
|
168
|
-
}
|
|
169
|
-
if (msg.command) //@@ constants
|
|
170
|
-
{
|
|
11
|
+
if (msg.command) {
|
|
171
12
|
switch (msg.command) {
|
|
172
13
|
case "Terminate":
|
|
173
14
|
this.LogInfoMessage(chalk.grey(`Received ` +
|
|
@@ -181,23 +22,10 @@ export class WorkerProcessBase extends ServerProcessBase {
|
|
|
181
22
|
` message from master thread`));
|
|
182
23
|
await this.Terminate(true, true);
|
|
183
24
|
break;
|
|
184
|
-
case "Message":
|
|
185
|
-
//this.LogInfoMessage(chalk.grey(`Received ` + chalk.bold.italic(`Message`) + ` message from master thread`));
|
|
186
|
-
this.ReceivedMessageFromMaster(msg.data);
|
|
187
|
-
break;
|
|
188
|
-
case "Response": // General response to a req/response interaction
|
|
189
|
-
//msg.details
|
|
190
25
|
}
|
|
191
26
|
}
|
|
192
27
|
});
|
|
193
28
|
return true;
|
|
194
29
|
};
|
|
195
|
-
ProcessTerminate() {
|
|
196
|
-
//this.#redisMessageHandler?.off()
|
|
197
|
-
if (this.#pingTimeout) {
|
|
198
|
-
clearTimeout(this.#pingTimeout);
|
|
199
|
-
}
|
|
200
|
-
return super.ProcessTerminate();
|
|
201
|
-
}
|
|
202
30
|
}
|
|
203
31
|
//# sourceMappingURL=workerprocessbase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../../src/process/workerprocessbase.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../../src/process/workerprocessbase.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,OAAO,iBACT,SAAQ,iBAAiB;IAGzB,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;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,OAAO,EAAE,CAAC;gBACd,QAAQ,GAAG,CAAC,OAAO,EAAE,CAAC;oBAClB,KAAK,WAAW;wBACZ,IAAI,CAAC,cAAc,CACf,KAAK,CAAC,IAAI,CACN,WAAW;4BACP,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;4BAC9B,6BAA6B,CACpC,CACJ,CAAC;wBACF,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,2EAA2E;wBAC9G,MAAM;oBACV,KAAK,kBAAkB;wBACnB,IAAI,CAAC,cAAc,CACf,KAAK,CAAC,IAAI,CACN,WAAW;4BACP,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;4BAC9B,6BAA6B,CACpC,CACJ,CAAC;wBACF,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACjC,MAAM;gBACd,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;CACL"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.150",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -51,6 +51,7 @@
|
|
|
51
51
|
"@nsshunt/stsconfig": "^1.27.76",
|
|
52
52
|
"@nsshunt/stsdatamanagement": "^1.18.203",
|
|
53
53
|
"@nsshunt/stsinstrumentmanagerclient": "^1.0.49",
|
|
54
|
+
"@nsshunt/stsmessaging": "^1.0.81",
|
|
54
55
|
"@nsshunt/stsobservability": "^1.0.167",
|
|
55
56
|
"@nsshunt/stssocketioutils": "^2.0.60",
|
|
56
57
|
"@nsshunt/stsutils": "^1.19.141",
|