@nsshunt/stsappframework 3.0.185 → 3.0.187
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/build.sh +1 -0
- package/dist/authutilsnode.js +9 -3
- package/dist/authutilsnode.js.map +1 -1
- package/dist/influxdb/influxDBManager.js +18 -15
- package/dist/influxdb/influxDBManager.js.map +1 -1
- package/dist/influxdb/influxDBManagerAgent.js +4 -1
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/influxdb/influxDBManagerService.js +4 -2
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/dist/kafka/IMKafkaManager.js +8 -5
- package/dist/kafka/IMKafkaManager.js.map +1 -1
- package/dist/middleware/serverNetworkMiddleware.js +80 -29
- package/dist/middleware/serverNetworkMiddleware.js.map +1 -1
- package/dist/publishertransports/publishTransportDirect.js.map +1 -1
- package/dist/socketIoServerHelper.js +12 -15
- package/dist/socketIoServerHelper.js.map +1 -1
- package/package.json +1 -1
- package/src/authutilsnode.ts +20 -10
- package/src/influxdb/influxDBManager.ts +19 -15
- package/src/influxdb/influxDBManagerAgent.ts +5 -1
- package/src/influxdb/influxDBManagerService.ts +5 -1
- package/src/kafka/IMKafkaManager.ts +9 -5
- package/src/middleware/serverNetworkMiddleware.ts +82 -28
- package/src/publishertransports/publishTransportDirect.ts +0 -1
- package/src/socketIoServerHelper.ts +13 -12
- package/types/authutilsnode.d.ts +5 -1
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/influxdb/influxDBManager.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
- package/types/kafka/IMKafkaManager.d.ts.map +1 -1
- package/types/middleware/serverNetworkMiddleware.d.ts.map +1 -1
- package/types/publishertransports/publishTransportDirect.d.ts.map +1 -1
- package/types/socketIoServerHelper.d.ts.map +1 -1
|
@@ -20,15 +20,44 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
20
20
|
#tinyEmitter = new tiny_emitter_1.TinyEmitter();
|
|
21
21
|
#socketCollection = {};
|
|
22
22
|
#id = '';
|
|
23
|
-
#debug;
|
|
24
23
|
constructor(options) {
|
|
25
24
|
super(options);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
25
|
+
}
|
|
26
|
+
#LogDebugMessage(message) {
|
|
27
|
+
console.log(`*********************************************************************************`);
|
|
28
|
+
console.log(`*********************************************************************************`);
|
|
29
|
+
console.log(`*********************************************************************************`);
|
|
30
|
+
console.log(`*********************************************************************************`);
|
|
31
|
+
console.log(`*********************************************************************************`);
|
|
32
|
+
console.log(`*********************************************************************************`);
|
|
33
|
+
console.log(`*********************************************************************************`);
|
|
34
|
+
console.log(`*********************************************************************************`);
|
|
35
|
+
setImmediate(() => {
|
|
36
|
+
if (this.options) {
|
|
37
|
+
try {
|
|
38
|
+
console.log(`*********************************************************************************`);
|
|
39
|
+
console.log(`*********************************************************************************`);
|
|
40
|
+
console.log(`*********************************************************************************`);
|
|
41
|
+
console.log(`*********************************************************************************`);
|
|
42
|
+
console.log(`*********************************************************************************`);
|
|
43
|
+
console.log(`*********************************************************************************`);
|
|
44
|
+
console.log(`*********************************************************************************`);
|
|
45
|
+
console.log(`*********************************************************************************`);
|
|
46
|
+
this.options?.logger.debug(message);
|
|
47
|
+
}
|
|
48
|
+
catch (error) {
|
|
49
|
+
console.log(`*********************************************************************************`);
|
|
50
|
+
console.log(`*********************************************************************************`);
|
|
51
|
+
console.log(`*********************************************************************************`);
|
|
52
|
+
console.log(`*********************************************************************************`);
|
|
53
|
+
console.log(`*********************************************************************************`);
|
|
54
|
+
console.log(`*********************************************************************************`);
|
|
55
|
+
console.log(`*********************************************************************************`);
|
|
56
|
+
console.log(`*********************************************************************************`);
|
|
57
|
+
console.error(error);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
});
|
|
32
61
|
}
|
|
33
62
|
on(eventName, callBackFn) {
|
|
34
63
|
this.#tinyEmitter.on(eventName, callBackFn);
|
|
@@ -48,11 +77,11 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
48
77
|
workingSocketRecord.currentBytesWritten = req.socket.bytesWritten;
|
|
49
78
|
workingSocketRecord.requestBytesRead = workingSocketRecord.currentBytesRead - workingSocketRecord.lastBytesRead;
|
|
50
79
|
workingSocketRecord.requestBytesWritten = workingSocketRecord.currentBytesWritten - workingSocketRecord.lastBytesWritten;
|
|
51
|
-
//this.#
|
|
52
|
-
//this.#
|
|
80
|
+
//this.#LogDebugMessage(chalk.gray(`totalBytesRead: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesRead}]`));
|
|
81
|
+
//this.#LogDebugMessage(chalk.gray(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`));
|
|
53
82
|
const workingSocketEventRecord = { ...workingSocketRecord };
|
|
54
83
|
delete workingSocketEventRecord.socket;
|
|
55
|
-
this.#
|
|
84
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
|
|
56
85
|
this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
|
|
57
86
|
workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
|
|
58
87
|
workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
|
|
@@ -71,7 +100,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
71
100
|
return contentLength;
|
|
72
101
|
}
|
|
73
102
|
catch (error) {
|
|
74
|
-
this.#
|
|
103
|
+
this.#LogDebugMessage(chalk_1.default.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
|
|
75
104
|
return 0;
|
|
76
105
|
}
|
|
77
106
|
};
|
|
@@ -93,37 +122,37 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
93
122
|
eventName: '',
|
|
94
123
|
};
|
|
95
124
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
96
|
-
this.#
|
|
125
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
97
126
|
workingSocketRecord.socket.on('data', () => {
|
|
98
127
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
99
128
|
if (socketRecord) {
|
|
100
|
-
this.#
|
|
129
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
101
130
|
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
102
131
|
}
|
|
103
132
|
else {
|
|
104
|
-
this.#
|
|
133
|
+
this.#LogDebugMessage(chalk_1.default.magenta(`Socket data event: Could not find socket within recordset`));
|
|
105
134
|
}
|
|
106
135
|
});
|
|
107
136
|
workingSocketRecord.socket.on('close', () => {
|
|
108
137
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
109
138
|
if (socketRecord) {
|
|
110
|
-
this.#
|
|
139
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
111
140
|
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
112
141
|
delete this.#socketCollection[socketRecord.id];
|
|
113
|
-
this.#
|
|
142
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
114
143
|
}
|
|
115
144
|
else {
|
|
116
|
-
this.#
|
|
145
|
+
this.#LogDebugMessage(chalk_1.default.magenta(`Socket close event: Could not find socket within recordset`));
|
|
117
146
|
}
|
|
118
147
|
});
|
|
119
148
|
workingSocketRecord.socket.on('end', () => {
|
|
120
149
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
121
150
|
if (socketRecord) {
|
|
122
|
-
this.#
|
|
151
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
123
152
|
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
124
153
|
}
|
|
125
154
|
else {
|
|
126
|
-
this.#
|
|
155
|
+
this.#LogDebugMessage(chalk_1.default.magenta(`Socket end event: Could not find socket within recordset`));
|
|
127
156
|
}
|
|
128
157
|
});
|
|
129
158
|
}
|
|
@@ -145,56 +174,78 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
145
174
|
res.setHeader('Expires', '0'); // Proxies
|
|
146
175
|
const headerLength = JSON.stringify(res.getHeaders()).length;
|
|
147
176
|
const totalSize = contentLength + headerLength;
|
|
148
|
-
this.#
|
|
177
|
+
this.#LogDebugMessage(chalk_1.default.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
|
|
149
178
|
});
|
|
150
179
|
// This event is the one where bytesWritten is generally recorded
|
|
151
180
|
req.on('end', () => {
|
|
152
181
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
153
182
|
if (socketRecord) {
|
|
154
|
-
this.#
|
|
183
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
155
184
|
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
156
185
|
}
|
|
157
186
|
else {
|
|
158
|
-
this.#
|
|
187
|
+
this.#LogDebugMessage(chalk_1.default.magenta(`Request end event: Could not find socket within recordset`));
|
|
159
188
|
}
|
|
160
189
|
});
|
|
161
190
|
req.on('close', () => {
|
|
162
191
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
163
192
|
if (socketRecord) {
|
|
164
|
-
this.#
|
|
193
|
+
this.#LogDebugMessage(chalk_1.default.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
165
194
|
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
166
195
|
}
|
|
167
196
|
else {
|
|
168
|
-
this.#
|
|
197
|
+
this.#LogDebugMessage(chalk_1.default.magenta(`Request close event: Could not find socket within recordset`));
|
|
169
198
|
}
|
|
170
199
|
});
|
|
171
200
|
/* These methods are also available but from testing they provide no specific value add, i.e. the calculated numbers are always 0.
|
|
172
201
|
req.on('data', () => {
|
|
173
202
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
174
203
|
if (workingSocketRecord) {
|
|
175
|
-
this.#
|
|
204
|
+
this.#LogDebugMessage(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
176
205
|
this.UpdateNetworkStats(workingSocketRecord, 'data', req);
|
|
177
206
|
} else {
|
|
178
|
-
this.#
|
|
207
|
+
this.#LogDebugMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
179
208
|
}
|
|
180
209
|
});
|
|
181
210
|
|
|
182
211
|
req.on('readable', () => {
|
|
183
212
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
184
213
|
if (workingSocketRecord) {
|
|
185
|
-
this.#
|
|
214
|
+
this.#LogDebugMessage(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
186
215
|
this.UpdateNetworkStats(workingSocketRecord, 'readable', req);
|
|
187
216
|
} else {
|
|
188
|
-
this.#
|
|
217
|
+
this.#LogDebugMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
189
218
|
}
|
|
190
219
|
});
|
|
191
220
|
*/
|
|
192
221
|
const inHeadersLength = JSON.stringify(req.headers).length;
|
|
193
222
|
const inContentLength = this.#GetRequestContentSize(req);
|
|
194
223
|
const inTotal = inHeadersLength + inContentLength;
|
|
195
|
-
this.#
|
|
224
|
+
this.#LogDebugMessage(chalk_1.default.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
|
|
196
225
|
// This event is the one where bytesRead is generally recorded
|
|
197
226
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
227
|
+
console.log(`*********************************************************************************`);
|
|
228
|
+
console.log(`*********************************************************************************`);
|
|
229
|
+
console.log(`*********************************************************************************`);
|
|
230
|
+
console.log(`*********************************************************************************`);
|
|
231
|
+
console.log(`*********************************************************************************`);
|
|
232
|
+
console.log(`*********************************************************************************`);
|
|
233
|
+
console.log(`*********************************************************************************`);
|
|
234
|
+
console.log(`*********************************************************************************`);
|
|
235
|
+
debug('*****************************************************************************');
|
|
236
|
+
debug('*****************************************************************************');
|
|
237
|
+
debug('*****************************************************************************');
|
|
238
|
+
debug('*****************************************************************************');
|
|
239
|
+
debug('*****************************************************************************');
|
|
240
|
+
debug('*****************************************************************************');
|
|
241
|
+
debug('*****************************************************************************');
|
|
242
|
+
debug('*****************************************************************************');
|
|
243
|
+
debug('*****************************************************************************');
|
|
244
|
+
debug('*****************************************************************************');
|
|
245
|
+
debug('*****************************************************************************');
|
|
246
|
+
debug('*****************************************************************************');
|
|
247
|
+
debug('*****************************************************************************');
|
|
248
|
+
debug('*****************************************************************************');
|
|
198
249
|
next();
|
|
199
250
|
};
|
|
200
251
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,wFAAwF,CAAE,UAAU;AACpG,kDAA0B,CAAC,4FAA4F;AAGvH,+CAA2C;AAE3C,kDAA+B;AAC/B,gDAAmD;AACnD,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAEjD,+BAAoC;AACpC,4DAAoC;AAEpC,IAAY,gCAEX;AAFD,WAAY,gCAAgC;IACxC,uGAAmE,CAAA,CAAC,oBAAoB;AAC5F,CAAC,EAFW,gCAAgC,gDAAhC,gCAAgC,QAE3C;AAsBD,MAAa,uBAAwB,SAAQ,yBAAc;IAEvD,YAAY,GAAgB,IAAI,0BAAW,EAAE,CAAC;IAC9C,iBAAiB,GAAkC,EAAG,CAAC;IACvD,GAAG,GAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishTransportDirect.js","sourceRoot":"","sources":["../../src/publishertransports/publishTransportDirect.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;;;;;;
|
|
1
|
+
{"version":3,"file":"publishTransportDirect.js","sourceRoot":"","sources":["../../src/publishertransports/publishTransportDirect.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;;;;;;AAKpG,8DAA0D;AAC1D,mEAA+D;AAE/D,mEAA+D;AAE/D,kDAA0B;AAO1B,MAAa,sBAAsB;IAE/B,gBAAgB,CAAkB;IAClC,eAAe,CAAiB;IAChC,QAAQ,CAAiC;IAEzC,YAAY,OAAuC;QAE/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,gBAAgB,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,IAAI,+BAAc,CAAC;YACtC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;SAC/B,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,8EAA8E,KAAK,GAAG,CAAC,CAAC,CAAC;QAC3I,CAAC,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,iDAAiD;IACjD,OAAO,GAAG,KAAK,EAAE,OAA2B,EAAoB,EAAE;QAE9D,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,6CAAqB,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACpF,OAAO,CAAC,OAAO,GAAG,cAAqB,CAAC;YAExC,oGAAoG;YACpG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC/C,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,+EAA+E,KAAK,GAAG,CAAC,CAAC,CAAC;YAC5I,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EACd,CAAC;YACG,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC,CAAA;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA7CD,wDA6CC"}
|
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.SocketIoServerHelper = void 0;
|
|
7
|
-
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
8
|
-
const debug_1 = __importDefault(require("debug"));
|
|
9
|
-
const debug = (0, debug_1.default)(`proc:${process.pid}:socketiohelper`);
|
|
10
4
|
class SocketIoServerHelper {
|
|
11
5
|
#socketIoServerHelperOptions;
|
|
12
6
|
constructor(options) {
|
|
13
7
|
this.#socketIoServerHelperOptions = options;
|
|
14
8
|
}
|
|
15
9
|
#namespace = {};
|
|
10
|
+
#LogDebugMessage(message) {
|
|
11
|
+
this.#socketIoServerHelperOptions.logger.debug(message);
|
|
12
|
+
}
|
|
16
13
|
LogMessage = (namespace, message) => {
|
|
17
14
|
this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
|
|
18
15
|
/*
|
|
@@ -23,42 +20,42 @@ class SocketIoServerHelper {
|
|
|
23
20
|
};
|
|
24
21
|
LeaveRoom = (namespace, socket, room) => {
|
|
25
22
|
const logMessage = `${namespace.socketionamespace.name}: Leaving room [${room}]`;
|
|
26
|
-
|
|
23
|
+
this.#LogDebugMessage(logMessage);
|
|
27
24
|
this.LogMessage(namespace, logMessage);
|
|
28
25
|
socket.leave(room);
|
|
29
26
|
};
|
|
30
27
|
JoinRoom = (namespace, socket, room) => {
|
|
31
28
|
const logMessage = `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
32
|
-
|
|
29
|
+
this.#LogDebugMessage(logMessage);
|
|
33
30
|
this.LogMessage(namespace, logMessage);
|
|
34
31
|
socket.join(room);
|
|
35
32
|
};
|
|
36
33
|
#SetupStandardEvents = (namespace, socket) => {
|
|
37
34
|
socket.on("__STSdisconnect", (reason) => {
|
|
38
|
-
|
|
35
|
+
this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
|
|
39
36
|
});
|
|
40
37
|
socket.on("__STSdisconnecting", (reason, callBackResult) => {
|
|
41
|
-
|
|
38
|
+
this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
|
|
42
39
|
callBackResult("__STSdisconnecting accepted by server.");
|
|
43
40
|
});
|
|
44
41
|
socket.on('__STSjoinRoom', (rooms) => {
|
|
45
42
|
rooms.forEach((room) => {
|
|
46
43
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
47
|
-
|
|
44
|
+
this.#LogDebugMessage(logMessage);
|
|
48
45
|
this.JoinRoom(namespace, socket, room);
|
|
49
46
|
});
|
|
50
47
|
});
|
|
51
48
|
socket.on('__STSleaveRoom', (rooms) => {
|
|
52
49
|
rooms.forEach((room) => {
|
|
53
50
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
|
|
54
|
-
|
|
51
|
+
this.#LogDebugMessage(logMessage);
|
|
55
52
|
this.LeaveRoom(namespace, socket, room);
|
|
56
53
|
});
|
|
57
54
|
});
|
|
58
55
|
socket.on('__STSsendToRoom', (rooms, payload) => {
|
|
59
56
|
rooms.forEach((room) => {
|
|
60
57
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`;
|
|
61
|
-
|
|
58
|
+
this.#LogDebugMessage(logMessage);
|
|
62
59
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
63
60
|
namespace.socketionamespace.to(room).emit(payload.command, payload);
|
|
64
61
|
});
|
|
@@ -103,9 +100,9 @@ class SocketIoServerHelper {
|
|
|
103
100
|
this.#SetupConnectionMiddleware(this.#namespace[namespace]);
|
|
104
101
|
this.#namespace[namespace].socketionamespace.on("connection", socket => {
|
|
105
102
|
const logMessage = `${namespace}: Socket connected, ID: [${socket.id}]`;
|
|
106
|
-
|
|
103
|
+
this.#LogDebugMessage(logMessage);
|
|
107
104
|
this.LogMessage(this.#namespace[namespace], logMessage);
|
|
108
|
-
|
|
105
|
+
this.#LogDebugMessage(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
109
106
|
this.#SetupMessageMiddleware(socket);
|
|
110
107
|
if (autoJoinRooms) {
|
|
111
108
|
rooms.map((room) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/authutilsnode.ts
CHANGED
|
@@ -11,7 +11,7 @@ const goptions = $Options()
|
|
|
11
11
|
|
|
12
12
|
import debugModule from 'debug'
|
|
13
13
|
|
|
14
|
-
import { GetErrorPayload, JSONObject } from '@nsshunt/stsutils'
|
|
14
|
+
import { GetErrorPayload, ISTSLogger, JSONObject } from '@nsshunt/stsutils'
|
|
15
15
|
|
|
16
16
|
import { AppFrameworkErrorCode } from './validation/errors'
|
|
17
17
|
|
|
@@ -54,18 +54,28 @@ export interface IGetAPITokenFromAuthServerUsingScopeOptions {
|
|
|
54
54
|
instrumentController?: PublishInstrumentControllerV2
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
export
|
|
58
|
-
|
|
57
|
+
export interface IAuthUtilsNodeOptions {
|
|
58
|
+
logger: ISTSLogger
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export class AuthUtilsNode {
|
|
62
|
+
#options: IAuthUtilsNodeOptions;
|
|
59
63
|
#cookiejar: tough.CookieJar;
|
|
60
64
|
#httpsAgent: https.Agent | null = null;
|
|
61
65
|
#debug = debugModule(`proc:${process.pid}:AuthUtilsNode`);
|
|
62
66
|
// Regular expression to match the origin
|
|
63
67
|
#originRegex = /^(api:\/\/\w+)/;
|
|
64
68
|
|
|
65
|
-
constructor() {
|
|
69
|
+
constructor(options: IAuthUtilsNodeOptions) {
|
|
70
|
+
this.#options = options;
|
|
66
71
|
this.#cookiejar = new tough.CookieJar();
|
|
67
72
|
}
|
|
68
73
|
|
|
74
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
|
+
#LogDebugMessage(message: any) {
|
|
76
|
+
this.#options.logger.debug(message);
|
|
77
|
+
}
|
|
78
|
+
|
|
69
79
|
#GetHttpsAgent = () =>
|
|
70
80
|
{
|
|
71
81
|
if (this.#httpsAgent === null) {
|
|
@@ -213,7 +223,7 @@ export class AuthUtilsNode
|
|
|
213
223
|
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
214
224
|
|
|
215
225
|
const invokeErrorCb = (error: Error) => {
|
|
216
|
-
this.#
|
|
226
|
+
this.#LogDebugMessage(error);
|
|
217
227
|
if (instrumentController) {
|
|
218
228
|
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, { // auth error
|
|
219
229
|
Inc: 1
|
|
@@ -276,7 +286,7 @@ export class AuthUtilsNode
|
|
|
276
286
|
if (retVal.status) {
|
|
277
287
|
if (retVal.status !== 200) {
|
|
278
288
|
// Just provide a warning here
|
|
279
|
-
this.#
|
|
289
|
+
this.#LogDebugMessage(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
|
|
280
290
|
}
|
|
281
291
|
} else {
|
|
282
292
|
invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
@@ -349,7 +359,7 @@ export class AuthUtilsNode
|
|
|
349
359
|
//,socketPath: '/var/run/sts/stsrest01.sock'
|
|
350
360
|
});
|
|
351
361
|
duration = (performance.now() - processStart).toFixed(4);
|
|
352
|
-
if (publishDebug)
|
|
362
|
+
if (publishDebug) this.#LogDebugMessage(`AuthUtilsNode.LoginNode request duration: [${duration}]`);
|
|
353
363
|
loginData = retVal.data.detail;
|
|
354
364
|
|
|
355
365
|
|
|
@@ -364,7 +374,7 @@ export class AuthUtilsNode
|
|
|
364
374
|
return loginData;
|
|
365
375
|
} catch (error)
|
|
366
376
|
{
|
|
367
|
-
if (publishDebug)
|
|
377
|
+
if (publishDebug) this.#LogDebugMessage(chalk.red(`Error (AuthUtilsNode:LoginNode): ${error}`));
|
|
368
378
|
throw error;
|
|
369
379
|
}
|
|
370
380
|
}
|
|
@@ -394,12 +404,12 @@ export class AuthUtilsNode
|
|
|
394
404
|
//,socketPath: '/var/run/sts/stsrest01.sock'
|
|
395
405
|
});
|
|
396
406
|
duration = (performance.now() - processStart).toFixed(4);
|
|
397
|
-
if (publishDebug)
|
|
407
|
+
if (publishDebug) this.#LogDebugMessage(`AuthUtilsNode.RefreshAuthTokenBrowser request duration: [${duration}]`);
|
|
398
408
|
loginData = retVal.data.detail;
|
|
399
409
|
await this.SetCookiesToJar(retVal.headers);
|
|
400
410
|
return loginData;
|
|
401
411
|
} catch (error) {
|
|
402
|
-
if (publishDebug)
|
|
412
|
+
if (publishDebug) this.#LogDebugMessage(chalk.red(`Error (AuthUtilsNode:RefreshAuthTokenBrowser): ${error}`));
|
|
403
413
|
throw error;
|
|
404
414
|
}
|
|
405
415
|
}
|
|
@@ -283,21 +283,25 @@ export class InfluxDBManager
|
|
|
283
283
|
this.#options.logger.error(message);
|
|
284
284
|
}
|
|
285
285
|
|
|
286
|
+
#LogDebugMessage(message: any) {
|
|
287
|
+
this.#options.logger.debug(message);
|
|
288
|
+
}
|
|
289
|
+
|
|
286
290
|
#BoostrapInfluxDB = async(): Promise<void> => {
|
|
287
291
|
const tasksAPI = new TasksAPI(this.#client);
|
|
288
292
|
const tasks: Tasks = await tasksAPI.getTasks({
|
|
289
293
|
org: 'my-org'
|
|
290
294
|
});
|
|
291
295
|
if (tasks.tasks) {
|
|
292
|
-
|
|
296
|
+
this.#LogDebugMessage(chalk.cyan(`[InfluxDB Tasks] - Count: [${tasks.tasks.length}]`));
|
|
293
297
|
tasks.tasks.forEach((task: Task) => {
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
+
this.#LogDebugMessage(chalk.cyan(`-- [ Start Task Definition ]--`));
|
|
299
|
+
this.#LogDebugMessage(chalk.green(`${JSON.stringify(task)}`));
|
|
300
|
+
this.#LogDebugMessage(chalk.yellow(`authorizationID: [${task.authorizationID}]`));
|
|
301
|
+
this.#LogDebugMessage(chalk.cyan(`-- [ End Task Definition ]--`));
|
|
298
302
|
});
|
|
299
303
|
} else {
|
|
300
|
-
|
|
304
|
+
this.#LogDebugMessage(chalk.magenta(`[InfluxDB Tasks] - Could not get tasks from the InfluxDB API`));
|
|
301
305
|
}
|
|
302
306
|
}
|
|
303
307
|
|
|
@@ -328,7 +332,7 @@ export class InfluxDBManager
|
|
|
328
332
|
|
|
329
333
|
Terminate = async () => {
|
|
330
334
|
if (this.#shuttingDown) {
|
|
331
|
-
|
|
335
|
+
this.#LogDebugMessage(chalk.yellow(`${_logPrefix}Terminate: Terminate already called. Ignoring.`));
|
|
332
336
|
} else {
|
|
333
337
|
this.#shuttingDown = true;
|
|
334
338
|
if (this.#writeClient) {
|
|
@@ -347,7 +351,7 @@ export class InfluxDBManager
|
|
|
347
351
|
|
|
348
352
|
this.#writeClient = null;
|
|
349
353
|
|
|
350
|
-
|
|
354
|
+
this.#LogDebugMessage(chalk.yellow(`ProducerDisconnect`));
|
|
351
355
|
} catch (error) {
|
|
352
356
|
this.#LogErrorMessage(chalk.red(`${_logPrefix}#Terminate: Error: [${error}]`));
|
|
353
357
|
}
|
|
@@ -442,15 +446,15 @@ export class InfluxDBManager
|
|
|
442
446
|
// ... there are more write options that can be customized, see
|
|
443
447
|
// https://influxdata.github.io/influxdb-client-js/influxdb-client.writeoptions.html and
|
|
444
448
|
// https://influxdata.github.io/influxdb-client-js/influxdb-client.writeretryoptions.html
|
|
445
|
-
writeFailed(error, lines, attempt, expires) {
|
|
446
|
-
|
|
449
|
+
writeFailed: (error, lines, attempt, expires) => {
|
|
450
|
+
this.#LogDebugMessage(chalk.red(`writeOptions:writeSuccess(): Error: [${error}], Attempt: [${attempt}], Expires: [${expires}], Lines: [${lines}]`));
|
|
447
451
|
},
|
|
448
|
-
writeSuccess(lines) {
|
|
452
|
+
writeSuccess: (lines) => {
|
|
449
453
|
// Needs option
|
|
450
|
-
//@@
|
|
454
|
+
//@@this.#LogDebugMessage(chalk.green(`writeOptions:writeSuccess(): Lines: [${lines}]`));
|
|
451
455
|
},
|
|
452
|
-
writeRetrySkipped(entry) {
|
|
453
|
-
|
|
456
|
+
writeRetrySkipped: (entry) => {
|
|
457
|
+
this.#LogDebugMessage(chalk.magenta(`writeOptions:writeSuccess(): Expires: [${entry.expires}], Lines: [${entry.lines}]`));
|
|
454
458
|
}
|
|
455
459
|
}
|
|
456
460
|
|
|
@@ -470,7 +474,7 @@ export class InfluxDBManager
|
|
|
470
474
|
await this.#writeClient.flush();
|
|
471
475
|
const end = performance.now();
|
|
472
476
|
// Needs option
|
|
473
|
-
//@@
|
|
477
|
+
//@@this.#LogDebugMessage(chalk.gray(`InfluxDB Flush time: [${end-start}]`));
|
|
474
478
|
attemptCount = 0;
|
|
475
479
|
StartWriteClient(normalFlushDelay);
|
|
476
480
|
} catch (error) {
|
|
@@ -133,6 +133,10 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
133
133
|
this.options.logger.error(message);
|
|
134
134
|
}
|
|
135
135
|
|
|
136
|
+
#LogDebugMessage(message: any) {
|
|
137
|
+
this.options.logger.debug(message);
|
|
138
|
+
}
|
|
139
|
+
|
|
136
140
|
// Queries --------------------------------------------------------------------------------------------------------
|
|
137
141
|
|
|
138
142
|
// Counter metrics
|
|
@@ -144,7 +148,7 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
144
148
|
|> filter(fn: (r) => r["_measurement"] == "${measurement}" ${filterClause})`;
|
|
145
149
|
|
|
146
150
|
if (showOutput) {
|
|
147
|
-
|
|
151
|
+
this.#LogDebugMessage(`GetSTSCountGenericAgent(): query: [${query}]`);
|
|
148
152
|
}
|
|
149
153
|
|
|
150
154
|
return this.queryApi.collectRows(query)
|
|
@@ -146,6 +146,10 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
|
|
|
146
146
|
this.options.logger.error(message);
|
|
147
147
|
}
|
|
148
148
|
|
|
149
|
+
#LogDebugMessage(message: any) {
|
|
150
|
+
this.options.logger.debug(message);
|
|
151
|
+
}
|
|
152
|
+
|
|
149
153
|
override get modelType(): string {
|
|
150
154
|
return 'service'
|
|
151
155
|
}
|
|
@@ -183,7 +187,7 @@ data
|
|
|
183
187
|
union(tables: [r1, r2])`;
|
|
184
188
|
|
|
185
189
|
if (showOutput) {
|
|
186
|
-
|
|
190
|
+
this.#LogDebugMessage(`InfluxDBManagerService:GetSTSCountGenericService(): query: [${query}]`);
|
|
187
191
|
}
|
|
188
192
|
|
|
189
193
|
return this.queryApi.collectRows(query)
|