@nsshunt/stsappframework 3.1.129 → 3.1.131
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonTypes.js +2 -2
- package/dist/commonTypes.js.map +1 -1
- package/dist/ipcMessageHandler.js +4 -2
- package/dist/ipcMessageHandler.js.map +1 -1
- package/dist/ipcMessageManager.js +32 -4
- package/dist/ipcMessageManager.js.map +1 -1
- package/dist/ipcMessageProcessorPrimary.js +2 -1
- package/dist/ipcMessageProcessorPrimary.js.map +1 -1
- package/dist/ipcMessageProcessorWorker.js +2 -1
- package/dist/ipcMessageProcessorWorker.js.map +1 -1
- package/dist/network.js +2 -3
- package/dist/network.js.map +1 -1
- package/dist/redisMessageHandler.js +144 -6
- package/dist/redisMessageHandler.js.map +1 -1
- package/dist/redisMessageHandler.test.js +4 -2
- package/dist/redisMessageHandler.test.js.map +1 -1
- package/dist/stsTransportWinston.js +2 -2
- package/dist/stsTransportWinston.js.map +1 -1
- package/dist/tcpserver/appConfig.js +1 -2
- package/dist/tcpserver/appConfig.js.map +1 -1
- package/dist/testing/app.js +191 -37
- package/dist/testing/app.js.map +1 -1
- package/dist/testing/appConfig.js +1 -2
- package/dist/testing/appConfig.js.map +1 -1
- package/dist/vitesttesting/appConfig.js +1 -2
- package/dist/vitesttesting/appConfig.js.map +1 -1
- package/dist/workerprocessbase.js +107 -0
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +13 -13
- package/runtest2.sh +1 -1
- package/src/ipcMessageHandler.ts +4 -2
- package/src/ipcMessageManager.ts +40 -4
- package/src/ipcMessageProcessorPrimary.ts +2 -1
- package/src/ipcMessageProcessorWorker.ts +2 -1
- package/src/redisMessageHandler.test.ts +4 -2
- package/src/redisMessageHandler.ts +155 -6
- package/src/testing/app.ts +192 -17
- package/src/workerprocessbase.ts +123 -2
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/commonTypes.d.ts +0 -2
- package/types/commonTypes.d.ts.map +1 -1
- package/types/ipcMessageHandler.d.ts +0 -1
- package/types/ipcMessageHandler.d.ts.map +1 -1
- package/types/ipcMessageManager.d.ts +1 -0
- package/types/ipcMessageManager.d.ts.map +1 -1
- package/types/ipcMessageProcessorPrimary.d.ts +0 -1
- package/types/ipcMessageProcessorPrimary.d.ts.map +1 -1
- package/types/ipcMessageProcessorWorker.d.ts.map +1 -1
- package/types/kafka/IMKafkaManager.d.ts.map +1 -1
- package/types/kafka/kafkaconsumer.d.ts.map +1 -1
- package/types/kafka/kafkamanager.d.ts.map +1 -1
- package/types/kafka/kafkaproducer.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts +0 -4
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/middleware/serverNetworkMiddleware.d.ts +0 -1
- package/types/middleware/serverNetworkMiddleware.d.ts.map +1 -1
- package/types/processbase.d.ts.map +1 -1
- package/types/redisMessageHandler.d.ts +2 -1
- package/types/redisMessageHandler.d.ts.map +1 -1
- package/types/serverprocessbase.d.ts.map +1 -1
- package/types/socketIoServerHelper.d.ts.map +1 -1
- package/types/testHelpers.d.ts +0 -1
- package/types/testHelpers.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts +15 -0
- package/types/workerprocessbase.d.ts.map +1 -1
package/dist/commonTypes.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.iss = exports.STSEvent = exports.STSRoom = exports.STSNamespace = exports.IPCMessageCommand =
|
|
3
|
+
exports.iss = exports.STSEvent = exports.STSRoom = exports.STSNamespace = exports.IPCMessageCommand = void 0;
|
|
4
|
+
exports.CreateServiceProcessContext = CreateServiceProcessContext;
|
|
4
5
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
5
6
|
function CreateServiceProcessContext(serviceName, serviceVersion, serviceInstanceId, hostName, processId, parentProcessId) {
|
|
6
7
|
const checkParams = [
|
|
@@ -26,7 +27,6 @@ ${processId.toString()}${stsutils_1.ModelDelimeter.COMPONENT_SEPERATOR}${parentP
|
|
|
26
27
|
parentProcessId: parentProcessId.toString()
|
|
27
28
|
};
|
|
28
29
|
}
|
|
29
|
-
exports.CreateServiceProcessContext = CreateServiceProcessContext;
|
|
30
30
|
var IPCMessageCommand;
|
|
31
31
|
(function (IPCMessageCommand) {
|
|
32
32
|
IPCMessageCommand["AddWorker"] = "AddWorker";
|
package/dist/commonTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;;AA0BA,kEA2BC;AAlDD,gDAA0G;AAuB1G,SAAgB,2BAA2B,CAAC,WAAmB,EAAE,cAAsB,EAAE,iBAAyB,EAC9G,QAAgB,EAAE,SAAiB,EAAE,eAAuB;IAE5D,MAAM,WAAW,GAAG;QAChB,CAAE,aAAa,EAAE,WAAW,CAAE;QAC9B,CAAE,gBAAgB,EAAE,cAAc,CAAE;QACpC,CAAE,UAAU,EAAE,QAAQ,CAAE;QACxB,CAAE,mBAAmB,EAAE,iBAAiB,CAAE;KAC7C,CAAC;IAEF,4BAA4B;IAC5B,IAAA,yBAAc,EAAC,WAAW,CAAC,CAAC;IAE5B,OAAO;QACH,GAAG,EAAE;EACX,WAAW,GAAG,yBAAc,CAAC,mBAAmB,GAAG,cAAc;EACjE,yBAAc,CAAC,SAAS;EACxB,iBAAiB,GAAG,yBAAc,CAAC,mBAAmB,GAAG,QAAQ;EACjE,yBAAc,CAAC,aAAa;EAC5B,SAAS,CAAC,QAAQ,EAAE,GAAG,yBAAc,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,CAAA;AACL,CAAC;AAED,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;IAC7B,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,iCAAjB,iBAAiB,QAI5B;AAkGD,IAAY,YAGX;AAHD,WAAY,YAAY;IACvB,8DAA8C,CAAA;IAC9C,8DAA8C,CAAA;AAC/C,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IAClB,mBAAmB;IACnB,0DAA+C,CAAA;IAC/C,kFAAuE,CAAA;IAEvE,mBAAmB;IACnB,0CAA+B,CAAA;IAC/B,kDAAuC,CAAA;AACxC,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB;AAED,IAAY,QAyBX;AAzBD,WAAY,QAAQ;IACnB,oBAAoB;IACpB,mDAAuC,CAAA;IACvC,yDAA6C,CAAA;IAC7C,6DAAiD,CAAA;IAEjD,2EAA+D,CAAA;IAC/D,yEAA6D,CAAA;IAE7D,mBAAmB;IACnB,iCAAqB,CAAA;IACrB,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,mCAAuB,CAAA;IACvB,yCAA6B,CAAA;IAC7B,iFAAiF;IACjF,0EAA0E;IAC1E,2DAA+C,CAAA;IAC/C,6DAAiD,CAAA;IACjD,8EAA8E;IAE9E,wCAA4B,CAAA;IAE5B,yBAAyB;IACzB,+BAAmB,CAAA;AACpB,CAAC,EAzBW,QAAQ,wBAAR,QAAQ,QAyBnB;AA4FY,QAAA,GAAG,GAAG,wCAAwC,CAAC"}
|
|
@@ -47,7 +47,8 @@ class IPCMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
47
47
|
messageReceiverStop: (options) => {
|
|
48
48
|
const worker = options.worker;
|
|
49
49
|
worker.off('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, { worker }));
|
|
50
|
-
}
|
|
50
|
+
},
|
|
51
|
+
groups: []
|
|
51
52
|
};
|
|
52
53
|
this.#ipcMessageManager = new ipcMessageManager_1.IPCMessageManager(ipcMessageManagerOptions);
|
|
53
54
|
};
|
|
@@ -71,7 +72,8 @@ class IPCMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
71
72
|
},
|
|
72
73
|
messageReceiverStop: (options) => {
|
|
73
74
|
process.off('message', (payload) => this.#ipcMessageManager?.ProcessMessage(payload, options));
|
|
74
|
-
}
|
|
75
|
+
},
|
|
76
|
+
groups: []
|
|
75
77
|
};
|
|
76
78
|
this.#ipcMessageManager = new ipcMessageManager_1.IPCMessageManager(ipcMessageManagerOptions);
|
|
77
79
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcMessageHandler.js","sourceRoot":"","sources":["../src/ipcMessageHandler.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,yBAAyB;AACnH,+CAA2C;AAC3C,gEAA8C;AAC9C,gDAAyE;AAIzE,2DAAiF;AASjF,MAAa,iBAAkB,SAAQ,0BAAW;IAC9C,kBAAkB,GAA6B,IAAI,CAAC;IACpD,QAAQ,CAA2B;IACnC,OAAO,GAAkB,IAAI,CAAC;IAC9B,OAAO,GAAe,EAAG,CAAC;IAE1B,YAAY,OAAiC;QACzC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,sBAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;IACL,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,YAAY,GAAG,GAAG,EAAE;QAChB,MAAM,wBAAwB,GAA6B;YACvD,MAAM,EAAE,wBAAa;YACrB,6BAA6B,EAAE,IAAI;YACnC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;YAClC,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,CAAC,OAAuC,EAAE,OAAY,EAAE,EAAE;gBACpE,OAAO,CAAC,MAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,OAAuC,EAAE,OAAY,EAAuB,EAAE;gBACxG,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC;YACD,oBAAoB,EAAE,CAAC,OAAY,EAAE,EAAE;gBACnC,6CAA6C;gBAC7C,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACpG,CAAC;YACD,mBAAmB,EAAE,CAAC,OAAY,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACrG,CAAC;
|
|
1
|
+
{"version":3,"file":"ipcMessageHandler.js","sourceRoot":"","sources":["../src/ipcMessageHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,30 +76,41 @@ class IPCMessageManager {
|
|
|
76
76
|
this.#options.messageSender(requestPayload, options);
|
|
77
77
|
};
|
|
78
78
|
#ProcessMessage = async (msg, options) => {
|
|
79
|
+
//console.log(chalk.grey(`#ProcessMessage`));
|
|
79
80
|
if (msg.header && msg.header.localeCompare(this.#messageHeader) === 0) {
|
|
80
81
|
const message = msg;
|
|
81
82
|
if (this.#inflightMessages[message.messageId]) {
|
|
82
83
|
const inFlightMessageRecord = this.#inflightMessages[message.messageId];
|
|
83
84
|
inFlightMessageRecord.responses[message.senderId] = { ...message };
|
|
84
85
|
let completed = true; // Defaults to true
|
|
86
|
+
//console.log(chalk.grey(`#ProcessMessage:2`));
|
|
85
87
|
if (this.#options.ProcessResponseMessage) {
|
|
88
|
+
if (msg.requestPayload.__eventName.localeCompare('ping') !== 0) {
|
|
89
|
+
console.log(chalk_1.default.grey(`#ProcessMessage:3: [${JSON.stringify(msg.requestPayload)}]`));
|
|
90
|
+
}
|
|
86
91
|
completed = await this.#options.ProcessResponseMessage(inFlightMessageRecord.responses, options);
|
|
87
92
|
if (completed) {
|
|
93
|
+
//console.log(chalk.grey(`#ProcessMessage:3.1`));
|
|
88
94
|
inFlightMessageRecord.endTime = performance.now();
|
|
89
95
|
clearTimeout(inFlightMessageRecord.timeout);
|
|
90
96
|
inFlightMessageRecord.callBack({
|
|
91
97
|
responsePayload: Object.values(inFlightMessageRecord.responses).map(r => r.responsePayload)
|
|
92
98
|
}, options); //
|
|
93
99
|
delete this.#inflightMessages[message.messageId];
|
|
100
|
+
//console.log(chalk.grey(`this.#inflightMessages.length = ${Object.keys(this.#inflightMessages).length}`));
|
|
94
101
|
}
|
|
95
102
|
}
|
|
96
103
|
else if (completed) {
|
|
104
|
+
//console.log(chalk.grey(`#ProcessMessage:4`));
|
|
97
105
|
inFlightMessageRecord.endTime = performance.now();
|
|
98
106
|
clearTimeout(inFlightMessageRecord.timeout);
|
|
99
107
|
inFlightMessageRecord.callBack(message, options); // inFlightMessageRecord.responses
|
|
100
108
|
//@@inFlightMessageRecord.callBack(Object.values(inFlightMessageRecord.responses), options) //
|
|
101
109
|
delete this.#inflightMessages[message.messageId];
|
|
102
110
|
}
|
|
111
|
+
else {
|
|
112
|
+
//console.log(chalk.grey(`#ProcessMessage:5`));
|
|
113
|
+
}
|
|
103
114
|
}
|
|
104
115
|
else {
|
|
105
116
|
//throw new Error(`Could not find Request/Response message with id: [${message.messageId}]`); //@@
|
|
@@ -127,10 +138,27 @@ class IPCMessageManager {
|
|
|
127
138
|
if (msg.header.includes(checkName)) {
|
|
128
139
|
const message = msg;
|
|
129
140
|
if (msg.messageType.localeCompare('REQUEST') === 0) {
|
|
130
|
-
|
|
131
|
-
message.
|
|
132
|
-
|
|
133
|
-
|
|
141
|
+
let processMessage = true;
|
|
142
|
+
if (message.requestPayload.args.length > 0 && message.requestPayload.args[0].group) {
|
|
143
|
+
const group = message.requestPayload.args[0].group;
|
|
144
|
+
console.log(chalk_1.default.green(`${process.pid}:ProcessMessage(): Processor Options Groups: [${this.#options.groups}] request group: [${group}]`));
|
|
145
|
+
processMessage = (this.#options.groups.indexOf(group) === -1) ? false : true;
|
|
146
|
+
if (processMessage === false) {
|
|
147
|
+
console.log(chalk_1.default.red(`${process.pid}:ProcessMessage(): Skipping this message: Not in correct group: [${group}]`));
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
console.log(chalk_1.default.yellow(`${process.pid}:ProcessMessage(): Will process this message: [${group}]`));
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
if (processMessage) {
|
|
154
|
+
message.responsePayload = await this.#options.ProcessRequestMessage(message, options);
|
|
155
|
+
message.senderId = this.#id;
|
|
156
|
+
message.messageType = 'RESPONSE';
|
|
157
|
+
if (message.requestPayload.__eventName.localeCompare('ping') !== 0) {
|
|
158
|
+
console.log(chalk_1.default.grey(`${process.pid}:ProcessMessage(): Sending response: [${JSON.stringify(message.responsePayload)}]`));
|
|
159
|
+
}
|
|
160
|
+
this.#options.messageSender(message, options);
|
|
161
|
+
}
|
|
134
162
|
}
|
|
135
163
|
else {
|
|
136
164
|
// Received a response (to my request)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcMessageManager.js","sourceRoot":"","sources":["../src/ipcMessageManager.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,kDAA0B;AAI1B,+BAAoC;
|
|
1
|
+
{"version":3,"file":"ipcMessageManager.js","sourceRoot":"","sources":["../src/ipcMessageManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,8 @@ class IPCMessageProcessorPrimary {
|
|
|
32
32
|
messageReceiverStop: (options) => {
|
|
33
33
|
const worker = options.worker;
|
|
34
34
|
worker.off('message', (payload) => this.#ipcMessageManager.ProcessMessage(payload, { worker }));
|
|
35
|
-
}
|
|
35
|
+
},
|
|
36
|
+
groups: []
|
|
36
37
|
};
|
|
37
38
|
this.#ipcMessageManager = new ipcMessageManager_1.IPCMessageManager(ipcMessageManagerOptions);
|
|
38
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcMessageProcessorPrimary.js","sourceRoot":"","sources":["../src/ipcMessageProcessorPrimary.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gDAAyE;AAMzE,2DAAiF;AAQjF,MAAa,0BAA0B;IAEnC,kBAAkB,CAAoB;IACtC,OAAO,GAAkB,IAAI,CAAC;IAE9B,YAAY,YAAyC;QACjD,MAAM,wBAAwB,GAA6B;YACvD,MAAM,EAAE,wBAAa;YACrB,6BAA6B,EAAE,IAAI;YACnC,SAAS,EAAE,YAAY,CAAC,SAAS;YACjC,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,CAAC,OAAuC,EAAE,OAAY,EAAE,EAAE;gBACpE,OAAO,CAAC,MAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,OAAuC,EAAE,OAAY,EAAuB,EAAE;gBACxG,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;oBAC9B,OAAO,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAG,CAAC;gBACf,CAAC;YACL,CAAC;YACD,oBAAoB,EAAE,CAAC,OAAY,EAAE,EAAE;gBACnC,6CAA6C;gBAC7C,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACnG,CAAC;YACD,mBAAmB,EAAE,CAAC,OAAY,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACpG,CAAC;
|
|
1
|
+
{"version":3,"file":"ipcMessageProcessorPrimary.js","sourceRoot":"","sources":["../src/ipcMessageProcessorPrimary.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gDAAyE;AAMzE,2DAAiF;AAQjF,MAAa,0BAA0B;IAEnC,kBAAkB,CAAoB;IACtC,OAAO,GAAkB,IAAI,CAAC;IAE9B,YAAY,YAAyC;QACjD,MAAM,wBAAwB,GAA6B;YACvD,MAAM,EAAE,wBAAa;YACrB,6BAA6B,EAAE,IAAI;YACnC,SAAS,EAAE,YAAY,CAAC,SAAS;YACjC,IAAI,EAAE,QAAQ;YACd,aAAa,EAAE,CAAC,OAAuC,EAAE,OAAY,EAAE,EAAE;gBACpE,OAAO,CAAC,MAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,OAAuC,EAAE,OAAY,EAAuB,EAAE;gBACxG,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;oBAC9B,OAAO,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAG,CAAC;gBACf,CAAC;YACL,CAAC;YACD,oBAAoB,EAAE,CAAC,OAAY,EAAE,EAAE;gBACnC,6CAA6C;gBAC7C,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACnG,CAAC;YACD,mBAAmB,EAAE,CAAC,OAAY,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAI,OAAO,CAAC,MAAiB,CAAC;gBAC1C,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;YACpG,CAAC;YACD,MAAM,EAAE,EAAG;SACd,CAAA;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,qCAAiB,CAAC,wBAAwB,CAAC,CAAC;IAC9E,CAAC;IAED,WAAW,GAAG,KAAK,EAAE,OAAmB,EAAuB,EAAE;QAC7D,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC,CAAA;IAED,KAAK,GAAG,CAAC,MAAc,EAAE,EAAE;QACvB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IAC1B,CAAC,CAAA;IAED,IAAI,GAAG,GAAG,EAAE;QACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC,CAAA;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AApDD,gEAoDC"}
|
|
@@ -31,7 +31,8 @@ class IPCMessageProcessorWorker {
|
|
|
31
31
|
},
|
|
32
32
|
messageReceiverStop: (options) => {
|
|
33
33
|
process.off('message', (payload) => this.#ipcMessageManager.ProcessMessage(payload, options));
|
|
34
|
-
}
|
|
34
|
+
},
|
|
35
|
+
groups: []
|
|
35
36
|
};
|
|
36
37
|
this.#ipcMessageManager = new ipcMessageManager_1.IPCMessageManager(ipcMessageManagerOptions);
|
|
37
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcMessageProcessorWorker.js","sourceRoot":"","sources":["../src/ipcMessageProcessorWorker.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gDAAyE;AAIzE,2DAAiF;AASjF,MAAa,yBAAyB;IAClC,kBAAkB,CAAoB;IAEtC,YAAY,YAAwC;QAChD,MAAM,wBAAwB,GAA6B;YACvD,MAAM,EAAE,wBAAa;YACrB,6BAA6B,EAAE,YAAY,CAAC,6BAA6B;YACzE,SAAS,EAAE,YAAY,CAAC,SAAS;YACjC,IAAI,EAAE,QAAQ;YACd,kGAAkG;YAClG,aAAa,EAAE,CAAC,OAAuC,EAAE,OAAY,EAAE,EAAE;gBACrE,kEAAkE;gBACjE,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,OAAuC,EAAE,OAAY,EAAuB,EAAE;gBACxG,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;oBAC9B,OAAO,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAG,CAAC;gBACf,CAAC;YACL,CAAC;YACD,oBAAoB,EAAE,CAAC,OAAY,EAAE,EAAE;gBACnC,0DAA0D;gBAC1D,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YACjG,CAAC;YACD,mBAAmB,EAAE,CAAC,OAAY,EAAE,EAAE;gBAClC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YAClG,CAAC;
|
|
1
|
+
{"version":3,"file":"ipcMessageProcessorWorker.js","sourceRoot":"","sources":["../src/ipcMessageProcessorWorker.ts"],"names":[],"mappings":";;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gDAAyE;AAIzE,2DAAiF;AASjF,MAAa,yBAAyB;IAClC,kBAAkB,CAAoB;IAEtC,YAAY,YAAwC;QAChD,MAAM,wBAAwB,GAA6B;YACvD,MAAM,EAAE,wBAAa;YACrB,6BAA6B,EAAE,YAAY,CAAC,6BAA6B;YACzE,SAAS,EAAE,YAAY,CAAC,SAAS;YACjC,IAAI,EAAE,QAAQ;YACd,kGAAkG;YAClG,aAAa,EAAE,CAAC,OAAuC,EAAE,OAAY,EAAE,EAAE;gBACrE,kEAAkE;gBACjE,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;YACD,qBAAqB,EAAE,KAAK,EAAE,OAAuC,EAAE,OAAY,EAAuB,EAAE;gBACxG,IAAI,YAAY,CAAC,cAAc,EAAE,CAAC;oBAC9B,OAAO,YAAY,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAG,CAAC;gBACf,CAAC;YACL,CAAC;YACD,oBAAoB,EAAE,CAAC,OAAY,EAAE,EAAE;gBACnC,0DAA0D;gBAC1D,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YACjG,CAAC;YACD,mBAAmB,EAAE,CAAC,OAAY,EAAE,EAAE;gBAClC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YAClG,CAAC;YACD,MAAM,EAAE,EAAG;SACd,CAAA;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,qCAAiB,CAAC,wBAAwB,CAAC,CAAC;IAC9E,CAAC;IAED,WAAW,GAAG,KAAK,EAAE,OAAmB,EAAuB,EAAE;QAC7D,OAAO,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,OAAO,EAAE,EAAG,CAAC,CAAC;IAC7D,CAAC,CAAA;IAED,KAAK,GAAG,GAAG,EAAE;QACT,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAG,CAAC,CAAC;IACvC,CAAC,CAAA;IAED,IAAI,GAAG,GAAG,EAAE;QACR,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAG,CAAC,CAAC;IACtC,CAAC,CAAA;CACJ;AA5CD,8DA4CC"}
|
package/dist/network.js
CHANGED
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.GetNetworkInterfaces = GetNetworkInterfaces;
|
|
7
|
+
exports.GetFirstNetworkInterface = GetFirstNetworkInterface;
|
|
7
8
|
const os_1 = __importDefault(require("os"));
|
|
8
9
|
function GetNetworkInterfaces() {
|
|
9
10
|
const nets = os_1.default.networkInterfaces();
|
|
@@ -22,7 +23,6 @@ function GetNetworkInterfaces() {
|
|
|
22
23
|
}
|
|
23
24
|
return results;
|
|
24
25
|
}
|
|
25
|
-
exports.GetNetworkInterfaces = GetNetworkInterfaces;
|
|
26
26
|
function GetFirstNetworkInterface() {
|
|
27
27
|
const nics = GetNetworkInterfaces();
|
|
28
28
|
let hostaddr = null;
|
|
@@ -35,5 +35,4 @@ function GetFirstNetworkInterface() {
|
|
|
35
35
|
}
|
|
36
36
|
return hostaddr;
|
|
37
37
|
}
|
|
38
|
-
exports.GetFirstNetworkInterface = GetFirstNetworkInterface;
|
|
39
38
|
//# sourceMappingURL=network.js.map
|
package/dist/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":";;;;;AAIA,oDAgBC;AAED,4DAaC;AAnCD,4CAAmB;AAInB,SAAgB,oBAAoB;IAChC,MAAM,IAAI,GAAG,YAAE,CAAC,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAsB,EAAG,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,8DAA8D;QAC9D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAQ,EAAE,CAAC;YAClC,6DAA6D;YAC7D,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAgB,wBAAwB;IACpC,MAAM,IAAI,GAAsB,oBAAoB,EAAE,CAAC;IACvD,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EACtB,CAAC;QACG,MAAM,GAAG,GAAa,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAClB,CAAC;YACG,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,MAAM;QACV,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
|
@@ -46,20 +46,35 @@ class RedisMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
46
46
|
if (this.#options.role.localeCompare('CLIENT') === 0) {
|
|
47
47
|
const ping = () => {
|
|
48
48
|
this.#pingTimeout = setTimeout(() => {
|
|
49
|
-
|
|
49
|
+
let group = '';
|
|
50
|
+
if (process.pid % 2 === 0) {
|
|
51
|
+
group = 'even';
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
group = 'odd';
|
|
55
|
+
}
|
|
56
|
+
//console.log(chalk.gray(`${process.pid}: emitting ping ...`))
|
|
57
|
+
this.emit('ping', {
|
|
58
|
+
id: this.#ipcMessageManager?.id,
|
|
59
|
+
groups: [
|
|
60
|
+
group
|
|
61
|
+
]
|
|
62
|
+
}, (response) => { });
|
|
50
63
|
ping();
|
|
51
64
|
}, 1000).unref();
|
|
52
65
|
};
|
|
53
66
|
ping();
|
|
54
67
|
}
|
|
55
68
|
else {
|
|
56
|
-
this.on('ping', (
|
|
69
|
+
this.on('ping', (pingData, callback) => {
|
|
70
|
+
const { id, groups } = pingData;
|
|
57
71
|
if (this.#clients[id]) {
|
|
58
72
|
clearTimeout(this.#clients[id].timeout);
|
|
59
73
|
this.#clients[id].pingCount++;
|
|
60
74
|
this.#clients[id].timeout = setTimeout(() => {
|
|
61
75
|
delete this.#clients[id];
|
|
62
76
|
}, 2000);
|
|
77
|
+
this.#clients[id].groups = groups;
|
|
63
78
|
}
|
|
64
79
|
else {
|
|
65
80
|
this.#clients[id] = {
|
|
@@ -68,12 +83,15 @@ class RedisMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
68
83
|
pingCount: 0,
|
|
69
84
|
timeout: setTimeout(() => {
|
|
70
85
|
delete this.#clients[id];
|
|
71
|
-
}, 2000)
|
|
86
|
+
}, 2000),
|
|
87
|
+
groups
|
|
72
88
|
};
|
|
73
89
|
}
|
|
90
|
+
//console.log(chalk.gray(` ${process.pid}: processed ping ...`))
|
|
74
91
|
callback('ok');
|
|
75
92
|
});
|
|
76
93
|
}
|
|
94
|
+
console.log(chalk_1.default.yellow(`RedisMessageHandler:constructor(): [${JSON.stringify(this.#options.groups)}]`));
|
|
77
95
|
}
|
|
78
96
|
#LogInfo(message) {
|
|
79
97
|
this.#options.logger.info(message);
|
|
@@ -92,6 +110,7 @@ class RedisMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
92
110
|
namespace: this.#options.namespace,
|
|
93
111
|
role: this.#options.role,
|
|
94
112
|
messageSender: this.#messageSender,
|
|
113
|
+
groups: this.#options.groups,
|
|
95
114
|
// This method is used to calculate if all responses have been received from multiple clients (broadcast)
|
|
96
115
|
// returns true/false.
|
|
97
116
|
ProcessResponseMessage: this.#ProcessResponseMessage,
|
|
@@ -129,15 +148,134 @@ class RedisMessageHandler extends tiny_emitter_1.TinyEmitter {
|
|
|
129
148
|
if (allFound) {
|
|
130
149
|
return allFound;
|
|
131
150
|
}
|
|
151
|
+
console.log(chalk_1.default.grey(`${process.pid}: -->> *** <<-- #ProcessResponseMessage`));
|
|
132
152
|
let found = true;
|
|
153
|
+
// Sender role here is SERVER
|
|
154
|
+
console.log(chalk_1.default.yellow(`${process.pid}: Total Clients :-`));
|
|
155
|
+
Object.values(this.#clients).forEach(c => {
|
|
156
|
+
console.log(chalk_1.default.yellow(`${process.pid}: ${c.id} ${c.groups}`));
|
|
157
|
+
});
|
|
158
|
+
let requestGroup = null;
|
|
159
|
+
console.log(chalk_1.default.blue(`${process.pid}: Responses :-`));
|
|
160
|
+
for (const [responseId, response] of Object.entries(responses)) {
|
|
161
|
+
console.log(chalk_1.default.blue(`${process.pid}: client.id: [${responseId}] response payload: [${JSON.stringify(response.responsePayload)}]`));
|
|
162
|
+
if (response.requestPayload.args.length > 0 && response.requestPayload.args[0].group) {
|
|
163
|
+
requestGroup = response.requestPayload.args[0].group;
|
|
164
|
+
console.log(chalk_1.default.blue(`${process.pid}: Group Request: [${requestGroup}]`));
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
if (requestGroup) {
|
|
169
|
+
console.log(chalk_1.default.blue(`${process.pid}: Group Request`));
|
|
170
|
+
const clientsInGroup = Object.values(this.#clients).filter(c => {
|
|
171
|
+
if (c.groups.indexOf(requestGroup) === -1) {
|
|
172
|
+
return false;
|
|
173
|
+
}
|
|
174
|
+
return true;
|
|
175
|
+
});
|
|
176
|
+
console.log(chalk_1.default.blue(`${process.pid}: Clients in group: [${requestGroup}] :-`));
|
|
177
|
+
clientsInGroup.forEach(c => {
|
|
178
|
+
console.log(chalk_1.default.blue(`${process.pid}: ${c.id}`));
|
|
179
|
+
});
|
|
180
|
+
// Now make sure that all clients are in the responses
|
|
181
|
+
found = true;
|
|
182
|
+
clientsInGroup.forEach(c => {
|
|
183
|
+
if (!responses[c.id]) {
|
|
184
|
+
found = false;
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
console.log(chalk_1.default.blue(`${process.pid}: found (group) = [${found}]`));
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
console.log(chalk_1.default.blue(`${process.pid}: Non-Group Request`));
|
|
191
|
+
const clientsInGroup = Object.values(this.#clients);
|
|
192
|
+
console.log(chalk_1.default.blue(`${process.pid}: Clients in group (global list): [${requestGroup}] :-`));
|
|
193
|
+
clientsInGroup.forEach(c => {
|
|
194
|
+
console.log(chalk_1.default.blue(`${process.pid}: ${c.id}`));
|
|
195
|
+
});
|
|
196
|
+
// Now make sure that all clients are in the responses
|
|
197
|
+
found = true;
|
|
198
|
+
clientsInGroup.forEach(c => {
|
|
199
|
+
if (!responses[c.id]) {
|
|
200
|
+
found = false;
|
|
201
|
+
}
|
|
202
|
+
});
|
|
203
|
+
console.log(chalk_1.default.blue(`${process.pid}: found (non-group) = [${found}]`));
|
|
204
|
+
}
|
|
205
|
+
return found;
|
|
206
|
+
/*
|
|
207
|
+
|
|
208
|
+
|
|
133
209
|
Object.values(this.#clients).map(c => {
|
|
134
|
-
if (
|
|
135
|
-
|
|
210
|
+
if (found) {
|
|
211
|
+
// Check for group payloads
|
|
212
|
+
|
|
213
|
+
console.log(chalk.magenta(`${process.pid}: clients (from ping data)`));
|
|
214
|
+
for (const [key, value] of Object.entries(this.#clients)) {
|
|
215
|
+
console.log(chalk.magenta(`${process.pid}: ${key} = [${value.id} ${value.groups}]`))
|
|
216
|
+
}
|
|
217
|
+
console.log(chalk.blue(`${process.pid}: ${JSON.stringify(responses)}`));
|
|
218
|
+
|
|
219
|
+
|
|
220
|
+
if (responses[c.id]) {
|
|
221
|
+
console.log(chalk.blue(`${process.pid}: 1`));
|
|
222
|
+
if (responses[c.id].requestPayload) {
|
|
223
|
+
console.log(chalk.blue(`${process.pid}: 2`));
|
|
224
|
+
if (responses[c.id].requestPayload.args.length > 0) {
|
|
225
|
+
console.log(chalk.blue(`${process.pid}: 3`));
|
|
226
|
+
if (responses[c.id].requestPayload.args[0].group) {
|
|
227
|
+
console.log(chalk.blue(`${process.pid}: 4`));
|
|
228
|
+
console.log(chalk.magenta(`${process.pid}:requestPayload: [${JSON.stringify(responses[c.id].requestPayload.args[0].group )}]`))
|
|
229
|
+
const requestGroup = responses[c.id].requestPayload.args[0].group;
|
|
230
|
+
//const responseGroup = responses[c.id].responsePayload.args[0].group;
|
|
231
|
+
|
|
232
|
+
console.log(chalk.magenta(`${process.pid}: clients (from ping data)`));
|
|
233
|
+
Object.values(this.#clients).forEach(c => {
|
|
234
|
+
console.log(chalk.magenta(` ${c.groups}`))
|
|
235
|
+
})
|
|
236
|
+
console.log(chalk.magenta(`${process.pid}:`));
|
|
237
|
+
|
|
238
|
+
console.log(chalk.magenta(`${process.pid}: responses so far...`));
|
|
239
|
+
|
|
240
|
+
for (const [key, value] of Object.entries(responses)) {
|
|
241
|
+
console.log(chalk.magenta(`${process.pid}: client.id: [${key}] response payload: [${JSON.stringify(value.responsePayload)}]`));
|
|
242
|
+
}
|
|
243
|
+
console.log(chalk.magenta(`${process.pid}:`));
|
|
244
|
+
|
|
245
|
+
const clientsInGroup = Object.values(this.#clients).filter(c => {
|
|
246
|
+
const foundGroupIndex = c.groups.indexOf(requestGroup);
|
|
247
|
+
if (foundGroupIndex === -1) {
|
|
248
|
+
return false;
|
|
249
|
+
}
|
|
250
|
+
return true;
|
|
251
|
+
});
|
|
252
|
+
clientsInGroup.forEach(c => {
|
|
253
|
+
console.log(`${process.pid}:clientsInGroup: [${c.id}] groups: [${c.groups}]`);
|
|
254
|
+
if (!responses[c.id]) {
|
|
255
|
+
console.log(`${process.pid}: clientsInGroup - not found: [${c.id}]`);
|
|
256
|
+
found = false;
|
|
257
|
+
}
|
|
258
|
+
});
|
|
259
|
+
// Now check if all responses for completed group membership
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
} else {
|
|
264
|
+
if (!responses[c.id]) {
|
|
265
|
+
found = false;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
136
268
|
}
|
|
137
269
|
});
|
|
138
|
-
|
|
270
|
+
|
|
271
|
+
console.log(chalk.grey(`${process.pid}: ** Testing condition **`))
|
|
272
|
+
if (found === true) {
|
|
273
|
+
console.log(chalk.green(`${process.pid}:Found all messages - should return results`))
|
|
139
274
|
return true;
|
|
140
275
|
}
|
|
276
|
+
console.log(chalk.red(`${process.pid}:did not find all messages (yet) ...`))
|
|
277
|
+
return false;
|
|
278
|
+
*/
|
|
141
279
|
return false;
|
|
142
280
|
};
|
|
143
281
|
#processPayload = (payload, options) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisMessageHandler.js","sourceRoot":"","sources":["../src/redisMessageHandler.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,yBAAyB;AACnH,+CAA2C;AAK3C,2DAAiF;AACjF,qCAA8C;AAE9C,kDAA0B;AAE1B,MAAM,eAAe,GAAG,oCAAoC,CAAA;AAC5D,MAAM,gBAAgB,GAAG,qCAAqC,CAAA;
|
|
1
|
+
{"version":3,"file":"redisMessageHandler.js","sourceRoot":"","sources":["../src/redisMessageHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,8 @@ vitest_1.describe.skip("Redis Message Handler Test", () => {
|
|
|
32
32
|
logger: stsutils_1.defaultLogger,
|
|
33
33
|
role: 'SERVER',
|
|
34
34
|
redisUrl: ioRedisMessageProcessorUrl, // goptions.imRedisMessageProcessorUrl,
|
|
35
|
-
namespace: 'redistestingstsframework'
|
|
35
|
+
namespace: 'redistestingstsframework',
|
|
36
|
+
groups: []
|
|
36
37
|
});
|
|
37
38
|
this.#r1.Start();
|
|
38
39
|
this.#r1.on('fromworkerredis', (arg1, arg2, arg3, callback) => {
|
|
@@ -72,7 +73,8 @@ vitest_1.describe.skip("Redis Message Handler Test", () => {
|
|
|
72
73
|
logger: stsutils_1.defaultLogger,
|
|
73
74
|
role: 'CLIENT',
|
|
74
75
|
redisUrl: ioRedisMessageProcessorUrl, // goptions.imRedisMessageProcessorUrl,
|
|
75
|
-
namespace: 'redistestingstsframework'
|
|
76
|
+
namespace: 'redistestingstsframework',
|
|
77
|
+
groups: []
|
|
76
78
|
});
|
|
77
79
|
this.#r1.Start();
|
|
78
80
|
this.#r1.on('fromprimaryredis', (arg1, callback) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisMessageHandler.test.js","sourceRoot":"","sources":["../src/redisMessageHandler.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,mCAAqE;AAErE,+DAA2D;AAE3D,gDAAqE;AAErE,kDAA0B;AAE1B,+BAAoC;AAEpC,mDAAkD;AAElD,iBAAQ,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAE7C,IAAI,gBAAqB,CAAC;IAC1B,IAAI,0BAA0B,GAAG,EAAE,CAAC;IAEpC,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QACjB,2FAA2F;QAE3F,gBAAgB,GAAG,MAAM,IAAI,iCAAgB,CAAC,OAAO,CAAC;aACjD,gBAAgB,CAAC,IAAI,CAAC;aACtB,KAAK,EAAE,CAAC;QACb,0BAA0B,GAAG,WAAW,gBAAgB,CAAC,OAAO,EAAE,IAAI,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;IACjH,CAAC,CAAC,CAAC;IAEH,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAChB,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAClC,CAAC;IACL,CAAC,EAAE,IAAI,CAAC,CAAC;IAET,MAAM,MAAM;QACR,GAAG,CAAsB;QAEzB;YACI,IAAI,CAAC,GAAG,GAAG,IAAI,yCAAmB,CAAC;gBAC/B,MAAM,EAAE,wBAAa;gBACrB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,0BAA0B,EAAE,uCAAuC;gBAC7E,SAAS,EAAE,0BAA0B;
|
|
1
|
+
{"version":3,"file":"redisMessageHandler.test.js","sourceRoot":"","sources":["../src/redisMessageHandler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.STSTransportWinston =
|
|
6
|
+
exports.STSTransportWinston = void 0;
|
|
7
|
+
exports.UpdateSTSTransportWithDebugger = UpdateSTSTransportWithDebugger;
|
|
7
8
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
8
9
|
const winston_transport_1 = __importDefault(require("winston-transport"));
|
|
9
10
|
function UpdateSTSTransportWithDebugger(logger, newDebugger) {
|
|
@@ -14,7 +15,6 @@ function UpdateSTSTransportWithDebugger(logger, newDebugger) {
|
|
|
14
15
|
stsTransport.debugger = newDebugger;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
|
-
exports.UpdateSTSTransportWithDebugger = UpdateSTSTransportWithDebugger;
|
|
18
18
|
class STSTransportWinston extends winston_transport_1.default {
|
|
19
19
|
#options;
|
|
20
20
|
constructor(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../src/stsTransportWinston.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../src/stsTransportWinston.ts"],"names":[],"mappings":";;;;;;AAUA,wEAOC;AAjBD,kDAAkD,CAAE,UAAU;AAC9D,0EAAqE;AASrE,SAAgB,8BAA8B,CAAC,MAAW,EAAE,WAAgB;IACxE,MAAM,YAAY,GAA0B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE;QAClF,OAAO,SAAS,YAAY,mBAAmB,CAAA;IACnD,CAAC,CAAC,CAAC;IACH,IAAI,YAAY,EAAE,CAAC;QACd,YAAoC,CAAC,QAAQ,GAAG,WAAW,CAAA;IAChE,CAAC;AACL,CAAC;AAED,MAAa,mBAAoB,SAAQ,2BAAS;IAE9C,QAAQ,CAA8B;IAEtC,YAAY,IAAiC;QACzC,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ,CAAC,WAAiC;QAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,WAAW,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,sBAAsB;QACtB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;YACvC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;QACX,KAAK;IACT,CAAC;CACJ;AA5BD,kDA4BC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ServiceConfigOptions =
|
|
6
|
+
exports.ServiceConfigOptions = ServiceConfigOptions;
|
|
7
7
|
const uuid_1 = require("uuid");
|
|
8
8
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
9
9
|
const index_1 = require("../index");
|
|
@@ -80,5 +80,4 @@ function ServiceConfigOptions(clusterMode, isMaster) {
|
|
|
80
80
|
return data;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
exports.ServiceConfigOptions = ServiceConfigOptions;
|
|
84
83
|
//# sourceMappingURL=appConfig.js.map
|
|
@@ -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":";;;;;AA0BA,oDAwEC;AAlGD,+BAAoC;AAEpC,kDAA6C;AAE7C,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,oBAAQ,CAAC,kBAAkB;YAC/C,0BAA0B,EAAE,oBAAQ,CAAC,mBAAmB;YACxD,sBAAsB,EAAE,IAAI;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,IAAI;YAEjB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,oBAAQ,CAAC,cAAc;YACjC,OAAO,EAAE,oBAAQ,CAAC,aAAa;YAC/B,UAAU,EAAE,oBAAQ,CAAC,cAAc;YACnC,IAAI,EAAE,oBAAQ,CAAC,UAAU;YAEzB,iBAAiB,EAAE,KAAK;YACxB,qBAAqB,EAAE,oBAAQ,CAAC,2BAA2B;YAE3D,WAAW,EAAE,oBAAQ,CAAC,iBAAiB;YACvC,cAAc,EAAE,oBAAQ,CAAC,oBAAoB;YAC7C,cAAc,EAAE,IAAI;YACpB,iBAAiB,EAAE,IAAI;YAEvB,kCAAkC,EAAE,oBAAQ,CAAC,kCAAkC;YAC/E,yBAAyB,EAAE,oBAAQ,CAAC,yBAAyB;YAE7D,uBAAuB,EAAE,KAAK;YAE9B,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,eAAe;YAChC,eAAe,EAAE,oBAAQ,CAAC,eAAe;SAC5C,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"}
|