@nsshunt/stsappframework 3.1.17 → 3.1.19
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/authutilsnode.js +9 -5
- package/dist/authutilsnode.js.map +1 -1
- package/dist/commonTypes.js.map +1 -1
- package/dist/masterprocessbase.js +47 -49
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/processbase.js +13 -24
- package/dist/processbase.js.map +1 -1
- package/dist/serverprocessbase.js +27 -28
- package/dist/serverprocessbase.js.map +1 -1
- package/dist/singleprocessbase.js +5 -5
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/tcpserver/appmaster.js +3 -3
- package/dist/tcpserver/appmaster.js.map +1 -1
- package/dist/workerprocessbase.js +7 -7
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +1 -1
- package/src/authutilsnode.ts +15 -7
- package/src/commonTypes.ts +0 -1
- package/src/masterprocessbase.ts +48 -49
- package/src/processbase.ts +13 -27
- package/src/serverprocessbase.ts +27 -28
- package/src/singleprocessbase.ts +5 -5
- package/src/tcpserver/appmaster.ts +3 -3
- package/src/workerprocessbase.ts +7 -7
- package/types/authutilsnode.d.ts +5 -1
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/commonTypes.d.ts +0 -1
- package/types/commonTypes.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/processbase.d.ts +0 -1
- package/types/processbase.d.ts.map +1 -1
- package/types/serverprocessbase.d.ts.map +1 -1
|
@@ -138,37 +138,36 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
138
138
|
this.#io = new socket_io_1.Server(this.#httpServer, options);
|
|
139
139
|
if (this.options.clusterMode) {
|
|
140
140
|
if (this.options.useRedisAdaptor) {
|
|
141
|
-
this.
|
|
141
|
+
this.LogInfoMessage(`Using Redis for socket.io cluster management (worker)`);
|
|
142
142
|
if (this.options.redisAdaptorUrl) {
|
|
143
|
-
this.
|
|
143
|
+
this.LogInfoMessage(`Redis url: [${this.options.redisAdaptorUrl}]`);
|
|
144
144
|
this.#redisClient = (0, redis_1.createClient)({ url: this.options.redisAdaptorUrl });
|
|
145
145
|
}
|
|
146
146
|
else {
|
|
147
|
-
this.
|
|
147
|
+
this.LogInfoMessage(`Redis url: [localhost]`);
|
|
148
148
|
this.#redisClient = (0, redis_1.createClient)();
|
|
149
149
|
}
|
|
150
150
|
await this.#redisClient.connect();
|
|
151
151
|
this.#io.adapter((0, redis_streams_adapter_1.createAdapter)(this.#redisClient));
|
|
152
|
-
this.
|
|
152
|
+
this.LogInfoMessage(`Redis successfully connected.`);
|
|
153
153
|
}
|
|
154
154
|
else {
|
|
155
155
|
this.#io.adapter((0, cluster_adapter_1.createAdapter)());
|
|
156
|
-
this.
|
|
156
|
+
this.LogInfoMessage(`Using nodejs cluster mode for socket.io cluster management`);
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
else {
|
|
160
|
-
this.
|
|
160
|
+
this.LogInfoMessage(`Not using any adaptors for socket.io cluster management.}`);
|
|
161
161
|
}
|
|
162
162
|
// To use a seperate socket server, the code below can be applied.
|
|
163
163
|
// this.#io = require("socket.io")(options);
|
|
164
164
|
// this.#io.adapter(createAdapter());
|
|
165
165
|
// this.#io.listen(3006);
|
|
166
|
-
// LogEx(`socket.io init`);
|
|
167
166
|
this.#io.engine.on("connection_error", (err) => {
|
|
168
|
-
this.
|
|
169
|
-
this.
|
|
170
|
-
this.
|
|
171
|
-
this.
|
|
167
|
+
this.LogInfoMessage(err.req); // the request object
|
|
168
|
+
this.LogInfoMessage(err.code); // the error code, for example 1
|
|
169
|
+
this.LogInfoMessage(err.message); // the error message, for example "Session ID unknown"
|
|
170
|
+
this.LogInfoMessage(err.context); // some additional error context
|
|
172
171
|
});
|
|
173
172
|
};
|
|
174
173
|
#GetTLSOptions = () => {
|
|
@@ -196,7 +195,7 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
196
195
|
this.#httpServer.listen(this.options.listenPort, () => {
|
|
197
196
|
//@@chmodSync(this.options.port, 511);
|
|
198
197
|
}).on('listening', () => {
|
|
199
|
-
this.
|
|
198
|
+
this.LogInfoMessage(`live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
|
|
200
199
|
});
|
|
201
200
|
};
|
|
202
201
|
#SetupTCPRawServer = async () => {
|
|
@@ -205,7 +204,7 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
205
204
|
this.#httpServer.listen(this.options.listenPort, 'stscore.stsmda.org', () => {
|
|
206
205
|
this.LogInfoMessage('TCP Server is running on port ' + this.options.listenPort + '.');
|
|
207
206
|
}).on('listening', () => {
|
|
208
|
-
this.
|
|
207
|
+
this.LogInfoMessage(`TCP live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
|
|
209
208
|
});
|
|
210
209
|
};
|
|
211
210
|
#SetupJSONRPCServer = async () => {
|
|
@@ -219,7 +218,7 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
219
218
|
this.#httpServer.listen(this.options.listenPort, 'stscore.stsmda.org', () => {
|
|
220
219
|
this.LogInfoMessage('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
|
|
221
220
|
}).on('listening', () => {
|
|
222
|
-
this.
|
|
221
|
+
this.LogInfoMessage(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
|
|
223
222
|
});
|
|
224
223
|
};
|
|
225
224
|
ProcessTerminating = async () => {
|
|
@@ -242,18 +241,18 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
242
241
|
await this.ProcessTerminating();
|
|
243
242
|
if (!this.options.clusterMode) {
|
|
244
243
|
if (this.GetUIController() !== null) {
|
|
245
|
-
this.
|
|
244
|
+
this.LogInfoMessage('Destroy the user interface controller.');
|
|
246
245
|
this.GetUIController().DestroyUI();
|
|
247
246
|
}
|
|
248
247
|
if (signal) {
|
|
249
|
-
this.
|
|
248
|
+
this.LogInfoMessage(this.GetSignalColour(signal)(`Main Process (singleprocess): ${process.pid} received signal: ${signal}`));
|
|
250
249
|
}
|
|
251
250
|
else {
|
|
252
|
-
this.
|
|
251
|
+
this.LogInfoMessage(this.GetSignalColour(null)(`Main Process (singleprocess): ${process.pid} received Terminate without signal.`));
|
|
253
252
|
}
|
|
254
253
|
}
|
|
255
254
|
if (this.options.wssServer === true && this.#io !== null) {
|
|
256
|
-
this.
|
|
255
|
+
this.LogInfoMessage(`Disconnect Sockets.`);
|
|
257
256
|
if (this.socketIoServerHelper !== null) {
|
|
258
257
|
this.socketIoServerHelper.DisconnectSockets();
|
|
259
258
|
}
|
|
@@ -267,31 +266,31 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
267
266
|
if (this.#httpServer) {
|
|
268
267
|
if (this.options.serverType === processoptions_1.STSServerType.TCPRAW_TLS) {
|
|
269
268
|
this.#sockets.forEach((socket, index, array) => {
|
|
270
|
-
this.
|
|
269
|
+
this.LogInfoMessage(chalk_1.default.yellow(`TCP Socket destroy, remote address: [${socket.remoteAddress}], remote port: [${socket.remotePort}]`));
|
|
271
270
|
socket.destroy();
|
|
272
271
|
//socket.end();
|
|
273
272
|
});
|
|
274
273
|
}
|
|
275
|
-
this.
|
|
274
|
+
this.LogInfoMessage(`Closing httpServer.`);
|
|
276
275
|
await this.#httpServer.close();
|
|
277
276
|
}
|
|
278
277
|
if (this.options.useDatabase) {
|
|
279
|
-
this.
|
|
278
|
+
this.LogInfoMessage(`Ending database connections and pools.`);
|
|
280
279
|
await this.TerminateDatabase();
|
|
281
280
|
//await this.accessLayer.enddatabase();
|
|
282
281
|
}
|
|
283
282
|
if (this.options.clusterMode) {
|
|
284
|
-
this.
|
|
283
|
+
this.LogInfoMessage(`Performing exit value: [${clusterPerformExit}]`);
|
|
285
284
|
if (clusterPerformExit) {
|
|
286
|
-
this.
|
|
285
|
+
this.LogInfoMessage(`Process will self terminate with process.exit(0).`);
|
|
287
286
|
}
|
|
288
287
|
else {
|
|
289
|
-
this.
|
|
288
|
+
this.LogInfoMessage(`Child process will not self terminate. Terminate will be handled by master process.`);
|
|
290
289
|
}
|
|
291
290
|
}
|
|
292
291
|
//if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {
|
|
293
292
|
if (this.InstrumentController) {
|
|
294
|
-
this.
|
|
293
|
+
this.LogInfoMessage(`Ending publisher.`);
|
|
295
294
|
setTimeout(() => {
|
|
296
295
|
//if (this.InstrumentController && this.InstrumentController.Workers.length > 0) {
|
|
297
296
|
if (this.InstrumentController) {
|
|
@@ -315,17 +314,17 @@ class ServerProcessBase extends processbase_1.ProcessBase {
|
|
|
315
314
|
else {
|
|
316
315
|
if (this.options.processExitOnTerminate && this.options.processExitOnTerminate === true) {
|
|
317
316
|
setTimeout(() => {
|
|
318
|
-
this.
|
|
317
|
+
this.LogInfoMessage(`Performing process.exit(0).`);
|
|
319
318
|
process.exit(0);
|
|
320
319
|
}, this.#masterProcessExitTime); // Give the workers time to terminate gracefully
|
|
321
320
|
}
|
|
322
321
|
else {
|
|
323
|
-
this.
|
|
322
|
+
this.LogInfoMessage(`Performing process.exit(0) - Immediate.`);
|
|
324
323
|
}
|
|
325
324
|
}
|
|
326
325
|
}
|
|
327
326
|
else {
|
|
328
|
-
this.
|
|
327
|
+
this.LogInfoMessage(`Process already terminating.`);
|
|
329
328
|
}
|
|
330
329
|
};
|
|
331
330
|
SetupSTSServer = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverprocessbase.js","sourceRoot":"","sources":["../src/serverprocessbase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serverprocessbase.js","sourceRoot":"","sources":["../src/serverprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,8 +78,8 @@ class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
78
78
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
79
79
|
this.expressServer = new server_1.STSExpressServer(this.options, this);
|
|
80
80
|
}
|
|
81
|
-
this.
|
|
82
|
-
this.
|
|
81
|
+
this.LogInfoMessage(`Service instance starting. Instance Id: [${this.options.serviceInstanceId}]`);
|
|
82
|
+
this.LogInfoMessage(`Master process:${process.pid} started`);
|
|
83
83
|
this.LogSystemTelemetry();
|
|
84
84
|
process.on('SIGINT', async () => {
|
|
85
85
|
await this.Terminate(false, 'SIGINT');
|
|
@@ -89,15 +89,15 @@ class SingleProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
89
89
|
});
|
|
90
90
|
process.on('exit', (code) => {
|
|
91
91
|
if (code === 0) {
|
|
92
|
-
this.
|
|
92
|
+
this.LogInfoMessage(chalk_1.default.green(`Main Process: ${process.pid} terminated gracefully with code: ${code}`));
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
95
|
-
this.
|
|
95
|
+
this.LogInfoMessage(chalk_1.default.red(`Main Process: ${process.pid} terminated with code: ${code}`));
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
await this.SetupSTSServer();
|
|
99
99
|
this.ProcessStarted();
|
|
100
|
-
this.
|
|
100
|
+
this.LogInfoMessage(chalk_1.default.green(`Main process:${process.pid} started`));
|
|
101
101
|
};
|
|
102
102
|
async TerminateApplication() {
|
|
103
103
|
await this.Terminate(false, 'SIGINT');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAA0B;AAE1B,oEAAiH;AAKjH,qCAA2C;AAC3C,2DAAuD;AAEvD,0EAAkC,CAAC,gCAAgC;AAEnE,2EAAuE;AAIvE,MAAa,iBAAkB,SAAQ,qCAAiB;IAEpD;;;OAGA;IACA,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAEQ,0BAA0B;QAC/B,MAAM,aAAa,GAAG;YAClB,WAAW,EAAE,aAAa;SAC7B,CAAA;QACD,2BAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,qBAAqB,EAAE;gBAC/C,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;aACR,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,wBAAwB;QAC7B,OAAO;YACH,CAAE,0BAAK,CAAC,qBAAqB,EAAE,+BAAU,CAAC,gBAAgB,EAAE;oBACxD,QAAQ,EAAE,QAAQ,CAAC,kCAAkC;oBACrD,UAAU,EAAE,QAAQ,CAAC,yBAAyB;iBACvB,CAAC;SAC/B,CAAA;IACL,CAAC;IAED;;;OAGA;IACS,eAAe;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,MAAM,SAAS,GAAG,IAAI,qDAAyB,CAAC;YAC5C,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QACH,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,WAAW;QAEP,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC;gBACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,UAAU,CAAC,KAAK,IAAI,EAAE;oBAClB,IAAI,CAAC;wBACD,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,MAAM,CAAC,KAAK,CAAC,CAAC;oBAClB,CAAC;gBACL,CAAC,EAAE,GAAG,CAAC,CAAC;YACZ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;YACzF,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAA0B;AAE1B,oEAAiH;AAKjH,qCAA2C;AAC3C,2DAAuD;AAEvD,0EAAkC,CAAC,gCAAgC;AAEnE,2EAAuE;AAIvE,MAAa,iBAAkB,SAAQ,qCAAiB;IAEpD;;;OAGA;IACA,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAEQ,0BAA0B;QAC/B,MAAM,aAAa,GAAG;YAClB,WAAW,EAAE,aAAa;SAC7B,CAAA;QACD,2BAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC9B,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,qBAAqB,EAAE;gBAC/C,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;aACR,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,wBAAwB;QAC7B,OAAO;YACH,CAAE,0BAAK,CAAC,qBAAqB,EAAE,+BAAU,CAAC,gBAAgB,EAAE;oBACxD,QAAQ,EAAE,QAAQ,CAAC,kCAAkC;oBACrD,UAAU,EAAE,QAAQ,CAAC,yBAAyB;iBACvB,CAAC;SAC/B,CAAA;IACL,CAAC;IAED;;;OAGA;IACS,eAAe;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,MAAM,SAAS,GAAG,IAAI,qDAAyB,CAAC;YAC5C,MAAM,EAAE,IAAI;SACf,CAAC,CAAC;QACH,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,WAAW;QAEP,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC;gBACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC5B,UAAU,CAAC,KAAK,IAAI,EAAE;oBAClB,IAAI,CAAC;wBACD,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;wBAC3B,OAAO,CAAC,IAAI,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACb,MAAM,CAAC,KAAK,CAAC,CAAC;oBAClB,CAAC;gBACL,CAAC,EAAE,GAAG,CAAC,CAAC;YACZ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE,CAAC;YACzF,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,4CAA4C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QACnG,IAAI,CAAC,cAAc,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC;QAE7D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAC7B,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACb,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,KAAK,CAAC,iBAAiB,OAAO,CAAC,GAAG,qCAAqC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9G,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,GAAG,0BAA0B,IAAI,EAAE,CAAC,CAAC,CAAC;YACjG,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,KAAK,CAAC,gBAAgB,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAA;IAED,KAAK,CAAC,oBAAoB;QAEtB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEQ,kBAAkB,GAAG,KAAK,IAAmB,EAAE;QACpD,OAAO;IACX,CAAC,CAAA;CACJ;AA7GD,8CA6GC"}
|
|
@@ -267,7 +267,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
267
267
|
server.listen(this.#serverPort, () => {
|
|
268
268
|
this.#LogInfoMessage('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
|
|
269
269
|
}).on('listening', () => {
|
|
270
|
-
this.
|
|
270
|
+
this.LogInfoMessage(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
|
|
271
271
|
});
|
|
272
272
|
return server;
|
|
273
273
|
};
|
|
@@ -449,12 +449,12 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
449
449
|
}, this.#electionTimeout).unref();
|
|
450
450
|
};
|
|
451
451
|
#StartRAFTService = async () => {
|
|
452
|
-
this.
|
|
452
|
+
this.LogInfoMessage(chalk_1.default.green(`---[ RAFT Protocol Starting ]---`));
|
|
453
453
|
this.#server = await this.#SetupJSONRPCServer();
|
|
454
454
|
this.#StartElectionTimeout();
|
|
455
455
|
};
|
|
456
456
|
#ChangeState(newState) {
|
|
457
|
-
this.
|
|
457
|
+
this.LogInfoMessage(chalk_1.default.magenta(`${this.#GetLogPrefix()}: State Change, From: [${this.#RAFTState.toString()}] --> To: [${newState.toString()}]`));
|
|
458
458
|
this.#RAFTState = newState;
|
|
459
459
|
}
|
|
460
460
|
MasterStarted() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"appmaster.js","sourceRoot":"","sources":["../../src/tcpserver/appmaster.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,7 +115,7 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
115
115
|
if (this.options.expressServerRouteFactory || this.options.expressServerRouteStaticFactory) {
|
|
116
116
|
this.expressServer = new server_1.STSExpressServer(this.options, this);
|
|
117
117
|
}
|
|
118
|
-
this.
|
|
118
|
+
this.LogInfoMessage(`Worker instance starting. Service instance Id: [${this.options.serviceInstanceId}]`);
|
|
119
119
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
120
120
|
process.on('message', async (msg) => {
|
|
121
121
|
if (msg.requestResponse) {
|
|
@@ -139,15 +139,15 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
139
139
|
{
|
|
140
140
|
switch (msg.command) {
|
|
141
141
|
case 'Terminate':
|
|
142
|
-
this.
|
|
142
|
+
this.LogInfoMessage(chalk_1.default.grey(`Received ` + chalk_1.default.bold.italic(`Terminate`) + ` message from master thread`));
|
|
143
143
|
await this.Terminate(true, false); // Don't kill the child process here, the master will take care of that ...
|
|
144
144
|
break;
|
|
145
145
|
case 'TerminateAndKill':
|
|
146
|
-
this.
|
|
146
|
+
this.LogInfoMessage(chalk_1.default.grey(`Received ` + chalk_1.default.bold.italic(`Terminate`) + ` message from master thread`));
|
|
147
147
|
await this.Terminate(true, true);
|
|
148
148
|
break;
|
|
149
149
|
case 'Message':
|
|
150
|
-
//this.
|
|
150
|
+
//this.LogInfoMessage(chalk.grey(`Received ` + chalk.bold.italic(`Message`) + ` message from master thread`));
|
|
151
151
|
this.ReceivedMessageFromMaster(msg.data);
|
|
152
152
|
break;
|
|
153
153
|
case 'Response': // General response to a req/response interaction
|
|
@@ -158,16 +158,16 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
158
158
|
// Signal Codes
|
|
159
159
|
// https://en.wikipedia.org/wiki/Signal_(IPC)
|
|
160
160
|
process.on('SIGTERM', async () => {
|
|
161
|
-
this.
|
|
161
|
+
this.LogInfoMessage(`SIGTERM signal received for worker: ${process.pid}`);
|
|
162
162
|
await this.Terminate(true, true);
|
|
163
163
|
});
|
|
164
164
|
process.on('SIGINT', async () => {
|
|
165
|
-
this.
|
|
165
|
+
this.LogInfoMessage(`SIGINT signal received for worker: ${process.pid}`);
|
|
166
166
|
await this.Terminate(true, true);
|
|
167
167
|
});
|
|
168
168
|
await this.SetupSTSServer();
|
|
169
169
|
this.WorkerStarted();
|
|
170
|
-
this.
|
|
170
|
+
this.LogInfoMessage(chalk_1.default.green(`Worker process:${process.pid} started`));
|
|
171
171
|
};
|
|
172
172
|
}
|
|
173
173
|
exports.WorkerProcessBase = WorkerProcessBase;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/authutilsnode.ts
CHANGED
|
@@ -9,9 +9,7 @@ import axios from 'axios';
|
|
|
9
9
|
import { $Options } from '@nsshunt/stsconfig'
|
|
10
10
|
const goptions = $Options()
|
|
11
11
|
|
|
12
|
-
import
|
|
13
|
-
|
|
14
|
-
import { GetErrorPayload, JSONObject } from '@nsshunt/stsutils'
|
|
12
|
+
import { GetErrorPayload, ISTSLogger, JSONObject } from '@nsshunt/stsutils'
|
|
15
13
|
|
|
16
14
|
import { AppFrameworkErrorCode } from './validation/errors'
|
|
17
15
|
|
|
@@ -54,18 +52,28 @@ export interface IGetAPITokenFromAuthServerUsingScopeOptions {
|
|
|
54
52
|
instrumentController?: PublishInstrumentControllerV2
|
|
55
53
|
}
|
|
56
54
|
|
|
55
|
+
export interface IAuthUtilsNodeOptions {
|
|
56
|
+
logger: ISTSLogger
|
|
57
|
+
}
|
|
58
|
+
|
|
57
59
|
export class AuthUtilsNode
|
|
58
60
|
{
|
|
61
|
+
#options: IAuthUtilsNodeOptions
|
|
59
62
|
#cookiejar: tough.CookieJar;
|
|
60
63
|
#httpsAgent: https.Agent | null = null;
|
|
61
|
-
#debug = debugModule(`proc:${process.pid}:AuthUtilsNode`);
|
|
62
64
|
// Regular expression to match the origin
|
|
63
65
|
#originRegex = /^(api:\/\/\w+)/;
|
|
64
66
|
|
|
65
|
-
constructor() {
|
|
67
|
+
constructor(options: IAuthUtilsNodeOptions) {
|
|
68
|
+
this.#options = options;
|
|
66
69
|
this.#cookiejar = new tough.CookieJar();
|
|
67
70
|
}
|
|
68
71
|
|
|
72
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
73
|
+
#LogDebugMessage(message: any) {
|
|
74
|
+
this.#options.logger.debug(message);
|
|
75
|
+
}
|
|
76
|
+
|
|
69
77
|
#GetHttpsAgent = () =>
|
|
70
78
|
{
|
|
71
79
|
if (this.#httpsAgent === null) {
|
|
@@ -213,7 +221,7 @@ export class AuthUtilsNode
|
|
|
213
221
|
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
214
222
|
|
|
215
223
|
const invokeErrorCb = (error: Error) => {
|
|
216
|
-
this.#
|
|
224
|
+
this.#LogDebugMessage(error);
|
|
217
225
|
if (instrumentController) {
|
|
218
226
|
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, { // auth error
|
|
219
227
|
Inc: 1
|
|
@@ -276,7 +284,7 @@ export class AuthUtilsNode
|
|
|
276
284
|
if (retVal.status) {
|
|
277
285
|
if (retVal.status !== 200) {
|
|
278
286
|
// Just provide a warning here
|
|
279
|
-
this.#
|
|
287
|
+
this.#LogDebugMessage(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
|
|
280
288
|
}
|
|
281
289
|
} else {
|
|
282
290
|
invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
package/src/commonTypes.ts
CHANGED
|
@@ -39,7 +39,6 @@ export interface IProcessBase extends STSOptionsBase {
|
|
|
39
39
|
UpdateInstrument: (instrumentName: Gauge, telemetry: InstrumentBaseTelemetry) => void
|
|
40
40
|
get InstrumentController(): PublishInstrumentControllerV2 | null
|
|
41
41
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
42
|
-
LogEx: (message: any) => void
|
|
43
42
|
LogErrorMessage(message: any): void
|
|
44
43
|
LogInfoMessage(message: any): void
|
|
45
44
|
LogMessageToLoggerInstrument(message: any): void
|