@nsshunt/stsappframework 3.0.176 → 3.0.178
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.map +1 -1
- package/dist/influxdb/influxDBManager.js +12 -8
- package/dist/influxdb/influxDBManager.js.map +1 -1
- package/dist/influxdb/influxDBManagerAgent.js +12 -9
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/influxdb/influxDBManagerBase.js +6 -3
- package/dist/influxdb/influxDBManagerBase.js.map +1 -1
- package/dist/influxdb/influxDBManagerService.js +13 -10
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/dist/instrumentationsubscriber.js +26 -36
- package/dist/instrumentationsubscriber.js.map +1 -1
- package/dist/kafka/IMKafkaManager.js +10 -5
- package/dist/kafka/IMKafkaManager.js.map +1 -1
- package/dist/kafka/kafkaconsumer.js +11 -6
- package/dist/kafka/kafkaconsumer.js.map +1 -1
- package/dist/kafka/kafkamanager.js +15 -3
- package/dist/kafka/kafkamanager.js.map +1 -1
- package/dist/kafka/kafkaproducer.js +11 -6
- package/dist/kafka/kafkaproducer.js.map +1 -1
- package/dist/kafkatesting/consume.js +45 -24
- package/dist/kafkatesting/consume.js.map +1 -1
- package/dist/kafkatesting/produce.js +35 -17
- package/dist/kafkatesting/produce.js.map +1 -1
- package/dist/masterprocessbase.js +11 -2
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/processbase.js +46 -39
- package/dist/processbase.js.map +1 -1
- package/dist/processoptions.js.map +1 -1
- package/dist/publishertransports/publishTransportDirect.js +12 -5
- package/dist/publishertransports/publishTransportDirect.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/serverprocessbase.js +11 -11
- package/dist/serverprocessbase.js.map +1 -1
- package/dist/socketIoServerHelper.js +5 -5
- package/dist/socketIoServerHelper.js.map +1 -1
- package/dist/stslatencycontroller.js +1 -1
- package/dist/stslatencycontroller.js.map +1 -1
- package/dist/tcpclient/app.js +2 -1
- package/dist/tcpclient/app.js.map +1 -1
- package/dist/tcpclient/app2.js +7 -6
- package/dist/tcpclient/app2.js.map +1 -1
- package/dist/tcpserver/appConfig.js +24 -1
- package/dist/tcpserver/appConfig.js.map +1 -1
- package/dist/tcpserver/appmaster.js +33 -27
- package/dist/tcpserver/appmaster.js.map +1 -1
- package/dist/testing/app.js +14 -12
- package/dist/testing/app.js.map +1 -1
- package/dist/testing/appConfig.js +24 -1
- package/dist/testing/appConfig.js.map +1 -1
- package/dist/testing/appWorkerWSS.js +18 -12
- package/dist/testing/appWorkerWSS.js.map +1 -1
- package/dist/testing/appsolo.js +15 -13
- package/dist/testing/appsolo.js.map +1 -1
- package/dist/testing/singleservertest.test.js +11 -7
- package/dist/testing/singleservertest.test.js.map +1 -1
- package/dist/webworkertesting/app.js +8 -6
- package/dist/webworkertesting/app.js.map +1 -1
- package/dist/webworkertesting/worker.js +4 -2
- package/dist/webworkertesting/worker.js.map +1 -1
- package/package.json +8 -7
- package/src/commonTypes.ts +4 -4
- package/src/influxdb/influxDBManager.ts +14 -9
- package/src/influxdb/influxDBManagerAgent.ts +13 -9
- package/src/influxdb/influxDBManagerBase.ts +7 -3
- package/src/influxdb/influxDBManagerService.ts +14 -10
- package/src/instrumentationsubscriber.ts +29 -40
- package/src/kafka/IMKafkaManager.ts +16 -6
- package/src/kafka/kafkaconsumer.ts +20 -6
- package/src/kafka/kafkamanager.ts +16 -4
- package/src/kafka/kafkaproducer.ts +19 -6
- package/src/kafkatesting/consume.ts +55 -24
- package/src/kafkatesting/produce.ts +45 -17
- package/src/masterprocessbase.ts +15 -2
- package/src/processbase.ts +52 -45
- package/src/processoptions.ts +6 -0
- package/src/publishertransports/publishTransportDirect.ts +18 -5
- package/src/server.ts +2 -2
- package/src/serverprocessbase.ts +11 -11
- package/src/socketIoServerHelper.ts +5 -5
- package/src/stslatencycontroller.ts +1 -1
- package/src/tcpclient/app.ts +3 -1
- package/src/tcpclient/app2.ts +8 -6
- package/src/tcpserver/appConfig.ts +35 -1
- package/src/tcpserver/appmaster.ts +35 -27
- package/src/testing/app.ts +14 -12
- package/src/testing/appConfig.ts +35 -1
- package/src/testing/appWorkerWSS.ts +22 -14
- package/src/testing/appsolo.ts +16 -13
- package/src/testing/singleservertest.test.ts +13 -7
- package/src/webworkertesting/app.ts +9 -6
- package/src/webworkertesting/worker.ts +5 -2
- package/types/commonTypes.d.ts +4 -2
- package/types/commonTypes.d.ts.map +1 -1
- package/types/influxdb/influxDBManager.d.ts +2 -2
- package/types/influxdb/influxDBManager.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerBase.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
- package/types/instrumentationsubscriber.d.ts +2 -3
- package/types/instrumentationsubscriber.d.ts.map +1 -1
- package/types/kafka/IMKafkaManager.d.ts +5 -1
- package/types/kafka/IMKafkaManager.d.ts.map +1 -1
- package/types/kafka/kafkaconsumer.d.ts +8 -1
- package/types/kafka/kafkaconsumer.d.ts.map +1 -1
- package/types/kafka/kafkamanager.d.ts +2 -1
- package/types/kafka/kafkamanager.d.ts.map +1 -1
- package/types/kafka/kafkaproducer.d.ts +7 -1
- package/types/kafka/kafkaproducer.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/processbase.d.ts +2 -0
- package/types/processbase.d.ts.map +1 -1
- package/types/processoptions.d.ts +3 -0
- package/types/processoptions.d.ts.map +1 -1
- package/types/publishertransports/publishTransportDirect.d.ts +5 -1
- package/types/publishertransports/publishTransportDirect.d.ts.map +1 -1
- package/types/tcpserver/appConfig.d.ts.map +1 -1
- package/types/tcpserver/appmaster.d.ts.map +1 -1
- package/types/testing/appConfig.d.ts.map +1 -1
- package/types/testing/appWorkerWSS.d.ts +2 -2
- package/types/testing/appWorkerWSS.d.ts.map +1 -1
- package/types/testing/appsolo.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/tcpclient/app.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,oDAA2B;AAE3B,0EAA0E;AAC1E,mEAAmE;AACnE,MAAM,OAAO,GAA4B;IACrC,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,oBAAoB;CAC7B,CAAC;AAEF,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAE1C,kBAAkB;AAElB,eAAe;AACf,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAS,GAAQ,EAAE,QAAa;IAC1D,IAAG,GAAG;QAAE,MAAM,GAAG,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/tcpclient/app.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,oDAA2B;AAE3B,0EAA0E;AAC1E,mEAAmE;AACnE,MAAM,OAAO,GAA4B;IACrC,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,oBAAoB;CAC7B,CAAC;AAEF,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAE1C,MAAM,cAAc,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAE7D,kBAAkB;AAElB,eAAe;AACf,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAS,GAAQ,EAAE,QAAa;IAC1D,IAAG,GAAG;QAAE,MAAM,GAAG,CAAC;IAClB,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;AACzC,CAAC,CAAC,CAAC"}
|
package/dist/tcpclient/app2.js
CHANGED
|
@@ -12,13 +12,14 @@ const options = {
|
|
|
12
12
|
host: 'stscore.stsmda.org'
|
|
13
13
|
};
|
|
14
14
|
const done = [];
|
|
15
|
+
const LogInfoMessage = (message) => console.log(message);
|
|
15
16
|
const dosomework = (socket, index) => {
|
|
16
|
-
|
|
17
|
+
LogInfoMessage('Connected');
|
|
17
18
|
socket.write("Hello From Client " + JSON.stringify(socket.address()));
|
|
18
19
|
(async () => {
|
|
19
20
|
for (;;) {
|
|
20
21
|
const msg = `${new Date()}: Hello`;
|
|
21
|
-
|
|
22
|
+
LogInfoMessage(`sending: [${msg}]`);
|
|
22
23
|
socket.write(msg);
|
|
23
24
|
await (0, stsutils_1.Sleep)(1000);
|
|
24
25
|
if (done[index]) {
|
|
@@ -34,11 +35,11 @@ for (let i = 0; i < 6; i++) {
|
|
|
34
35
|
dosomework(socket1, i);
|
|
35
36
|
});
|
|
36
37
|
socket1.on('close', function (data) {
|
|
37
|
-
|
|
38
|
+
LogInfoMessage(chalk_1.default.yellow(`CLOSED: ${socket1.remoteAddress} ${socket1.remotePort}`));
|
|
38
39
|
done[i] = true;
|
|
39
40
|
});
|
|
40
41
|
socket1.on('data', function (data) {
|
|
41
|
-
|
|
42
|
+
LogInfoMessage(chalk_1.default.yellow(`DATA ${socket1.remoteAddress} ${socket1.remotePort} ${data}`));
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
45
|
/*
|
|
@@ -47,10 +48,10 @@ socket2.on('secureConnect', () => {
|
|
|
47
48
|
dosomework(socket2);
|
|
48
49
|
});
|
|
49
50
|
socket2.on('close', function(data: any) {
|
|
50
|
-
|
|
51
|
+
LogInfoMessage(chalk.green(`CLOSED: ${socket2.remoteAddress} ${socket2.remotePort}`));
|
|
51
52
|
});
|
|
52
53
|
socket2.on('data', function(data: any) {
|
|
53
|
-
|
|
54
|
+
LogInfoMessage(chalk.green(`DATA ${socket2.remoteAddress} ${socket2.remotePort} ${data}`));
|
|
54
55
|
});
|
|
55
56
|
*/
|
|
56
57
|
//# sourceMappingURL=app2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app2.js","sourceRoot":"","sources":["../../src/tcpclient/app2.ts"],"names":[],"mappings":";;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,8CAAsB;AACtB,gDAAyC;AAEzC,kDAA0B;AAE1B,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,oBAAoB;CAC7B,CAAC;AAEF,MAAM,IAAI,GAAc,EAAE,CAAC;AAE3B,MAAM,UAAU,GAAG,CAAC,MAAW,EAAE,KAAa,EAAE,EAAE;IAC9C,
|
|
1
|
+
{"version":3,"file":"app2.js","sourceRoot":"","sources":["../../src/tcpclient/app2.ts"],"names":[],"mappings":";;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,8CAAsB;AACtB,gDAAyC;AAEzC,kDAA0B;AAE1B,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,oBAAoB;CAC7B,CAAC;AAEF,MAAM,IAAI,GAAc,EAAE,CAAC;AAE3B,MAAM,cAAc,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAE7D,MAAM,UAAU,GAAG,CAAC,MAAW,EAAE,KAAa,EAAE,EAAE;IAC9C,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5B,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC,KAAK,IAAI,EAAE;QACR,SAAS,CAAC;YACN,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,SAAS,CAAC;YACnC,cAAc,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC;YAClB,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACd,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAA;AAED,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,aAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAS,IAAS;QAClC,cAAc,CAAC,eAAK,CAAC,MAAM,CAAC,WAAW,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,CAAC,CAAC,GAAC,IAAI,CAAC;IACjB,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAS,IAAS;QACjC,cAAc,CAAC,eAAK,CAAC,MAAM,CAAC,QAAQ,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;;;;;;;EAWE"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.ServiceConfigOptions = void 0;
|
|
4
7
|
const uuid_1 = require("uuid");
|
|
5
8
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
6
9
|
const goptions = (0, stsconfig_1.$Options)();
|
|
7
10
|
const index_1 = require("../index");
|
|
11
|
+
const winston_1 = __importDefault(require("winston"));
|
|
8
12
|
/*
|
|
9
13
|
// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion} | ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()} ^ ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
|
|
10
14
|
// <serviceId> <serviceInstanceId> <serviceInstanceProcessId>
|
|
@@ -23,6 +27,21 @@ ${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : p
|
|
|
23
27
|
}
|
|
24
28
|
*/
|
|
25
29
|
function ServiceConfigOptions(clusterMode, isMaster) {
|
|
30
|
+
winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple());
|
|
31
|
+
const logger = winston_1.default.createLogger({
|
|
32
|
+
level: 'silly',
|
|
33
|
+
format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple()),
|
|
34
|
+
transports: [
|
|
35
|
+
new winston_1.default.transports.Console()
|
|
36
|
+
]
|
|
37
|
+
});
|
|
38
|
+
const publisherLogger = winston_1.default.createLogger({
|
|
39
|
+
level: 'info',
|
|
40
|
+
format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple()),
|
|
41
|
+
transports: [
|
|
42
|
+
new winston_1.default.transports.Console()
|
|
43
|
+
]
|
|
44
|
+
});
|
|
26
45
|
if (isMaster === true) {
|
|
27
46
|
const serviceInstanceId = (0, uuid_1.v4)();
|
|
28
47
|
const data = {
|
|
@@ -48,12 +67,16 @@ function ServiceConfigOptions(clusterMode, isMaster) {
|
|
|
48
67
|
instrumentLogging: true,
|
|
49
68
|
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
50
69
|
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
51
|
-
useRedisAdaptor: false
|
|
70
|
+
useRedisAdaptor: false,
|
|
71
|
+
logger: logger,
|
|
72
|
+
publisherLogger: publisherLogger
|
|
52
73
|
};
|
|
53
74
|
return data;
|
|
54
75
|
}
|
|
55
76
|
else {
|
|
56
77
|
const data = JSON.parse(process.env['STS_GSD_SII']);
|
|
78
|
+
data.logger = logger;
|
|
79
|
+
data.publisherLogger = publisherLogger;
|
|
57
80
|
return data;
|
|
58
81
|
}
|
|
59
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/tcpserver/appConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/tcpserver/appConfig.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAoC;AAEpC,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,oCAAwD;AAExD,sDAA6B;AAE7B;;;;;;;;;;;;;;;;EAgBE;AAEF,SAAgB,oBAAoB,CAAC,WAAoB,EAAE,QAAiB;IACxE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAClB,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B,CAAC;IAEF,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;QAChC,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B;QACD,UAAU,EAAE;YACR,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;SACnC;KACJ,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,iBAAO,CAAC,YAAY,CAAC;QACzC,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B;QACD,UAAU,EAAE;YACR,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;SACnC;KACJ,CAAC,CAAC;IAEH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,iBAAiB,GAAG,IAAA,SAAM,GAAE,CAAC;QACnC,MAAM,IAAI,GAAmB;YACzB,UAAU,EAAE,qBAAa,CAAC,UAAU;YAEpC,WAAW,EAAE,WAAW;YACxB,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,KAAK;YACjB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,0BAA0B,EAAE,QAAQ,CAAC,mBAAmB;YACxD,sBAAsB,EAAE,IAAI;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,IAAI;YAEjB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ,CAAC,cAAc;YACjC,OAAO,EAAE,QAAQ,CAAC,aAAa;YAC/B,UAAU,EAAE,QAAQ,CAAC,cAAc;YACnC,IAAI,EAAE,QAAQ,CAAC,UAAU;YAEzB,iBAAiB,EAAE,KAAK;YACxB,qBAAqB,EAAE,QAAQ,CAAC,2BAA2B;YAE3D,WAAW,EAAE,QAAQ,CAAC,iBAAiB;YACvC,cAAc,EAAE,QAAQ,CAAC,oBAAoB;YAC7C,cAAc,EAAE,IAAI;YACpB,iBAAiB,EAAE,IAAI;YAEvB,kCAAkC,EAAE,QAAQ,CAAC,kCAAkC;YAC/E,yBAAyB,EAAE,QAAQ,CAAC,yBAAyB;YAE7D,eAAe,EAAE,KAAK;YAEtB,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,eAAe;SACnC,CAAA;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,GAAmB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAW,CAAmB,CAAC;QAChG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAvED,oDAuEC"}
|
|
@@ -74,6 +74,12 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
74
74
|
this.#electionTimeout = crypto_1.default.randomInt(this.#minElectionTimeout, this.#maxElectionTimeout);
|
|
75
75
|
this.#heartBeatTimeout = 750; //@@ config - also must be smaller than electionTimeout
|
|
76
76
|
}
|
|
77
|
+
#LogErrorMessage(message) {
|
|
78
|
+
this.options.logger.error(message);
|
|
79
|
+
}
|
|
80
|
+
#LogInfoMessage(message) {
|
|
81
|
+
this.options.logger.error(message);
|
|
82
|
+
}
|
|
77
83
|
#GetTLSOptions = () => {
|
|
78
84
|
return {
|
|
79
85
|
key: fs_1.default.readFileSync(this.options.httpsServerKeyPath),
|
|
@@ -81,12 +87,12 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
81
87
|
};
|
|
82
88
|
};
|
|
83
89
|
#SetupRPCServer = async (socket) => {
|
|
84
|
-
|
|
85
|
-
socket.on('close',
|
|
86
|
-
|
|
90
|
+
this.#LogInfoMessage('CONNECTED: ' + socket.remoteAddress + ':' + socket.remotePort + ' ' + process.pid);
|
|
91
|
+
socket.on('close', (data) => {
|
|
92
|
+
this.#LogInfoMessage('CLOSED: ' + socket.remoteAddress + ' ' + socket.remotePort + ' ' + process.pid);
|
|
87
93
|
});
|
|
88
|
-
socket.on('data',
|
|
89
|
-
|
|
94
|
+
socket.on('data', (data) => {
|
|
95
|
+
this.#LogInfoMessage('DATA ' + socket.remoteAddress + ': ' + data);
|
|
90
96
|
});
|
|
91
97
|
};
|
|
92
98
|
#GetLogPrefix = () => {
|
|
@@ -98,14 +104,14 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
98
104
|
// Update my currentTerm
|
|
99
105
|
this.#currentTerm = term;
|
|
100
106
|
// Return my yes vote
|
|
101
|
-
|
|
107
|
+
this.#LogInfoMessage(chalk_1.default.green(`${message} - Vote Yes`));
|
|
102
108
|
callback(null, true); // YES vote
|
|
103
109
|
};
|
|
104
110
|
#VoteNo = (callback, term, message) => {
|
|
105
111
|
// Log the fact that I have now voted for this currentTerm
|
|
106
112
|
this.#votedLog[term] = true;
|
|
107
113
|
// Return my yes vote
|
|
108
|
-
|
|
114
|
+
this.#LogInfoMessage(chalk_1.default.yellow(`${message} - Vote No`));
|
|
109
115
|
callback(null, false); // NO vote
|
|
110
116
|
};
|
|
111
117
|
#FindService = (host, port) => {
|
|
@@ -192,22 +198,22 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
192
198
|
if (this.#RAFTState.localeCompare(AppMasterRAFTState.CANDIDATE) === 0) {
|
|
193
199
|
const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
|
|
194
200
|
if (retVal.retVal === true) {
|
|
195
|
-
|
|
196
|
-
|
|
201
|
+
this.#LogInfoMessage(`${retVal.msg}`);
|
|
202
|
+
this.#LogInfoMessage(chalk_1.default.magenta(`${this.#GetLogPrefix()}: New leader detected, Host: [${host}], Port: [${port}], while in CANDIDATE mode, reverting to FOLLOWER.`));
|
|
197
203
|
// This sending node is the leader so revert to follower
|
|
198
204
|
this.#currentTerm = term;
|
|
199
205
|
this.#ChangeState(AppMasterRAFTState.FOLLOWER);
|
|
200
206
|
}
|
|
201
207
|
else {
|
|
202
|
-
|
|
203
|
-
|
|
208
|
+
this.#LogInfoMessage(`${retVal.msg}`);
|
|
209
|
+
this.#LogInfoMessage(chalk_1.default.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
|
|
204
210
|
// Reject this RPC and continue in the CANDIDATE state
|
|
205
211
|
callback(null, false);
|
|
206
212
|
return;
|
|
207
213
|
}
|
|
208
214
|
}
|
|
209
215
|
else if (this.#RAFTState.localeCompare(AppMasterRAFTState.LEADER) === 0) {
|
|
210
|
-
|
|
216
|
+
this.#LogInfoMessage(chalk_1.default.red(`${this.#GetLogPrefix()}: appendEntry called while I am the current leader, rejecting RPC call.`));
|
|
211
217
|
// Reject this RPC and continue in the LEADER state
|
|
212
218
|
callback(null, false);
|
|
213
219
|
return;
|
|
@@ -220,13 +226,13 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
220
226
|
const retVal = this.#CheckMoreRecentTerm(term, lastLogItemTerm, lastLogItemIndex);
|
|
221
227
|
if (retVal.retVal === true) {
|
|
222
228
|
if (term > this.#currentTerm) {
|
|
223
|
-
|
|
229
|
+
this.#LogInfoMessage(chalk_1.default.cyan(`${retVal.msg}`));
|
|
224
230
|
this.#currentTerm = term;
|
|
225
231
|
}
|
|
226
232
|
}
|
|
227
233
|
else {
|
|
228
|
-
|
|
229
|
-
|
|
234
|
+
this.#LogInfoMessage(`${retVal.msg}`);
|
|
235
|
+
this.#LogInfoMessage(chalk_1.default.magenta(`${this.#GetLogPrefix()}: appendEntry called but log is older than my current state, Host: [${host}], Port: [${port}].`));
|
|
230
236
|
// Reject this RPC and continue in the CANDIDATE state
|
|
231
237
|
callback(null, false);
|
|
232
238
|
return;
|
|
@@ -237,29 +243,29 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
237
243
|
if (sentLeaderService) {
|
|
238
244
|
if (sentLeaderService.host.localeCompare(this.#leaderNode.host) !== 0 || sentLeaderService.port !== this.#leaderNode.port) {
|
|
239
245
|
this.#leaderNode = sentLeaderService;
|
|
240
|
-
|
|
246
|
+
this.#LogInfoMessage(chalk_1.default.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
|
|
241
247
|
}
|
|
242
248
|
}
|
|
243
249
|
}
|
|
244
250
|
else {
|
|
245
251
|
this.#leaderNode = this.#FindService(host, port);
|
|
246
252
|
if (this.#leaderNode) {
|
|
247
|
-
|
|
253
|
+
this.#LogInfoMessage(chalk_1.default.white(`${this.#GetLogPrefix()}: Leader Service: Host:[${this.#leaderNode.host}] Port: [${this.#leaderNode.port}]`));
|
|
248
254
|
}
|
|
249
255
|
}
|
|
250
256
|
// Now update the log if only more recent
|
|
251
257
|
callback(null, true);
|
|
252
258
|
});
|
|
253
|
-
jaysonServer.method("ping", async
|
|
259
|
+
jaysonServer.method("ping", async (args, callback) => {
|
|
254
260
|
// do something, do nothing
|
|
255
|
-
|
|
261
|
+
this.#LogInfoMessage('server got ping');
|
|
256
262
|
callback();
|
|
257
263
|
});
|
|
258
264
|
const server = jaysonServer.tls(this.#GetTLSOptions());
|
|
259
265
|
//(server as tls.Server).on('secureConnection', this.#SetupRPCServer);
|
|
260
266
|
//server.listen(this.options.listenPort, () => { // 'stscore.stsmda.org'
|
|
261
267
|
server.listen(this.#serverPort, () => {
|
|
262
|
-
|
|
268
|
+
this.#LogInfoMessage('JSON RPC 2.0 Server is running on port ' + this.options.listenPort + '.');
|
|
263
269
|
}).on('listening', () => {
|
|
264
270
|
this.LogEx(`JSON RPC 2.0 live on ${this.options.endpoint}:${this.options.listenPort}${this.options.apiRoot}`);
|
|
265
271
|
});
|
|
@@ -284,7 +290,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
284
290
|
}
|
|
285
291
|
client.request('vote', [this.#currentTerm, lastLogItem.term, lastLogItem.index], (error, response) => {
|
|
286
292
|
if (error) {
|
|
287
|
-
//
|
|
293
|
+
//this.#LogInfoMessage(chalk.red(`vote attempt fail: [${JSON.stringify(options)}: ${error}]`));
|
|
288
294
|
}
|
|
289
295
|
else {
|
|
290
296
|
// Log the result
|
|
@@ -314,7 +320,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
314
320
|
}
|
|
315
321
|
client.request('appendEntry', [this.#thisService.host, this.#thisService.port, this.#currentTerm, lastLogItem.term, lastLogItem.index], (error, response) => {
|
|
316
322
|
if (error) {
|
|
317
|
-
//
|
|
323
|
+
//this.#LogInfoMessage(chalk.red(`appendEntry attempt fail: [${JSON.stringify(options)}: ${error}]`));
|
|
318
324
|
}
|
|
319
325
|
else {
|
|
320
326
|
this.#appendedEntries[this.#GetServiceKey(service)] = 1;
|
|
@@ -363,13 +369,13 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
363
369
|
this.#StartAppendEntries();
|
|
364
370
|
}
|
|
365
371
|
else {
|
|
366
|
-
|
|
372
|
+
this.#LogInfoMessage(chalk_1.default.red(`${this.#GetLogPrefix()}: Not enough response for valid cluster state.`));
|
|
367
373
|
}
|
|
368
374
|
}, this.#heartBeatTimeout);
|
|
369
375
|
};
|
|
370
376
|
#Promote = () => {
|
|
371
377
|
this.#ChangeState(AppMasterRAFTState.LEADER);
|
|
372
|
-
|
|
378
|
+
this.#LogInfoMessage(chalk_1.default.green(`${this.#GetLogPrefix()}: New LEADER is elected: [${this.#GetSelfServiceKey()}]`));
|
|
373
379
|
// As leader, now start the regular pings
|
|
374
380
|
this.#StartAppendEntries();
|
|
375
381
|
};
|
|
@@ -385,7 +391,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
385
391
|
}
|
|
386
392
|
const requiredVotes = Math.floor(this.#services.length / 2) + 1;
|
|
387
393
|
if (requiredVotes !== this.#lastRequiredVotes || votes !== this.#lastVotes) {
|
|
388
|
-
|
|
394
|
+
this.#LogInfoMessage(chalk_1.default.cyan(`${this.#GetLogPrefix()}votes: [${votes} need: [${requiredVotes}]`));
|
|
389
395
|
this.#lastRequiredVotes = requiredVotes;
|
|
390
396
|
this.#lastVotes = votes;
|
|
391
397
|
}
|
|
@@ -394,7 +400,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
394
400
|
#StartCanidateVote = () => {
|
|
395
401
|
// Get the election timeout going again
|
|
396
402
|
this.#StartElectionTimeout();
|
|
397
|
-
|
|
403
|
+
this.#LogInfoMessage(chalk_1.default.yellow(`${this.#GetLogPrefix()}: Start CANDIDATE vote`));
|
|
398
404
|
// Start in the CANDIDATE state
|
|
399
405
|
this.#ChangeState(AppMasterRAFTState.CANDIDATE);
|
|
400
406
|
// Reset votes
|
|
@@ -413,7 +419,7 @@ class AppMaster extends masterprocessbase_1.MasterProcessBase {
|
|
|
413
419
|
// Log the result - Vote for myself
|
|
414
420
|
this.#votes[this.#GetSelfServiceKey()] = 1;
|
|
415
421
|
// Return my yes vote
|
|
416
|
-
|
|
422
|
+
this.#LogInfoMessage(chalk_1.default.green(`${this.#GetLogPrefix()}: SELF VOTE: canidate currentTerm: [${this.#currentTerm}], vote YES`));
|
|
417
423
|
this.#CheckMajority();
|
|
418
424
|
}
|
|
419
425
|
else {
|
|
@@ -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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"}
|
package/dist/testing/app.js
CHANGED
|
@@ -12,6 +12,8 @@ const node_fs_1 = __importDefault(require("node:fs"));
|
|
|
12
12
|
//const pid = process.pid;
|
|
13
13
|
const pid = 523552;
|
|
14
14
|
const filePath = `/proc/${pid}/net/dev`;
|
|
15
|
+
const LogInfoMessage = (message) => console.log(message);
|
|
16
|
+
const LogErrorMessage = (message) => console.error(message);
|
|
15
17
|
/*
|
|
16
18
|
async function testError() {
|
|
17
19
|
throw new Error('some error')
|
|
@@ -21,7 +23,7 @@ async function testtheerror() {
|
|
|
21
23
|
try {
|
|
22
24
|
await testError();
|
|
23
25
|
} catch (error) {
|
|
24
|
-
|
|
26
|
+
this.#LogErrorMessage(`Error2: [${error}]`);
|
|
25
27
|
}
|
|
26
28
|
}
|
|
27
29
|
|
|
@@ -31,14 +33,14 @@ async function testtheerror2(cb: (error: any) => void) {
|
|
|
31
33
|
cb('some error');
|
|
32
34
|
|
|
33
35
|
} catch (error) {
|
|
34
|
-
|
|
36
|
+
this.#LogErrorMessage(`Error2: [${error}]`);
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
(async () => {
|
|
39
41
|
await Sleep(1000);
|
|
40
|
-
let z = await testtheerror2((error) =>
|
|
41
|
-
|
|
42
|
+
let z = await testtheerror2((error) => this.#LogInfoMessage(error));
|
|
43
|
+
this.#LogInfoMessage(`done.....`);
|
|
42
44
|
|
|
43
45
|
process.exit(0);
|
|
44
46
|
})();
|
|
@@ -52,19 +54,19 @@ function getNetworkUsage() {
|
|
|
52
54
|
const headers1 = lines[0].split('|').map(header => header.trim());
|
|
53
55
|
const headers2 = lines[1].split('|').map(header => header.trim());
|
|
54
56
|
const data = lines[2].split('|').map(value => value.trim());
|
|
55
|
-
|
|
57
|
+
LogInfoMessage(data);
|
|
56
58
|
// Find the index of the relevant network statistics (e.g., bytes received and transmitted)
|
|
57
59
|
//const rxIndex = headers.indexOf('Receive');
|
|
58
60
|
//const txIndex = headers.indexOf('Transmit');
|
|
59
61
|
// Display network usage information
|
|
60
62
|
/*
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
63
|
+
this.#LogInfoMessage(`Network Usage for Process ${pid}:`);
|
|
64
|
+
this.#LogInfoMessage(` Incoming: ${data[rxIndex]} bytes`);
|
|
65
|
+
this.#LogInfoMessage(` Outgoing: ${data[txIndex]} bytes`);
|
|
64
66
|
*/
|
|
65
67
|
}
|
|
66
|
-
catch (
|
|
67
|
-
|
|
68
|
+
catch (error) {
|
|
69
|
+
LogErrorMessage(`Error reading file: [${error}]`);
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
if (cluster_1.default.isPrimary) {
|
|
@@ -72,11 +74,11 @@ if (cluster_1.default.isPrimary) {
|
|
|
72
74
|
setInterval(function () {
|
|
73
75
|
/*
|
|
74
76
|
si.networkStats().then(data => {
|
|
75
|
-
|
|
77
|
+
this.#LogInfoMessage(data);
|
|
76
78
|
});
|
|
77
79
|
*/
|
|
78
80
|
getNetworkUsage();
|
|
79
|
-
//
|
|
81
|
+
//this.#LogInfoMessage(process.pid)
|
|
80
82
|
//getNetworkUsage()
|
|
81
83
|
}, 1000);
|
|
82
84
|
}
|
package/dist/testing/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":";;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,2CAAkD;AAClD,4BAAwC;AACxC,iDAA8C;AAE9C,sDAA8B;AAE9B,sDAAwB;AAExB,0BAA0B;AAC1B,MAAM,GAAG,GAAG,MAAM,CAAA;AAElB,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BE;AAEF,SAAS,eAAe;IACpB,IAAI,CAAC;QACD,oDAAoD;QACpD,MAAM,OAAO,GAAG,iBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAElD,sDAAsD;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/testing/app.ts"],"names":[],"mappings":";;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,2CAAkD;AAClD,4BAAwC;AACxC,iDAA8C;AAE9C,sDAA8B;AAE9B,sDAAwB;AAExB,0BAA0B;AAC1B,MAAM,GAAG,GAAG,MAAM,CAAA;AAElB,MAAM,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAExC,MAAM,cAAc,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC7D,MAAM,eAAe,GAAG,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;AAChE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8BE;AAEF,SAAS,eAAe;IACpB,IAAI,CAAC;QACD,oDAAoD;QACpD,MAAM,OAAO,GAAG,iBAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAElD,sDAAsD;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5D,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,2FAA2F;QAC3F,6CAA6C;QAC7C,8CAA8C;QAE9C,oCAAoC;QACpC;;;;QAIA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,eAAe,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;IACtD,CAAC;AACL,CAAC;AAED,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;IACpB,IAAI,qBAAiB,CAAC,IAAA,gCAAoB,EAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAEnF,WAAW,CAAC;QACR;;;;UAIE;QAEF,eAAe,EAAE,CAAA;QAEjB,mCAAmC;QAEnC,mBAAmB;IAEvB,CAAC,EAAE,IAAI,CAAC,CAAA;AAEZ,CAAC;KAAM,CAAC;IACJ,IAAI,4BAAa,CAAC,IAAA,gCAAoB,EAAC,IAAI,EAAE,iBAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACnF,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.ServiceConfigOptions = void 0;
|
|
4
7
|
const uuid_1 = require("uuid");
|
|
@@ -6,6 +9,7 @@ const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
|
6
9
|
const goptions = (0, stsconfig_1.$Options)();
|
|
7
10
|
const __1 = require("./..");
|
|
8
11
|
const server_1 = require("./server");
|
|
12
|
+
const winston_1 = __importDefault(require("winston"));
|
|
9
13
|
/*
|
|
10
14
|
// nid: `${goptions.rest01servicename} @ ${goptions.rest01serviceversion} | ${this.options.globalServiceData.serviceInstanceId} @ ${os.hostname()} ^ ${process.pid} @ ${(cluster.isMaster ? process.pid : process.ppid)}`,
|
|
11
15
|
// <serviceId> <serviceInstanceId> <serviceInstanceProcessId>
|
|
@@ -24,6 +28,21 @@ ${process.pid}${ModelDelimeter.COMPONENT_SEPERATOR}${(isMaster ? process.pid : p
|
|
|
24
28
|
}
|
|
25
29
|
*/
|
|
26
30
|
function ServiceConfigOptions(clusterMode, isMaster) {
|
|
31
|
+
winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple());
|
|
32
|
+
const logger = winston_1.default.createLogger({
|
|
33
|
+
level: 'silly',
|
|
34
|
+
format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple()),
|
|
35
|
+
transports: [
|
|
36
|
+
new winston_1.default.transports.Console()
|
|
37
|
+
]
|
|
38
|
+
});
|
|
39
|
+
const publisherLogger = winston_1.default.createLogger({
|
|
40
|
+
level: 'info',
|
|
41
|
+
format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple()),
|
|
42
|
+
transports: [
|
|
43
|
+
new winston_1.default.transports.Console()
|
|
44
|
+
]
|
|
45
|
+
});
|
|
27
46
|
if (isMaster === true) {
|
|
28
47
|
const serviceInstanceId = (0, uuid_1.v4)();
|
|
29
48
|
const data = {
|
|
@@ -50,7 +69,9 @@ function ServiceConfigOptions(clusterMode, isMaster) {
|
|
|
50
69
|
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
51
70
|
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
52
71
|
useRedisAdaptor: false,
|
|
53
|
-
workerExec: './dist/testing/app.js'
|
|
72
|
+
workerExec: './dist/testing/app.js',
|
|
73
|
+
logger: logger,
|
|
74
|
+
publisherLogger: publisherLogger
|
|
54
75
|
};
|
|
55
76
|
if (!clusterMode) {
|
|
56
77
|
data.expressServerRouteFactory = (app, stsApp) => {
|
|
@@ -64,6 +85,8 @@ function ServiceConfigOptions(clusterMode, isMaster) {
|
|
|
64
85
|
data.expressServerRouteFactory = (app, stsApp) => {
|
|
65
86
|
return new server_1.STSExpressRouteFactory(app, stsApp);
|
|
66
87
|
};
|
|
88
|
+
data.logger = logger;
|
|
89
|
+
data.publisherLogger = publisherLogger;
|
|
67
90
|
return data;
|
|
68
91
|
}
|
|
69
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/testing/appConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/testing/appConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,17 +34,23 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
34
34
|
logger: this.LogEx
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
+
#LogErrorMessage(message) {
|
|
38
|
+
this.options.logger.error(message);
|
|
39
|
+
}
|
|
40
|
+
#LogInfoMessage(message) {
|
|
41
|
+
this.options.logger.info(message);
|
|
42
|
+
}
|
|
37
43
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
38
44
|
ReceivedMessageFromMaster = async (messageData) => {
|
|
39
45
|
// Only response to these message types (note should be part of generic pub/sub pattern in framework)
|
|
40
46
|
if (messageData.subCommand) {
|
|
41
47
|
if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
|
|
42
|
-
//
|
|
43
|
-
|
|
48
|
+
//this.#LogInfoMessage(chalk.gray(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`));
|
|
49
|
+
this.#LogInfoMessage(chalk_1.default.gray(`WorkerProcess.ReceivedMessageFromMaster`));
|
|
44
50
|
const { socketId, workerId } = messageData; //@@ type
|
|
45
51
|
if (node_cluster_1.default.worker && node_cluster_1.default.worker.id !== workerId) {
|
|
46
52
|
// Invalid data - this workerId must match
|
|
47
|
-
|
|
53
|
+
this.#LogInfoMessage(chalk_1.default.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerId: [${workerId}]. Should have been: [${node_cluster_1.default.worker.id}].`));
|
|
48
54
|
}
|
|
49
55
|
else {
|
|
50
56
|
const workerProcess = this;
|
|
@@ -53,17 +59,17 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
53
59
|
const sockets = await stsMonitorNamespace.fetchSockets();
|
|
54
60
|
for (const socket of sockets) {
|
|
55
61
|
if (socket.id.localeCompare(socketId) === 0) {
|
|
56
|
-
|
|
62
|
+
this.#LogInfoMessage(chalk_1.default.green(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`));
|
|
57
63
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
58
64
|
//socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
59
65
|
return;
|
|
60
66
|
}
|
|
61
67
|
}
|
|
62
|
-
|
|
68
|
+
this.#LogInfoMessage(chalk_1.default.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid socketId. Expecting socket to existing in socket namespace collection.`));
|
|
63
69
|
// Invalid - could not find matching socketid to send to
|
|
64
70
|
}
|
|
65
71
|
else {
|
|
66
|
-
|
|
72
|
+
this.#LogInfoMessage(chalk_1.default.red(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerProcess.stsMonitorNamespace is null. Expecting non-null value.`));
|
|
67
73
|
}
|
|
68
74
|
}
|
|
69
75
|
}
|
|
@@ -72,23 +78,23 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
72
78
|
#SendIPCMessageToMaster(socket, eventName, data) {
|
|
73
79
|
try {
|
|
74
80
|
if (node_cluster_1.default.worker) {
|
|
75
|
-
|
|
81
|
+
this.#LogInfoMessage(chalk_1.default.gray(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${eventName}]`));
|
|
76
82
|
const payload = {
|
|
77
83
|
socketId: socket.id,
|
|
78
84
|
workerId: node_cluster_1.default.worker.id,
|
|
79
85
|
data: data
|
|
80
86
|
};
|
|
81
|
-
//
|
|
82
|
-
|
|
87
|
+
//this.#LogInfoMessage(chalk.gray(`WorkerProcess.#SendIPCMessageToMaster: payload: [${JSON.stringify(payload)}]`));
|
|
88
|
+
this.#LogInfoMessage(chalk_1.default.gray(`WorkerProcess.#SendIPCMessageToMaster`));
|
|
83
89
|
process.send({ command: eventName, payload }, null, { swallowErrors: true }, (error) => {
|
|
84
90
|
if (error) {
|
|
85
|
-
|
|
91
|
+
this.#LogErrorMessage(chalk_1.default.red(`Error with WorkerProcess:SendIPCMessageToMaster(1): [${error}]`));
|
|
86
92
|
}
|
|
87
93
|
});
|
|
88
94
|
}
|
|
89
95
|
}
|
|
90
96
|
catch (error) {
|
|
91
|
-
|
|
97
|
+
this.#LogErrorMessage(chalk_1.default.red(`Error with WorkerProcess:SendIPCMessageToMaster(2): [${error}]`));
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
100
|
WorkerStarted() {
|
|
@@ -104,7 +110,7 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
104
110
|
], true, // Make any connecting client automatically join the room list above
|
|
105
111
|
// Connect call back when a client connects
|
|
106
112
|
(socket) => {
|
|
107
|
-
|
|
113
|
+
this.#LogInfoMessage(chalk_1.default.gray(`WorkerProcess.#SendIPCMessageToMaster: Id: [${socket.id}] eventName: [${InstrumentManagerEventName.CONNECT}]`));
|
|
108
114
|
},
|
|
109
115
|
// Custom client to server events
|
|
110
116
|
(socket) => {
|