@nsshunt/stsappframework 3.0.86 → 3.0.87
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.
|
@@ -8,6 +8,7 @@ const tiny_emitter_1 = require("tiny-emitter");
|
|
|
8
8
|
const debug_1 = __importDefault(require("debug"));
|
|
9
9
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
10
10
|
const debug = (0, debug_1.default)(`proc:${process.pid}`);
|
|
11
|
+
const uuid_1 = require("uuid");
|
|
11
12
|
var ServerNetworkMiddlewareEventName;
|
|
12
13
|
(function (ServerNetworkMiddlewareEventName) {
|
|
13
14
|
ServerNetworkMiddlewareEventName["UpdateInstrument_SERVER_NET_VAL"] = "UpdateInstrument_SERVER_NET_VAL"; // request net stats
|
|
@@ -15,7 +16,7 @@ var ServerNetworkMiddlewareEventName;
|
|
|
15
16
|
class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
16
17
|
#tinyEmitter = new tiny_emitter_1.TinyEmitter();
|
|
17
18
|
#socketCollection = {};
|
|
18
|
-
#id =
|
|
19
|
+
#id = '';
|
|
19
20
|
#debug;
|
|
20
21
|
constructor(options) {
|
|
21
22
|
super(options);
|
|
@@ -57,7 +58,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
57
58
|
let workingSocketRecord = null;
|
|
58
59
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
59
60
|
if (!workingSocketRecord) {
|
|
60
|
-
this.#id
|
|
61
|
+
this.#id = (0, uuid_1.v4)();
|
|
61
62
|
workingSocketRecord = {
|
|
62
63
|
id: `${this.options.name}_${this.#id.toString()}`,
|
|
63
64
|
socket: req.socket,
|
|
@@ -72,34 +73,46 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
72
73
|
};
|
|
73
74
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
74
75
|
this.#debug(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
|
|
76
|
+
if (res.socket) {
|
|
77
|
+
const workingResSocketRecord = this.GetSocketRecord(res.socket);
|
|
78
|
+
if (!workingResSocketRecord) {
|
|
79
|
+
this.#debug(`Response socket is a different socket`.magenta);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
this.#debug(`Response socket is the SAME socket`.green);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
this.#debug(`No response socket`.red);
|
|
87
|
+
}
|
|
75
88
|
workingSocketRecord.socket.on('data', () => {
|
|
76
|
-
|
|
77
|
-
if (
|
|
78
|
-
this.#debug(`Socket close event: ID: [${
|
|
79
|
-
this.UpdateNetworkStats(
|
|
80
|
-
this.#debug(`Socket removed from recordset: ID: [${
|
|
89
|
+
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
90
|
+
if (socketRecord) {
|
|
91
|
+
this.#debug(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
92
|
+
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
93
|
+
this.#debug(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
81
94
|
}
|
|
82
95
|
else {
|
|
83
96
|
this.#debug(`Socket close event: Could not find socket within recordset`.magenta);
|
|
84
97
|
}
|
|
85
98
|
});
|
|
86
99
|
workingSocketRecord.socket.on('close', () => {
|
|
87
|
-
|
|
88
|
-
if (
|
|
89
|
-
this.#debug(`Socket close event: ID: [${
|
|
90
|
-
this.UpdateNetworkStats(
|
|
91
|
-
delete this.#socketCollection[
|
|
92
|
-
this.#debug(`Socket removed from recordset: ID: [${
|
|
100
|
+
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
101
|
+
if (socketRecord) {
|
|
102
|
+
this.#debug(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
103
|
+
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
104
|
+
delete this.#socketCollection[socketRecord.id];
|
|
105
|
+
this.#debug(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
93
106
|
}
|
|
94
107
|
else {
|
|
95
108
|
this.#debug(`Socket close event: Could not find socket within recordset`.magenta);
|
|
96
109
|
}
|
|
97
110
|
});
|
|
98
111
|
workingSocketRecord.socket.on('end', () => {
|
|
99
|
-
|
|
100
|
-
if (
|
|
101
|
-
this.#debug(`Socket end event: ID: [${
|
|
102
|
-
this.UpdateNetworkStats(
|
|
112
|
+
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
113
|
+
if (socketRecord) {
|
|
114
|
+
this.#debug(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
115
|
+
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
103
116
|
}
|
|
104
117
|
else {
|
|
105
118
|
this.#debug(`Socket end event: Could not find socket within recordset`.magenta);
|
|
@@ -107,20 +120,20 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
107
120
|
});
|
|
108
121
|
}
|
|
109
122
|
req.on('end', () => {
|
|
110
|
-
|
|
111
|
-
if (
|
|
112
|
-
this.#debug(`Request end event: ID: [${
|
|
113
|
-
this.UpdateNetworkStats(
|
|
123
|
+
const socketRecord = this.GetSocketRecord(req.socket);
|
|
124
|
+
if (socketRecord) {
|
|
125
|
+
this.#debug(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
126
|
+
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
114
127
|
}
|
|
115
128
|
else {
|
|
116
129
|
this.#debug(`Request end event: Could not find socket within recordset`.magenta);
|
|
117
130
|
}
|
|
118
131
|
});
|
|
119
132
|
req.on('close', () => {
|
|
120
|
-
|
|
121
|
-
if (
|
|
122
|
-
this.#debug(`Request close event: ID: [${
|
|
123
|
-
this.UpdateNetworkStats(
|
|
133
|
+
const socketRecord = this.GetSocketRecord(req.socket);
|
|
134
|
+
if (socketRecord) {
|
|
135
|
+
this.#debug(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray);
|
|
136
|
+
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
124
137
|
}
|
|
125
138
|
else {
|
|
126
139
|
this.#debug(`Request close event: Could not find socket within recordset`.magenta);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";;;;;;AAGA,+CAA2C;AAE3C,kDAA+B;AAC/B,gDAAmD;AAEnD,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAEjD,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,
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,6 +8,8 @@ import { STSOptionsBase } from '@nsshunt/stsutils';
|
|
|
8
8
|
import { CompareSTSInstrumentControllerPluginKey } from '@nsshunt/stspublisherserver';
|
|
9
9
|
const debug = debugModule(`proc:${process.pid}`);
|
|
10
10
|
|
|
11
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
12
|
+
|
|
11
13
|
export enum ServerNetworkMiddlewareEventName {
|
|
12
14
|
UpdateInstrument_SERVER_NET_VAL = 'UpdateInstrument_SERVER_NET_VAL' // request net stats
|
|
13
15
|
}
|
|
@@ -36,7 +38,7 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
36
38
|
{
|
|
37
39
|
#tinyEmitter: TinyEmitter = new TinyEmitter();
|
|
38
40
|
#socketCollection: Record<string, ISocketRecord> = { };
|
|
39
|
-
#id:
|
|
41
|
+
#id: string = '';
|
|
40
42
|
#debug: any;
|
|
41
43
|
|
|
42
44
|
constructor(options: IServerNetworkMiddleware) {
|
|
@@ -87,8 +89,9 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
87
89
|
let workingSocketRecord: ISocketRecord | null = null;
|
|
88
90
|
|
|
89
91
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
92
|
+
|
|
90
93
|
if (!workingSocketRecord) {
|
|
91
|
-
this.#id
|
|
94
|
+
this.#id = uuidv4();
|
|
92
95
|
workingSocketRecord = {
|
|
93
96
|
id: `${(this.options as IServerNetworkMiddleware).name}_${this.#id.toString()}`,
|
|
94
97
|
socket: req.socket,
|
|
@@ -106,34 +109,46 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
106
109
|
|
|
107
110
|
this.#debug(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
108
111
|
|
|
112
|
+
if (res.socket) {
|
|
113
|
+
const workingResSocketRecord = this.GetSocketRecord(res.socket);
|
|
114
|
+
if (!workingResSocketRecord) {
|
|
115
|
+
this.#debug(`Response socket is a different socket`.magenta);
|
|
116
|
+
} else {
|
|
117
|
+
this.#debug(`Response socket is the SAME socket`.green);
|
|
118
|
+
}
|
|
119
|
+
} else {
|
|
120
|
+
this.#debug(`No response socket`.red);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
|
|
109
124
|
workingSocketRecord.socket.on('data', () => {
|
|
110
|
-
|
|
111
|
-
if (
|
|
112
|
-
this.#debug(`Socket close event: ID: [${
|
|
113
|
-
this.UpdateNetworkStats(
|
|
114
|
-
this.#debug(`Socket removed from recordset: ID: [${
|
|
125
|
+
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
126
|
+
if (socketRecord) {
|
|
127
|
+
this.#debug(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
128
|
+
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
129
|
+
this.#debug(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
115
130
|
} else {
|
|
116
131
|
this.#debug(`Socket close event: Could not find socket within recordset`.magenta)
|
|
117
132
|
}
|
|
118
133
|
});
|
|
119
134
|
|
|
120
135
|
workingSocketRecord.socket.on('close', () => {
|
|
121
|
-
|
|
122
|
-
if (
|
|
123
|
-
this.#debug(`Socket close event: ID: [${
|
|
124
|
-
this.UpdateNetworkStats(
|
|
125
|
-
delete this.#socketCollection[
|
|
126
|
-
this.#debug(`Socket removed from recordset: ID: [${
|
|
136
|
+
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
137
|
+
if (socketRecord) {
|
|
138
|
+
this.#debug(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
139
|
+
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
140
|
+
delete this.#socketCollection[socketRecord.id];
|
|
141
|
+
this.#debug(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
127
142
|
} else {
|
|
128
143
|
this.#debug(`Socket close event: Could not find socket within recordset`.magenta)
|
|
129
144
|
}
|
|
130
145
|
});
|
|
131
146
|
|
|
132
147
|
workingSocketRecord.socket.on('end', () => {
|
|
133
|
-
|
|
134
|
-
if (
|
|
135
|
-
this.#debug(`Socket end event: ID: [${
|
|
136
|
-
this.UpdateNetworkStats(
|
|
148
|
+
const socketRecord = this.GetSocketRecord((workingSocketRecord as ISocketRecord).socket);
|
|
149
|
+
if (socketRecord) {
|
|
150
|
+
this.#debug(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
151
|
+
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
137
152
|
} else {
|
|
138
153
|
this.#debug(`Socket end event: Could not find socket within recordset`.magenta)
|
|
139
154
|
}
|
|
@@ -141,20 +156,20 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
141
156
|
}
|
|
142
157
|
|
|
143
158
|
req.on('end', () => {
|
|
144
|
-
|
|
145
|
-
if (
|
|
146
|
-
this.#debug(`Request end event: ID: [${
|
|
147
|
-
this.UpdateNetworkStats(
|
|
159
|
+
const socketRecord = this.GetSocketRecord(req.socket);
|
|
160
|
+
if (socketRecord) {
|
|
161
|
+
this.#debug(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
162
|
+
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
148
163
|
} else {
|
|
149
164
|
this.#debug(`Request end event: Could not find socket within recordset`.magenta)
|
|
150
165
|
}
|
|
151
166
|
});
|
|
152
167
|
|
|
153
168
|
req.on('close', () => {
|
|
154
|
-
|
|
155
|
-
if (
|
|
156
|
-
this.#debug(`Request close event: ID: [${
|
|
157
|
-
this.UpdateNetworkStats(
|
|
169
|
+
const socketRecord = this.GetSocketRecord(req.socket);
|
|
170
|
+
if (socketRecord) {
|
|
171
|
+
this.#debug(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`.gray)
|
|
172
|
+
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
158
173
|
} else {
|
|
159
174
|
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
160
175
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMnD,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;CACvB;AAED,qBAAa,uBAAwB,SAAQ,cAAc;;gBAO3C,OAAO,EAAE,wBAAwB;IAS7C,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,UAoBxF;IAED,UAAU,QAAS,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAmH5D;CACJ"}
|