@nsshunt/stsappframework 3.1.131 → 3.1.133
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/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/ipcMessageHandler.js +1 -1
- package/dist/ipcMessageManager.js +1 -24
- package/dist/ipcMessageManager.js.map +1 -1
- package/dist/ipcMessageProcessorPrimary.js +1 -1
- package/dist/masterprocessbase.js +15 -0
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/redisMessageHandler.js +57 -121
- package/dist/redisMessageHandler.js.map +1 -1
- package/dist/testing/app.js +61 -21
- package/dist/testing/app.js.map +1 -1
- package/dist/workerprocessbase.js +23 -13
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +1 -1
- package/runtest2.sh +1 -1
- package/src/index.ts +1 -0
- package/src/ipcMessageHandler.ts +1 -1
- package/src/ipcMessageManager.ts +1 -29
- package/src/ipcMessageProcessorPrimary.ts +1 -1
- package/src/masterprocessbase.ts +19 -1
- package/src/redisMessageHandler.ts +74 -129
- package/src/testing/app.ts +73 -25
- package/src/workerprocessbase.ts +22 -12
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
- package/types/ipcMessageManager.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/redisMessageHandler.d.ts +16 -1
- package/types/redisMessageHandler.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts +2 -1
- package/types/workerprocessbase.d.ts.map +1 -1
package/dist/testing/app.js
CHANGED
|
@@ -90,7 +90,7 @@ const StartTestWorker = () => {
|
|
|
90
90
|
const w1 = new ipcMessageProcessorWorker_1.IPCMessageProcessorWorker({
|
|
91
91
|
logger: stsutils_1.defaultLogger,
|
|
92
92
|
namespace: 'test1',
|
|
93
|
-
requestResponseMessageTimeout:
|
|
93
|
+
requestResponseMessageTimeout: 5000,
|
|
94
94
|
processPayload: async (payload) => {
|
|
95
95
|
return {
|
|
96
96
|
msg1: `From WORKER: [${process.pid}]`,
|
|
@@ -102,7 +102,7 @@ const StartTestWorker = () => {
|
|
|
102
102
|
const w2 = new ipcMessageProcessorWorker_1.IPCMessageProcessorWorker({
|
|
103
103
|
logger: stsutils_1.defaultLogger,
|
|
104
104
|
namespace: 'test2',
|
|
105
|
-
requestResponseMessageTimeout:
|
|
105
|
+
requestResponseMessageTimeout: 5000,
|
|
106
106
|
processPayload: async (payload) => {
|
|
107
107
|
return {
|
|
108
108
|
msg2: `From WORKER: [${process.pid}]`,
|
|
@@ -114,7 +114,7 @@ const StartTestWorker = () => {
|
|
|
114
114
|
const w3 = new ipcMessageProcessorWorker_1.IPCMessageProcessorWorker({
|
|
115
115
|
logger: stsutils_1.defaultLogger,
|
|
116
116
|
namespace: 'zzz',
|
|
117
|
-
requestResponseMessageTimeout:
|
|
117
|
+
requestResponseMessageTimeout: 5000,
|
|
118
118
|
processPayload: async (payload) => {
|
|
119
119
|
switch (payload.requestPayload.cmd) {
|
|
120
120
|
case 'cmd1':
|
|
@@ -235,6 +235,14 @@ if (node_cluster_1.default.isPrimary) {
|
|
|
235
235
|
new __1.MasterProcessBase((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
|
|
236
236
|
//StartTestPrimary();
|
|
237
237
|
LogSystemTelemetry();
|
|
238
|
+
const stsServiceControl = new redisMessageHandler_1.RedisMessageHandler({
|
|
239
|
+
logger: stsutils_1.defaultLogger,
|
|
240
|
+
role: 'SERVER',
|
|
241
|
+
redisUrl: stsconfig_1.goptions.imRedisMessageProcessorUrl,
|
|
242
|
+
namespace: 'stsServiceControl',
|
|
243
|
+
groups: []
|
|
244
|
+
});
|
|
245
|
+
stsServiceControl.Start();
|
|
238
246
|
setTimeout(() => {
|
|
239
247
|
const p = {};
|
|
240
248
|
/*
|
|
@@ -285,31 +293,47 @@ if (node_cluster_1.default.isPrimary) {
|
|
|
285
293
|
groups: []
|
|
286
294
|
});
|
|
287
295
|
r1.Start();
|
|
296
|
+
const RunTest = async (eventName, emitobj) => {
|
|
297
|
+
const start = performance.now();
|
|
298
|
+
try {
|
|
299
|
+
const response = await r1.emitex(eventName, emitobj);
|
|
300
|
+
const duration = performance.now() - start;
|
|
301
|
+
console.log(chalk_1.default.cyan(`${process.pid}: Duration: ${duration} Test: [test1] Response(${chalk_1.default.bold(eventName)}): [${JSON.stringify(response)}]`));
|
|
302
|
+
}
|
|
303
|
+
catch (error) {
|
|
304
|
+
const duration = performance.now() - start;
|
|
305
|
+
console.log(chalk_1.default.cyan(`${process.pid}: Duration: ${duration} Test: [test1] Response(${chalk_1.default.bold(eventName)}): Error: [${JSON.stringify(error)}]`));
|
|
306
|
+
}
|
|
307
|
+
};
|
|
288
308
|
let i = 0;
|
|
289
309
|
let group = '';
|
|
310
|
+
const maxIterations = 20;
|
|
290
311
|
const xxx = () => {
|
|
291
312
|
setTimeout(() => {
|
|
292
313
|
i++;
|
|
314
|
+
if (i > maxIterations) {
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
317
|
+
console.log(chalk_1.default.yellow(`Iteration: [${i}]`));
|
|
293
318
|
if (i % 2 === 0) {
|
|
294
319
|
group = 'even';
|
|
295
320
|
}
|
|
296
321
|
else {
|
|
297
322
|
group = 'odd';
|
|
298
323
|
}
|
|
299
|
-
const
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
console.log(
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
}, 2000);
|
|
324
|
+
const promArray = [];
|
|
325
|
+
const start = performance.now();
|
|
326
|
+
promArray.push(RunTest('fromprimaryredis', { group, i: i, a: 'a', b: 'b' }), RunTest('fromprimaryredis', { group: '2', i: i, a: 'a', b: 'b' }), RunTest('fromprimaryredis', { group: '4', i: i, a: 'a', b: 'b' }), RunTest('globalmessage', { i: i, a: 'a', b: 'b' }));
|
|
327
|
+
(async () => {
|
|
328
|
+
await Promise.all(promArray);
|
|
329
|
+
const duration = performance.now() - start;
|
|
330
|
+
console.log(chalk_1.default.green(`${process.pid}: Duration: ${duration} Test: [All Tests Run]`));
|
|
331
|
+
console.log();
|
|
332
|
+
xxx();
|
|
333
|
+
})();
|
|
334
|
+
}, 250);
|
|
311
335
|
};
|
|
312
|
-
xxx();
|
|
336
|
+
setTimeout(() => xxx(), 1000);
|
|
313
337
|
/*
|
|
314
338
|
const r1: RedisMessageHandler = new RedisMessageHandler({
|
|
315
339
|
logger: defaultLogger,
|
|
@@ -340,7 +364,19 @@ if (node_cluster_1.default.isPrimary) {
|
|
|
340
364
|
|
|
341
365
|
}, 1000);
|
|
342
366
|
*/
|
|
343
|
-
},
|
|
367
|
+
}, 2000);
|
|
368
|
+
const ListClients = () => {
|
|
369
|
+
setTimeout(() => {
|
|
370
|
+
Object.values(stsServiceControl.clients).forEach(c => {
|
|
371
|
+
console.log(chalk_1.default.gray(`client id: [${c.id}]`));
|
|
372
|
+
console.log(chalk_1.default.gray(`client groups: [${c.groups}]`));
|
|
373
|
+
console.log(chalk_1.default.gray(`client pingCount: [${c.pingCount}]`));
|
|
374
|
+
console.log(chalk_1.default.gray(`client serviceProcessContext: [${JSON.stringify(c.serviceProcessContext)}]`));
|
|
375
|
+
});
|
|
376
|
+
ListClients();
|
|
377
|
+
}, 1000).unref();
|
|
378
|
+
};
|
|
379
|
+
ListClients();
|
|
344
380
|
}
|
|
345
381
|
else {
|
|
346
382
|
new appWorkerWSS_1.WorkerProcess((0, appConfig_1.ServiceConfigOptions)(true, node_cluster_1.default.isPrimary)).SetupServer();
|
|
@@ -353,22 +389,26 @@ else {
|
|
|
353
389
|
else {
|
|
354
390
|
group = 'odd';
|
|
355
391
|
}
|
|
392
|
+
let workerId = '0';
|
|
393
|
+
if (node_cluster_1.default.worker) {
|
|
394
|
+
console.log(chalk_1.default.blue(`Worker: [${node_cluster_1.default.worker?.id}]`));
|
|
395
|
+
workerId = node_cluster_1.default.worker?.id.toString();
|
|
396
|
+
}
|
|
356
397
|
const r1 = new redisMessageHandler_1.RedisMessageHandler({
|
|
357
398
|
logger: stsutils_1.defaultLogger,
|
|
358
399
|
role: 'CLIENT',
|
|
359
400
|
redisUrl: stsconfig_1.goptions.imRedisMessageProcessorUrl,
|
|
360
401
|
namespace: 'mytestapp',
|
|
361
|
-
groups: [group]
|
|
402
|
+
groups: [group, workerId],
|
|
403
|
+
ignoreEvents: ['ping']
|
|
362
404
|
});
|
|
363
405
|
r1.Start();
|
|
364
406
|
r1.on('fromprimaryredis', (arg1, callback) => {
|
|
365
|
-
console.log(chalk_1.default.greenBright(` -->> ${process.pid}: fromprimaryredis.ON: [${JSON.stringify(arg1)}]`));
|
|
366
407
|
callback({
|
|
367
408
|
status: `PID: [${process.pid}]: response message from event = fromprimaryredis with args ${JSON.stringify(arg1)}`
|
|
368
409
|
});
|
|
369
410
|
});
|
|
370
411
|
r1.on('globalmessage', (arg1, callback) => {
|
|
371
|
-
console.log(chalk_1.default.greenBright(` -->> ${process.pid}: globalmessage.ON: [${JSON.stringify(arg1)}]`));
|
|
372
412
|
callback({
|
|
373
413
|
status: `PID: [${process.pid}]: response message from event = globalmessage with args ${JSON.stringify(arg1)}`
|
|
374
414
|
});
|
|
@@ -413,6 +453,6 @@ else {
|
|
|
413
453
|
}
|
|
414
454
|
}, 1000);
|
|
415
455
|
*/
|
|
416
|
-
},
|
|
456
|
+
}, 2000);
|
|
417
457
|
}
|
|
418
458
|
//# sourceMappingURL=app.js.map
|
package/dist/testing/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const server_1 = require("./server");
|
|
|
12
12
|
const serverprocessbase_1 = require("./serverprocessbase");
|
|
13
13
|
const uuid_1 = require("uuid");
|
|
14
14
|
const stsTransportLoggerWinston_1 = require("./stsTransportLoggerWinston");
|
|
15
|
+
const redisMessageHandler_1 = require("./redisMessageHandler");
|
|
15
16
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
16
17
|
const systeminformation_1 = __importDefault(require("systeminformation")); // https://systeminformation.io/
|
|
17
18
|
const network_1 = require("./network");
|
|
@@ -22,11 +23,10 @@ const network_1 = require("./network");
|
|
|
22
23
|
*/
|
|
23
24
|
class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
24
25
|
#inFlightMessage = {};
|
|
25
|
-
#requestResponseMessageTimeout =
|
|
26
|
+
#requestResponseMessageTimeout = 5000; //@@ config
|
|
26
27
|
#redisMessageHandler = null;
|
|
27
28
|
#redisMessageHandlerPing = 1000;
|
|
28
29
|
#pingTimeout = null;
|
|
29
|
-
#instanceId = (0, uuid_1.v4)();
|
|
30
30
|
constructor(options) {
|
|
31
31
|
super(options);
|
|
32
32
|
}
|
|
@@ -74,7 +74,7 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
74
74
|
setTimeout(() => {
|
|
75
75
|
delete this.#inFlightMessage[message.id];
|
|
76
76
|
}, 0).unref();
|
|
77
|
-
this.#LogDebugMessage(
|
|
77
|
+
//this.#LogDebugMessage(chalk.red(`Timeout has occurred after: [${this.#requestResponseMessageTimeout}]ms with message id: [${message.id}]. Details: [${JSON.stringify(this.#inFlightMessage[message.id].iPCMessagePayload)}]`));
|
|
78
78
|
reject('Did not receive response form parent process.');
|
|
79
79
|
}, this.#requestResponseMessageTimeout) // max message timeout allowed
|
|
80
80
|
};
|
|
@@ -165,7 +165,8 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
165
165
|
});
|
|
166
166
|
const dockerContainerStats = await Promise.all(promArray);
|
|
167
167
|
const sysInfo = {
|
|
168
|
-
|
|
168
|
+
serviceInstanceId: this.options.serviceInstanceId,
|
|
169
|
+
serviceProcessContext: this.options.serviceProcessContext,
|
|
169
170
|
hostname,
|
|
170
171
|
numCPUs,
|
|
171
172
|
hostaddr,
|
|
@@ -235,25 +236,34 @@ class WorkerProcessBase extends serverprocessbase_1.ServerProcessBase {
|
|
|
235
236
|
await this.Terminate(true, true);
|
|
236
237
|
});
|
|
237
238
|
await this.SetupSTSServer();
|
|
238
|
-
|
|
239
|
-
this.#redisMessageHandler = new RedisMessageHandler({
|
|
239
|
+
this.#redisMessageHandler = new redisMessageHandler_1.RedisMessageHandler({
|
|
240
240
|
logger: this.options.logger,
|
|
241
241
|
role: 'CLIENT',
|
|
242
|
-
redisUrl: goptions.imRedisMessageProcessorUrl,
|
|
242
|
+
redisUrl: stsconfig_1.goptions.imRedisMessageProcessorUrl,
|
|
243
243
|
namespace: 'stsServiceControl',
|
|
244
|
-
groups: [
|
|
244
|
+
groups: [],
|
|
245
|
+
ignoreEvents: ['ping'],
|
|
246
|
+
processOptions: this.options
|
|
245
247
|
});
|
|
246
248
|
this.#redisMessageHandler.Start();
|
|
247
|
-
|
|
249
|
+
/*
|
|
248
250
|
const ping = () => {
|
|
249
251
|
this.#pingTimeout = setTimeout(() => {
|
|
250
252
|
const pingData = {
|
|
251
|
-
|
|
253
|
+
group: 'stsServiceControlGroup',
|
|
254
|
+
serviceInstanceId: this.options.serviceInstanceId,
|
|
255
|
+
serviceName: this.options.serviceName,
|
|
256
|
+
serviceVersion: this.options.serviceVersion,
|
|
257
|
+
serviceProcessContext: this.options.serviceProcessContext
|
|
252
258
|
}
|
|
253
259
|
if (this.#redisMessageHandler) {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
260
|
+
try {
|
|
261
|
+
this.#redisMessageHandler.emit('ping_ex', pingData, (response: any) => {
|
|
262
|
+
console.log(chalk.cyan(` ==>> ${process.pid}: Response(ping): [${JSON.stringify(response)}]`));
|
|
263
|
+
});
|
|
264
|
+
} catch (error) {
|
|
265
|
+
console.log(`************************************************`)
|
|
266
|
+
}
|
|
257
267
|
}
|
|
258
268
|
ping();
|
|
259
269
|
}, this.#redisMessageHandlerPing).unref();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,gEAA2E;AAG3E,+CAAiH;AACjH,qCAA4C;AAC5C,2DAAuD;AAEvD,+BAAoC;AAEpC,2EAAuE;
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAE1B,gEAA2E;AAG3E,+CAAiH;AACjH,qCAA4C;AAC5C,2DAAuD;AAEvD,+BAAoC;AAEpC,2EAAuE;AAEvE,+DAA4D;AAE5D,kDAA6C;AAE7C,0EAAkC,CAAC,gCAAgC;AACnE,uCAAoD;AAEpD;;;;GAIG;AACH,MAAa,iBAAkB,SAAQ,qCAAiB;IAEpD,gBAAgB,GAAgB,EAAG,CAAA;IACnC,8BAA8B,GAAG,IAAI,CAAC,CAAC,WAAW;IAClD,oBAAoB,GAA+B,IAAI,CAAC;IACxD,wBAAwB,GAAW,IAAI,CAAC;IACxC,YAAY,GAA0B,IAAI,CAAC;IAE3C,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,aAAa;QACT,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,kGAAkG;IAClG,yBAAyB,CAAC,GAAQ;QAC9B,mCAAmC;IACvC,CAAC;IAEQ,0BAA0B;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACtD,+DAA+D;YAC/D,IAAI,CAAC,gBAAgB,CAAC,wBAAK,CAAC,sBAAsB,EAAE;gBAChD,GAAG,EAAE,KAAK;aACe,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,2BAA2B,GAAG,CAAC,OAA0B,EAAuB,EAAE;QAC9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,qBAAqB,OAAO,CAAC,EAAE,+DAA+D,CAAC,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG;oBAChC,iBAAiB,EAAE,EAAE,GAAG,OAAO,EAAE;oBACjC,EAAE,EAAE,GAAG,EAAE;wBACL,MAAM,MAAM,GAAe,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,cAA4B,CAAA;wBAC3G,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxD,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,2MAA2M;wBAC3M,OAAO,CAAC,MAAM,CAAC,CAAC;oBACpB,CAAC;oBACD,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;wBACrB,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,iOAAiO;wBACjO,MAAM,CAAC,+CAA+C,CAAC,CAAC;oBAC5D,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC,8BAA8B;iBACzE,CAAC;gBACF,+LAA+L;gBAC9L,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,+DAA+D;IAC/D,SAAS,GAAG,KAAK,EAAE,OAAY,EAAmB,EAAE;QAChD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE;gBACX,OAAO;aACV;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAA;IAED,+DAA+D;IAC/D,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAY,EAAuB,EAAE;QACzE,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,YAAY;YACvC,aAAa,EAAE;gBACX,OAAO;gBACP,QAAQ;aACX;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,uBAAuB,GAAG,KAAK,IAAyB,EAAE;QACtD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE,EAAG;SACrB,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,WAAW,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC,CAAA;IAED,UAAU,GAAG,KAAK,IAAqB,EAAE;QACrC,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,GAAG,EAAE,GAAG;SACX,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,2BAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,oBAAQ,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,oBAAQ,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,GAAG,oBAAQ,CAAC,OAAO,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,oBAAQ,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,CAAA;IAED,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;YACR,UAAU,EAAE,GAAG;YACf,oBAAoB;YACpB,gBAAgB,EAAE,GAAG;SACxB,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,2BAAE,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;QACzC,MAAM,QAAQ,GAAG,IAAA,kCAAwB,GAAE,CAAC;QAE5C,MAAM,SAAS,GAAmB,EAAG,CAAC;QAEtC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAmB,EAAE,EAAE;YACrD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,2BAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG;YACZ,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YACzD,QAAQ;YACR,OAAO;YACP,QAAQ;YACR,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,oBAAoB;SACvB,CAAA;QAED,OAAO,OAAO,CAAC;IACnB,CAAC,CAAA;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,mDAAmD,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAE1G,+DAA+D;QAC/D,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YACrC,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;gBACtB,MAAM,iBAAiB,GAAsB,GAAwB,CAAC;gBACtE,IAAI,iBAAiB,CAAC,EAAE,EAAE,CAAC;oBACvB,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC9C,MAAM,eAAe,GAAe,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;wBAChF,eAAe,CAAC,iBAAiB,CAAC,cAAc,GAAG,EAAE,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAA;wBAC1F,eAAe,CAAC,EAAE,EAAE,CAAC;oBACzB,CAAC;yBAAM,CAAC;wBACJ,MAAM,IAAI,KAAK,CAAC,qDAAqD,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;oBAClG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;gBAClG,CAAC;gBACD,OAAO;YACX,CAAC;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,cAAc;aAC/B,CAAC;gBACG,QAAQ,GAAG,CAAC,OAAO,EACnB,CAAC;oBACD,KAAK,WAAW;wBACZ,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBAC9G,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,2EAA2E;wBAC9G,MAAM;oBACV,KAAK,kBAAkB;wBACnB,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,IAAI,CAAC,WAAW,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,6BAA6B,CAAC,CAAC,CAAC;wBAC9G,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBACjC,MAAM;oBACV,KAAK,SAAS;wBACV,8GAA8G;wBAC9G,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACzC,MAAM;oBACV,KAAK,UAAU,EAAG,iDAAiD;wBAC/D,GAAG,CAAC,OAAO,CAAA;gBACf,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,eAAe;QACf,6CAA6C;QAC7C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAE7B,IAAI,CAAC,cAAc,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAE5B,IAAI,CAAC,cAAc,CAAC,sCAAsC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACzE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,CAAC,oBAAoB,GAAG,IAAI,yCAAmB,CAAC;YAChD,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC3B,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,oBAAQ,CAAC,0BAA0B;YAC7C,SAAS,EAAE,mBAAmB;YAC9B,MAAM,EAAE,EAAG;YACX,YAAY,EAAE,CAAE,MAAM,CAAE;YACxB,cAAc,EAAE,IAAI,CAAC,OAAO;SAC/B,CAAC,CAAC;QACH,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;QAElC;;;;;;;;;;;;;;;;;;;;;;;UAuBE;QAIF,gIAAgI;QAChI,yHAAyH;QACzH;;;;;;;kBAOU;QACV,aAAa;QAEb,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,cAAc,CAAC,eAAK,CAAC,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;IAEO,gBAAgB;QACrB,kCAAkC;QAClC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,oBAAoB,EAAE,IAAI,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC,gBAAgB,EAAE,CAAC;IACpC,CAAC;CACJ;AA/SD,8CA+SC"}
|
package/package.json
CHANGED
package/runtest2.sh
CHANGED
package/src/index.ts
CHANGED
package/src/ipcMessageHandler.ts
CHANGED
|
@@ -37,7 +37,7 @@ export class IPCMessageHandler extends TinyEmitter {
|
|
|
37
37
|
SetupPrimary = () => {
|
|
38
38
|
const ipcMessageManagerOptions: IPCMessageManagerOptions = {
|
|
39
39
|
logger: defaultLogger,
|
|
40
|
-
requestResponseMessageTimeout:
|
|
40
|
+
requestResponseMessageTimeout: 5000,
|
|
41
41
|
namespace: this.#options.namespace,
|
|
42
42
|
role: 'SERVER',
|
|
43
43
|
messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
|
package/src/ipcMessageManager.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
|
-
import chalk from 'chalk';
|
|
3
|
-
|
|
4
2
|
import { ISTSLogger, JSONObject } from '@nsshunt/stsutils'
|
|
5
3
|
|
|
6
4
|
import { v4 as uuidv4 } from 'uuid';
|
|
@@ -86,7 +84,7 @@ export class IPCMessageManager
|
|
|
86
84
|
startTime: performance.now(),
|
|
87
85
|
endTime: 0,
|
|
88
86
|
timeout: setTimeout(() => {
|
|
89
|
-
this.#LogDebugMessage(chalk.red(`Timeout has occurred after: [${this.#options.requestResponseMessageTimeout}]ms with message id: [${messageRecord.messageId}]. Details: [${JSON.stringify(this.#inflightMessages[messageRecord.messageId].requestPayload)}]`));
|
|
87
|
+
//this.#LogDebugMessage(chalk.red(`Timeout has occurred after: [${this.#options.requestResponseMessageTimeout}]ms with message id: [${messageRecord.messageId}]. Details: [${JSON.stringify(this.#inflightMessages[messageRecord.messageId].requestPayload)}]`));
|
|
90
88
|
setTimeout(() => {
|
|
91
89
|
delete this.#inflightMessages[messageRecord.messageId];
|
|
92
90
|
}, 0).unref();
|
|
@@ -101,36 +99,23 @@ export class IPCMessageManager
|
|
|
101
99
|
}
|
|
102
100
|
|
|
103
101
|
#ProcessMessage = async (msg: any, options: any): Promise<void> => {
|
|
104
|
-
//console.log(chalk.grey(`#ProcessMessage`));
|
|
105
102
|
if (msg.header && msg.header.localeCompare(this.#messageHeader) === 0) {
|
|
106
103
|
const message = (msg as IIPCMessageProcessorIPCPayload);
|
|
107
104
|
if (this.#inflightMessages[message.messageId]) {
|
|
108
105
|
const inFlightMessageRecord: IIPCMessageProcessorWorkerRecord = this.#inflightMessages[message.messageId];
|
|
109
106
|
inFlightMessageRecord.responses[message.senderId ] = { ...message };
|
|
110
107
|
let completed = true; // Defaults to true
|
|
111
|
-
|
|
112
|
-
//console.log(chalk.grey(`#ProcessMessage:2`));
|
|
113
|
-
|
|
114
108
|
if (this.#options.ProcessResponseMessage) {
|
|
115
|
-
|
|
116
|
-
if (msg.requestPayload.__eventName.localeCompare('ping') !== 0) {
|
|
117
|
-
console.log(chalk.grey(`#ProcessMessage:3: [${JSON.stringify(msg.requestPayload)}]`));
|
|
118
|
-
}
|
|
119
|
-
|
|
120
109
|
completed = await this.#options.ProcessResponseMessage(inFlightMessageRecord.responses, options);
|
|
121
110
|
if (completed) {
|
|
122
|
-
//console.log(chalk.grey(`#ProcessMessage:3.1`));
|
|
123
111
|
inFlightMessageRecord.endTime = performance.now();
|
|
124
112
|
clearTimeout(inFlightMessageRecord.timeout as NodeJS.Timer);
|
|
125
113
|
inFlightMessageRecord.callBack({
|
|
126
114
|
responsePayload: Object.values(inFlightMessageRecord.responses).map(r => r.responsePayload)
|
|
127
115
|
} as any, options) //
|
|
128
116
|
delete this.#inflightMessages[message.messageId];
|
|
129
|
-
|
|
130
|
-
//console.log(chalk.grey(`this.#inflightMessages.length = ${Object.keys(this.#inflightMessages).length}`));
|
|
131
117
|
}
|
|
132
118
|
} else if (completed) {
|
|
133
|
-
//console.log(chalk.grey(`#ProcessMessage:4`));
|
|
134
119
|
inFlightMessageRecord.endTime = performance.now();
|
|
135
120
|
clearTimeout(inFlightMessageRecord.timeout as NodeJS.Timer);
|
|
136
121
|
inFlightMessageRecord.callBack(message, options) // inFlightMessageRecord.responses
|
|
@@ -172,27 +157,14 @@ export class IPCMessageManager
|
|
|
172
157
|
let processMessage = true;
|
|
173
158
|
if (message.requestPayload.args.length > 0 && message.requestPayload.args[0].group) {
|
|
174
159
|
const group = message.requestPayload.args[0].group;
|
|
175
|
-
console.log(chalk.green(`${process.pid}:ProcessMessage(): Processor Options Groups: [${this.#options.groups}] request group: [${group}]`));
|
|
176
160
|
processMessage = (this.#options.groups.indexOf(group) === -1) ? false : true;
|
|
177
|
-
if (processMessage === false) {
|
|
178
|
-
console.log(chalk.red(`${process.pid}:ProcessMessage(): Skipping this message: Not in correct group: [${group}]`));
|
|
179
|
-
} else {
|
|
180
|
-
console.log(chalk.yellow(`${process.pid}:ProcessMessage(): Will process this message: [${group}]`));
|
|
181
|
-
}
|
|
182
161
|
}
|
|
183
|
-
|
|
184
162
|
if (processMessage) {
|
|
185
163
|
message.responsePayload = await this.#options.ProcessRequestMessage(message, options);
|
|
186
164
|
message.senderId = this.#id;
|
|
187
165
|
message.messageType = 'RESPONSE';
|
|
188
|
-
|
|
189
|
-
if (message.requestPayload.__eventName.localeCompare('ping') !== 0) {
|
|
190
|
-
console.log(chalk.grey(`${process.pid}:ProcessMessage(): Sending response: [${JSON.stringify(message.responsePayload)}]`));
|
|
191
|
-
}
|
|
192
|
-
|
|
193
166
|
this.#options.messageSender(message, options);
|
|
194
167
|
}
|
|
195
|
-
|
|
196
168
|
} else {
|
|
197
169
|
// Received a response (to my request)
|
|
198
170
|
this.#ProcessMessage(msg, options);
|
|
@@ -21,7 +21,7 @@ export class IPCMessageProcessorPrimary
|
|
|
21
21
|
constructor(classOptions: IIPCMessageProcessorPrimary) {
|
|
22
22
|
const ipcMessageManagerOptions: IPCMessageManagerOptions = {
|
|
23
23
|
logger: defaultLogger,
|
|
24
|
-
requestResponseMessageTimeout:
|
|
24
|
+
requestResponseMessageTimeout: 5000,
|
|
25
25
|
namespace: classOptions.namespace,
|
|
26
26
|
role: 'SERVER',
|
|
27
27
|
messageSender: (payload: IIPCMessageProcessorIPCPayload, options: any) => {
|
package/src/masterprocessbase.ts
CHANGED
|
@@ -28,7 +28,9 @@ import { InstrumentDefinitions } from '@nsshunt/stsobservability'
|
|
|
28
28
|
import { IPCMessagePayload, IPCMessageCommand } from './commonTypes'
|
|
29
29
|
|
|
30
30
|
import { STSTransportLoggerWinston } from './stsTransportLoggerWinston'
|
|
31
|
-
import { ISTSLogger } from "@nsshunt/stsutils";
|
|
31
|
+
import { ISTSLogger, JSONObject } from "@nsshunt/stsutils";
|
|
32
|
+
|
|
33
|
+
import { RedisMessageHandler } from './redisMessageHandler';
|
|
32
34
|
|
|
33
35
|
export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
34
36
|
{
|
|
@@ -614,6 +616,22 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
|
614
616
|
}, 1000).unref();
|
|
615
617
|
}
|
|
616
618
|
|
|
619
|
+
/*
|
|
620
|
+
const stsServiceControl: RedisMessageHandler = new RedisMessageHandler({
|
|
621
|
+
logger: this.options.logger,
|
|
622
|
+
role: 'SERVER',
|
|
623
|
+
redisUrl: goptions.imRedisMessageProcessorUrl,
|
|
624
|
+
namespace: 'stsServiceControl',
|
|
625
|
+
groups: [ 'stsServiceControlGroup' ]
|
|
626
|
+
});
|
|
627
|
+
stsServiceControl.Start();
|
|
628
|
+
|
|
629
|
+
stsServiceControl.on('ping_ex', (pingData: JSONObject, callback: any) => {
|
|
630
|
+
console.log(chalk.yellow(`${process.pid}: stsServiceControl.on(ping): [${JSON.stringify(pingData)}]`));
|
|
631
|
+
callback({pingData, dateTime: new Date().getTime()})
|
|
632
|
+
});
|
|
633
|
+
*/
|
|
634
|
+
|
|
617
635
|
this.MasterStarted();
|
|
618
636
|
|
|
619
637
|
this.LogInfoMessage(chalk.green(`Master process:${process.pid} started`));
|