@nsshunt/stsappframework 3.0.82 → 3.0.83
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.
|
@@ -94,27 +94,48 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
94
94
|
this.#debug(`Socket end event: Could not find socket within recordset`.magenta);
|
|
95
95
|
}
|
|
96
96
|
});
|
|
97
|
-
req.on('end', () => {
|
|
98
|
-
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
99
|
-
if (workingSocketRecord) {
|
|
100
|
-
this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
|
|
101
|
-
this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
this.#debug(`Request end event: Could not find socket within recordset`.magenta);
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
req.on('close', () => {
|
|
108
|
-
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
109
|
-
if (workingSocketRecord) {
|
|
110
|
-
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
|
|
111
|
-
this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
this.#debug(`Request close event: Could not find socket within recordset`.magenta);
|
|
115
|
-
}
|
|
116
|
-
});
|
|
117
97
|
}
|
|
98
|
+
req.on('end', () => {
|
|
99
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
100
|
+
if (workingSocketRecord) {
|
|
101
|
+
this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
|
|
102
|
+
this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
this.#debug(`Request end event: Could not find socket within recordset`.magenta);
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
req.on('close', () => {
|
|
109
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
110
|
+
if (workingSocketRecord) {
|
|
111
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray);
|
|
112
|
+
this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
/*
|
|
119
|
+
req.on('data', () => {
|
|
120
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
121
|
+
if (workingSocketRecord) {
|
|
122
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
123
|
+
this.UpdateNetworkStats(workingSocketRecord, 'data', req);
|
|
124
|
+
} else {
|
|
125
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
req.on('readable', () => {
|
|
130
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
131
|
+
if (workingSocketRecord) {
|
|
132
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
133
|
+
this.UpdateNetworkStats(workingSocketRecord, 'readable', req);
|
|
134
|
+
} else {
|
|
135
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
*/
|
|
118
139
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
119
140
|
next();
|
|
120
141
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":";;;;;;AAGA,+CAA2C;AAE3C,kDAA+B;AAC/B,gDAAmD;
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -5,6 +5,7 @@ import { TinyEmitter } from 'tiny-emitter';
|
|
|
5
5
|
|
|
6
6
|
import debugModule from 'debug'
|
|
7
7
|
import { STSOptionsBase } from '@nsshunt/stsutils';
|
|
8
|
+
import { CompareSTSInstrumentControllerPluginKey } from '@nsshunt/stspublisherserver';
|
|
8
9
|
const debug = debugModule(`proc:${process.pid}`);
|
|
9
10
|
|
|
10
11
|
export enum ServerNetworkMiddlewareEventName {
|
|
@@ -126,28 +127,50 @@ export class ServerNetworkMiddleware extends STSOptionsBase
|
|
|
126
127
|
this.#debug(`Socket end event: Could not find socket within recordset`.magenta)
|
|
127
128
|
}
|
|
128
129
|
});
|
|
129
|
-
|
|
130
|
-
req.on('end', () => {
|
|
131
|
-
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
132
|
-
if (workingSocketRecord) {
|
|
133
|
-
this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
134
|
-
this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
|
|
135
|
-
} else {
|
|
136
|
-
this.#debug(`Request end event: Could not find socket within recordset`.magenta)
|
|
137
|
-
}
|
|
138
|
-
});
|
|
139
|
-
|
|
140
|
-
req.on('close', () => {
|
|
141
|
-
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
142
|
-
if (workingSocketRecord) {
|
|
143
|
-
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
144
|
-
this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
|
|
145
|
-
} else {
|
|
146
|
-
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
147
|
-
}
|
|
148
|
-
});
|
|
149
130
|
}
|
|
150
131
|
|
|
132
|
+
req.on('end', () => {
|
|
133
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
134
|
+
if (workingSocketRecord) {
|
|
135
|
+
this.#debug(`Request end event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
136
|
+
this.UpdateNetworkStats(workingSocketRecord, 'req_end', req);
|
|
137
|
+
} else {
|
|
138
|
+
this.#debug(`Request end event: Could not find socket within recordset`.magenta)
|
|
139
|
+
}
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
req.on('close', () => {
|
|
143
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
144
|
+
if (workingSocketRecord) {
|
|
145
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
146
|
+
this.UpdateNetworkStats(workingSocketRecord, 'req_close', req);
|
|
147
|
+
} else {
|
|
148
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
/*
|
|
153
|
+
req.on('data', () => {
|
|
154
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
155
|
+
if (workingSocketRecord) {
|
|
156
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
157
|
+
this.UpdateNetworkStats(workingSocketRecord, 'data', req);
|
|
158
|
+
} else {
|
|
159
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
|
|
163
|
+
req.on('readable', () => {
|
|
164
|
+
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
165
|
+
if (workingSocketRecord) {
|
|
166
|
+
this.#debug(`Request close event: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`.gray)
|
|
167
|
+
this.UpdateNetworkStats(workingSocketRecord, 'readable', req);
|
|
168
|
+
} else {
|
|
169
|
+
this.#debug(`Request close event: Could not find socket within recordset`.magenta)
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
*/
|
|
173
|
+
|
|
151
174
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
152
175
|
|
|
153
176
|
next();
|
|
@@ -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;AAInD,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,UA2F5D;CACJ"}
|