@nsshunt/stsappframework 3.3.171 → 3.3.173
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 +1 -0
- package/dist/commonTypes.js.map +1 -1
- package/dist/process/latencyManager.js +6 -6
- package/dist/process/latencyManager.js.map +1 -1
- package/dist/process/logManager.js +35 -0
- package/dist/process/logManager.js.map +1 -0
- package/dist/process/masterprocessbase.js +27 -45
- package/dist/process/masterprocessbase.js.map +1 -1
- package/dist/process/processbase.js +21 -47
- package/dist/process/processbase.js.map +1 -1
- package/dist/process/serverprocessbase.js +28 -22
- package/dist/process/serverprocessbase.js.map +1 -1
- package/dist/process/singleprocessbase.js +2 -2
- package/dist/process/singleprocessbase.js.map +1 -1
- package/dist/process/sysinfo.js +11 -11
- package/dist/process/sysinfo.js.map +1 -1
- package/dist/process/workerprocessbase.js +5 -2
- package/dist/process/workerprocessbase.js.map +1 -1
- package/package.json +1 -1
- package/types/commonTypes.d.ts +8 -6
- package/types/commonTypes.d.ts.map +1 -1
- package/types/process/latencyManager.d.ts +1 -1
- package/types/process/latencyManager.d.ts.map +1 -1
- package/types/process/logManager.d.ts +9 -0
- package/types/process/logManager.d.ts.map +1 -0
- package/types/process/masterprocessbase.d.ts.map +1 -1
- package/types/process/processbase.d.ts +1 -8
- package/types/process/processbase.d.ts.map +1 -1
- package/types/process/serverprocessbase.d.ts.map +1 -1
- package/types/process/singleprocessbase.d.ts.map +1 -1
- package/types/process/sysinfo.d.ts +3 -3
- package/types/process/sysinfo.d.ts.map +1 -1
- package/types/process/workerprocessbase.d.ts +1 -0
- package/types/process/workerprocessbase.d.ts.map +1 -1
package/dist/commonTypes.js
CHANGED
|
@@ -28,6 +28,7 @@ export const PublishInstrumentControllerToken = new InjectionToken("PublishInstr
|
|
|
28
28
|
export const ProcessOptionsToken = new InjectionToken("ProcessOptions");
|
|
29
29
|
export const DataManagerToken = new InjectionToken("DataManager");
|
|
30
30
|
export const STSLoggerToken = new InjectionToken("STSLogger");
|
|
31
|
+
export const LogManagerToken = new InjectionToken("LogManager");
|
|
31
32
|
export const STSServerToken = new InjectionToken("STSServer");
|
|
32
33
|
export const ProcessBaseToken = new InjectionToken("ProcessBase");
|
|
33
34
|
export const ProcessMetricsToken = new InjectionToken("ProcessMetrics");
|
package/dist/commonTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAQA,OAAO,EAEH,cAAc,EACd,cAAc,EAEd,cAAc,GACjB,MAAM,mBAAmB,CAAC;AA4C3B,MAAM,UAAU,2BAA2B,CACvC,WAAmB,EACnB,cAAsB,EACtB,iBAAyB,EACzB,QAAgB,EAChB,SAAiB,EACjB,eAAuB;IAEvB,MAAM,WAAW,GAAG;QAChB,CAAC,aAAa,EAAE,WAAW,CAAC;QAC5B,CAAC,gBAAgB,EAAE,cAAc,CAAC;QAClC,CAAC,UAAU,EAAE,QAAQ,CAAC;QACtB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;KAC3C,CAAC;IAEF,4BAA4B;IAC5B,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,cAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,cAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,cAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,cAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC,mBAAmB,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE;QAClF,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC/B,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;KAC9C,CAAC;AACN,CAAC;
|
|
1
|
+
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAQA,OAAO,EAEH,cAAc,EACd,cAAc,EAEd,cAAc,GACjB,MAAM,mBAAmB,CAAC;AA4C3B,MAAM,UAAU,2BAA2B,CACvC,WAAmB,EACnB,cAAsB,EACtB,iBAAyB,EACzB,QAAgB,EAChB,SAAiB,EACjB,eAAuB;IAEvB,MAAM,WAAW,GAAG;QAChB,CAAC,aAAa,EAAE,WAAW,CAAC;QAC5B,CAAC,gBAAgB,EAAE,cAAc,CAAC;QAClC,CAAC,UAAU,EAAE,QAAQ,CAAC;QACtB,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;KAC3C,CAAC;IAEF,4BAA4B;IAC5B,cAAc,CAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,cAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,cAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,cAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,cAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,cAAc,CAAC,mBAAmB,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE;QAClF,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC/B,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;KAC9C,CAAC;AACN,CAAC;AA6VD,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,cAAc,CAC/C,cAAc,CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,cAAc,CAEhE,6BAA6B,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,gBAAgB,CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAC9C,aAAa,CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAa,WAAW,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,cAAc,CAAc,YAAY,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAC5C,WAAW,CACd,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAe,aAAa,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,gBAAgB,CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,cAAc,CAC5D,2BAA2B,CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,cAAc,CACjD,gBAAgB,CACnB,CAAC"}
|
|
@@ -4,13 +4,13 @@ import chalk from "chalk";
|
|
|
4
4
|
import { Gauge, } from "@nsshunt/stsobservability";
|
|
5
5
|
import { ProcessMetricsToken } from "./../commonTypes.js";
|
|
6
6
|
import { STSAxiosConfig } from "@nsshunt/stsutils";
|
|
7
|
-
import { ProcessOptionsToken, AgentManagerToken,
|
|
7
|
+
import { ProcessOptionsToken, AgentManagerToken, LogManagerToken, } from "./../commonTypes.js";
|
|
8
8
|
import { inject } from "@nsshunt/stsutils";
|
|
9
9
|
export class LatencyManager {
|
|
10
10
|
options = inject(ProcessOptionsToken);
|
|
11
11
|
agentManager = inject(AgentManagerToken);
|
|
12
|
-
processBase = inject(ProcessBaseToken);
|
|
13
12
|
metrics = inject(ProcessMetricsToken);
|
|
13
|
+
logManager = inject(LogManagerToken);
|
|
14
14
|
CheckLatency = async () => {
|
|
15
15
|
const start = process.hrtime();
|
|
16
16
|
await this.#GetLatency();
|
|
@@ -25,16 +25,16 @@ export class LatencyManager {
|
|
|
25
25
|
.withDefaultHeaders()
|
|
26
26
|
.withAgentManager(this.agentManager).config);
|
|
27
27
|
if (retVal.status !== 200) {
|
|
28
|
-
this.
|
|
28
|
+
this.logManager.LogDebugMessage(chalk.magenta(`Error (MasterProcessBase:#GetLatency): Invalid response from server: [${retVal.status}]`));
|
|
29
29
|
return null;
|
|
30
30
|
}
|
|
31
31
|
return retVal.data.detail;
|
|
32
32
|
}
|
|
33
33
|
catch (error) {
|
|
34
|
-
this.
|
|
35
|
-
this.
|
|
34
|
+
this.logManager.LogDebugMessage(chalk.red(`Error (MasterProcessBase:#GetLatency:catch): [${error}]`));
|
|
35
|
+
this.logManager.LogDebugMessage(chalk.red(` url: [${url}]`));
|
|
36
36
|
if (error.response && error.response.data) {
|
|
37
|
-
this.
|
|
37
|
+
this.logManager.LogDebugMessage(chalk.red(` Details: [${JSON.stringify(error.response.data)}]`));
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"latencyManager.js","sourceRoot":"","sources":["../../src/process/latencyManager.ts"],"names":[],"mappings":"AAAA,wFAAwF,CAAC,UAAU;AACnG,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACH,KAAK,GAGR,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACH,mBAAmB,EACnB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"latencyManager.js","sourceRoot":"","sources":["../../src/process/latencyManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
|
+
import cluster from "node:cluster";
|
|
3
|
+
import chalk from "chalk";
|
|
4
|
+
import { inject } from "@nsshunt/stsutils";
|
|
5
|
+
import { ProcessOptionsToken } from "./../commonTypes.js";
|
|
6
|
+
export class LogManager {
|
|
7
|
+
options = inject(ProcessOptionsToken);
|
|
8
|
+
#GetFormattedLogMessage(message) {
|
|
9
|
+
let prefix = "";
|
|
10
|
+
let col = null;
|
|
11
|
+
const appName = this.options.serviceName;
|
|
12
|
+
if (cluster.isPrimary) {
|
|
13
|
+
prefix = "M";
|
|
14
|
+
col = chalk.bold.cyan;
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
prefix = "W";
|
|
18
|
+
col = chalk.green;
|
|
19
|
+
}
|
|
20
|
+
return col(`${prefix}(${process.pid}) [${appName}]: ${message}`);
|
|
21
|
+
}
|
|
22
|
+
LogErrorMessage(message) {
|
|
23
|
+
this.options.logger.error(this.#GetFormattedLogMessage(message));
|
|
24
|
+
}
|
|
25
|
+
LogInfoMessage(message) {
|
|
26
|
+
this.options.logger.info(this.#GetFormattedLogMessage(message));
|
|
27
|
+
}
|
|
28
|
+
LogWarnMessage(message) {
|
|
29
|
+
this.options.logger.warn(this.#GetFormattedLogMessage(message));
|
|
30
|
+
}
|
|
31
|
+
LogDebugMessage(message) {
|
|
32
|
+
this.options.logger.debug(this.#GetFormattedLogMessage(message));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=logManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logManager.js","sourceRoot":"","sources":["../../src/process/logManager.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,OAAO,UAAU;IACnB,OAAO,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAEtC,uBAAuB,CAAC,OAAe;QACnC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAEzC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,GAAG,GAAG,CAAC;YACb,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,GAAG,CAAC;YACb,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC;QACtB,CAAC;QACD,OAAO,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,CAAC,GAAG,MAAM,OAAO,MAAM,OAAO,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,eAAe,CAAC,OAAY;QACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,cAAc,CAAC,OAAY;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,cAAc,CAAC,OAAY;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,eAAe,CAAC,OAAY;QACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;CACJ"}
|
|
@@ -11,10 +11,8 @@ import { AggregatorRegistry } from "prom-client";
|
|
|
11
11
|
import { goptions } from "@nsshunt/stsconfig";
|
|
12
12
|
import { Gauge, GaugeTypes, } from "@nsshunt/stsobservability";
|
|
13
13
|
import { ProcessBase } from "./processbase.js";
|
|
14
|
-
import { ProcessMetricsToken, STSTransportLoggerWinstonToken, DataManagerToken, LatencyManagerToken, } from "./../commonTypes.js";
|
|
15
|
-
import { Sleep
|
|
16
|
-
import http from "node:http";
|
|
17
|
-
import https from "node:https";
|
|
14
|
+
import { ProcessMetricsToken, STSTransportLoggerWinstonToken, DataManagerToken, LatencyManagerToken, LogManagerToken, } from "./../commonTypes.js";
|
|
15
|
+
import { Sleep } from "@nsshunt/stsutils";
|
|
18
16
|
import { SysInfo } from "./sysinfo.js";
|
|
19
17
|
import { ClusterWorkerManager } from "./clusterworkermanager.js";
|
|
20
18
|
//@@ refactor todo items
|
|
@@ -25,7 +23,6 @@ import { ClusterWorkerManager } from "./clusterworkermanager.js";
|
|
|
25
23
|
//@@ remove ipc message handling and replace with stsmessaging
|
|
26
24
|
//@@ remove TerminateUIController - does not appear to be used by anything
|
|
27
25
|
export class MasterProcessBase extends ProcessBase {
|
|
28
|
-
//static WORKER_MESSAGE_EVENT = 'sts_worker_message_event';
|
|
29
26
|
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
30
27
|
#childProcessExitTime = goptions.childProcessExitTime;
|
|
31
28
|
#siValueObject = {
|
|
@@ -36,26 +33,11 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
36
33
|
#aggregatorRegistry = null;
|
|
37
34
|
#checkLatency = null;
|
|
38
35
|
#shuttingDown = false;
|
|
39
|
-
#agentManager;
|
|
40
36
|
#clusterWorkerManager;
|
|
37
|
+
#logManager;
|
|
41
38
|
constructor(options) {
|
|
42
39
|
super(options);
|
|
43
|
-
this.#
|
|
44
|
-
agentOptions: {
|
|
45
|
-
keepAlive: false, // Use basic defaults. This agent will not use keep-alive.
|
|
46
|
-
maxFreeSockets: goptions.maxFreeSockets,
|
|
47
|
-
maxSockets: goptions.maxSockets,
|
|
48
|
-
maxTotalSockets: goptions.maxTotalSockets,
|
|
49
|
-
timeout: goptions.timeout,
|
|
50
|
-
rejectUnauthorized: goptions.isProduction, // Allows self-signed certificates if non-production
|
|
51
|
-
},
|
|
52
|
-
httpAgentFactory(options) {
|
|
53
|
-
return new http.Agent(options);
|
|
54
|
-
},
|
|
55
|
-
httpsAgentFactory(options) {
|
|
56
|
-
return new https.Agent(options);
|
|
57
|
-
},
|
|
58
|
-
});
|
|
40
|
+
this.#logManager = this.ProcessBaseInjector().get(LogManagerToken);
|
|
59
41
|
this.ProcessBaseInjector().runInContext(() => {
|
|
60
42
|
this.#clusterWorkerManager = new ClusterWorkerManager();
|
|
61
43
|
});
|
|
@@ -108,7 +90,7 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
108
90
|
}
|
|
109
91
|
}
|
|
110
92
|
if (allListening) {
|
|
111
|
-
this.LogInfoMessage(`Service instance started.`);
|
|
93
|
+
this.#logManager.LogInfoMessage(`Service instance started.`);
|
|
112
94
|
this.emit("allListening");
|
|
113
95
|
}
|
|
114
96
|
});
|
|
@@ -153,7 +135,7 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
153
135
|
})
|
|
154
136
|
.on("listening", () => {
|
|
155
137
|
this.emit("prometheusScrapesListening", `${this.options.endpoint}:${this.options.prometheusClusterPort}/metrics`, this.options.endpoint, this.options.prometheusClusterPort);
|
|
156
|
-
this.LogInfoMessage(`Prometheus scrapes ready and live on ${this.options.endpoint}:${this.options.prometheusClusterPort}/metrics`);
|
|
138
|
+
this.#logManager.LogInfoMessage(`Prometheus scrapes ready and live on ${this.options.endpoint}:${this.options.prometheusClusterPort}/metrics`);
|
|
157
139
|
});
|
|
158
140
|
}
|
|
159
141
|
catch (error) {
|
|
@@ -192,17 +174,17 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
192
174
|
}
|
|
193
175
|
SetupServerEx = async () => {
|
|
194
176
|
this.ProcessStartup();
|
|
195
|
-
this.LogInfoMessage(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
196
|
-
const sysInfo = new SysInfo(this);
|
|
177
|
+
this.#logManager.LogInfoMessage(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
178
|
+
const sysInfo = new SysInfo(this.ProcessBaseInjector().get(LogManagerToken));
|
|
197
179
|
sysInfo.LogSystemTelemetry();
|
|
198
180
|
// socket.io
|
|
199
181
|
// setup connections between the workers
|
|
200
182
|
if (this.options.wssServer === true) {
|
|
201
183
|
if (this.options.useSocketIoRedisAdaptor) {
|
|
202
|
-
this.LogInfoMessage(`Using Redis for socket.io cluster management (master)`);
|
|
184
|
+
this.#logManager.LogInfoMessage(`Using Redis for socket.io cluster management (master)`);
|
|
203
185
|
}
|
|
204
186
|
else {
|
|
205
|
-
this.LogInfoMessage(`Using nodejs cluster mode for socket.io cluster management`);
|
|
187
|
+
this.#logManager.LogInfoMessage(`Using nodejs cluster mode for socket.io cluster management`);
|
|
206
188
|
setupPrimary();
|
|
207
189
|
}
|
|
208
190
|
}
|
|
@@ -219,31 +201,31 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
219
201
|
this.#InitCluster();
|
|
220
202
|
cluster.on("listening", (worker, address) => {
|
|
221
203
|
this.emit("clusterListening", worker, address);
|
|
222
|
-
this.LogInfoMessage(`Worker process ${worker.process.pid} is listening at address: ${JSON.stringify(address)}`);
|
|
204
|
+
this.#logManager.LogInfoMessage(`Worker process ${worker.process.pid} is listening at address: ${JSON.stringify(address)}`);
|
|
223
205
|
});
|
|
224
206
|
//Setting up lifecycle event listeners for worker processes
|
|
225
207
|
cluster.on("online", (worker) => {
|
|
226
208
|
this.emit("clusterOnline", worker);
|
|
227
|
-
this.LogInfoMessage(`Worker process ${worker.process.pid} is online`);
|
|
209
|
+
this.#logManager.LogInfoMessage(`Worker process ${worker.process.pid} is online`);
|
|
228
210
|
});
|
|
229
211
|
cluster.on("exit", (worker, code, signal) => {
|
|
230
212
|
this.emit("clusterExit", worker, code, signal);
|
|
231
213
|
if ((code !== null && code === 0) || signal === "SIGINT") {
|
|
232
|
-
this.LogInfoMessage(chalk.green(`Process ${worker.process.pid} terminated gracefully with code: ${code}, signal: ${signal}`));
|
|
214
|
+
this.#logManager.LogInfoMessage(chalk.green(`Process ${worker.process.pid} terminated gracefully with code: ${code}, signal: ${signal}`));
|
|
233
215
|
this.DecWorkers();
|
|
234
216
|
}
|
|
235
217
|
else if ((code !== null && code === 15) || signal === "SIGTERM") {
|
|
236
218
|
this.DecWorkers();
|
|
237
|
-
this.LogInfoMessage(chalk.red(`Process ${worker.process.pid} terminated with code: ${code}, signal: ${signal}`));
|
|
219
|
+
this.#logManager.LogInfoMessage(chalk.red(`Process ${worker.process.pid} terminated with code: ${code}, signal: ${signal}`));
|
|
238
220
|
}
|
|
239
221
|
else {
|
|
240
222
|
this.DecWorkers();
|
|
241
|
-
this.LogInfoMessage(chalk.red(`worker ${worker.process.pid} died`));
|
|
242
|
-
this.LogInfoMessage(chalk.red(`code: ${code}`));
|
|
243
|
-
this.LogInfoMessage(chalk.red(`signal: ${signal}`));
|
|
244
|
-
this.LogInfoMessage(chalk.red("process terminated in an error state"));
|
|
223
|
+
this.#logManager.LogInfoMessage(chalk.red(`worker ${worker.process.pid} died`));
|
|
224
|
+
this.#logManager.LogInfoMessage(chalk.red(`code: ${code}`));
|
|
225
|
+
this.#logManager.LogInfoMessage(chalk.red(`signal: ${signal}`));
|
|
226
|
+
this.#logManager.LogInfoMessage(chalk.red("process terminated in an error state"));
|
|
245
227
|
if (goptions.respawnOnFail === true) {
|
|
246
|
-
this.LogInfoMessage(chalk.magenta(`Attemping to respawn worker`));
|
|
228
|
+
this.#logManager.LogInfoMessage(chalk.magenta(`Attemping to respawn worker`));
|
|
247
229
|
return this.#clusterWorkerManager.SpawnWorker();
|
|
248
230
|
}
|
|
249
231
|
}
|
|
@@ -257,7 +239,7 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
257
239
|
const TerminateHTTPServer = async () => {
|
|
258
240
|
if (this.#httpServer !== null) {
|
|
259
241
|
const logPrefix = `ServerProcessBase:TerminateHTTPServer():${process.pid}:`;
|
|
260
|
-
this.LogInfoMessage(`${logPrefix} Closing httpServer.`);
|
|
242
|
+
this.#logManager.LogInfoMessage(`${logPrefix} Closing httpServer.`);
|
|
261
243
|
await this.#httpServer.close();
|
|
262
244
|
this.#httpServer = null;
|
|
263
245
|
}
|
|
@@ -274,14 +256,14 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
274
256
|
if (this.#shuttingDown === false) {
|
|
275
257
|
this.#shuttingDown = true;
|
|
276
258
|
if (signal) {
|
|
277
|
-
this.LogInfoMessage(this.GetSignalColour(signal)(`${logPrefix} Received signal: ${signal}`));
|
|
259
|
+
this.#logManager.LogInfoMessage(this.GetSignalColour(signal)(`${logPrefix} Received signal: ${signal}`));
|
|
278
260
|
}
|
|
279
261
|
else {
|
|
280
|
-
this.LogInfoMessage(this.GetSignalColour(null)(`${logPrefix} Received Terminate without signal.`));
|
|
262
|
+
this.#logManager.LogInfoMessage(this.GetSignalColour(null)(`${logPrefix} Received Terminate without signal.`));
|
|
281
263
|
}
|
|
282
264
|
TerminateLatency();
|
|
283
265
|
await this.ProcessTerminate();
|
|
284
|
-
this.LogInfoMessage(`${logPrefix} De-Registering service.`);
|
|
266
|
+
this.#logManager.LogInfoMessage(`${logPrefix} De-Registering service.`);
|
|
285
267
|
//@@ De-register here ...
|
|
286
268
|
await TerminateHTTPServer();
|
|
287
269
|
this.KillWorkers(signal);
|
|
@@ -293,7 +275,7 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
293
275
|
this.ProcessExit(this.#childProcessExitTime + this.#masterProcessExitTime);
|
|
294
276
|
}
|
|
295
277
|
else {
|
|
296
|
-
this.LogInfoMessage(`${logPrefix} Process already terminating.`);
|
|
278
|
+
this.#logManager.LogInfoMessage(`${logPrefix} Process already terminating.`);
|
|
297
279
|
}
|
|
298
280
|
};
|
|
299
281
|
process.on("SIGINT", async () => {
|
|
@@ -307,10 +289,10 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
307
289
|
process.on("exit", (code) => {
|
|
308
290
|
this.emit("processExit", code);
|
|
309
291
|
if (code === 0) {
|
|
310
|
-
this.LogInfoMessage(chalk.green(`Main Process: ${process.pid} terminated gracefully with code: ${code}`));
|
|
292
|
+
this.#logManager.LogInfoMessage(chalk.green(`Main Process: ${process.pid} terminated gracefully with code: ${code}`));
|
|
311
293
|
}
|
|
312
294
|
else {
|
|
313
|
-
this.LogInfoMessage(chalk.red(`Main Process: ${process.pid} terminated with code: ${code}`));
|
|
295
|
+
this.#logManager.LogInfoMessage(chalk.red(`Main Process: ${process.pid} terminated with code: ${code}`));
|
|
314
296
|
}
|
|
315
297
|
});
|
|
316
298
|
if (this.options.useLatency) {
|
|
@@ -322,7 +304,7 @@ export class MasterProcessBase extends ProcessBase {
|
|
|
322
304
|
}
|
|
323
305
|
this.#CollectAdditionalTelemetry();
|
|
324
306
|
this.MasterStarted();
|
|
325
|
-
this.LogInfoMessage(chalk.green(`Master process:${process.pid} started`));
|
|
307
|
+
this.#logManager.LogInfoMessage(chalk.green(`Master process:${process.pid} started`));
|
|
326
308
|
};
|
|
327
309
|
BroadcastDataToWorkers = (command, data) => {
|
|
328
310
|
return this.#clusterWorkerManager.BroadcastDataToWorkers(command, data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,18 @@
|
|
|
1
|
-
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
2
|
-
import cluster from "node:cluster";
|
|
3
1
|
import { STSTransportLoggerWinston } from "./../logger/stsTransportLoggerWinston.js";
|
|
4
2
|
import chalk from "chalk";
|
|
5
3
|
import { goptions } from "@nsshunt/stsconfig";
|
|
6
|
-
import { createAgentManager, inject
|
|
4
|
+
import { createAgentManager, inject } from "@nsshunt/stsutils";
|
|
7
5
|
import { PublishInstrumentController, TransportType, GetInstruments, } from "@nsshunt/stsinstrumentmanagerclient";
|
|
8
6
|
import { getCurrentInjector } from "@nsshunt/stsutils";
|
|
9
7
|
import os from "os";
|
|
10
|
-
import { CreateServiceProcessContext, ProcessOptionsToken, AgentManagerToken, PublishInstrumentControllerToken, STSLoggerToken, ProcessBaseToken, ProcessMetricsToken, STSTransportLoggerWinstonToken, DataManagerToken, LatencyManagerToken, } from "./../commonTypes.js";
|
|
8
|
+
import { CreateServiceProcessContext, ProcessOptionsToken, AgentManagerToken, PublishInstrumentControllerToken, STSLoggerToken, ProcessBaseToken, ProcessMetricsToken, STSTransportLoggerWinstonToken, DataManagerToken, LatencyManagerToken, LogManagerToken, } from "./../commonTypes.js";
|
|
11
9
|
import { TinyEmitter } from "tiny-emitter";
|
|
12
10
|
import http from "node:http";
|
|
13
11
|
import https from "node:https";
|
|
14
12
|
import { Metrics } from "./metrics.js";
|
|
15
13
|
import { DataManager } from "./datamanager.js";
|
|
16
14
|
import { LatencyManager } from "./latencyManager.js";
|
|
17
|
-
|
|
18
|
-
//@@ ------------------------------------------------------------
|
|
19
|
-
//@@ remove the getters that just return injectables - the clients should do this
|
|
20
|
-
//@@ refactor config (and simplify) - needs to be an injectable
|
|
15
|
+
import { LogManager } from "./logManager.js";
|
|
21
16
|
export class ProcessBase extends TinyEmitter {
|
|
22
17
|
#processBaseInjector;
|
|
23
18
|
constructor(options) {
|
|
@@ -62,6 +57,10 @@ export class ProcessBase extends TinyEmitter {
|
|
|
62
57
|
provide: LatencyManagerToken,
|
|
63
58
|
useClass: LatencyManager,
|
|
64
59
|
},
|
|
60
|
+
{
|
|
61
|
+
provide: LogManagerToken,
|
|
62
|
+
useClass: LogManager,
|
|
63
|
+
},
|
|
65
64
|
]);
|
|
66
65
|
}
|
|
67
66
|
#CreateDataManager = () => {
|
|
@@ -126,35 +125,9 @@ export class ProcessBase extends TinyEmitter {
|
|
|
126
125
|
};
|
|
127
126
|
return new PublishInstrumentController(instrumentControllerOptions);
|
|
128
127
|
};
|
|
129
|
-
#GetFormattedLogMessage(message) {
|
|
130
|
-
let prefix = "";
|
|
131
|
-
let col = null;
|
|
132
|
-
const appName = this.options.serviceName;
|
|
133
|
-
if (cluster.isPrimary) {
|
|
134
|
-
prefix = "M";
|
|
135
|
-
col = chalk.bold.cyan;
|
|
136
|
-
}
|
|
137
|
-
else {
|
|
138
|
-
prefix = "W";
|
|
139
|
-
col = chalk.green;
|
|
140
|
-
}
|
|
141
|
-
return col(`${prefix}(${process.pid}) [${appName}]: ${message}`);
|
|
142
|
-
}
|
|
143
128
|
ProcessBaseInjector = () => {
|
|
144
129
|
return this.#processBaseInjector;
|
|
145
130
|
};
|
|
146
|
-
LogErrorMessage(message) {
|
|
147
|
-
this.options.logger.error(this.#GetFormattedLogMessage(message));
|
|
148
|
-
}
|
|
149
|
-
LogInfoMessage(message) {
|
|
150
|
-
this.options.logger.info(this.#GetFormattedLogMessage(message));
|
|
151
|
-
}
|
|
152
|
-
LogWarnMessage(message) {
|
|
153
|
-
this.options.logger.warn(this.#GetFormattedLogMessage(message));
|
|
154
|
-
}
|
|
155
|
-
LogDebugMessage(message) {
|
|
156
|
-
this.options.logger.debug(this.#GetFormattedLogMessage(message));
|
|
157
|
-
}
|
|
158
131
|
get options() {
|
|
159
132
|
return this.#processBaseInjector.get(ProcessOptionsToken);
|
|
160
133
|
}
|
|
@@ -172,36 +145,37 @@ export class ProcessBase extends TinyEmitter {
|
|
|
172
145
|
}
|
|
173
146
|
};
|
|
174
147
|
ProcessExit = (processExitDelay) => {
|
|
148
|
+
const lm = this.#processBaseInjector.get(LogManagerToken);
|
|
175
149
|
if (this.options.processExitOnTerminate &&
|
|
176
150
|
this.options.processExitOnTerminate === true) {
|
|
177
151
|
setTimeout(() => {
|
|
178
|
-
|
|
152
|
+
lm.LogInfoMessage(`Performing process.exit(0).`);
|
|
179
153
|
process.exit(0);
|
|
180
154
|
}, processExitDelay); // Give the workers time to terminate gracefully
|
|
181
155
|
}
|
|
182
156
|
else {
|
|
183
|
-
|
|
157
|
+
lm.LogInfoMessage(`Performing process.exit(0) - Immediate.`);
|
|
184
158
|
}
|
|
185
159
|
};
|
|
186
160
|
TerminateInstrumentController = () => {
|
|
187
|
-
|
|
188
|
-
|
|
161
|
+
const ic = this.#processBaseInjector.get(PublishInstrumentControllerToken);
|
|
162
|
+
if (ic) {
|
|
163
|
+
this.#processBaseInjector
|
|
164
|
+
.get(LogManagerToken)
|
|
165
|
+
.LogInfoMessage(`ProcessBase:TerminateInstrumentController()`);
|
|
189
166
|
setTimeout(async () => {
|
|
190
|
-
if (
|
|
191
|
-
await
|
|
167
|
+
if (ic) {
|
|
168
|
+
await ic.EndPublish();
|
|
192
169
|
setTimeout(() => {
|
|
193
|
-
this.
|
|
170
|
+
const am = this.#processBaseInjector.get(AgentManagerToken);
|
|
171
|
+
if (am) {
|
|
172
|
+
am.Terminate();
|
|
173
|
+
}
|
|
194
174
|
}, 50);
|
|
195
175
|
}
|
|
196
176
|
}, 100);
|
|
197
177
|
}
|
|
198
178
|
};
|
|
199
|
-
get InstrumentController() {
|
|
200
|
-
return this.#processBaseInjector.get(PublishInstrumentControllerToken);
|
|
201
|
-
}
|
|
202
|
-
get AgentManager() {
|
|
203
|
-
return this.#processBaseInjector.get(AgentManagerToken);
|
|
204
|
-
}
|
|
205
179
|
async ProcessTerminate() {
|
|
206
180
|
this.emit("ProcessTerminate");
|
|
207
181
|
this.#processBaseInjector.get(ProcessMetricsToken).Stop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
import chalk from "chalk";
|
|
3
3
|
import { goptions } from "@nsshunt/stsconfig";
|
|
4
4
|
import { Sleep } from "@nsshunt/stsutils";
|
|
5
|
-
import { STSServerToken, STSTransportLoggerWinstonToken, DataManagerToken, } from "./../commonTypes.js";
|
|
5
|
+
import { STSServerToken, STSTransportLoggerWinstonToken, DataManagerToken, PublishInstrumentControllerToken, LogManagerToken, } from "./../commonTypes.js";
|
|
6
6
|
import { ProcessBase } from "./processbase.js";
|
|
7
7
|
import { CreateSTSServer } from "./servertypes/stsserverfactory.js";
|
|
8
|
+
import { Gauge } from "@nsshunt/stsobservability";
|
|
8
9
|
/**
|
|
9
10
|
* todo
|
|
10
11
|
* @typedef {Object} options - todo
|
|
@@ -16,6 +17,7 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
16
17
|
#CORE_DOMAIN = "stscore.stsmda.org";
|
|
17
18
|
#serverProcessInjector;
|
|
18
19
|
#stsServer;
|
|
20
|
+
#logManager;
|
|
19
21
|
constructor(options) {
|
|
20
22
|
super(options);
|
|
21
23
|
this.#serverProcessInjector = this.ProcessBaseInjector().createChild([
|
|
@@ -26,6 +28,7 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
26
28
|
},
|
|
27
29
|
},
|
|
28
30
|
]);
|
|
31
|
+
this.#logManager = this.ProcessBaseInjector().get(LogManagerToken);
|
|
29
32
|
}
|
|
30
33
|
get STSServer() {
|
|
31
34
|
return this.#stsServer;
|
|
@@ -48,10 +51,10 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
48
51
|
if (this.#shuttingDown === false) {
|
|
49
52
|
this.#shuttingDown = true;
|
|
50
53
|
if (signal) {
|
|
51
|
-
this
|
|
54
|
+
this.#logManager?.LogInfoMessage(this.GetSignalColour(signal)(`${logPrefix} Received signal: ${signal}`));
|
|
52
55
|
}
|
|
53
56
|
else {
|
|
54
|
-
this
|
|
57
|
+
this.#logManager?.LogInfoMessage(this.GetSignalColour(null)(`${logPrefix} Received Terminate without signal.`));
|
|
55
58
|
}
|
|
56
59
|
await this.ProcessTerminate();
|
|
57
60
|
if (this.#stsServer) {
|
|
@@ -62,12 +65,12 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
62
65
|
?.TerminateDatabase();
|
|
63
66
|
// Output final messages here (before TerminateInstrumentController)
|
|
64
67
|
if (this.options.clusterMode) {
|
|
65
|
-
this
|
|
68
|
+
this.#logManager?.LogInfoMessage(`${logPrefix} clusterPerformExit value: [${clusterPerformExit}]`);
|
|
66
69
|
if (clusterPerformExit) {
|
|
67
|
-
this
|
|
70
|
+
this.#logManager?.LogInfoMessage(`${logPrefix} Process will self terminate with process.exit(0).`);
|
|
68
71
|
}
|
|
69
72
|
else {
|
|
70
|
-
this
|
|
73
|
+
this.#logManager?.LogInfoMessage(`${logPrefix} Child process will not self terminate. Terminate will be handled by master process.`);
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
76
|
this.TerminateInstrumentController();
|
|
@@ -89,7 +92,7 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
else {
|
|
92
|
-
this
|
|
95
|
+
this.#logManager?.LogInfoMessage(`${logPrefix} Process already terminating.`);
|
|
93
96
|
}
|
|
94
97
|
};
|
|
95
98
|
async SetupServer() {
|
|
@@ -117,43 +120,46 @@ export class ServerProcessBase extends ProcessBase {
|
|
|
117
120
|
}, 0);
|
|
118
121
|
}
|
|
119
122
|
async SetupServerEx() {
|
|
120
|
-
this
|
|
123
|
+
this.#logManager?.LogInfoMessage(chalk.green(`ServerProcessBase:SetupServerEx(): Main Process:${process.pid} Starting ...`));
|
|
121
124
|
this.ProcessStartup();
|
|
122
|
-
this
|
|
125
|
+
this.#logManager?.LogInfoMessage(`ServerProcessBase:SetupServerEx(): Worker instance starting. Service instance Id: [${this.options.serviceInstanceId}]`);
|
|
123
126
|
// Signal Codes
|
|
124
127
|
// https://en.wikipedia.org/wiki/Signal_(IPC)
|
|
125
128
|
process.on("SIGTERM", async () => {
|
|
126
|
-
this
|
|
129
|
+
this.#logManager?.LogInfoMessage(`ServerProcessBase:SetupServerEx(): SIGTERM signal received for worker: ${process.pid}`);
|
|
127
130
|
await this.Terminate(true, true);
|
|
128
131
|
});
|
|
129
132
|
process.on("SIGINT", async () => {
|
|
130
|
-
this
|
|
133
|
+
this.#logManager?.LogInfoMessage(`ServerProcessBase:SetupServerEx(): SIGINT signal received for worker: ${process.pid}`);
|
|
131
134
|
await this.Terminate(true, true);
|
|
132
135
|
});
|
|
133
136
|
process.on("exit", (code) => {
|
|
134
137
|
if (code === 0) {
|
|
135
|
-
this
|
|
138
|
+
this.#logManager?.LogInfoMessage(chalk.green(`ServerProcessBase:SetupServerEx(): Process: ${process.pid} terminated gracefully with code: ${code}`));
|
|
136
139
|
}
|
|
137
140
|
else {
|
|
138
|
-
this
|
|
141
|
+
this.#logManager?.LogInfoMessage(chalk.red(`ServerProcessBase:SetupServerEx(): Process: ${process.pid} terminated with code: ${code}`));
|
|
139
142
|
}
|
|
140
143
|
});
|
|
141
144
|
this.#serverProcessInjector.get(STSServerToken);
|
|
142
145
|
this.#CollectAdditionalTelemetry();
|
|
143
146
|
this.ProcessStarted();
|
|
144
|
-
this
|
|
147
|
+
this.#logManager?.LogInfoMessage(chalk.green(`ServerProcessBase:SetupServerEx(): Main Process:${process.pid} Started`));
|
|
145
148
|
return true;
|
|
146
149
|
}
|
|
147
150
|
#CollectAdditionalTelemetry() {
|
|
148
|
-
|
|
151
|
+
const server = this.#serverProcessInjector.get(STSServerToken);
|
|
152
|
+
const im = this.ProcessBaseInjector().get(PublishInstrumentControllerToken);
|
|
149
153
|
try {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
154
|
+
server
|
|
155
|
+
?.GetHttpServer()
|
|
156
|
+
?.getConnections((error, count) => {
|
|
157
|
+
im.UpdateInstrument(Gauge.CONNECTION_COUNT_GAUGE, {
|
|
158
|
+
val: count,
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
catch (error) { }
|
|
157
163
|
}
|
|
158
164
|
#SetupSTSServer = () => {
|
|
159
165
|
const expressConfig = {
|
|
@@ -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,EAAoB,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAIH,cAAc,EACd,8BAA8B,EAC9B,gBAAgB,
|
|
1
|
+
{"version":3,"file":"serverprocessbase.js","sourceRoot":"","sources":["../../src/process/serverprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +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
|
+
import { ProcessMetricsToken, LogManagerToken, } from "./../commonTypes.js";
|
|
5
5
|
import { ServerProcessBase } from "./serverprocessbase.js";
|
|
6
6
|
import { SysInfo } from "./sysinfo.js";
|
|
7
7
|
import si from "systeminformation"; // https://systeminformation.io/
|
|
@@ -49,7 +49,7 @@ export class SingleProcessBase extends ServerProcessBase {
|
|
|
49
49
|
SetupServerEx = async () => {
|
|
50
50
|
await super.SetupServerEx();
|
|
51
51
|
this.#CollectAdditionalTelemetry();
|
|
52
|
-
const sysInfo = new SysInfo(this);
|
|
52
|
+
const sysInfo = new SysInfo(this.ProcessBaseInjector().get(LogManagerToken));
|
|
53
53
|
sysInfo.LogSystemTelemetry();
|
|
54
54
|
return true;
|
|
55
55
|
};
|
|
@@ -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;AAEnC,OAAO,EAGH,mBAAmB,
|
|
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,EACnB,eAAe,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,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,MAAM,OAAO,GAAG,IAAI,OAAO,CACvB,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAClD,CAAC;QACF,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAE7B,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF,KAAK,CAAC,oBAAoB;QACtB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;CACJ"}
|
package/dist/process/sysinfo.js
CHANGED
|
@@ -2,9 +2,9 @@ import si from "systeminformation"; // https://systeminformation.io/
|
|
|
2
2
|
import { GetFirstNetworkInterface } from "./../sysinfo/network.js";
|
|
3
3
|
import { goptions } from "@nsshunt/stsconfig";
|
|
4
4
|
export class SysInfo {
|
|
5
|
-
|
|
6
|
-
constructor(
|
|
7
|
-
this
|
|
5
|
+
#logManager;
|
|
6
|
+
constructor(logManager) {
|
|
7
|
+
this.#logManager = logManager;
|
|
8
8
|
}
|
|
9
9
|
GetNumCPUs = async () => {
|
|
10
10
|
// https://systeminformation.io/
|
|
@@ -39,17 +39,17 @@ export class SysInfo {
|
|
|
39
39
|
const hostname = sysinfo.osInfo.hostname;
|
|
40
40
|
const hostaddr = GetFirstNetworkInterface();
|
|
41
41
|
if (hostaddr !== null) {
|
|
42
|
-
this.
|
|
42
|
+
this.#logManager.LogInfoMessage(`Host Address: ${hostaddr}`);
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
|
-
this.
|
|
45
|
+
this.#logManager.LogInfoMessage(`Unknown Host Address.`);
|
|
46
46
|
}
|
|
47
|
-
this.
|
|
48
|
-
this.
|
|
49
|
-
this.
|
|
50
|
-
this.
|
|
51
|
-
this.
|
|
52
|
-
this.
|
|
47
|
+
this.#logManager.LogInfoMessage(`Server starting with ${numCPUs} Cores/Threads`);
|
|
48
|
+
this.#logManager.LogInfoMessage(`Hostname: ${hostname}`);
|
|
49
|
+
this.#logManager.LogInfoMessage(`System: ${JSON.stringify(sysinfo.system)}`);
|
|
50
|
+
this.#logManager.LogInfoMessage(`OS Info: ${JSON.stringify(sysinfo.osInfo)}`);
|
|
51
|
+
this.#logManager.LogInfoMessage(`CPU: ${JSON.stringify(sysinfo.cpu)}`);
|
|
52
|
+
this.#logManager.LogInfoMessage(`Memory: ${JSON.stringify(sysinfo.mem)}`);
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
//# sourceMappingURL=sysinfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sysinfo.js","sourceRoot":"","sources":["../../src/process/sysinfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,mBAAmB,CAAC,CAAC,gCAAgC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,MAAM,OAAO,OAAO;IAChB,WAAW,
|
|
1
|
+
{"version":3,"file":"sysinfo.js","sourceRoot":"","sources":["../../src/process/sysinfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,mBAAmB,CAAC,CAAC,gCAAgC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,MAAM,OAAO,OAAO;IAChB,WAAW,CAAc;IAEzB,YAAY,UAAuB;QAC/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IAED,UAAU,GAAG,KAAK,IAAqB,EAAE;QACrC,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,GAAG,EAAE,GAAG;SACX,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,QAAQ,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QACxC,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;IAEF,kBAAkB,GAAG,KAAK,IAAI,EAAE;QAC5B,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,MAAM,EAAE,GAAG;YACX,MAAM,EAAE,GAAG;YACX,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;SACX,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzC,MAAM,QAAQ,GAAG,wBAAwB,EAAE,CAAC;QAC5C,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,iBAAiB,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,wBAAwB,OAAO,gBAAgB,CAClD,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,aAAa,QAAQ,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAC9C,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAC/C,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC,WAAW,CAAC,cAAc,CAC3B,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAC3C,CAAC;IACN,CAAC,CAAC;CACL"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
2
|
import chalk from "chalk";
|
|
3
|
+
import { LogManagerToken, } from "./../commonTypes.js";
|
|
3
4
|
import { ServerProcessBase } from "./serverprocessbase.js";
|
|
4
5
|
export class WorkerProcessBase extends ServerProcessBase {
|
|
6
|
+
#logManager;
|
|
5
7
|
constructor(options) {
|
|
6
8
|
super(options);
|
|
9
|
+
this.#logManager = this.ProcessBaseInjector().get(LogManagerToken);
|
|
7
10
|
}
|
|
8
11
|
SetupServerEx = async () => {
|
|
9
12
|
await super.SetupServerEx();
|
|
@@ -11,13 +14,13 @@ export class WorkerProcessBase extends ServerProcessBase {
|
|
|
11
14
|
if (msg.command) {
|
|
12
15
|
switch (msg.command) {
|
|
13
16
|
case "Terminate":
|
|
14
|
-
this.LogInfoMessage(chalk.grey(`Received ` +
|
|
17
|
+
this.#logManager.LogInfoMessage(chalk.grey(`Received ` +
|
|
15
18
|
chalk.bold.italic(`Terminate`) +
|
|
16
19
|
` message from master thread`));
|
|
17
20
|
await this.Terminate(true, false); // Don't kill the child process here, the master will take care of that ...
|
|
18
21
|
break;
|
|
19
22
|
case "TerminateAndKill":
|
|
20
|
-
this.LogInfoMessage(chalk.grey(`Received ` +
|
|
23
|
+
this.#logManager.LogInfoMessage(chalk.grey(`Received ` +
|
|
21
24
|
chalk.bold.italic(`Terminate`) +
|
|
22
25
|
` message from master thread`));
|
|
23
26
|
await this.Terminate(true, true);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../../src/process/workerprocessbase.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAC,UAAU;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAGH,eAAe,GAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,OAAO,iBACT,SAAQ,iBAAiB;IAGzB,WAAW,CAAc;IAEzB,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvE,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,WAAW,CAAC,cAAc,CAC3B,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,WAAW,CAAC,cAAc,CAC3B,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
package/types/commonTypes.d.ts
CHANGED
|
@@ -51,14 +51,9 @@ export interface IProcessBaseEvents {
|
|
|
51
51
|
];
|
|
52
52
|
}
|
|
53
53
|
export interface IProcessBase extends TinyEmitter {
|
|
54
|
-
GetAdditionalInstruments(): InstrumentDefinitions;
|
|
55
54
|
ProcessStartup: () => void;
|
|
56
|
-
get InstrumentController(): PublishInstrumentController | undefined;
|
|
57
|
-
get AgentManager(): IAgentManager;
|
|
58
|
-
LogErrorMessage(message: any): void;
|
|
59
|
-
LogInfoMessage(message: any): void;
|
|
60
|
-
LogDebugMessage(message: any): void;
|
|
61
55
|
ProcessTerminate(): Promise<void>;
|
|
56
|
+
GetAdditionalInstruments(): InstrumentDefinitions;
|
|
62
57
|
get options(): ProcessOptions;
|
|
63
58
|
get shuttingDown(): boolean;
|
|
64
59
|
emit<K extends keyof IProcessBaseEvents>(event: K, ...arg: IProcessBaseEvents[K]): this;
|
|
@@ -248,11 +243,18 @@ export interface IDataManager {
|
|
|
248
243
|
export interface ILatencyManager {
|
|
249
244
|
CheckLatency: () => Promise<void>;
|
|
250
245
|
}
|
|
246
|
+
export interface ILogManager {
|
|
247
|
+
LogErrorMessage(message: any): void;
|
|
248
|
+
LogInfoMessage(message: any): void;
|
|
249
|
+
LogWarnMessage(message: any): void;
|
|
250
|
+
LogDebugMessage(message: any): void;
|
|
251
|
+
}
|
|
251
252
|
export declare const AgentManagerToken: InjectionToken<IAgentManager>;
|
|
252
253
|
export declare const PublishInstrumentControllerToken: InjectionToken<PublishInstrumentController | undefined>;
|
|
253
254
|
export declare const ProcessOptionsToken: InjectionToken<ProcessOptions>;
|
|
254
255
|
export declare const DataManagerToken: InjectionToken<IDataManager | undefined>;
|
|
255
256
|
export declare const STSLoggerToken: InjectionToken<ISTSLogger>;
|
|
257
|
+
export declare const LogManagerToken: InjectionToken<ILogManager>;
|
|
256
258
|
export declare const STSServerToken: InjectionToken<ISTSServer | undefined>;
|
|
257
259
|
export declare const ProcessBaseToken: InjectionToken<IProcessBase>;
|
|
258
260
|
export declare const ProcessMetricsToken: InjectionToken<IMetrics>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ export declare class LatencyManager implements ILatencyManager {
|
|
|
3
3
|
#private;
|
|
4
4
|
private readonly options;
|
|
5
5
|
private readonly agentManager;
|
|
6
|
-
private readonly processBase;
|
|
7
6
|
private readonly metrics;
|
|
7
|
+
private readonly logManager;
|
|
8
8
|
CheckLatency: () => Promise<void>;
|
|
9
9
|
}
|
|
10
10
|
//# sourceMappingURL=latencyManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"latencyManager.d.ts","sourceRoot":"","sources":["../../src/process/latencyManager.ts"],"names":[],"mappings":"AAeA,OAAO,
|
|
1
|
+
{"version":3,"file":"latencyManager.d.ts","sourceRoot":"","sources":["../../src/process/latencyManager.ts"],"names":[],"mappings":"AAeA,OAAO,EAGH,eAAe,EAElB,MAAM,qBAAqB,CAAC;AAI7B,qBAAa,cAAe,YAAW,eAAe;;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA2B;IAEtD,YAAY,sBAIV;CAqDL"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare class LogManager {
|
|
2
|
+
#private;
|
|
3
|
+
options: import("./../commonTypes.js").ProcessOptions;
|
|
4
|
+
LogErrorMessage(message: any): void;
|
|
5
|
+
LogInfoMessage(message: any): void;
|
|
6
|
+
LogWarnMessage(message: any): void;
|
|
7
|
+
LogDebugMessage(message: any): void;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=logManager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logManager.d.ts","sourceRoot":"","sources":["../../src/process/logManager.ts"],"names":[],"mappings":"AAOA,qBAAa,UAAU;;IACnB,OAAO,+CAA+B;IAiBtC,eAAe,CAAC,OAAO,EAAE,GAAG;IAI5B,cAAc,CAAC,OAAO,EAAE,GAAG;IAI3B,cAAc,CAAC,OAAO,EAAE,GAAG;IAI3B,eAAe,CAAC,OAAO,EAAE,GAAG;CAG/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACH,kBAAkB,EAClB,cAAc,
|
|
1
|
+
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/masterprocessbase.ts"],"names":[],"mappings":"AAwBA,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;AAe5E,qBAAa,iBACT,SAAQ,WACR,YAAW,kBAAkB;;gBAejB,OAAO,EAAE,cAAc;IA2C1B,wBAAwB,IAAI,qBAAqB;IAqG1D,WAAW,sBAIT;IAEF,UAAU,GACN,IAAI,MAAM,EACV,QAAQ,MAAM,CAAC,OAAO,YAAY,EAClC,SAAS,GAAG,EACZ,aAAa,OAAO,EACpB,cAAc,OAAO,KACtB,OAAO,CAQR;IAEF,WAAW,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,UAAU,OAAO,KAAG,IAAI,CAE7D;IAEF,UAAU,QAAO,IAAI,CAEnB;IAEF,UAAU,QAAO,IAAI,CAEnB;IAEF,SAAS,GAAI,SAAS,GAAG,KAAG,MAAM,CAEhC;IAEF,aAAa,IAAI,IAAI;IASrB,IAAa,YAAY,IAAI,OAAO,CAEnC;IAED,aAAa,sBAiNX;IAEF,sBAAsB,GAAI,SAAS,GAAG,EAAE,MAAM,GAAG,UAK/C;CACL"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { PublishInstrumentController, InstrumentDefinitions } from "@nsshunt/stsinstrumentmanagerclient";
|
|
1
|
+
import { InstrumentDefinitions } from "@nsshunt/stsinstrumentmanagerclient";
|
|
3
2
|
import { Injector } from "@nsshunt/stsutils";
|
|
4
3
|
import { IProcessBase, ProcessOptions, IProcessBaseEvents } from "./../commonTypes.js";
|
|
5
4
|
import { TinyEmitter } from "tiny-emitter";
|
|
@@ -7,18 +6,12 @@ export declare abstract class ProcessBase extends TinyEmitter implements IProces
|
|
|
7
6
|
#private;
|
|
8
7
|
constructor(options: ProcessOptions);
|
|
9
8
|
ProcessBaseInjector: () => Injector;
|
|
10
|
-
LogErrorMessage(message: any): void;
|
|
11
|
-
LogInfoMessage(message: any): void;
|
|
12
|
-
LogWarnMessage(message: any): void;
|
|
13
|
-
LogDebugMessage(message: any): void;
|
|
14
9
|
get options(): ProcessOptions;
|
|
15
10
|
get shuttingDown(): boolean;
|
|
16
11
|
GetAdditionalInstruments(): InstrumentDefinitions;
|
|
17
12
|
ProcessStartup: () => void;
|
|
18
13
|
ProcessExit: (processExitDelay: number) => void;
|
|
19
14
|
TerminateInstrumentController: () => void;
|
|
20
|
-
get InstrumentController(): PublishInstrumentController | undefined;
|
|
21
|
-
get AgentManager(): IAgentManager;
|
|
22
15
|
ProcessTerminate(): Promise<void>;
|
|
23
16
|
GetSignalColour: (signal: any) => import("chalk").ChalkInstance;
|
|
24
17
|
emit<K extends keyof IProcessBaseEvents>(event: K, ...arg: IProcessBaseEvents[K]): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../../src/process/processbase.ts"],"names":[],"mappings":"AAWA,OAAO,EAGH,qBAAqB,EAIxB,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAsB,MAAM,mBAAmB,CAAC;AAIjE,OAAO,EACH,YAAY,EAEZ,cAAc,EACd,kBAAkB,EAWrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAU3C,8BAAsB,WAAY,SAAQ,WAAY,YAAW,YAAY;;gBAG7D,OAAO,EAAE,cAAc;IAqInC,mBAAmB,QAAO,QAAQ,CAEhC;IAEF,IAAI,OAAO,IAAI,cAAc,CAE5B;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,wBAAwB,IAAI,qBAAqB;IAIjD,cAAc,aAOZ;IAEF,WAAW,GAAI,kBAAkB,MAAM,UAarC;IAEF,6BAA6B,aAqB3B;IAEI,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC,eAAe,GAAI,QAAQ,GAAG,mCAQ5B;IAEF,IAAI,CAAC,CAAC,SAAS,MAAM,kBAAkB,EACnC,KAAK,EAAE,CAAC,EACR,GAAG,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC9B,IAAI;IAKP,EAAE,CAAC,CAAC,SAAS,MAAM,kBAAkB,EACjC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,GAAG,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,IAAI,GAClD,IAAI;IAKP,GAAG,CAAC,CAAC,SAAS,MAAM,kBAAkB,EAClC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,GAAG,GAAG,EAAE,kBAAkB,CAAC,CAAC,CAAC,KAAK,IAAI,GAClD,IAAI;CAIV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/serverprocessbase.ts"],"names":[],"mappings":"AAKA,OAAO,EAAU,QAAQ,EAAS,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EACH,cAAc,EACd,kBAAkB,EAClB,UAAU,
|
|
1
|
+
{"version":3,"file":"serverprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/serverprocessbase.ts"],"names":[],"mappings":"AAKA,OAAO,EAAU,QAAQ,EAAS,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EACH,cAAc,EACd,kBAAkB,EAClB,UAAU,EAOb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C;;;;GAIG;AACH,8BAAsB,iBAClB,SAAQ,WACR,YAAW,kBAAkB;;gBASjB,OAAO,EAAE,cAAc;IAenC,IAAI,SAAS,IAAI,UAAU,GAAG,SAAS,CAEtC;IAED,qBAAqB;IAIrB,IAAa,YAAY,IAAI,OAAO,CAEnC;IASD,SAAS,GACL,oBAAoB,OAAO,EAC3B,SAAS,GAAG,KACb,OAAO,CAAC,IAAI,CAAC,CAqEd;IAEI,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAiBrC,cAAc;IASR,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;CA8I1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/singleprocessbase.ts"],"names":[],"mappings":"AAUA,OAAO,EACH,kBAAkB,EAClB,cAAc,
|
|
1
|
+
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/singleprocessbase.ts"],"names":[],"mappings":"AAUA,OAAO,EACH,kBAAkB,EAClB,cAAc,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAK5E,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;AAEvD,qBAAa,iBACT,SAAQ,iBACR,YAAW,kBAAkB;;IAE7B;;;OAGG;gBACS,OAAO,EAAE,cAAc;IAyB1B,wBAAwB,IAAI,qBAAqB;IAajD,aAAa,QAAa,OAAO,CAAC,OAAO,CAAC,CAWjD;IAEI,oBAAoB;CAG7B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ILogManager } from "./../commonTypes.js";
|
|
2
2
|
export declare class SysInfo {
|
|
3
|
-
|
|
4
|
-
constructor(
|
|
3
|
+
#private;
|
|
4
|
+
constructor(logManager: ILogManager);
|
|
5
5
|
GetNumCPUs: () => Promise<number>;
|
|
6
6
|
LogSystemTelemetry: () => Promise<void>;
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sysinfo.d.ts","sourceRoot":"","sources":["../../src/process/sysinfo.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sysinfo.d.ts","sourceRoot":"","sources":["../../src/process/sysinfo.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,qBAAa,OAAO;;gBAGJ,UAAU,EAAE,WAAW;IAInC,UAAU,QAAa,OAAO,CAAC,MAAM,CAAC,CAkBpC;IAEF,kBAAkB,sBAkChB;CACL"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { IWorkerProcessBase, ProcessOptions } from "./../commonTypes.js";
|
|
2
2
|
import { ServerProcessBase } from "./serverprocessbase.js";
|
|
3
3
|
export declare class WorkerProcessBase extends ServerProcessBase implements IWorkerProcessBase {
|
|
4
|
+
#private;
|
|
4
5
|
constructor(options: ProcessOptions);
|
|
5
6
|
SetupServerEx: () => Promise<boolean>;
|
|
6
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/workerprocessbase.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../../src/process/workerprocessbase.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,kBAAkB,EAClB,cAAc,EAGjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,qBAAa,iBACT,SAAQ,iBACR,YAAW,kBAAkB;;gBAIjB,OAAO,EAAE,cAAc;IAK1B,aAAa,QAAa,OAAO,CAAC,OAAO,CAAC,CA+BjD;CACL"}
|