@nsshunt/stsappframework 3.3.103 → 3.3.105
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/dist/commonTypes.js +11 -15
- package/dist/commonTypes.js.map +1 -1
- package/dist/controller/stscontrollerbase.js +1 -5
- package/dist/controller/stscontrollerbase.js.map +1 -1
- package/dist/controller/stslatencycontroller.js +5 -9
- package/dist/controller/stslatencycontroller.js.map +1 -1
- package/dist/grpc/grpcServer.js +24 -64
- package/dist/grpc/grpcServer.js.map +1 -1
- package/dist/index.js +15 -31
- package/dist/index.js.map +1 -1
- package/dist/logger/socketClientLogPublisher.js +26 -33
- package/dist/logger/socketClientLogPublisher.js.map +1 -1
- package/dist/logger/stsTransportLoggerSocket.js +4 -11
- package/dist/logger/stsTransportLoggerSocket.js.map +1 -1
- package/dist/logger/stsTransportLoggerWinston.js +2 -9
- package/dist/logger/stsTransportLoggerWinston.js.map +1 -1
- package/dist/logger/stsTransportWinston.js +3 -11
- package/dist/logger/stsTransportWinston.js.map +1 -1
- package/dist/middleware/serverNetworkMiddleware.js +28 -35
- package/dist/middleware/serverNetworkMiddleware.js.map +1 -1
- package/dist/network.js +4 -11
- package/dist/network.js.map +1 -1
- package/dist/process/masterprocessbase.js +95 -102
- package/dist/process/masterprocessbase.js.map +1 -1
- package/dist/process/processbase.js +63 -70
- package/dist/process/processbase.js.map +1 -1
- package/dist/process/serverprocessbase.js +47 -54
- package/dist/process/serverprocessbase.js.map +1 -1
- package/dist/process/singleprocessbase.js +10 -17
- package/dist/process/singleprocessbase.js.map +1 -1
- package/dist/process/workerprocessbase.js +26 -33
- package/dist/process/workerprocessbase.js.map +1 -1
- package/dist/publishertransports/publishTransportUtils.js +10 -14
- package/dist/publishertransports/publishTransportUtils.js.map +1 -1
- package/dist/route/stslatencyroute.js +4 -8
- package/dist/route/stslatencyroute.js.map +1 -1
- package/dist/route/stsrouterbase.js +3 -7
- package/dist/route/stsrouterbase.js.map +1 -1
- package/dist/server.test.js +5 -7
- package/dist/server.test.js.map +1 -1
- package/dist/stsexpressserver.js +32 -39
- package/dist/stsexpressserver.js.map +1 -1
- package/dist/validation/errors.js +1 -4
- package/dist/validation/errors.js.map +1 -1
- package/package.json +21 -20
- package/types/controller/stscontrollerbase.d.ts +1 -1
- package/types/controller/stscontrollerbase.d.ts.map +1 -1
- package/types/controller/stslatencycontroller.d.ts +2 -2
- package/types/controller/stslatencycontroller.d.ts.map +1 -1
- package/types/grpc/grpcServer.d.ts.map +1 -1
- package/types/index.d.ts +15 -15
- package/types/index.d.ts.map +1 -1
- package/types/logger/stsTransportLoggerWinston.d.ts +1 -1
- package/types/logger/stsTransportLoggerWinston.d.ts.map +1 -1
- package/types/middleware/serverNetworkMiddleware.d.ts +3 -2
- package/types/middleware/serverNetworkMiddleware.d.ts.map +1 -1
- package/types/process/masterprocessbase.d.ts +3 -3
- package/types/process/masterprocessbase.d.ts.map +1 -1
- package/types/process/processbase.d.ts +2 -3
- package/types/process/processbase.d.ts.map +1 -1
- package/types/process/serverprocessbase.d.ts +3 -3
- package/types/process/serverprocessbase.d.ts.map +1 -1
- package/types/process/singleprocessbase.d.ts +2 -2
- package/types/process/singleprocessbase.d.ts.map +1 -1
- package/types/process/workerprocessbase.d.ts +3 -3
- package/types/process/workerprocessbase.d.ts.map +1 -1
- package/types/publishertransports/publishTransportUtils.d.ts +1 -1
- package/types/publishertransports/publishTransportUtils.d.ts.map +1 -1
- package/types/route/stslatencyroute.d.ts +2 -2
- package/types/route/stslatencyroute.d.ts.map +1 -1
- package/types/route/stsrouterbase.d.ts +1 -1
- package/types/route/stsrouterbase.d.ts.map +1 -1
- package/types/stsexpressserver.d.ts +1 -1
- package/types/stsexpressserver.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../../src/logger/stsTransportWinston.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stsTransportWinston.js","sourceRoot":"","sources":["../../src/logger/stsTransportWinston.ts"],"names":[],"mappings":"AAAA,kDAAkD,CAAE,UAAU;AAC9D,OAAO,SAAqC,MAAM,mBAAmB,CAAA;AASrE,MAAM,UAAU,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;AAED,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IAC9C,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"}
|
|
@@ -1,25 +1,19 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ServerNetworkMiddleware = exports.ServerNetworkMiddlewareEventName = void 0;
|
|
7
1
|
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
var ServerNetworkMiddlewareEventName;
|
|
2
|
+
import chalk from 'chalk'; // Note: Do NOT upgrade beyond 4.1.2 as the ESM version (5.0.0+) breaks this entire codebase
|
|
3
|
+
import { TinyEmitter } from 'tiny-emitter';
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
5
|
+
import onHeaders from 'on-headers';
|
|
6
|
+
export var ServerNetworkMiddlewareEventName;
|
|
14
7
|
(function (ServerNetworkMiddlewareEventName) {
|
|
15
8
|
ServerNetworkMiddlewareEventName["UpdateInstrument_SERVER_NET_VAL"] = "UpdateInstrument_SERVER_NET_VAL"; // request net stats
|
|
16
|
-
})(ServerNetworkMiddlewareEventName || (
|
|
17
|
-
class ServerNetworkMiddleware
|
|
18
|
-
|
|
9
|
+
})(ServerNetworkMiddlewareEventName || (ServerNetworkMiddlewareEventName = {}));
|
|
10
|
+
export class ServerNetworkMiddleware {
|
|
11
|
+
options;
|
|
12
|
+
#tinyEmitter = new TinyEmitter();
|
|
19
13
|
#socketCollection = {};
|
|
20
14
|
#id = '';
|
|
21
15
|
constructor(options) {
|
|
22
|
-
|
|
16
|
+
this.options = options;
|
|
23
17
|
}
|
|
24
18
|
#LogSillyMessage(message) {
|
|
25
19
|
this.options?.logger.silly(message);
|
|
@@ -49,7 +43,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
49
43
|
//this.#LogDebugMessage(chalk.gray(`totalBytesWritten: [${workingSocketRecord.id}] [${workingSocketRecord.originalUrl}] [${eventName}] [${workingSocketRecord.requestBytesWritten}]`));
|
|
50
44
|
const workingSocketEventRecord = { ...workingSocketRecord };
|
|
51
45
|
delete workingSocketEventRecord.socket;
|
|
52
|
-
this.#LogSillyMessage(
|
|
46
|
+
this.#LogSillyMessage(chalk.gray(`Sending event: [${JSON.stringify(workingSocketEventRecord)}]`));
|
|
53
47
|
this.#tinyEmitter.emit(ServerNetworkMiddlewareEventName.UpdateInstrument_SERVER_NET_VAL, workingSocketEventRecord);
|
|
54
48
|
workingSocketRecord.lastBytesRead = workingSocketRecord.currentBytesRead;
|
|
55
49
|
workingSocketRecord.lastBytesWritten = workingSocketRecord.currentBytesWritten;
|
|
@@ -68,7 +62,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
68
62
|
return contentLength;
|
|
69
63
|
}
|
|
70
64
|
catch (error) {
|
|
71
|
-
this.#LogErrorMessage(
|
|
65
|
+
this.#LogErrorMessage(chalk.red(`ServerNetworkMiddleware:#GetRequestContentSize(): Error: [${error}]`));
|
|
72
66
|
return 0;
|
|
73
67
|
}
|
|
74
68
|
};
|
|
@@ -76,7 +70,7 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
76
70
|
let workingSocketRecord = null;
|
|
77
71
|
workingSocketRecord = this.GetSocketRecord(req.socket);
|
|
78
72
|
if (!workingSocketRecord) {
|
|
79
|
-
this.#id = (
|
|
73
|
+
this.#id = randomUUID();
|
|
80
74
|
workingSocketRecord = {
|
|
81
75
|
id: `${this.options.name}_${this.#id.toString()}`,
|
|
82
76
|
socket: req.socket,
|
|
@@ -90,43 +84,43 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
90
84
|
eventName: '',
|
|
91
85
|
};
|
|
92
86
|
this.#socketCollection[workingSocketRecord.id] = workingSocketRecord;
|
|
93
|
-
this.#LogSillyMessage(
|
|
87
|
+
this.#LogSillyMessage(chalk.gray(`Adding new socket to recordset: ID: [${workingSocketRecord.id}], originalUrl: [${workingSocketRecord.originalUrl}]`));
|
|
94
88
|
workingSocketRecord.socket.on('data', () => {
|
|
95
89
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
96
90
|
if (socketRecord) {
|
|
97
|
-
this.#LogSillyMessage(
|
|
91
|
+
this.#LogSillyMessage(chalk.gray(`Socket data event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
98
92
|
this.UpdateNetworkStats(socketRecord, 'socket_data', req);
|
|
99
93
|
}
|
|
100
94
|
else {
|
|
101
|
-
this.#LogSillyMessage(
|
|
95
|
+
this.#LogSillyMessage(chalk.magenta(`Socket data event: Could not find socket within recordset`));
|
|
102
96
|
}
|
|
103
97
|
});
|
|
104
98
|
workingSocketRecord.socket.on('close', () => {
|
|
105
99
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
106
100
|
if (socketRecord) {
|
|
107
|
-
this.#LogSillyMessage(
|
|
101
|
+
this.#LogSillyMessage(chalk.gray(`Socket close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
108
102
|
this.UpdateNetworkStats(socketRecord, 'socket_close', req);
|
|
109
103
|
delete this.#socketCollection[socketRecord.id];
|
|
110
|
-
this.#LogSillyMessage(
|
|
104
|
+
this.#LogSillyMessage(chalk.gray(`Socket removed from recordset: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
111
105
|
}
|
|
112
106
|
else {
|
|
113
|
-
this.#LogSillyMessage(
|
|
107
|
+
this.#LogSillyMessage(chalk.magenta(`Socket close event: Could not find socket within recordset`));
|
|
114
108
|
}
|
|
115
109
|
});
|
|
116
110
|
workingSocketRecord.socket.on('end', () => {
|
|
117
111
|
const socketRecord = this.GetSocketRecord(workingSocketRecord.socket);
|
|
118
112
|
if (socketRecord) {
|
|
119
|
-
this.#LogSillyMessage(
|
|
113
|
+
this.#LogSillyMessage(chalk.gray(`Socket end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
120
114
|
this.UpdateNetworkStats(socketRecord, 'socket_end', req);
|
|
121
115
|
}
|
|
122
116
|
else {
|
|
123
|
-
this.#LogSillyMessage(
|
|
117
|
+
this.#LogSillyMessage(chalk.magenta(`Socket end event: Could not find socket within recordset`));
|
|
124
118
|
}
|
|
125
119
|
});
|
|
126
120
|
}
|
|
127
121
|
// The following gets the payload size from adding _contentLength or content-length to the header size.
|
|
128
122
|
// From brief observations, this appears to be about 80 bytes short from what is reported by the socket writtenBytes.
|
|
129
|
-
(
|
|
123
|
+
onHeaders(res, () => {
|
|
130
124
|
let contentLength = 0;
|
|
131
125
|
if (res['_contentLength']) {
|
|
132
126
|
contentLength = res['_contentLength'];
|
|
@@ -142,27 +136,27 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
142
136
|
res.setHeader('Expires', '0'); // Proxies
|
|
143
137
|
const headerLength = JSON.stringify(res.getHeaders()).length;
|
|
144
138
|
const totalSize = contentLength + headerLength;
|
|
145
|
-
this.#LogSillyMessage(
|
|
139
|
+
this.#LogSillyMessage(chalk.white.bgBlue(`contentLength: [${contentLength}], headerLength: [${headerLength}], total Size: [${totalSize}]`));
|
|
146
140
|
});
|
|
147
141
|
// This event is the one where bytesWritten is generally recorded
|
|
148
142
|
req.on('end', () => {
|
|
149
143
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
150
144
|
if (socketRecord) {
|
|
151
|
-
this.#LogSillyMessage(
|
|
145
|
+
this.#LogSillyMessage(chalk.gray(`Request end event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
152
146
|
this.UpdateNetworkStats(socketRecord, 'req_end', req);
|
|
153
147
|
}
|
|
154
148
|
else {
|
|
155
|
-
this.#LogSillyMessage(
|
|
149
|
+
this.#LogSillyMessage(chalk.magenta(`Request end event: Could not find socket within recordset`));
|
|
156
150
|
}
|
|
157
151
|
});
|
|
158
152
|
req.on('close', () => {
|
|
159
153
|
const socketRecord = this.GetSocketRecord(req.socket);
|
|
160
154
|
if (socketRecord) {
|
|
161
|
-
this.#LogSillyMessage(
|
|
155
|
+
this.#LogSillyMessage(chalk.gray(`Request close event: ID: [${socketRecord.id}], originalUrl: [${socketRecord.originalUrl}]`));
|
|
162
156
|
this.UpdateNetworkStats(socketRecord, 'req_close', req);
|
|
163
157
|
}
|
|
164
158
|
else {
|
|
165
|
-
this.#LogSillyMessage(
|
|
159
|
+
this.#LogSillyMessage(chalk.magenta(`Request close event: Could not find socket within recordset`));
|
|
166
160
|
}
|
|
167
161
|
});
|
|
168
162
|
/* These methods are also available but from testing they provide no specific value add, i.e. the calculated numbers are always 0.
|
|
@@ -189,11 +183,10 @@ class ServerNetworkMiddleware extends stsutils_1.STSOptionsBase {
|
|
|
189
183
|
const inHeadersLength = JSON.stringify(req.headers).length;
|
|
190
184
|
const inContentLength = this.#GetRequestContentSize(req);
|
|
191
185
|
const inTotal = inHeadersLength + inContentLength;
|
|
192
|
-
this.#LogSillyMessage(
|
|
186
|
+
this.#LogSillyMessage(chalk.white.bgGray(`inHeadersLength: [${inHeadersLength}], inContentLength: [${inContentLength}], inTotal: [${inTotal}]`));
|
|
193
187
|
// This event is the one where bytesRead is generally recorded
|
|
194
188
|
this.UpdateNetworkStats(workingSocketRecord, 'middleware', req);
|
|
195
189
|
next();
|
|
196
190
|
};
|
|
197
191
|
}
|
|
198
|
-
exports.ServerNetworkMiddleware = ServerNetworkMiddleware;
|
|
199
192
|
//# sourceMappingURL=serverNetworkMiddleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serverNetworkMiddleware.js","sourceRoot":"","sources":["../../src/middleware/serverNetworkMiddleware.ts"],"names":[],"mappings":"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"}
|
package/dist/network.js
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.GetNetworkInterfaces = GetNetworkInterfaces;
|
|
7
|
-
exports.GetFirstNetworkInterface = GetFirstNetworkInterface;
|
|
8
|
-
const os_1 = __importDefault(require("os"));
|
|
9
|
-
function GetNetworkInterfaces() {
|
|
10
|
-
const nets = os_1.default.networkInterfaces();
|
|
1
|
+
import os from 'os';
|
|
2
|
+
export function GetNetworkInterfaces() {
|
|
3
|
+
const nets = os.networkInterfaces();
|
|
11
4
|
const results = {};
|
|
12
5
|
for (const name of Object.keys(nets)) {
|
|
13
6
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -23,7 +16,7 @@ function GetNetworkInterfaces() {
|
|
|
23
16
|
}
|
|
24
17
|
return results;
|
|
25
18
|
}
|
|
26
|
-
function GetFirstNetworkInterface() {
|
|
19
|
+
export function GetFirstNetworkInterface() {
|
|
27
20
|
const nics = GetNetworkInterfaces();
|
|
28
21
|
let hostaddr = null;
|
|
29
22
|
for (const nic in nics) {
|
package/dist/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAInB,MAAM,UAAU,oBAAoB;IAChC,MAAM,IAAI,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAsB,EAAG,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,8DAA8D;QAC9D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAQ,EAAE,CAAC;YAClC,6DAA6D;YAC7D,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjB,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,wBAAwB;IACpC,MAAM,IAAI,GAAsB,oBAAoB,EAAE,CAAC;IACvD,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,IAAI,EACtB,CAAC;QACG,MAAM,GAAG,GAAa,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAClB,CAAC;YACG,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,MAAM;QACV,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|