@nsshunt/stsappframework 3.1.5 → 3.1.6
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.
|
@@ -26,6 +26,12 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
26
26
|
#LogDebugMessage(message) {
|
|
27
27
|
this.options?.logger.debug(message);
|
|
28
28
|
}
|
|
29
|
+
#LogSillyMessage(message) {
|
|
30
|
+
this.options?.logger.silly(message);
|
|
31
|
+
}
|
|
32
|
+
#LogErrorMessage(message) {
|
|
33
|
+
this.options?.logger.error(message);
|
|
34
|
+
}
|
|
29
35
|
on(eventName, callBackFn) {
|
|
30
36
|
this.#tinyEmitter.on(eventName, callBackFn);
|
|
31
37
|
}
|
|
@@ -48,7 +54,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
48
54
|
//this.#LogDebugMessage(chalk.gray(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`));
|
|
49
55
|
const workingSocketEventRecord = { ...workingSocketRecord };
|
|
50
56
|
delete workingSocketEventRecord.socket;
|
|
51
|
-
|
|
57
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
|
|
52
58
|
this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
|
|
53
59
|
workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
|
|
54
60
|
workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
|
|
@@ -67,7 +73,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
67
73
|
return contentLength;
|
|
68
74
|
}
|
|
69
75
|
catch (error) {
|
|
70
|
-
this.#
|
|
76
|
+
this.#LogErrorMessage(chalk_1.default.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
|
|
71
77
|
return 0;
|
|
72
78
|
}
|
|
73
79
|
};
|
|
@@ -89,37 +95,37 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
89
95
|
eventName: '',
|
|
90
96
|
};
|
|
91
97
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
92
|
-
this.#
|
|
98
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
93
99
|
workingSocketRecord.socket.on('data', () => {
|
|
94
100
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
95
101
|
if (socketRecord) {
|
|
96
|
-
this.#
|
|
102
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
97
103
|
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
98
104
|
}
|
|
99
105
|
else {
|
|
100
|
-
this.#
|
|
106
|
+
this.#LogSillyMessage(chalk_1.default.magenta(`Socket data event: Could not find socket within recordset`));
|
|
101
107
|
}
|
|
102
108
|
});
|
|
103
109
|
workingSocketRecord.socket.on('close', () => {
|
|
104
110
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
105
111
|
if (socketRecord) {
|
|
106
|
-
this.#
|
|
112
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
107
113
|
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
108
114
|
delete this.#socketCollection[socketRecord.id];
|
|
109
|
-
this.#
|
|
115
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
110
116
|
}
|
|
111
117
|
else {
|
|
112
|
-
this.#
|
|
118
|
+
this.#LogSillyMessage(chalk_1.default.magenta(`Socket close event: Could not find socket within recordset`));
|
|
113
119
|
}
|
|
114
120
|
});
|
|
115
121
|
workingSocketRecord.socket.on('end', () => {
|
|
116
122
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
117
123
|
if (socketRecord) {
|
|
118
|
-
this.#
|
|
124
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
119
125
|
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
120
126
|
}
|
|
121
127
|
else {
|
|
122
|
-
this.#
|
|
128
|
+
this.#LogSillyMessage(chalk_1.default.magenta(`Socket end event: Could not find socket within recordset`));
|
|
123
129
|
}
|
|
124
130
|
});
|
|
125
131
|
}
|
|
@@ -141,27 +147,27 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
141
147
|
res.setHeader('Expires', '0'); // Proxies
|
|
142
148
|
const headerLength = JSON.stringify(res.getHeaders()).length;
|
|
143
149
|
const totalSize = contentLength + headerLength;
|
|
144
|
-
this.#
|
|
150
|
+
this.#LogSillyMessage(chalk_1.default.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
|
|
145
151
|
});
|
|
146
152
|
// This event is the one where bytesWritten is generally recorded
|
|
147
153
|
req.on('end', () => {
|
|
148
154
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
149
155
|
if (socketRecord) {
|
|
150
|
-
this.#
|
|
156
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
151
157
|
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
152
158
|
}
|
|
153
159
|
else {
|
|
154
|
-
this.#
|
|
160
|
+
this.#LogSillyMessage(chalk_1.default.magenta(`Request end event: Could not find socket within recordset`));
|
|
155
161
|
}
|
|
156
162
|
});
|
|
157
163
|
req.on('close', () => {
|
|
158
164
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
159
165
|
if (socketRecord) {
|
|
160
|
-
this.#
|
|
166
|
+
this.#LogSillyMessage(chalk_1.default.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
161
167
|
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
162
168
|
}
|
|
163
169
|
else {
|
|
164
|
-
this.#
|
|
170
|
+
this.#LogSillyMessage(chalk_1.default.magenta(`Request close event: Could not find socket within recordset`));
|
|
165
171
|
}
|
|
166
172
|
});
|
|
167
173
|
/* These methods are also available but from testing they provide no specific value add, i.e. the calculated numbers are always 0.
|
|
@@ -188,7 +194,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
188
194
|
const inHeadersLength = JSON.stringify(req.headers).length;
|
|
189
195
|
const inContentLength = this.#GetRequestContentSize(req);
|
|
190
196
|
const inTotal = inHeadersLength + inContentLength;
|
|
191
|
-
this.#
|
|
197
|
+
this.#LogSillyMessage(chalk_1.default.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
|
|
192
198
|
// This event is the one where bytesRead is generally recorded
|
|
193
199
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
194
200
|
next();
|
|
@@ -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,gDAA+D;AAC/D,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;AAuBD,MAAa,uBAAwB,SAAQ,yBAAc;IAEvD,YAAY,GAAgB,IAAI,0BAAW,EAAE,CAAC;IAC9C,iBAAiB,GAAkC,EAAG,CAAC;IACvD,GAAG,GAAW,EAAE,CAAC;IAEjB,YAAY,OAAiC;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,EAAE,CAAC,SAA2C,EAAE,UAA4C;QACxF,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,eAAe,GAAG,CAAC,MAAc,EAAwB,EAAE;QACvD,KAAK,MAAM,CAAC,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpE,IAAI,YAAY,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACjC,OAAO,YAAY,CAAC;YACxB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;IAED,kBAAkB,GAAG,CAAC,mBAAkC,EAAE,SAAiB,EAAE,GAAY,EAAE,EAAE;QACzF,mBAAmB,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QAClD,mBAAmB,CAAC,SAAS,GAAG,SAAS,CAAC;QAE1C,mBAAmB,CAAC,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;QAC5D,mBAAmB,CAAC,mBAAmB,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QAElE,mBAAmB,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,aAAa,CAAC;QAChH,mBAAmB,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,gBAAgB,CAAC;QAEzH,iLAAiL;QACjL,uLAAuL;QAEvL,MAAM,wBAAwB,GAAG,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAC5D,OAAQ,wBAAgC,CAAC,MAAM,CAAC;QAEhD,
|
|
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,gDAA+D;AAC/D,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;AAuBD,MAAa,uBAAwB,SAAQ,yBAAc;IAEvD,YAAY,GAAgB,IAAI,0BAAW,EAAE,CAAC;IAC9C,iBAAiB,GAAkC,EAAG,CAAC;IACvD,GAAG,GAAW,EAAE,CAAC;IAEjB,YAAY,OAAiC;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,EAAE,CAAC,SAA2C,EAAE,UAA4C;QACxF,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,eAAe,GAAG,CAAC,MAAc,EAAwB,EAAE;QACvD,KAAK,MAAM,CAAC,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpE,IAAI,YAAY,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBACjC,OAAO,YAAY,CAAC;YACxB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;IAED,kBAAkB,GAAG,CAAC,mBAAkC,EAAE,SAAiB,EAAE,GAAY,EAAE,EAAE;QACzF,mBAAmB,CAAC,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;QAClD,mBAAmB,CAAC,SAAS,GAAG,SAAS,CAAC;QAE1C,mBAAmB,CAAC,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;QAC5D,mBAAmB,CAAC,mBAAmB,GAAG,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QAElE,mBAAmB,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,aAAa,CAAC;QAChH,mBAAmB,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,gBAAgB,CAAC;QAEzH,iLAAiL;QACjL,uLAAuL;QAEvL,MAAM,wBAAwB,GAAG,EAAE,GAAG,mBAAmB,EAAE,CAAC;QAC5D,OAAQ,wBAAgC,CAAC,MAAM,CAAC;QAEhD,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gCAAgC,CAAC,+BAA+B,EAAE,wBAAwB,CAAC,CAAC;QAEnH,mBAAmB,CAAC,aAAa,GAAG,mBAAmB,CAAC,gBAAgB,CAAC;QACzE,mBAAmB,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC;IACnF,CAAC,CAAA;IAED,sBAAsB,GAAG,CAAC,GAAY,EAAE,EAAE;QACtC,IAAI,CAAC;YACD,IAAI,aAAa,GAAG,CAAC,CAAC;YACtB,IAAK,GAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACjC,aAAa,GAAI,GAAW,CAAC,gBAAgB,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACJ,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAChC,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAA;gBAC3D,CAAC;YACL,CAAC;YACD,OAAO,aAAa,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,GAAG,CAAC,6DAA6D,KAAK,GAAG,CAAC,CAAC,CAAC;YACxG,OAAO,CAAC,CAAC;QACb,CAAC;IACL,CAAC,CAAA;IAED,UAAU,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC7D,IAAI,mBAAmB,GAAyB,IAAI,CAAC;QAErD,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,GAAG,IAAA,SAAM,GAAE,CAAC;YACpB,mBAAmB,GAAG;gBAClB,EAAE,EAAE,GAAI,IAAI,CAAC,OAAoC,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;gBAC/E,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,gBAAgB,EAAE,CAAC;gBACnB,mBAAmB,EAAE,CAAC;gBACtB,aAAa,EAAE,CAAC;gBAChB,gBAAgB,EAAE,CAAC;gBACnB,gBAAgB,EAAE,CAAC;gBACnB,mBAAmB,EAAE,CAAC;gBACtB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,SAAS,EAAE,EAAE;aAChB,CAAC;YAEF,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC;YAErE,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,wCAAwC,mBAAmB,CAAC,EAAE,oBAAoB,mBAAmB,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;YAExJ,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACvC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAE,mBAAqC,CAAC,MAAM,CAAC,CAAC;gBACzF,IAAI,YAAY,EAAE,CAAC;oBACf,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,2BAA2B,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;oBAC7H,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,2DAA2D,CAAC,CAAC,CAAC;gBACtG,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAE,mBAAqC,CAAC,MAAM,CAAC,CAAC;gBACzF,IAAI,YAAY,EAAE,CAAC;oBACf,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,4BAA4B,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;oBAC9H,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC;oBAC3D,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;oBAC/C,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,uCAAuC,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;gBAC7I,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAC,CAAC;gBACvG,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACtC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAE,mBAAqC,CAAC,MAAM,CAAC,CAAC;gBACzF,IAAI,YAAY,EAAE,CAAC;oBACf,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,0BAA0B,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;oBAC5H,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;gBAC7D,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,0DAA0D,CAAC,CAAC,CAAC;gBACrG,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAED,uGAAuG;QACvG,qHAAqH;QACrH,IAAA,oBAAS,EAAC,GAAG,EAAE,GAAG,EAAE;YAChB,IAAI,aAAa,GAAG,CAAC,CAAC;YACtB,IAAK,GAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACjC,aAAa,GAAI,GAAW,CAAC,gBAAgB,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACJ,IAAI,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAClC,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAW,CAAC,CAAC;gBACxE,CAAC;YACL,CAAC;YAED,qDAAqD;YACrD,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,qCAAqC,CAAC,CAAC,CAAC,WAAW;YAClF,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW;YAChD,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU;YAEzC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;YAC7D,MAAM,SAAS,GAAG,aAAa,GAAG,YAAY,CAAC;YAE/C,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,aAAa,qBAAqB,YAAY,mBAAmB,SAAS,GAAG,CAAC,CAAC,CAAC;QAChJ,CAAC,CAAC,CAAC;QAEH,iEAAiE;QACjE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACf,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,YAAY,EAAE,CAAC;gBACf,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,2BAA2B,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAA;gBAC5H,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;YAC1D,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,2DAA2D,CAAC,CAAC,CAAC;YACtG,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACjB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtD,IAAI,YAAY,EAAE,CAAC;gBACf,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,IAAI,CAAC,6BAA6B,YAAY,CAAC,EAAE,oBAAoB,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;gBAC/H,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAC,CAAC;YACxG,CAAC;QACL,CAAC,CAAC,CAAC;QAEH;;;;;;;;;;;;;;;;;;;;UAoBE;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,eAAe,GAAG,eAAe,CAAC;QAElD,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,eAAe,wBAAwB,eAAe,gBAAgB,OAAO,GAAG,CAAC,CAAC,CAAC;QAEjJ,8DAA8D;QAC9D,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QAEhE,IAAI,EAAE,CAAC;IACX,CAAC,CAAA;CACJ;AAlND,0DAkNC"}
|
package/package.json
CHANGED
|
@@ -50,6 +50,14 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
50
50
|
this.options?.logger.debug(message);
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
#LogSillyMessage(message: any) {
|
|
54
|
+
this.options?.logger.silly(message);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
#LogErrorMessage(message: any) {
|
|
58
|
+
this.options?.logger.error(message);
|
|
59
|
+
}
|
|
60
|
+
|
|
53
61
|
on(eventName: ServerNetworkMiddlewareEventName, callBackFn: ServerNetworkMiddlewareEventFunc) {
|
|
54
62
|
this.#tinyEmitter.on(eventName, callBackFn);
|
|
55
63
|
}
|
|
@@ -79,8 +87,8 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
79
87
|
const workingSocketEventRecord = { ...workingSocketRecord };
|
|
80
88
|
delete (workingSocketEventRecord as any).socket;
|
|
81
89
|
|
|
82
|
-
|
|
83
|
-
|
|
90
|
+
this.#LogSillyMessage(chalk.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
|
|
91
|
+
|
|
84
92
|
this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
|
|
85
93
|
|
|
86
94
|
workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
|
|
@@ -99,7 +107,7 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
99
107
|
}
|
|
100
108
|
return contentLength;
|
|
101
109
|
} catch (error) {
|
|
102
|
-
this.#
|
|
110
|
+
this.#LogErrorMessage(chalk.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
|
|
103
111
|
return 0;
|
|
104
112
|
}
|
|
105
113
|
}
|
|
@@ -126,37 +134,37 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
126
134
|
|
|
127
135
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
128
136
|
|
|
129
|
-
this.#
|
|
137
|
+
this.#LogSillyMessage(chalk.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
130
138
|
|
|
131
139
|
workingSocketRecord.socket.on('data', () => {
|
|
132
140
|
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
133
141
|
if (socketRecord) {
|
|
134
|
-
this.#
|
|
142
|
+
this.#LogSillyMessage(chalk.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
135
143
|
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
136
144
|
} else {
|
|
137
|
-
this.#
|
|
145
|
+
this.#LogSillyMessage(chalk.magenta(`Socket data event: Could not find socket within recordset`));
|
|
138
146
|
}
|
|
139
147
|
});
|
|
140
148
|
|
|
141
149
|
workingSocketRecord.socket.on('close', () => {
|
|
142
150
|
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
143
151
|
if (socketRecord) {
|
|
144
|
-
this.#
|
|
152
|
+
this.#LogSillyMessage(chalk.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
145
153
|
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
146
154
|
delete this.#socketCollection[socketRecord.id];
|
|
147
|
-
this.#
|
|
155
|
+
this.#LogSillyMessage(chalk.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
148
156
|
} else {
|
|
149
|
-
this.#
|
|
157
|
+
this.#LogSillyMessage(chalk.magenta(`Socket close event: Could not find socket within recordset`));
|
|
150
158
|
}
|
|
151
159
|
});
|
|
152
160
|
|
|
153
161
|
workingSocketRecord.socket.on('end', () => {
|
|
154
162
|
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
155
163
|
if (socketRecord) {
|
|
156
|
-
this.#
|
|
164
|
+
this.#LogSillyMessage(chalk.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
157
165
|
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
158
166
|
} else {
|
|
159
|
-
this.#
|
|
167
|
+
this.#LogSillyMessage(chalk.magenta(`Socket end event: Could not find socket within recordset`));
|
|
160
168
|
}
|
|
161
169
|
});
|
|
162
170
|
}
|
|
@@ -181,27 +189,27 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
181
189
|
const headerLength = JSON.stringify(res.getHeaders()).length;
|
|
182
190
|
const totalSize = contentLength + headerLength;
|
|
183
191
|
|
|
184
|
-
this.#
|
|
192
|
+
this.#LogSillyMessage(chalk.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
|
|
185
193
|
});
|
|
186
194
|
|
|
187
195
|
// This event is the one where bytesWritten is generally recorded
|
|
188
196
|
req.on('end', () => {
|
|
189
197
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
190
198
|
if (socketRecord) {
|
|
191
|
-
this.#
|
|
199
|
+
this.#LogSillyMessage(chalk.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`))
|
|
192
200
|
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
193
201
|
} else {
|
|
194
|
-
this.#
|
|
202
|
+
this.#LogSillyMessage(chalk.magenta(`Request end event: Could not find socket within recordset`));
|
|
195
203
|
}
|
|
196
204
|
});
|
|
197
205
|
|
|
198
206
|
req.on('close', () => {
|
|
199
207
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
200
208
|
if (socketRecord) {
|
|
201
|
-
this.#
|
|
209
|
+
this.#LogSillyMessage(chalk.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
202
210
|
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
203
211
|
} else {
|
|
204
|
-
this.#
|
|
212
|
+
this.#LogSillyMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
205
213
|
}
|
|
206
214
|
});
|
|
207
215
|
|
|
@@ -231,7 +239,7 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
231
239
|
const inContentLength = this.#GetRequestContentSize(req);
|
|
232
240
|
const inTotal = inHeadersLength + inContentLength;
|
|
233
241
|
|
|
234
|
-
this.#
|
|
242
|
+
this.#LogSillyMessage(chalk.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
|
|
235
243
|
|
|
236
244
|
// This event is the one where bytesRead is generally recorded
|
|
237
245
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM/D,oBAAY,gCAAgC;IACxC,+BAA+B,oCAAoC;CACtE;AAED,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,gCAAgC,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,uBAAwB,SAAQ,cAAc;;gBAM3C,OAAO,EAAE,wBAAwB;
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM/D,oBAAY,gCAAgC;IACxC,+BAA+B,oCAAoC;CACtE;AAED,MAAM,WAAW,aAAa;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,EAAE,MAAM,CAAA;IACrB,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,MAAM,gCAAgC,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,IAAI,CAAC;AAE7E,MAAM,WAAW,wBAAwB;IACrC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,uBAAwB,SAAQ,cAAc;;gBAM3C,OAAO,EAAE,wBAAwB;IAgB7C,EAAE,CAAC,SAAS,EAAE,gCAAgC,EAAE,UAAU,EAAE,gCAAgC;IAI5F,eAAe,WAAY,MAAM,KAAG,aAAa,GAAG,IAAI,CAOvD;IAED,kBAAkB,wBAAyB,aAAa,aAAa,MAAM,OAAO,OAAO,UAsBxF;IAmBD,UAAU,QAAS,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAqI5D;CACJ"}
|