@nsshunt/stsappframework 3.0.187 → 3.1.1
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 +0 -1
- package/dist/authutilsnode.js +3 -9
- package/dist/authutilsnode.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/influxdb/influxDBManager.js +15 -18
- package/dist/influxdb/influxDBManager.js.map +1 -1
- package/dist/influxdb/influxDBManagerAgent.js +1 -4
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/influxdb/influxDBManagerService.js +2 -4
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/dist/kafka/IMKafkaManager.js +5 -8
- package/dist/kafka/IMKafkaManager.js.map +1 -1
- package/dist/middleware/serverNetworkMiddleware.js +29 -80
- package/dist/middleware/serverNetworkMiddleware.js.map +1 -1
- package/dist/publishertransports/publishTransportDirect.js.map +1 -1
- package/dist/socketIoServerHelper.js +15 -12
- package/dist/socketIoServerHelper.js.map +1 -1
- package/dist/{stsTransportLoggerWinston.js → stsAppFrameworkTransportWinston.js} +7 -5
- package/dist/stsAppFrameworkTransportWinston.js.map +1 -0
- package/dist/{stsTransportDebuggerWinston.js → stsTransportWinston.js} +5 -5
- package/dist/stsTransportWinston.js.map +1 -0
- package/package.json +1 -1
- package/src/authutilsnode.ts +10 -20
- package/src/index.ts +2 -2
- package/src/influxdb/influxDBManager.ts +15 -19
- package/src/influxdb/influxDBManagerAgent.ts +1 -5
- package/src/influxdb/influxDBManagerService.ts +1 -5
- package/src/kafka/IMKafkaManager.ts +5 -9
- package/src/middleware/serverNetworkMiddleware.ts +28 -82
- package/src/publishertransports/publishTransportDirect.ts +1 -0
- package/src/socketIoServerHelper.ts +12 -13
- package/src/stsAppFrameworkTransportWinston.ts +28 -0
- package/src/{stsTransportDebuggerWinston.ts → stsTransportWinston.ts} +6 -6
- package/types/authutilsnode.d.ts +1 -5
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/index.d.ts +2 -2
- package/types/index.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
- package/types/stsAppFrameworkTransportWinston.d.ts +12 -0
- package/types/stsAppFrameworkTransportWinston.d.ts.map +1 -0
- package/types/{stsTransportDebuggerWinston.d.ts → stsTransportWinston.d.ts} +4 -4
- package/types/stsTransportWinston.d.ts.map +1 -0
- package/dist/stsTransportDebuggerWinston.js.map +0 -1
- package/dist/stsTransportLoggerWinston.js.map +0 -1
- package/src/stsTransportLoggerWinston.ts +0 -23
- package/types/stsTransportDebuggerWinston.d.ts.map +0 -1
- package/types/stsTransportLoggerWinston.d.ts +0 -12
- package/types/stsTransportLoggerWinston.d.ts.map +0 -1
|
@@ -20,44 +20,15 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
20
20
|
#tinyEmitter = new tiny_emitter_1.TinyEmitter();
|
|
21
21
|
#socketCollection = {};
|
|
22
22
|
#id = '';
|
|
23
|
+
#debug;
|
|
23
24
|
constructor(options) {
|
|
24
25
|
super(options);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
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
|
-
});
|
|
26
|
+
if (options.outputDebug) {
|
|
27
|
+
this.#debug = debug;
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
this.#debug = () => { };
|
|
31
|
+
}
|
|
61
32
|
}
|
|
62
33
|
on(eventName, callBackFn) {
|
|
63
34
|
this.#tinyEmitter.on(eventName, callBackFn);
|
|
@@ -77,11 +48,11 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
77
48
|
workingSocketRecord.currentBytesWritten = req.socket.bytesWritten;
|
|
78
49
|
workingSocketRecord.requestBytesRead = workingSocketRecord.currentBytesRead - workingSocketRecord.lastBytesRead;
|
|
79
50
|
workingSocketRecord.requestBytesWritten = workingSocketRecord.currentBytesWritten - workingSocketRecord.lastBytesWritten;
|
|
80
|
-
//this.#
|
|
81
|
-
//this.#
|
|
51
|
+
//this.#debug(chalk.gray(`totalBytesRead: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesRead}]`));
|
|
52
|
+
//this.#debug(chalk.gray(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`));
|
|
82
53
|
const workingSocketEventRecord = { ...workingSocketRecord };
|
|
83
54
|
delete workingSocketEventRecord.socket;
|
|
84
|
-
this.#
|
|
55
|
+
this.#debug(chalk_1.default.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
|
|
85
56
|
this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
|
|
86
57
|
workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
|
|
87
58
|
workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
|
|
@@ -100,7 +71,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
100
71
|
return contentLength;
|
|
101
72
|
}
|
|
102
73
|
catch (error) {
|
|
103
|
-
this.#
|
|
74
|
+
this.#debug(chalk_1.default.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
|
|
104
75
|
return 0;
|
|
105
76
|
}
|
|
106
77
|
};
|
|
@@ -122,37 +93,37 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
122
93
|
eventName: '',
|
|
123
94
|
};
|
|
124
95
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
125
|
-
this.#
|
|
96
|
+
this.#debug(chalk_1.default.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
126
97
|
workingSocketRecord.socket.on('data', () => {
|
|
127
98
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
128
99
|
if (socketRecord) {
|
|
129
|
-
this.#
|
|
100
|
+
this.#debug(chalk_1.default.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
130
101
|
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
131
102
|
}
|
|
132
103
|
else {
|
|
133
|
-
this.#
|
|
104
|
+
this.#debug(chalk_1.default.magenta(`Socket data event: Could not find socket within recordset`));
|
|
134
105
|
}
|
|
135
106
|
});
|
|
136
107
|
workingSocketRecord.socket.on('close', () => {
|
|
137
108
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
138
109
|
if (socketRecord) {
|
|
139
|
-
this.#
|
|
110
|
+
this.#debug(chalk_1.default.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
140
111
|
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
141
112
|
delete this.#socketCollection[socketRecord.id];
|
|
142
|
-
this.#
|
|
113
|
+
this.#debug(chalk_1.default.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
143
114
|
}
|
|
144
115
|
else {
|
|
145
|
-
this.#
|
|
116
|
+
this.#debug(chalk_1.default.magenta(`Socket close event: Could not find socket within recordset`));
|
|
146
117
|
}
|
|
147
118
|
});
|
|
148
119
|
workingSocketRecord.socket.on('end', () => {
|
|
149
120
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
150
121
|
if (socketRecord) {
|
|
151
|
-
this.#
|
|
122
|
+
this.#debug(chalk_1.default.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
152
123
|
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
153
124
|
}
|
|
154
125
|
else {
|
|
155
|
-
this.#
|
|
126
|
+
this.#debug(chalk_1.default.magenta(`Socket end event: Could not find socket within recordset`));
|
|
156
127
|
}
|
|
157
128
|
});
|
|
158
129
|
}
|
|
@@ -174,78 +145,56 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
174
145
|
res.setHeader('Expires', '0'); // Proxies
|
|
175
146
|
const headerLength = JSON.stringify(res.getHeaders()).length;
|
|
176
147
|
const totalSize = contentLength + headerLength;
|
|
177
|
-
this.#
|
|
148
|
+
this.#debug(chalk_1.default.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
|
|
178
149
|
});
|
|
179
150
|
// This event is the one where bytesWritten is generally recorded
|
|
180
151
|
req.on('end', () => {
|
|
181
152
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
182
153
|
if (socketRecord) {
|
|
183
|
-
this.#
|
|
154
|
+
this.#debug(chalk_1.default.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
184
155
|
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
185
156
|
}
|
|
186
157
|
else {
|
|
187
|
-
this.#
|
|
158
|
+
this.#debug(chalk_1.default.magenta(`Request end event: Could not find socket within recordset`));
|
|
188
159
|
}
|
|
189
160
|
});
|
|
190
161
|
req.on('close', () => {
|
|
191
162
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
192
163
|
if (socketRecord) {
|
|
193
|
-
this.#
|
|
164
|
+
this.#debug(chalk_1.default.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
194
165
|
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
195
166
|
}
|
|
196
167
|
else {
|
|
197
|
-
this.#
|
|
168
|
+
this.#debug(chalk_1.default.magenta(`Request close event: Could not find socket within recordset`));
|
|
198
169
|
}
|
|
199
170
|
});
|
|
200
171
|
/* These methods are also available but from testing they provide no specific value add, i.e. the calculated numbers are always 0.
|
|
201
172
|
req.on('data', () => {
|
|
202
173
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
203
174
|
if (workingSocketRecord) {
|
|
204
|
-
this.#
|
|
175
|
+
this.#debug(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
205
176
|
this.UpdateNetworkStats(workingSocketRecord, 'data', req);
|
|
206
177
|
} else {
|
|
207
|
-
this.#
|
|
178
|
+
this.#debug(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
208
179
|
}
|
|
209
180
|
});
|
|
210
181
|
|
|
211
182
|
req.on('readable', () => {
|
|
212
183
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
213
184
|
if (workingSocketRecord) {
|
|
214
|
-
this.#
|
|
185
|
+
this.#debug(chalk.gray(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
215
186
|
this.UpdateNetworkStats(workingSocketRecord, 'readable', req);
|
|
216
187
|
} else {
|
|
217
|
-
this.#
|
|
188
|
+
this.#debug(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
218
189
|
}
|
|
219
190
|
});
|
|
220
191
|
*/
|
|
221
192
|
const inHeadersLength = JSON.stringify(req.headers).length;
|
|
222
193
|
const inContentLength = this.#GetRequestContentSize(req);
|
|
223
194
|
const inTotal = inHeadersLength + inContentLength;
|
|
224
|
-
this.#
|
|
195
|
+
this.#debug(chalk_1.default.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
|
|
225
196
|
// This event is the one where bytesRead is generally recorded
|
|
226
197
|
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('*****************************************************************************');
|
|
249
198
|
next();
|
|
250
199
|
};
|
|
251
200
|
}
|
|
@@ -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;;;;;;AAMpG,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,15 +1,18 @@
|
|
|
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.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`);
|
|
4
10
|
class SocketIoServerHelper {
|
|
5
11
|
#socketIoServerHelperOptions;
|
|
6
12
|
constructor(options) {
|
|
7
13
|
this.#socketIoServerHelperOptions = options;
|
|
8
14
|
}
|
|
9
15
|
#namespace = {};
|
|
10
|
-
#LogDebugMessage(message) {
|
|
11
|
-
this.#socketIoServerHelperOptions.logger.debug(message);
|
|
12
|
-
}
|
|
13
16
|
LogMessage = (namespace, message) => {
|
|
14
17
|
this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
|
|
15
18
|
/*
|
|
@@ -20,42 +23,42 @@ class SocketIoServerHelper {
|
|
|
20
23
|
};
|
|
21
24
|
LeaveRoom = (namespace, socket, room) => {
|
|
22
25
|
const logMessage = `${namespace.socketionamespace.name}: Leaving room [${room}]`;
|
|
23
|
-
|
|
26
|
+
debug(logMessage);
|
|
24
27
|
this.LogMessage(namespace, logMessage);
|
|
25
28
|
socket.leave(room);
|
|
26
29
|
};
|
|
27
30
|
JoinRoom = (namespace, socket, room) => {
|
|
28
31
|
const logMessage = `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
29
|
-
|
|
32
|
+
debug(logMessage);
|
|
30
33
|
this.LogMessage(namespace, logMessage);
|
|
31
34
|
socket.join(room);
|
|
32
35
|
};
|
|
33
36
|
#SetupStandardEvents = (namespace, socket) => {
|
|
34
37
|
socket.on("__STSdisconnect", (reason) => {
|
|
35
|
-
|
|
38
|
+
debug(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
|
|
36
39
|
});
|
|
37
40
|
socket.on("__STSdisconnecting", (reason, callBackResult) => {
|
|
38
|
-
|
|
41
|
+
debug(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
|
|
39
42
|
callBackResult("__STSdisconnecting accepted by server.");
|
|
40
43
|
});
|
|
41
44
|
socket.on('__STSjoinRoom', (rooms) => {
|
|
42
45
|
rooms.forEach((room) => {
|
|
43
46
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
44
|
-
|
|
47
|
+
debug(logMessage);
|
|
45
48
|
this.JoinRoom(namespace, socket, room);
|
|
46
49
|
});
|
|
47
50
|
});
|
|
48
51
|
socket.on('__STSleaveRoom', (rooms) => {
|
|
49
52
|
rooms.forEach((room) => {
|
|
50
53
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
|
|
51
|
-
|
|
54
|
+
debug(logMessage);
|
|
52
55
|
this.LeaveRoom(namespace, socket, room);
|
|
53
56
|
});
|
|
54
57
|
});
|
|
55
58
|
socket.on('__STSsendToRoom', (rooms, payload) => {
|
|
56
59
|
rooms.forEach((room) => {
|
|
57
60
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`;
|
|
58
|
-
|
|
61
|
+
debug(logMessage);
|
|
59
62
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
60
63
|
namespace.socketionamespace.to(room).emit(payload.command, payload);
|
|
61
64
|
});
|
|
@@ -100,9 +103,9 @@ class SocketIoServerHelper {
|
|
|
100
103
|
this.#SetupConnectionMiddleware(this.#namespace[namespace]);
|
|
101
104
|
this.#namespace[namespace].socketionamespace.on("connection", socket => {
|
|
102
105
|
const logMessage = `${namespace}: Socket connected, ID: [${socket.id}]`;
|
|
103
|
-
|
|
106
|
+
debug(logMessage);
|
|
104
107
|
this.LogMessage(this.#namespace[namespace], logMessage);
|
|
105
|
-
|
|
108
|
+
debug(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
106
109
|
this.#SetupMessageMiddleware(socket);
|
|
107
110
|
if (autoJoinRooms) {
|
|
108
111
|
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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"}
|
|
@@ -3,20 +3,22 @@ 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.STSAppFrameworkTransportWinston = void 0;
|
|
7
7
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
8
8
|
const winston_transport_1 = __importDefault(require("winston-transport"));
|
|
9
|
-
class
|
|
9
|
+
class STSAppFrameworkTransportWinston extends winston_transport_1.default {
|
|
10
10
|
#options;
|
|
11
11
|
constructor(opts) {
|
|
12
12
|
super(opts);
|
|
13
13
|
this.#options = opts;
|
|
14
14
|
}
|
|
15
15
|
log(info, callback) {
|
|
16
|
-
|
|
16
|
+
//setImmediate(() => {
|
|
17
|
+
this.#options.app.LogEx(info.message);
|
|
17
18
|
this.emit('logged', info);
|
|
18
19
|
callback();
|
|
20
|
+
//});
|
|
19
21
|
}
|
|
20
22
|
}
|
|
21
|
-
exports.
|
|
22
|
-
//# sourceMappingURL=
|
|
23
|
+
exports.STSAppFrameworkTransportWinston = STSAppFrameworkTransportWinston;
|
|
24
|
+
//# sourceMappingURL=stsAppFrameworkTransportWinston.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stsAppFrameworkTransportWinston.js","sourceRoot":"","sources":["../src/stsAppFrameworkTransportWinston.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,0EAAqE;AASrE,MAAa,+BAAgC,SAAQ,2BAAS;IAE1D,QAAQ,CAA0C;IAElD,YAAY,IAA6C;QACrD,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,IAAS,EAAE,QAAa;QACxB,sBAAsB;QACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,QAAQ,EAAE,CAAC;QACX,KAAK;IACT,CAAC;CACJ;AAjBD,0EAiBC"}
|
|
@@ -3,19 +3,19 @@ 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.STSTransportWinston = exports.UpdateSTSTransportWithDebugger = void 0;
|
|
7
7
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
8
8
|
const winston_transport_1 = __importDefault(require("winston-transport"));
|
|
9
9
|
function UpdateSTSTransportWithDebugger(logger, newDebugger) {
|
|
10
10
|
const stsTransport = logger.transports.find((transport) => {
|
|
11
|
-
return transport instanceof
|
|
11
|
+
return transport instanceof STSTransportWinston;
|
|
12
12
|
});
|
|
13
13
|
if (stsTransport) {
|
|
14
14
|
stsTransport.debugger = newDebugger;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
exports.UpdateSTSTransportWithDebugger = UpdateSTSTransportWithDebugger;
|
|
18
|
-
class
|
|
18
|
+
class STSTransportWinston extends winston_transport_1.default {
|
|
19
19
|
#options;
|
|
20
20
|
constructor(opts) {
|
|
21
21
|
super(opts);
|
|
@@ -39,5 +39,5 @@ class STSTransportDebuggerWinston extends winston_transport_1.default {
|
|
|
39
39
|
//});
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
exports.
|
|
43
|
-
//# sourceMappingURL=
|
|
42
|
+
exports.STSTransportWinston = STSTransportWinston;
|
|
43
|
+
//# sourceMappingURL=stsTransportWinston.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../src/stsTransportWinston.ts"],"names":[],"mappings":";;;;;;AAAA,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;AAPD,wEAOC;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"}
|
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,
|
|
14
|
+
import { GetErrorPayload, JSONObject } from '@nsshunt/stsutils'
|
|
15
15
|
|
|
16
16
|
import { AppFrameworkErrorCode } from './validation/errors'
|
|
17
17
|
|
|
@@ -54,28 +54,18 @@ export interface IGetAPITokenFromAuthServerUsingScopeOptions {
|
|
|
54
54
|
instrumentController?: PublishInstrumentControllerV2
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
export
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
export class AuthUtilsNode {
|
|
62
|
-
#options: IAuthUtilsNodeOptions;
|
|
57
|
+
export class AuthUtilsNode
|
|
58
|
+
{
|
|
63
59
|
#cookiejar: tough.CookieJar;
|
|
64
60
|
#httpsAgent: https.Agent | null = null;
|
|
65
61
|
#debug = debugModule(`proc:${process.pid}:AuthUtilsNode`);
|
|
66
62
|
// Regular expression to match the origin
|
|
67
63
|
#originRegex = /^(api:\/\/\w+)/;
|
|
68
64
|
|
|
69
|
-
constructor(
|
|
70
|
-
this.#options = options;
|
|
65
|
+
constructor() {
|
|
71
66
|
this.#cookiejar = new tough.CookieJar();
|
|
72
67
|
}
|
|
73
68
|
|
|
74
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
|
-
#LogDebugMessage(message: any) {
|
|
76
|
-
this.#options.logger.debug(message);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
69
|
#GetHttpsAgent = () =>
|
|
80
70
|
{
|
|
81
71
|
if (this.#httpsAgent === null) {
|
|
@@ -223,7 +213,7 @@ export class AuthUtilsNode {
|
|
|
223
213
|
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
224
214
|
|
|
225
215
|
const invokeErrorCb = (error: Error) => {
|
|
226
|
-
this.#
|
|
216
|
+
this.#debug(error);
|
|
227
217
|
if (instrumentController) {
|
|
228
218
|
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, { // auth error
|
|
229
219
|
Inc: 1
|
|
@@ -286,7 +276,7 @@ export class AuthUtilsNode {
|
|
|
286
276
|
if (retVal.status) {
|
|
287
277
|
if (retVal.status !== 200) {
|
|
288
278
|
// Just provide a warning here
|
|
289
|
-
this.#
|
|
279
|
+
this.#debug(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
|
|
290
280
|
}
|
|
291
281
|
} else {
|
|
292
282
|
invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
@@ -359,7 +349,7 @@ export class AuthUtilsNode {
|
|
|
359
349
|
//,socketPath: '/var/run/sts/stsrest01.sock'
|
|
360
350
|
});
|
|
361
351
|
duration = (performance.now() - processStart).toFixed(4);
|
|
362
|
-
if (publishDebug)
|
|
352
|
+
if (publishDebug) debug(`AuthUtilsNode.LoginNode request duration: [${duration}]`);
|
|
363
353
|
loginData = retVal.data.detail;
|
|
364
354
|
|
|
365
355
|
|
|
@@ -374,7 +364,7 @@ export class AuthUtilsNode {
|
|
|
374
364
|
return loginData;
|
|
375
365
|
} catch (error)
|
|
376
366
|
{
|
|
377
|
-
if (publishDebug)
|
|
367
|
+
if (publishDebug) debug(chalk.red(`Error (AuthUtilsNode:LoginNode): ${error}`));
|
|
378
368
|
throw error;
|
|
379
369
|
}
|
|
380
370
|
}
|
|
@@ -404,12 +394,12 @@ export class AuthUtilsNode {
|
|
|
404
394
|
//,socketPath: '/var/run/sts/stsrest01.sock'
|
|
405
395
|
});
|
|
406
396
|
duration = (performance.now() - processStart).toFixed(4);
|
|
407
|
-
if (publishDebug)
|
|
397
|
+
if (publishDebug) debug(`AuthUtilsNode.RefreshAuthTokenBrowser request duration: [${duration}]`);
|
|
408
398
|
loginData = retVal.data.detail;
|
|
409
399
|
await this.SetCookiesToJar(retVal.headers);
|
|
410
400
|
return loginData;
|
|
411
401
|
} catch (error) {
|
|
412
|
-
if (publishDebug)
|
|
402
|
+
if (publishDebug) debug(chalk.red(`Error (AuthUtilsNode:RefreshAuthTokenBrowser): ${error}`));
|
|
413
403
|
throw error;
|
|
414
404
|
}
|
|
415
405
|
}
|
package/src/index.ts
CHANGED
|
@@ -20,5 +20,5 @@ export * from './influxdb/influxDBManagerService'
|
|
|
20
20
|
export * from './influxdb/influxDBManagerAgent'
|
|
21
21
|
export * from './publishertransports/publishTransportUtils'
|
|
22
22
|
export * from './instrumentationsubscriber'
|
|
23
|
-
export * from './
|
|
24
|
-
export * from './
|
|
23
|
+
export * from './stsTransportWinston'
|
|
24
|
+
export * from './stsAppFrameworkTransportWinston'
|