@push.rocks/smartproxy 3.14.2 → 3.15.0
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.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.15.0',
|
|
7
7
|
description: 'A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdNQUFnTTtDQUM5TSxDQUFBIn0=
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
/** Domain configuration with per‐domain allowed port ranges */
|
|
2
3
|
export interface IDomainConfig {
|
|
3
4
|
domain: string;
|
|
4
5
|
allowedIPs: string[];
|
|
5
6
|
targetIP?: string;
|
|
7
|
+
portRanges: Array<{
|
|
8
|
+
from: number;
|
|
9
|
+
to: number;
|
|
10
|
+
}>;
|
|
6
11
|
}
|
|
12
|
+
/** Port proxy settings including global allowed port ranges */
|
|
7
13
|
export interface IPortProxySettings extends plugins.tls.TlsOptions {
|
|
8
14
|
fromPort: number;
|
|
9
15
|
toPort: number;
|
|
@@ -13,6 +19,10 @@ export interface IPortProxySettings extends plugins.tls.TlsOptions {
|
|
|
13
19
|
defaultAllowedIPs?: string[];
|
|
14
20
|
preserveSourceIP?: boolean;
|
|
15
21
|
maxConnectionLifetime?: number;
|
|
22
|
+
globalPortRanges: Array<{
|
|
23
|
+
from: number;
|
|
24
|
+
to: number;
|
|
25
|
+
}>;
|
|
16
26
|
}
|
|
17
27
|
export declare class PortProxy {
|
|
18
28
|
netServer: plugins.net.Server;
|
|
@@ -103,10 +103,15 @@ export class PortProxy {
|
|
|
103
103
|
const expandedPatterns = patterns.flatMap(normalizeIP);
|
|
104
104
|
return normalizedIPVariants.some(ipVariant => expandedPatterns.some(pattern => plugins.minimatch(ipVariant, pattern)));
|
|
105
105
|
};
|
|
106
|
-
//
|
|
106
|
+
// Check if a port falls within any of the given port ranges.
|
|
107
|
+
const isPortInRanges = (port, ranges) => {
|
|
108
|
+
return ranges.some(range => port >= range.from && port <= range.to);
|
|
109
|
+
};
|
|
110
|
+
// Find a matching domain config based on SNI (fallback when port ranges aren’t used)
|
|
107
111
|
const findMatchingDomain = (serverName) => this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
|
|
108
112
|
this.netServer = plugins.net.createServer((socket) => {
|
|
109
113
|
const remoteIP = socket.remoteAddress || '';
|
|
114
|
+
const localPort = socket.localPort; // The port on which this connection was accepted.
|
|
110
115
|
const connectionRecord = {
|
|
111
116
|
incoming: socket,
|
|
112
117
|
outgoing: null,
|
|
@@ -114,7 +119,7 @@ export class PortProxy {
|
|
|
114
119
|
connectionClosed: false,
|
|
115
120
|
};
|
|
116
121
|
this.connectionRecords.add(connectionRecord);
|
|
117
|
-
console.log(`New connection from ${remoteIP}. Active connections: ${this.connectionRecords.size}`);
|
|
122
|
+
console.log(`New connection from ${remoteIP} on port ${localPort}. Active connections: ${this.connectionRecords.size}`);
|
|
118
123
|
let initialDataReceived = false;
|
|
119
124
|
let incomingTerminationReason = null;
|
|
120
125
|
let outgoingTerminationReason = null;
|
|
@@ -178,10 +183,17 @@ export class PortProxy {
|
|
|
178
183
|
}
|
|
179
184
|
cleanupOnce();
|
|
180
185
|
};
|
|
181
|
-
|
|
186
|
+
/**
|
|
187
|
+
* Sets up the connection to the target host.
|
|
188
|
+
* @param serverName - The SNI hostname (unused when forcedDomain is provided).
|
|
189
|
+
* @param initialChunk - Optional initial data chunk.
|
|
190
|
+
* @param forcedDomain - If provided, overrides SNI/domain lookup (used for port-based routing).
|
|
191
|
+
*/
|
|
192
|
+
const setupConnection = (serverName, initialChunk, forcedDomain) => {
|
|
193
|
+
// If a forcedDomain is provided (port-based routing), use it; otherwise, use SNI-based lookup.
|
|
194
|
+
const domainConfig = forcedDomain ? forcedDomain : (serverName ? findMatchingDomain(serverName) : undefined);
|
|
182
195
|
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
183
|
-
if (!defaultAllowed && serverName) {
|
|
184
|
-
const domainConfig = findMatchingDomain(serverName);
|
|
196
|
+
if (!defaultAllowed && serverName && !forcedDomain) {
|
|
185
197
|
if (!domainConfig) {
|
|
186
198
|
return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
187
199
|
}
|
|
@@ -189,13 +201,9 @@ export class PortProxy {
|
|
|
189
201
|
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
190
202
|
}
|
|
191
203
|
}
|
|
192
|
-
else if (!defaultAllowed && !serverName) {
|
|
193
|
-
return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
194
|
-
}
|
|
195
204
|
else if (defaultAllowed && !serverName) {
|
|
196
205
|
console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
|
|
197
206
|
}
|
|
198
|
-
const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
|
|
199
207
|
const targetHost = domainConfig?.targetIP || this.settings.toHost;
|
|
200
208
|
const connectionOptions = {
|
|
201
209
|
host: targetHost,
|
|
@@ -208,7 +216,7 @@ export class PortProxy {
|
|
|
208
216
|
connectionRecord.outgoing = targetSocket;
|
|
209
217
|
connectionRecord.outgoingStartTime = Date.now();
|
|
210
218
|
console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
|
|
211
|
-
`${serverName ? ` (SNI: ${serverName})` : ''}`);
|
|
219
|
+
`${serverName ? ` (SNI: ${serverName})` : forcedDomain ? ` (Port-based for domain: ${forcedDomain.domain})` : ''}`);
|
|
212
220
|
if (initialChunk) {
|
|
213
221
|
socket.unshift(initialChunk);
|
|
214
222
|
}
|
|
@@ -238,7 +246,7 @@ export class PortProxy {
|
|
|
238
246
|
});
|
|
239
247
|
socket.on('end', handleClose('incoming'));
|
|
240
248
|
targetSocket.on('end', handleClose('outgoing'));
|
|
241
|
-
//
|
|
249
|
+
// Initialize a cleanup timer for max connection lifetime.
|
|
242
250
|
if (this.settings.maxConnectionLifetime) {
|
|
243
251
|
let incomingActive = false;
|
|
244
252
|
let outgoingActive = false;
|
|
@@ -253,9 +261,7 @@ export class PortProxy {
|
|
|
253
261
|
}, this.settings.maxConnectionLifetime);
|
|
254
262
|
}
|
|
255
263
|
};
|
|
256
|
-
// Start the cleanup timer.
|
|
257
264
|
resetCleanupTimer();
|
|
258
|
-
// Listen for data events on both sides and reset the timer when both are active.
|
|
259
265
|
socket.on('data', () => {
|
|
260
266
|
incomingActive = true;
|
|
261
267
|
if (incomingActive && outgoingActive) {
|
|
@@ -274,6 +280,34 @@ export class PortProxy {
|
|
|
274
280
|
});
|
|
275
281
|
}
|
|
276
282
|
};
|
|
283
|
+
// --- PORT RANGE-BASED HANDLING ---
|
|
284
|
+
// If global port ranges are defined, enforce port-based routing and ignore SNI.
|
|
285
|
+
if (this.settings.globalPortRanges && this.settings.globalPortRanges.length > 0) {
|
|
286
|
+
if (!isPortInRanges(localPort, this.settings.globalPortRanges)) {
|
|
287
|
+
console.log(`Connection from ${remoteIP} rejected: port ${localPort} is not in global allowed ranges.`);
|
|
288
|
+
socket.destroy();
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
// Find a matching domain config based on the incoming local port.
|
|
292
|
+
const forcedDomain = this.settings.domains.find(domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges));
|
|
293
|
+
if (!forcedDomain) {
|
|
294
|
+
console.log(`Connection from ${remoteIP} rejected: port ${localPort} not configured in any domain's portRanges.`);
|
|
295
|
+
socket.destroy();
|
|
296
|
+
return;
|
|
297
|
+
}
|
|
298
|
+
// Check allowed IPs for the forced domain.
|
|
299
|
+
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
300
|
+
if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
|
|
301
|
+
console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
|
|
302
|
+
socket.end();
|
|
303
|
+
return;
|
|
304
|
+
}
|
|
305
|
+
console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
|
|
306
|
+
// Proceed immediately using the forced domain; ignore SNI.
|
|
307
|
+
setupConnection('', undefined, forcedDomain);
|
|
308
|
+
return;
|
|
309
|
+
}
|
|
310
|
+
// --- FALLBACK: SNI-BASED HANDLING (if no global port ranges are defined) ---
|
|
277
311
|
if (this.settings.sniEnabled) {
|
|
278
312
|
socket.setTimeout(5000, () => {
|
|
279
313
|
console.log(`Initial data timeout for ${remoteIP}`);
|
|
@@ -303,7 +337,7 @@ export class PortProxy {
|
|
|
303
337
|
console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}` +
|
|
304
338
|
`${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
|
|
305
339
|
});
|
|
306
|
-
//
|
|
340
|
+
// Log active connection count and longest running durations every 10 seconds.
|
|
307
341
|
this.connectionLogger = setInterval(() => {
|
|
308
342
|
const now = Date.now();
|
|
309
343
|
let maxIncoming = 0;
|
|
@@ -332,4 +366,4 @@ export class PortProxy {
|
|
|
332
366
|
await done.promise;
|
|
333
367
|
}
|
|
334
368
|
}
|
|
335
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.portproxy.js","sourceRoot":"","sources":["../ts/classes.portproxy.ts"],"names":[],"mappings":"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"}
|
|
369
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.portproxy.js","sourceRoot":"","sources":["../ts/classes.portproxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.15.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '3.
|
|
6
|
+
version: '3.15.0',
|
|
7
7
|
description: 'A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.'
|
|
8
8
|
}
|
package/ts/classes.portproxy.ts
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
|
|
3
|
+
/** Domain configuration with per‐domain allowed port ranges */
|
|
3
4
|
export interface IDomainConfig {
|
|
4
5
|
domain: string; // Glob pattern for domain
|
|
5
6
|
allowedIPs: string[]; // Glob patterns for allowed IPs
|
|
6
7
|
targetIP?: string; // Optional target IP for this domain
|
|
8
|
+
portRanges: Array<{ from: number; to: number }>; // Domain-specific allowed port ranges
|
|
7
9
|
}
|
|
8
10
|
|
|
11
|
+
/** Port proxy settings including global allowed port ranges */
|
|
9
12
|
export interface IPortProxySettings extends plugins.tls.TlsOptions {
|
|
10
13
|
fromPort: number;
|
|
11
14
|
toPort: number;
|
|
@@ -14,7 +17,8 @@ export interface IPortProxySettings extends plugins.tls.TlsOptions {
|
|
|
14
17
|
sniEnabled?: boolean;
|
|
15
18
|
defaultAllowedIPs?: string[];
|
|
16
19
|
preserveSourceIP?: boolean;
|
|
17
|
-
maxConnectionLifetime?: number; //
|
|
20
|
+
maxConnectionLifetime?: number; // (ms) force cleanup of long-lived connections
|
|
21
|
+
globalPortRanges: Array<{ from: number; to: number }>; // Global allowed port ranges
|
|
18
22
|
}
|
|
19
23
|
|
|
20
24
|
/**
|
|
@@ -144,12 +148,18 @@ export class PortProxy {
|
|
|
144
148
|
);
|
|
145
149
|
};
|
|
146
150
|
|
|
147
|
-
//
|
|
151
|
+
// Check if a port falls within any of the given port ranges.
|
|
152
|
+
const isPortInRanges = (port: number, ranges: Array<{ from: number; to: number }>): boolean => {
|
|
153
|
+
return ranges.some(range => port >= range.from && port <= range.to);
|
|
154
|
+
};
|
|
155
|
+
|
|
156
|
+
// Find a matching domain config based on SNI (fallback when port ranges aren’t used)
|
|
148
157
|
const findMatchingDomain = (serverName: string): IDomainConfig | undefined =>
|
|
149
158
|
this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
|
|
150
159
|
|
|
151
160
|
this.netServer = plugins.net.createServer((socket: plugins.net.Socket) => {
|
|
152
161
|
const remoteIP = socket.remoteAddress || '';
|
|
162
|
+
const localPort = socket.localPort; // The port on which this connection was accepted.
|
|
153
163
|
const connectionRecord: IConnectionRecord = {
|
|
154
164
|
incoming: socket,
|
|
155
165
|
outgoing: null,
|
|
@@ -157,7 +167,7 @@ export class PortProxy {
|
|
|
157
167
|
connectionClosed: false,
|
|
158
168
|
};
|
|
159
169
|
this.connectionRecords.add(connectionRecord);
|
|
160
|
-
console.log(`New connection from ${remoteIP}. Active connections: ${this.connectionRecords.size}`);
|
|
170
|
+
console.log(`New connection from ${remoteIP} on port ${localPort}. Active connections: ${this.connectionRecords.size}`);
|
|
161
171
|
|
|
162
172
|
let initialDataReceived = false;
|
|
163
173
|
let incomingTerminationReason: string | null = null;
|
|
@@ -225,24 +235,27 @@ export class PortProxy {
|
|
|
225
235
|
cleanupOnce();
|
|
226
236
|
};
|
|
227
237
|
|
|
228
|
-
|
|
238
|
+
/**
|
|
239
|
+
* Sets up the connection to the target host.
|
|
240
|
+
* @param serverName - The SNI hostname (unused when forcedDomain is provided).
|
|
241
|
+
* @param initialChunk - Optional initial data chunk.
|
|
242
|
+
* @param forcedDomain - If provided, overrides SNI/domain lookup (used for port-based routing).
|
|
243
|
+
*/
|
|
244
|
+
const setupConnection = (serverName: string, initialChunk?: Buffer, forcedDomain?: IDomainConfig) => {
|
|
245
|
+
// If a forcedDomain is provided (port-based routing), use it; otherwise, use SNI-based lookup.
|
|
246
|
+
const domainConfig = forcedDomain ? forcedDomain : (serverName ? findMatchingDomain(serverName) : undefined);
|
|
229
247
|
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
230
248
|
|
|
231
|
-
if (!defaultAllowed && serverName) {
|
|
232
|
-
const domainConfig = findMatchingDomain(serverName);
|
|
249
|
+
if (!defaultAllowed && serverName && !forcedDomain) {
|
|
233
250
|
if (!domainConfig) {
|
|
234
251
|
return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
235
252
|
}
|
|
236
253
|
if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
|
|
237
254
|
return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
238
255
|
}
|
|
239
|
-
} else if (!defaultAllowed && !serverName) {
|
|
240
|
-
return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
241
256
|
} else if (defaultAllowed && !serverName) {
|
|
242
257
|
console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
|
|
243
258
|
}
|
|
244
|
-
|
|
245
|
-
const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
|
|
246
259
|
const targetHost = domainConfig?.targetIP || this.settings.toHost!;
|
|
247
260
|
const connectionOptions: plugins.net.NetConnectOpts = {
|
|
248
261
|
host: targetHost,
|
|
@@ -258,7 +271,7 @@ export class PortProxy {
|
|
|
258
271
|
|
|
259
272
|
console.log(
|
|
260
273
|
`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
|
|
261
|
-
`${serverName ? ` (SNI: ${serverName})` : ''}`
|
|
274
|
+
`${serverName ? ` (SNI: ${serverName})` : forcedDomain ? ` (Port-based for domain: ${forcedDomain.domain})` : ''}`
|
|
262
275
|
);
|
|
263
276
|
|
|
264
277
|
if (initialChunk) {
|
|
@@ -292,7 +305,7 @@ export class PortProxy {
|
|
|
292
305
|
socket.on('end', handleClose('incoming'));
|
|
293
306
|
targetSocket.on('end', handleClose('outgoing'));
|
|
294
307
|
|
|
295
|
-
//
|
|
308
|
+
// Initialize a cleanup timer for max connection lifetime.
|
|
296
309
|
if (this.settings.maxConnectionLifetime) {
|
|
297
310
|
let incomingActive = false;
|
|
298
311
|
let outgoingActive = false;
|
|
@@ -308,10 +321,8 @@ export class PortProxy {
|
|
|
308
321
|
}
|
|
309
322
|
};
|
|
310
323
|
|
|
311
|
-
// Start the cleanup timer.
|
|
312
324
|
resetCleanupTimer();
|
|
313
325
|
|
|
314
|
-
// Listen for data events on both sides and reset the timer when both are active.
|
|
315
326
|
socket.on('data', () => {
|
|
316
327
|
incomingActive = true;
|
|
317
328
|
if (incomingActive && outgoingActive) {
|
|
@@ -331,6 +342,37 @@ export class PortProxy {
|
|
|
331
342
|
}
|
|
332
343
|
};
|
|
333
344
|
|
|
345
|
+
// --- PORT RANGE-BASED HANDLING ---
|
|
346
|
+
// If global port ranges are defined, enforce port-based routing and ignore SNI.
|
|
347
|
+
if (this.settings.globalPortRanges && this.settings.globalPortRanges.length > 0) {
|
|
348
|
+
if (!isPortInRanges(localPort, this.settings.globalPortRanges)) {
|
|
349
|
+
console.log(`Connection from ${remoteIP} rejected: port ${localPort} is not in global allowed ranges.`);
|
|
350
|
+
socket.destroy();
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
353
|
+
// Find a matching domain config based on the incoming local port.
|
|
354
|
+
const forcedDomain = this.settings.domains.find(
|
|
355
|
+
domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges)
|
|
356
|
+
);
|
|
357
|
+
if (!forcedDomain) {
|
|
358
|
+
console.log(`Connection from ${remoteIP} rejected: port ${localPort} not configured in any domain's portRanges.`);
|
|
359
|
+
socket.destroy();
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
362
|
+
// Check allowed IPs for the forced domain.
|
|
363
|
+
const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
|
|
364
|
+
if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
|
|
365
|
+
console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
|
|
366
|
+
socket.end();
|
|
367
|
+
return;
|
|
368
|
+
}
|
|
369
|
+
console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
|
|
370
|
+
// Proceed immediately using the forced domain; ignore SNI.
|
|
371
|
+
setupConnection('', undefined, forcedDomain);
|
|
372
|
+
return;
|
|
373
|
+
}
|
|
374
|
+
|
|
375
|
+
// --- FALLBACK: SNI-BASED HANDLING (if no global port ranges are defined) ---
|
|
334
376
|
if (this.settings.sniEnabled) {
|
|
335
377
|
socket.setTimeout(5000, () => {
|
|
336
378
|
console.log(`Initial data timeout for ${remoteIP}`);
|
|
@@ -363,7 +405,7 @@ export class PortProxy {
|
|
|
363
405
|
);
|
|
364
406
|
});
|
|
365
407
|
|
|
366
|
-
//
|
|
408
|
+
// Log active connection count and longest running durations every 10 seconds.
|
|
367
409
|
this.connectionLogger = setInterval(() => {
|
|
368
410
|
const now = Date.now();
|
|
369
411
|
let maxIncoming = 0;
|