@push.rocks/smartproxy 3.9.4 → 3.10.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.10.0',
|
|
7
7
|
description: 'a proxy for handling high workloads of proxying'
|
|
8
8
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=
|
|
@@ -20,7 +20,9 @@ export declare class PortProxy {
|
|
|
20
20
|
private incomingConnectionTimes;
|
|
21
21
|
private outgoingConnectionTimes;
|
|
22
22
|
private connectionLogger;
|
|
23
|
+
private terminationStats;
|
|
23
24
|
constructor(settings: IProxySettings);
|
|
25
|
+
private incrementTerminationStat;
|
|
24
26
|
start(): Promise<void>;
|
|
25
27
|
stop(): Promise<void>;
|
|
26
28
|
}
|
|
@@ -92,11 +92,25 @@ export class PortProxy {
|
|
|
92
92
|
// Record start times for outgoing connections
|
|
93
93
|
this.outgoingConnectionTimes = new Map();
|
|
94
94
|
this.connectionLogger = null;
|
|
95
|
+
// Overall termination statistics
|
|
96
|
+
this.terminationStats = {
|
|
97
|
+
incoming: {},
|
|
98
|
+
outgoing: {},
|
|
99
|
+
};
|
|
95
100
|
this.settings = {
|
|
96
101
|
...settings,
|
|
97
102
|
toHost: settings.toHost || 'localhost'
|
|
98
103
|
};
|
|
99
104
|
}
|
|
105
|
+
// Helper to update termination stats.
|
|
106
|
+
incrementTerminationStat(side, reason) {
|
|
107
|
+
if (!this.terminationStats[side][reason]) {
|
|
108
|
+
this.terminationStats[side][reason] = 1;
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
this.terminationStats[side][reason]++;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
100
114
|
async start() {
|
|
101
115
|
// Adjusted cleanUpSockets to allow an optional outgoing socket.
|
|
102
116
|
const cleanUpSockets = (from, to) => {
|
|
@@ -141,6 +155,9 @@ export class PortProxy {
|
|
|
141
155
|
console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
|
|
142
156
|
// Flag to detect if we've received the first data chunk.
|
|
143
157
|
let initialDataReceived = false;
|
|
158
|
+
// Local termination reason trackers for each side.
|
|
159
|
+
let incomingTermReason = null;
|
|
160
|
+
let outgoingTermReason = null;
|
|
144
161
|
// Immediately attach an error handler to catch early errors.
|
|
145
162
|
socket.on('error', (err) => {
|
|
146
163
|
if (!initialDataReceived) {
|
|
@@ -150,7 +167,7 @@ export class PortProxy {
|
|
|
150
167
|
console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
|
|
151
168
|
}
|
|
152
169
|
});
|
|
153
|
-
//
|
|
170
|
+
// Ensure cleanup happens only once.
|
|
154
171
|
let connectionClosed = false;
|
|
155
172
|
const cleanupOnce = () => {
|
|
156
173
|
if (!connectionClosed) {
|
|
@@ -166,20 +183,40 @@ export class PortProxy {
|
|
|
166
183
|
}
|
|
167
184
|
}
|
|
168
185
|
};
|
|
169
|
-
//
|
|
186
|
+
// Outgoing connection placeholder.
|
|
170
187
|
let to = null;
|
|
188
|
+
// Handle errors by recording termination reason and cleaning up.
|
|
171
189
|
const handleError = (side) => (err) => {
|
|
172
190
|
const code = err.code;
|
|
191
|
+
let reason = 'error';
|
|
173
192
|
if (code === 'ECONNRESET') {
|
|
193
|
+
reason = 'econnreset';
|
|
174
194
|
console.log(`ECONNRESET on ${side} side from ${remoteIP}: ${err.message}`);
|
|
175
195
|
}
|
|
176
196
|
else {
|
|
177
197
|
console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
|
|
178
198
|
}
|
|
199
|
+
if (side === 'incoming' && incomingTermReason === null) {
|
|
200
|
+
incomingTermReason = reason;
|
|
201
|
+
this.incrementTerminationStat('incoming', reason);
|
|
202
|
+
}
|
|
203
|
+
else if (side === 'outgoing' && outgoingTermReason === null) {
|
|
204
|
+
outgoingTermReason = reason;
|
|
205
|
+
this.incrementTerminationStat('outgoing', reason);
|
|
206
|
+
}
|
|
179
207
|
cleanupOnce();
|
|
180
208
|
};
|
|
209
|
+
// Handle close events. If no termination reason was recorded, mark as "normal".
|
|
181
210
|
const handleClose = (side) => () => {
|
|
182
211
|
console.log(`Connection closed on ${side} side from ${remoteIP}`);
|
|
212
|
+
if (side === 'incoming' && incomingTermReason === null) {
|
|
213
|
+
incomingTermReason = 'normal';
|
|
214
|
+
this.incrementTerminationStat('incoming', 'normal');
|
|
215
|
+
}
|
|
216
|
+
else if (side === 'outgoing' && outgoingTermReason === null) {
|
|
217
|
+
outgoingTermReason = 'normal';
|
|
218
|
+
this.incrementTerminationStat('outgoing', 'normal');
|
|
219
|
+
}
|
|
183
220
|
cleanupOnce();
|
|
184
221
|
};
|
|
185
222
|
// Setup connection, optionally accepting the initial data chunk.
|
|
@@ -191,12 +228,20 @@ export class PortProxy {
|
|
|
191
228
|
if (!domainConfig) {
|
|
192
229
|
console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
193
230
|
socket.end();
|
|
231
|
+
if (incomingTermReason === null) {
|
|
232
|
+
incomingTermReason = 'rejected';
|
|
233
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
234
|
+
}
|
|
194
235
|
cleanupOnce();
|
|
195
236
|
return;
|
|
196
237
|
}
|
|
197
238
|
if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
|
|
198
239
|
console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
199
240
|
socket.end();
|
|
241
|
+
if (incomingTermReason === null) {
|
|
242
|
+
incomingTermReason = 'rejected';
|
|
243
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
244
|
+
}
|
|
200
245
|
cleanupOnce();
|
|
201
246
|
return;
|
|
202
247
|
}
|
|
@@ -204,6 +249,10 @@ export class PortProxy {
|
|
|
204
249
|
else if (!isDefaultAllowed && !serverName) {
|
|
205
250
|
console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
206
251
|
socket.end();
|
|
252
|
+
if (incomingTermReason === null) {
|
|
253
|
+
incomingTermReason = 'rejected';
|
|
254
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
255
|
+
}
|
|
207
256
|
cleanupOnce();
|
|
208
257
|
return;
|
|
209
258
|
}
|
|
@@ -223,7 +272,6 @@ export class PortProxy {
|
|
|
223
272
|
}
|
|
224
273
|
// Establish outgoing connection.
|
|
225
274
|
to = plugins.net.connect(connectionOptions);
|
|
226
|
-
// Record start time for the outgoing connection.
|
|
227
275
|
if (to) {
|
|
228
276
|
this.outgoingConnectionTimes.set(to, Date.now());
|
|
229
277
|
}
|
|
@@ -233,20 +281,27 @@ export class PortProxy {
|
|
|
233
281
|
socket.unshift(initialChunk);
|
|
234
282
|
}
|
|
235
283
|
socket.setTimeout(120000);
|
|
236
|
-
// Since 'to' is not null here, we can use the non-null assertion.
|
|
237
284
|
socket.pipe(to);
|
|
238
285
|
to.pipe(socket);
|
|
239
|
-
// Attach
|
|
286
|
+
// Attach event handlers for both sockets.
|
|
240
287
|
socket.on('error', handleError('incoming'));
|
|
241
288
|
to.on('error', handleError('outgoing'));
|
|
242
289
|
socket.on('close', handleClose('incoming'));
|
|
243
290
|
to.on('close', handleClose('outgoing'));
|
|
244
291
|
socket.on('timeout', () => {
|
|
245
292
|
console.log(`Timeout on incoming side from ${remoteIP}`);
|
|
293
|
+
if (incomingTermReason === null) {
|
|
294
|
+
incomingTermReason = 'timeout';
|
|
295
|
+
this.incrementTerminationStat('incoming', 'timeout');
|
|
296
|
+
}
|
|
246
297
|
cleanupOnce();
|
|
247
298
|
});
|
|
248
299
|
to.on('timeout', () => {
|
|
249
300
|
console.log(`Timeout on outgoing side from ${remoteIP}`);
|
|
301
|
+
if (outgoingTermReason === null) {
|
|
302
|
+
outgoingTermReason = 'timeout';
|
|
303
|
+
this.incrementTerminationStat('outgoing', 'timeout');
|
|
304
|
+
}
|
|
250
305
|
cleanupOnce();
|
|
251
306
|
});
|
|
252
307
|
socket.on('end', handleClose('incoming'));
|
|
@@ -256,7 +311,6 @@ export class PortProxy {
|
|
|
256
311
|
if (this.settings.sniEnabled) {
|
|
257
312
|
socket.once('data', (chunk) => {
|
|
258
313
|
initialDataReceived = true;
|
|
259
|
-
// Try to extract the server name from the ClientHello.
|
|
260
314
|
const serverName = extractSNI(chunk) || '';
|
|
261
315
|
console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
|
|
262
316
|
setupConnection(serverName, chunk);
|
|
@@ -268,6 +322,10 @@ export class PortProxy {
|
|
|
268
322
|
if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
|
|
269
323
|
console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
|
|
270
324
|
socket.end();
|
|
325
|
+
if (incomingTermReason === null) {
|
|
326
|
+
incomingTermReason = 'rejected';
|
|
327
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
328
|
+
}
|
|
271
329
|
cleanupOnce();
|
|
272
330
|
return;
|
|
273
331
|
}
|
|
@@ -280,7 +338,8 @@ export class PortProxy {
|
|
|
280
338
|
.listen(this.settings.fromPort, () => {
|
|
281
339
|
console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
|
|
282
340
|
});
|
|
283
|
-
// Log active connection count
|
|
341
|
+
// Log active connection count, longest running connection durations,
|
|
342
|
+
// and termination statistics every 10 seconds.
|
|
284
343
|
this.connectionLogger = setInterval(() => {
|
|
285
344
|
const now = Date.now();
|
|
286
345
|
let maxIncoming = 0;
|
|
@@ -297,7 +356,7 @@ export class PortProxy {
|
|
|
297
356
|
maxOutgoing = duration;
|
|
298
357
|
}
|
|
299
358
|
}
|
|
300
|
-
console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
|
|
359
|
+
console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, (outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`);
|
|
301
360
|
}, 10000);
|
|
302
361
|
}
|
|
303
362
|
async stop() {
|
|
@@ -312,4 +371,4 @@ export class PortProxy {
|
|
|
312
371
|
await done.promise;
|
|
313
372
|
}
|
|
314
373
|
}
|
|
315
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
|
|
374
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -123,6 +123,15 @@ export class PortProxy {
|
|
|
123
123
|
private outgoingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
|
|
124
124
|
private connectionLogger: NodeJS.Timeout | null = null;
|
|
125
125
|
|
|
126
|
+
// Overall termination statistics
|
|
127
|
+
private terminationStats: {
|
|
128
|
+
incoming: Record<string, number>;
|
|
129
|
+
outgoing: Record<string, number>;
|
|
130
|
+
} = {
|
|
131
|
+
incoming: {},
|
|
132
|
+
outgoing: {},
|
|
133
|
+
};
|
|
134
|
+
|
|
126
135
|
constructor(settings: IProxySettings) {
|
|
127
136
|
this.settings = {
|
|
128
137
|
...settings,
|
|
@@ -130,6 +139,15 @@ export class PortProxy {
|
|
|
130
139
|
};
|
|
131
140
|
}
|
|
132
141
|
|
|
142
|
+
// Helper to update termination stats.
|
|
143
|
+
private incrementTerminationStat(side: 'incoming' | 'outgoing', reason: string): void {
|
|
144
|
+
if (!this.terminationStats[side][reason]) {
|
|
145
|
+
this.terminationStats[side][reason] = 1;
|
|
146
|
+
} else {
|
|
147
|
+
this.terminationStats[side][reason]++;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
133
151
|
public async start() {
|
|
134
152
|
// Adjusted cleanUpSockets to allow an optional outgoing socket.
|
|
135
153
|
const cleanUpSockets = (from: plugins.net.Socket, to?: plugins.net.Socket) => {
|
|
@@ -183,6 +201,10 @@ export class PortProxy {
|
|
|
183
201
|
// Flag to detect if we've received the first data chunk.
|
|
184
202
|
let initialDataReceived = false;
|
|
185
203
|
|
|
204
|
+
// Local termination reason trackers for each side.
|
|
205
|
+
let incomingTermReason: string | null = null;
|
|
206
|
+
let outgoingTermReason: string | null = null;
|
|
207
|
+
|
|
186
208
|
// Immediately attach an error handler to catch early errors.
|
|
187
209
|
socket.on('error', (err: Error) => {
|
|
188
210
|
if (!initialDataReceived) {
|
|
@@ -192,7 +214,7 @@ export class PortProxy {
|
|
|
192
214
|
}
|
|
193
215
|
});
|
|
194
216
|
|
|
195
|
-
//
|
|
217
|
+
// Ensure cleanup happens only once.
|
|
196
218
|
let connectionClosed = false;
|
|
197
219
|
const cleanupOnce = () => {
|
|
198
220
|
if (!connectionClosed) {
|
|
@@ -209,21 +231,39 @@ export class PortProxy {
|
|
|
209
231
|
}
|
|
210
232
|
};
|
|
211
233
|
|
|
212
|
-
//
|
|
234
|
+
// Outgoing connection placeholder.
|
|
213
235
|
let to: plugins.net.Socket | null = null;
|
|
214
236
|
|
|
237
|
+
// Handle errors by recording termination reason and cleaning up.
|
|
215
238
|
const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
|
|
216
239
|
const code = (err as any).code;
|
|
240
|
+
let reason = 'error';
|
|
217
241
|
if (code === 'ECONNRESET') {
|
|
242
|
+
reason = 'econnreset';
|
|
218
243
|
console.log(`ECONNRESET on ${side} side from ${remoteIP}: ${err.message}`);
|
|
219
244
|
} else {
|
|
220
245
|
console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
|
|
221
246
|
}
|
|
247
|
+
if (side === 'incoming' && incomingTermReason === null) {
|
|
248
|
+
incomingTermReason = reason;
|
|
249
|
+
this.incrementTerminationStat('incoming', reason);
|
|
250
|
+
} else if (side === 'outgoing' && outgoingTermReason === null) {
|
|
251
|
+
outgoingTermReason = reason;
|
|
252
|
+
this.incrementTerminationStat('outgoing', reason);
|
|
253
|
+
}
|
|
222
254
|
cleanupOnce();
|
|
223
255
|
};
|
|
224
256
|
|
|
257
|
+
// Handle close events. If no termination reason was recorded, mark as "normal".
|
|
225
258
|
const handleClose = (side: 'incoming' | 'outgoing') => () => {
|
|
226
259
|
console.log(`Connection closed on ${side} side from ${remoteIP}`);
|
|
260
|
+
if (side === 'incoming' && incomingTermReason === null) {
|
|
261
|
+
incomingTermReason = 'normal';
|
|
262
|
+
this.incrementTerminationStat('incoming', 'normal');
|
|
263
|
+
} else if (side === 'outgoing' && outgoingTermReason === null) {
|
|
264
|
+
outgoingTermReason = 'normal';
|
|
265
|
+
this.incrementTerminationStat('outgoing', 'normal');
|
|
266
|
+
}
|
|
227
267
|
cleanupOnce();
|
|
228
268
|
};
|
|
229
269
|
|
|
@@ -236,18 +276,30 @@ export class PortProxy {
|
|
|
236
276
|
if (!domainConfig) {
|
|
237
277
|
console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
|
|
238
278
|
socket.end();
|
|
279
|
+
if (incomingTermReason === null) {
|
|
280
|
+
incomingTermReason = 'rejected';
|
|
281
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
282
|
+
}
|
|
239
283
|
cleanupOnce();
|
|
240
284
|
return;
|
|
241
285
|
}
|
|
242
286
|
if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
|
|
243
287
|
console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
|
|
244
288
|
socket.end();
|
|
289
|
+
if (incomingTermReason === null) {
|
|
290
|
+
incomingTermReason = 'rejected';
|
|
291
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
292
|
+
}
|
|
245
293
|
cleanupOnce();
|
|
246
294
|
return;
|
|
247
295
|
}
|
|
248
296
|
} else if (!isDefaultAllowed && !serverName) {
|
|
249
297
|
console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
|
|
250
298
|
socket.end();
|
|
299
|
+
if (incomingTermReason === null) {
|
|
300
|
+
incomingTermReason = 'rejected';
|
|
301
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
302
|
+
}
|
|
251
303
|
cleanupOnce();
|
|
252
304
|
return;
|
|
253
305
|
} else {
|
|
@@ -269,7 +321,6 @@ export class PortProxy {
|
|
|
269
321
|
|
|
270
322
|
// Establish outgoing connection.
|
|
271
323
|
to = plugins.net.connect(connectionOptions);
|
|
272
|
-
// Record start time for the outgoing connection.
|
|
273
324
|
if (to) {
|
|
274
325
|
this.outgoingConnectionTimes.set(to, Date.now());
|
|
275
326
|
}
|
|
@@ -280,21 +331,28 @@ export class PortProxy {
|
|
|
280
331
|
socket.unshift(initialChunk);
|
|
281
332
|
}
|
|
282
333
|
socket.setTimeout(120000);
|
|
283
|
-
// Since 'to' is not null here, we can use the non-null assertion.
|
|
284
334
|
socket.pipe(to!);
|
|
285
335
|
to!.pipe(socket);
|
|
286
336
|
|
|
287
|
-
// Attach
|
|
337
|
+
// Attach event handlers for both sockets.
|
|
288
338
|
socket.on('error', handleError('incoming'));
|
|
289
339
|
to!.on('error', handleError('outgoing'));
|
|
290
340
|
socket.on('close', handleClose('incoming'));
|
|
291
341
|
to!.on('close', handleClose('outgoing'));
|
|
292
342
|
socket.on('timeout', () => {
|
|
293
343
|
console.log(`Timeout on incoming side from ${remoteIP}`);
|
|
344
|
+
if (incomingTermReason === null) {
|
|
345
|
+
incomingTermReason = 'timeout';
|
|
346
|
+
this.incrementTerminationStat('incoming', 'timeout');
|
|
347
|
+
}
|
|
294
348
|
cleanupOnce();
|
|
295
349
|
});
|
|
296
350
|
to!.on('timeout', () => {
|
|
297
351
|
console.log(`Timeout on outgoing side from ${remoteIP}`);
|
|
352
|
+
if (outgoingTermReason === null) {
|
|
353
|
+
outgoingTermReason = 'timeout';
|
|
354
|
+
this.incrementTerminationStat('outgoing', 'timeout');
|
|
355
|
+
}
|
|
298
356
|
cleanupOnce();
|
|
299
357
|
});
|
|
300
358
|
socket.on('end', handleClose('incoming'));
|
|
@@ -305,7 +363,6 @@ export class PortProxy {
|
|
|
305
363
|
if (this.settings.sniEnabled) {
|
|
306
364
|
socket.once('data', (chunk: Buffer) => {
|
|
307
365
|
initialDataReceived = true;
|
|
308
|
-
// Try to extract the server name from the ClientHello.
|
|
309
366
|
const serverName = extractSNI(chunk) || '';
|
|
310
367
|
console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
|
|
311
368
|
setupConnection(serverName, chunk);
|
|
@@ -316,6 +373,10 @@ export class PortProxy {
|
|
|
316
373
|
if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
|
|
317
374
|
console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
|
|
318
375
|
socket.end();
|
|
376
|
+
if (incomingTermReason === null) {
|
|
377
|
+
incomingTermReason = 'rejected';
|
|
378
|
+
this.incrementTerminationStat('incoming', 'rejected');
|
|
379
|
+
}
|
|
319
380
|
cleanupOnce();
|
|
320
381
|
return;
|
|
321
382
|
}
|
|
@@ -329,7 +390,8 @@ export class PortProxy {
|
|
|
329
390
|
console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
|
|
330
391
|
});
|
|
331
392
|
|
|
332
|
-
// Log active connection count
|
|
393
|
+
// Log active connection count, longest running connection durations,
|
|
394
|
+
// and termination statistics every 10 seconds.
|
|
333
395
|
this.connectionLogger = setInterval(() => {
|
|
334
396
|
const now = Date.now();
|
|
335
397
|
let maxIncoming = 0;
|
|
@@ -346,7 +408,7 @@ export class PortProxy {
|
|
|
346
408
|
maxOutgoing = duration;
|
|
347
409
|
}
|
|
348
410
|
}
|
|
349
|
-
console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
|
|
411
|
+
console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, (outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`);
|
|
350
412
|
}, 10000);
|
|
351
413
|
}
|
|
352
414
|
|