@push.rocks/smartproxy 3.10.1 → 3.10.3

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.
Files changed (5) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/smartproxy.portproxy.js +105 -174
  3. package/package.json +1 -1
  4. package/ts/00_commitinfo_data.ts +1 -1
  5. package/ts/smartproxy.portproxy.ts +123 -196
package/dist_ts/00_commitinfo_data.js CHANGED
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '3.10.1',
6
+ version: '3.10.3',
7
7
  description: 'a proxy for handling high workloads of proxying'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=
package/dist_ts/smartproxy.portproxy.js CHANGED
@@ -1,77 +1,54 @@
1
1
  import * as plugins from './plugins.js';
2
2
  /**
3
- * Extract SNI (Server Name Indication) from a TLS ClientHello packet.
4
- * Returns the server name if found, or undefined.
3
+ * Extracts the SNI (Server Name Indication) from a TLS ClientHello packet.
4
+ * @param buffer - Buffer containing the TLS ClientHello.
5
+ * @returns The server name if found, otherwise undefined.
5
6
  */
6
7
  function extractSNI(buffer) {
7
8
  let offset = 0;
8
- // We need at least 5 bytes for the record header.
9
- if (buffer.length < 5) {
9
+ if (buffer.length < 5)
10
10
  return undefined;
11
- }
12
- // TLS record header
13
11
  const recordType = buffer.readUInt8(0);
14
- if (recordType !== 22) { // 22 = handshake
15
- return undefined;
16
- }
17
- // Read record length
12
+ if (recordType !== 22)
13
+ return undefined; // 22 = handshake
18
14
  const recordLength = buffer.readUInt16BE(3);
19
- if (buffer.length < 5 + recordLength) {
20
- // Not all data arrived yet; in production you might need to accumulate more data.
15
+ if (buffer.length < 5 + recordLength)
21
16
  return undefined;
22
- }
23
17
  offset = 5;
24
- // Handshake message type should be 1 for ClientHello.
25
18
  const handshakeType = buffer.readUInt8(offset);
26
- if (handshakeType !== 1) {
27
- return undefined;
28
- }
29
- // Skip handshake header (1 byte type + 3 bytes length)
30
- offset += 4;
31
- // Skip client version (2 bytes) and random (32 bytes)
32
- offset += 2 + 32;
33
- // Session ID
19
+ if (handshakeType !== 1)
20
+ return undefined; // 1 = ClientHello
21
+ offset += 4; // Skip handshake header (type + length)
22
+ offset += 2 + 32; // Skip client version and random
34
23
  const sessionIDLength = buffer.readUInt8(offset);
35
- offset += 1 + sessionIDLength;
36
- // Cipher suites
24
+ offset += 1 + sessionIDLength; // Skip session ID
37
25
  const cipherSuitesLength = buffer.readUInt16BE(offset);
38
- offset += 2 + cipherSuitesLength;
39
- // Compression methods
26
+ offset += 2 + cipherSuitesLength; // Skip cipher suites
40
27
  const compressionMethodsLength = buffer.readUInt8(offset);
41
- offset += 1 + compressionMethodsLength;
42
- // Extensions length
43
- if (offset + 2 > buffer.length) {
28
+ offset += 1 + compressionMethodsLength; // Skip compression methods
29
+ if (offset + 2 > buffer.length)
44
30
  return undefined;
45
- }
46
31
  const extensionsLength = buffer.readUInt16BE(offset);
47
32
  offset += 2;
48
33
  const extensionsEnd = offset + extensionsLength;
49
- // Iterate over extensions
50
34
  while (offset + 4 <= extensionsEnd) {
51
35
  const extensionType = buffer.readUInt16BE(offset);
52
36
  const extensionLength = buffer.readUInt16BE(offset + 2);
53
37
  offset += 4;
54
- // Check for SNI extension (type 0)
55
- if (extensionType === 0x0000) {
56
- // SNI extension: first 2 bytes are the SNI list length.
57
- if (offset + 2 > buffer.length) {
38
+ if (extensionType === 0x0000) { // SNI extension
39
+ if (offset + 2 > buffer.length)
58
40
  return undefined;
59
- }
60
41
  const sniListLength = buffer.readUInt16BE(offset);
61
42
  offset += 2;
62
43
  const sniListEnd = offset + sniListLength;
63
- // Loop through the list; typically there is one entry.
64
44
  while (offset + 3 < sniListEnd) {
65
- const nameType = buffer.readUInt8(offset);
66
- offset++;
45
+ const nameType = buffer.readUInt8(offset++);
67
46
  const nameLen = buffer.readUInt16BE(offset);
68
47
  offset += 2;
69
48
  if (nameType === 0) { // host_name
70
- if (offset + nameLen > buffer.length) {
49
+ if (offset + nameLen > buffer.length)
71
50
  return undefined;
72
- }
73
- const serverName = buffer.toString('utf8', offset, offset + nameLen);
74
- return serverName;
51
+ return buffer.toString('utf8', offset, offset + nameLen);
75
52
  }
76
53
  offset += nameLen;
77
54
  }
@@ -85,93 +62,67 @@ function extractSNI(buffer) {
85
62
  }
86
63
  export class PortProxy {
87
64
  constructor(settings) {
88
- // Track active incoming connections
89
65
  this.activeConnections = new Set();
90
- // Record start times for incoming connections
91
66
  this.incomingConnectionTimes = new Map();
92
- // Record start times for outgoing connections
93
67
  this.outgoingConnectionTimes = new Map();
94
68
  this.connectionLogger = null;
95
- // Overall termination statistics
96
69
  this.terminationStats = {
97
70
  incoming: {},
98
71
  outgoing: {},
99
72
  };
100
73
  this.settings = {
101
74
  ...settings,
102
- toHost: settings.toHost || 'localhost'
75
+ toHost: settings.toHost || 'localhost',
103
76
  };
104
77
  }
105
- // Helper to update termination stats.
106
78
  incrementTerminationStat(side, reason) {
107
- if (!this.terminationStats[side][reason]) {
108
- this.terminationStats[side][reason] = 1;
109
- }
110
- else {
111
- this.terminationStats[side][reason]++;
112
- }
79
+ this.terminationStats[side][reason] = (this.terminationStats[side][reason] || 0) + 1;
113
80
  }
114
81
  async start() {
115
- // Adjusted cleanUpSockets: forcefully destroy both sockets if they haven't been destroyed.
116
- const cleanUpSockets = (from, to) => {
117
- if (!from.destroyed) {
118
- from.destroy();
119
- }
120
- if (to && !to.destroyed) {
121
- to.destroy();
122
- }
82
+ // Helper to forcefully destroy sockets.
83
+ const cleanUpSockets = (socketA, socketB) => {
84
+ if (!socketA.destroyed)
85
+ socketA.destroy();
86
+ if (socketB && !socketB.destroyed)
87
+ socketB.destroy();
123
88
  };
89
+ // Normalize an IP to include both IPv4 and IPv6 representations.
124
90
  const normalizeIP = (ip) => {
125
- // Handle IPv4-mapped IPv6 addresses
126
91
  if (ip.startsWith('::ffff:')) {
127
- const ipv4 = ip.slice(7); // Remove '::ffff:' prefix
92
+ const ipv4 = ip.slice(7);
128
93
  return [ip, ipv4];
129
94
  }
130
- // Handle IPv4 addresses by adding IPv4-mapped IPv6 variant
131
95
  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ip)) {
132
96
  return [ip, `::ffff:${ip}`];
133
97
  }
134
98
  return [ip];
135
99
  };
136
- const isAllowed = (value, patterns) => {
137
- // Expand patterns to include both IPv4 and IPv6 variants
100
+ // Check if a given IP matches any of the glob patterns.
101
+ const isAllowed = (ip, patterns) => {
102
+ const normalizedIPVariants = normalizeIP(ip);
138
103
  const expandedPatterns = patterns.flatMap(normalizeIP);
139
- // Check if any variant of the IP matches any expanded pattern
140
- return normalizeIP(value).some(ip => expandedPatterns.some(pattern => plugins.minimatch(ip, pattern)));
141
- };
142
- const findMatchingDomain = (serverName) => {
143
- return this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
104
+ return normalizedIPVariants.some(ipVariant => expandedPatterns.some(pattern => plugins.minimatch(ipVariant, pattern)));
144
105
  };
145
- // Create a plain net server for TLS passthrough.
106
+ // Find a matching domain config based on the SNI.
107
+ const findMatchingDomain = (serverName) => this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
146
108
  this.netServer = plugins.net.createServer((socket) => {
147
109
  const remoteIP = socket.remoteAddress || '';
148
- // Record start time for the incoming connection.
149
110
  this.activeConnections.add(socket);
150
111
  this.incomingConnectionTimes.set(socket, Date.now());
151
112
  console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
152
- // Flag to detect if we've received the first data chunk.
153
113
  let initialDataReceived = false;
154
- // Local termination reason trackers for each side.
155
- let incomingTermReason = null;
156
- let outgoingTermReason = null;
157
- // Immediately attach an error handler to catch early errors.
158
- socket.on('error', (err) => {
159
- if (!initialDataReceived) {
160
- console.log(`(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`);
161
- }
162
- else {
163
- console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
164
- }
165
- });
166
- // Ensure cleanup happens only once.
114
+ let incomingTerminationReason = null;
115
+ let outgoingTerminationReason = null;
116
+ let targetSocket = null;
167
117
  let connectionClosed = false;
118
+ // Ensure cleanup happens only once.
168
119
  const cleanupOnce = () => {
169
120
  if (!connectionClosed) {
170
121
  connectionClosed = true;
171
- cleanUpSockets(socket, to || undefined);
122
+ cleanUpSockets(socket, targetSocket || undefined);
172
123
  this.incomingConnectionTimes.delete(socket);
173
- if (to) {
174
- this.outgoingConnectionTimes.delete(to);
124
+ if (targetSocket) {
125
+ this.outgoingConnectionTimes.delete(targetSocket);
175
126
  }
176
127
  if (this.activeConnections.has(socket)) {
177
128
  this.activeConnections.delete(socket);
@@ -179,9 +130,22 @@ export class PortProxy {
179
130
  }
180
131
  }
181
132
  };
182
- // Outgoing connection placeholder.
183
- let to = null;
184
- // Handle errors by recording termination reason and cleaning up.
133
+ // Helper to reject an incoming connection.
134
+ const rejectIncomingConnection = (reason, logMessage) => {
135
+ console.log(logMessage);
136
+ socket.end();
137
+ if (incomingTerminationReason === null) {
138
+ incomingTerminationReason = reason;
139
+ this.incrementTerminationStat('incoming', reason);
140
+ }
141
+ cleanupOnce();
142
+ };
143
+ socket.on('error', (err) => {
144
+ const errorMessage = initialDataReceived
145
+ ? `(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`
146
+ : `(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`;
147
+ console.log(errorMessage);
148
+ });
185
149
  const handleError = (side) => (err) => {
186
150
  const code = err.code;
187
151
  let reason = 'error';
@@ -192,73 +156,47 @@ export class PortProxy {
192
156
  else {
193
157
  console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
194
158
  }
195
- if (side === 'incoming' && incomingTermReason === null) {
196
- incomingTermReason = reason;
159
+ if (side === 'incoming' && incomingTerminationReason === null) {
160
+ incomingTerminationReason = reason;
197
161
  this.incrementTerminationStat('incoming', reason);
198
162
  }
199
- else if (side === 'outgoing' && outgoingTermReason === null) {
200
- outgoingTermReason = reason;
163
+ else if (side === 'outgoing' && outgoingTerminationReason === null) {
164
+ outgoingTerminationReason = reason;
201
165
  this.incrementTerminationStat('outgoing', reason);
202
166
  }
203
167
  cleanupOnce();
204
168
  };
205
- // Handle close events. If no termination reason was recorded, mark as "normal".
206
169
  const handleClose = (side) => () => {
207
170
  console.log(`Connection closed on ${side} side from ${remoteIP}`);
208
- if (side === 'incoming' && incomingTermReason === null) {
209
- incomingTermReason = 'normal';
171
+ if (side === 'incoming' && incomingTerminationReason === null) {
172
+ incomingTerminationReason = 'normal';
210
173
  this.incrementTerminationStat('incoming', 'normal');
211
174
  }
212
- else if (side === 'outgoing' && outgoingTermReason === null) {
213
- outgoingTermReason = 'normal';
175
+ else if (side === 'outgoing' && outgoingTerminationReason === null) {
176
+ outgoingTerminationReason = 'normal';
214
177
  this.incrementTerminationStat('outgoing', 'normal');
215
178
  }
216
179
  cleanupOnce();
217
180
  };
218
- // Setup connection, optionally accepting the initial data chunk.
219
181
  const setupConnection = (serverName, initialChunk) => {
220
- // Check if the IP is allowed by default.
221
- const isDefaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
222
- if (!isDefaultAllowed && serverName) {
182
+ const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
183
+ if (!defaultAllowed && serverName) {
223
184
  const domainConfig = findMatchingDomain(serverName);
224
185
  if (!domainConfig) {
225
- console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
226
- socket.end();
227
- if (incomingTermReason === null) {
228
- incomingTermReason = 'rejected';
229
- this.incrementTerminationStat('incoming', 'rejected');
230
- }
231
- cleanupOnce();
232
- return;
186
+ return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
233
187
  }
234
188
  if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
235
- console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
236
- socket.end();
237
- if (incomingTermReason === null) {
238
- incomingTermReason = 'rejected';
239
- this.incrementTerminationStat('incoming', 'rejected');
240
- }
241
- cleanupOnce();
242
- return;
189
+ return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
243
190
  }
244
191
  }
245
- else if (!isDefaultAllowed && !serverName) {
246
- console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
247
- socket.end();
248
- if (incomingTermReason === null) {
249
- incomingTermReason = 'rejected';
250
- this.incrementTerminationStat('incoming', 'rejected');
251
- }
252
- cleanupOnce();
253
- return;
192
+ else if (!defaultAllowed && !serverName) {
193
+ return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
254
194
  }
255
- else {
195
+ else if (defaultAllowed && !serverName) {
256
196
  console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
257
197
  }
258
- // Determine target host.
259
198
  const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
260
199
  const targetHost = domainConfig?.targetIP || this.settings.toHost;
261
- // Create connection options.
262
200
  const connectionOptions = {
263
201
  host: targetHost,
264
202
  port: this.settings.toPort,
@@ -266,46 +204,49 @@ export class PortProxy {
266
204
  if (this.settings.preserveSourceIP) {
267
205
  connectionOptions.localAddress = remoteIP.replace('::ffff:', '');
268
206
  }
269
- // Establish outgoing connection.
270
- to = plugins.net.connect(connectionOptions);
271
- if (to) {
272
- this.outgoingConnectionTimes.set(to, Date.now());
207
+ targetSocket = plugins.net.connect(connectionOptions);
208
+ if (targetSocket) {
209
+ this.outgoingConnectionTimes.set(targetSocket, Date.now());
273
210
  }
274
- console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
275
- // Push back the initial chunk if provided.
211
+ console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
212
+ `${serverName ? ` (SNI: ${serverName})` : ''}`);
276
213
  if (initialChunk) {
277
214
  socket.unshift(initialChunk);
278
215
  }
279
216
  socket.setTimeout(120000);
280
- socket.pipe(to);
281
- to.pipe(socket);
282
- // Attach event handlers for both sockets.
217
+ socket.pipe(targetSocket);
218
+ targetSocket.pipe(socket);
283
219
  socket.on('error', handleError('incoming'));
284
- to.on('error', handleError('outgoing'));
220
+ targetSocket.on('error', handleError('outgoing'));
285
221
  socket.on('close', handleClose('incoming'));
286
- to.on('close', handleClose('outgoing'));
222
+ targetSocket.on('close', handleClose('outgoing'));
287
223
  socket.on('timeout', () => {
288
224
  console.log(`Timeout on incoming side from ${remoteIP}`);
289
- if (incomingTermReason === null) {
290
- incomingTermReason = 'timeout';
225
+ if (incomingTerminationReason === null) {
226
+ incomingTerminationReason = 'timeout';
291
227
  this.incrementTerminationStat('incoming', 'timeout');
292
228
  }
293
229
  cleanupOnce();
294
230
  });
295
- to.on('timeout', () => {
231
+ targetSocket.on('timeout', () => {
296
232
  console.log(`Timeout on outgoing side from ${remoteIP}`);
297
- if (outgoingTermReason === null) {
298
- outgoingTermReason = 'timeout';
233
+ if (outgoingTerminationReason === null) {
234
+ outgoingTerminationReason = 'timeout';
299
235
  this.incrementTerminationStat('outgoing', 'timeout');
300
236
  }
301
237
  cleanupOnce();
302
238
  });
303
239
  socket.on('end', handleClose('incoming'));
304
- to.on('end', handleClose('outgoing'));
240
+ targetSocket.on('end', handleClose('outgoing'));
305
241
  };
306
- // For SNI-enabled connections, peek at the first chunk.
307
242
  if (this.settings.sniEnabled) {
243
+ socket.setTimeout(5000, () => {
244
+ console.log(`Initial data timeout for ${remoteIP}`);
245
+ socket.end();
246
+ cleanupOnce();
247
+ });
308
248
  socket.once('data', (chunk) => {
249
+ socket.setTimeout(0);
309
250
  initialDataReceived = true;
310
251
  const serverName = extractSNI(chunk) || '';
311
252
  console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
@@ -313,17 +254,9 @@ export class PortProxy {
313
254
  });
314
255
  }
315
256
  else {
316
- // For non-SNI connections, simply check defaultAllowedIPs.
317
257
  initialDataReceived = true;
318
258
  if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
319
- console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
320
- socket.end();
321
- if (incomingTermReason === null) {
322
- incomingTermReason = 'rejected';
323
- this.incrementTerminationStat('incoming', 'rejected');
324
- }
325
- cleanupOnce();
326
- return;
259
+ return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
327
260
  }
328
261
  setupConnection('');
329
262
  }
@@ -332,7 +265,8 @@ export class PortProxy {
332
265
  console.log(`Server Error: ${err.message}`);
333
266
  })
334
267
  .listen(this.settings.fromPort, () => {
335
- console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
268
+ console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}` +
269
+ `${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
336
270
  });
337
271
  // Log active connection count, longest running connection durations,
338
272
  // and termination statistics every 10 seconds.
@@ -340,19 +274,16 @@ export class PortProxy {
340
274
  const now = Date.now();
341
275
  let maxIncoming = 0;
342
276
  for (const startTime of this.incomingConnectionTimes.values()) {
343
- const duration = now - startTime;
344
- if (duration > maxIncoming) {
345
- maxIncoming = duration;
346
- }
277
+ maxIncoming = Math.max(maxIncoming, now - startTime);
347
278
  }
348
279
  let maxOutgoing = 0;
349
280
  for (const startTime of this.outgoingConnectionTimes.values()) {
350
- const duration = now - startTime;
351
- if (duration > maxOutgoing) {
352
- maxOutgoing = duration;
353
- }
281
+ maxOutgoing = Math.max(maxOutgoing, now - startTime);
354
282
  }
355
- 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)}`);
283
+ console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. ` +
284
+ `Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. ` +
285
+ `Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, ` +
286
+ `(outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`);
356
287
  }, 10000);
357
288
  }
358
289
  async stop() {
@@ -367,4 +298,4 @@ export class PortProxy {
367
298
  await done.promise;
368
299
  }
369
300
  }
370
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
301
+ //# 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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "3.10.1",
3
+ "version": "3.10.3",
4
4
  "private": false,
5
5
  "description": "a proxy for handling high workloads of proxying",
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.10.1',
6
+ version: '3.10.3',
7
7
  description: 'a proxy for handling high workloads of proxying'
8
8
  }
package/ts/smartproxy.portproxy.ts CHANGED
@@ -1,106 +1,73 @@
1
1
  import * as plugins from './plugins.js';
2
2
 
3
3
  export interface IDomainConfig {
4
- domain: string; // glob pattern for domain
5
- allowedIPs: string[]; // glob patterns for IPs allowed to access this domain
4
+ domain: string; // Glob pattern for domain
5
+ allowedIPs: string[]; // Glob patterns for allowed IPs
6
6
  targetIP?: string; // Optional target IP for this domain
7
7
  }
8
8
 
9
9
  export interface IProxySettings extends plugins.tls.TlsOptions {
10
- // Port configuration
11
10
  fromPort: number;
12
11
  toPort: number;
13
- toHost?: string; // Target host to proxy to, defaults to 'localhost'
14
-
15
- // Domain and security settings
12
+ toHost?: string; // Target host to proxy to, defaults to 'localhost'
16
13
  domains: IDomainConfig[];
17
14
  sniEnabled?: boolean;
18
- defaultAllowedIPs?: string[]; // Optional default IP patterns if no matching domain found
19
- preserveSourceIP?: boolean; // Whether to preserve the client's source IP when proxying
15
+ defaultAllowedIPs?: string[];
16
+ preserveSourceIP?: boolean;
20
17
  }
21
18
 
22
19
  /**
23
- * Extract SNI (Server Name Indication) from a TLS ClientHello packet.
24
- * Returns the server name if found, or undefined.
20
+ * Extracts the SNI (Server Name Indication) from a TLS ClientHello packet.
21
+ * @param buffer - Buffer containing the TLS ClientHello.
22
+ * @returns The server name if found, otherwise undefined.
25
23
  */
26
24
  function extractSNI(buffer: Buffer): string | undefined {
27
25
  let offset = 0;
28
- // We need at least 5 bytes for the record header.
29
- if (buffer.length < 5) {
30
- return undefined;
31
- }
26
+ if (buffer.length < 5) return undefined;
32
27
 
33
- // TLS record header
34
28
  const recordType = buffer.readUInt8(0);
35
- if (recordType !== 22) { // 22 = handshake
36
- return undefined;
37
- }
38
- // Read record length
29
+ if (recordType !== 22) return undefined; // 22 = handshake
30
+
39
31
  const recordLength = buffer.readUInt16BE(3);
40
- if (buffer.length < 5 + recordLength) {
41
- // Not all data arrived yet; in production you might need to accumulate more data.
42
- return undefined;
43
- }
32
+ if (buffer.length < 5 + recordLength) return undefined;
44
33
 
45
34
  offset = 5;
46
- // Handshake message type should be 1 for ClientHello.
47
35
  const handshakeType = buffer.readUInt8(offset);
48
- if (handshakeType !== 1) {
49
- return undefined;
50
- }
51
- // Skip handshake header (1 byte type + 3 bytes length)
52
- offset += 4;
36
+ if (handshakeType !== 1) return undefined; // 1 = ClientHello
53
37
 
54
- // Skip client version (2 bytes) and random (32 bytes)
55
- offset += 2 + 32;
38
+ offset += 4; // Skip handshake header (type + length)
39
+ offset += 2 + 32; // Skip client version and random
56
40
 
57
- // Session ID
58
41
  const sessionIDLength = buffer.readUInt8(offset);
59
- offset += 1 + sessionIDLength;
42
+ offset += 1 + sessionIDLength; // Skip session ID
60
43
 
61
- // Cipher suites
62
44
  const cipherSuitesLength = buffer.readUInt16BE(offset);
63
- offset += 2 + cipherSuitesLength;
45
+ offset += 2 + cipherSuitesLength; // Skip cipher suites
64
46
 
65
- // Compression methods
66
47
  const compressionMethodsLength = buffer.readUInt8(offset);
67
- offset += 1 + compressionMethodsLength;
48
+ offset += 1 + compressionMethodsLength; // Skip compression methods
68
49
 
69
- // Extensions length
70
- if (offset + 2 > buffer.length) {
71
- return undefined;
72
- }
50
+ if (offset + 2 > buffer.length) return undefined;
73
51
  const extensionsLength = buffer.readUInt16BE(offset);
74
52
  offset += 2;
75
53
  const extensionsEnd = offset + extensionsLength;
76
54
 
77
- // Iterate over extensions
78
55
  while (offset + 4 <= extensionsEnd) {
79
56
  const extensionType = buffer.readUInt16BE(offset);
80
57
  const extensionLength = buffer.readUInt16BE(offset + 2);
81
58
  offset += 4;
82
-
83
- // Check for SNI extension (type 0)
84
- if (extensionType === 0x0000) {
85
- // SNI extension: first 2 bytes are the SNI list length.
86
- if (offset + 2 > buffer.length) {
87
- return undefined;
88
- }
59
+ if (extensionType === 0x0000) { // SNI extension
60
+ if (offset + 2 > buffer.length) return undefined;
89
61
  const sniListLength = buffer.readUInt16BE(offset);
90
62
  offset += 2;
91
63
  const sniListEnd = offset + sniListLength;
92
- // Loop through the list; typically there is one entry.
93
64
  while (offset + 3 < sniListEnd) {
94
- const nameType = buffer.readUInt8(offset);
95
- offset++;
65
+ const nameType = buffer.readUInt8(offset++);
96
66
  const nameLen = buffer.readUInt16BE(offset);
97
67
  offset += 2;
98
68
  if (nameType === 0) { // host_name
99
- if (offset + nameLen > buffer.length) {
100
- return undefined;
101
- }
102
- const serverName = buffer.toString('utf8', offset, offset + nameLen);
103
- return serverName;
69
+ if (offset + nameLen > buffer.length) return undefined;
70
+ return buffer.toString('utf8', offset, offset + nameLen);
104
71
  }
105
72
  offset += nameLen;
106
73
  }
@@ -115,15 +82,11 @@ function extractSNI(buffer: Buffer): string | undefined {
115
82
  export class PortProxy {
116
83
  netServer: plugins.net.Server;
117
84
  settings: IProxySettings;
118
- // Track active incoming connections
119
85
  private activeConnections: Set<plugins.net.Socket> = new Set();
120
- // Record start times for incoming connections
121
86
  private incomingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
122
- // Record start times for outgoing connections
123
87
  private outgoingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
124
88
  private connectionLogger: NodeJS.Timeout | null = null;
125
89
 
126
- // Overall termination statistics
127
90
  private terminationStats: {
128
91
  incoming: Record<string, number>;
129
92
  outgoing: Record<string, number>;
@@ -135,90 +98,66 @@ export class PortProxy {
135
98
  constructor(settings: IProxySettings) {
136
99
  this.settings = {
137
100
  ...settings,
138
- toHost: settings.toHost || 'localhost'
101
+ toHost: settings.toHost || 'localhost',
139
102
  };
140
103
  }
141
104
 
142
- // Helper to update termination stats.
143
105
  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
- }
106
+ this.terminationStats[side][reason] = (this.terminationStats[side][reason] || 0) + 1;
149
107
  }
150
108
 
151
109
  public async start() {
152
- // Adjusted cleanUpSockets: forcefully destroy both sockets if they haven't been destroyed.
153
- const cleanUpSockets = (from: plugins.net.Socket, to?: plugins.net.Socket) => {
154
- if (!from.destroyed) {
155
- from.destroy();
156
- }
157
- if (to && !to.destroyed) {
158
- to.destroy();
159
- }
110
+ // Helper to forcefully destroy sockets.
111
+ const cleanUpSockets = (socketA: plugins.net.Socket, socketB?: plugins.net.Socket) => {
112
+ if (!socketA.destroyed) socketA.destroy();
113
+ if (socketB && !socketB.destroyed) socketB.destroy();
160
114
  };
161
115
 
116
+ // Normalize an IP to include both IPv4 and IPv6 representations.
162
117
  const normalizeIP = (ip: string): string[] => {
163
- // Handle IPv4-mapped IPv6 addresses
164
118
  if (ip.startsWith('::ffff:')) {
165
- const ipv4 = ip.slice(7); // Remove '::ffff:' prefix
119
+ const ipv4 = ip.slice(7);
166
120
  return [ip, ipv4];
167
121
  }
168
- // Handle IPv4 addresses by adding IPv4-mapped IPv6 variant
169
122
  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(ip)) {
170
123
  return [ip, `::ffff:${ip}`];
171
124
  }
172
125
  return [ip];
173
126
  };
174
127
 
175
- const isAllowed = (value: string, patterns: string[]): boolean => {
176
- // Expand patterns to include both IPv4 and IPv6 variants
128
+ // Check if a given IP matches any of the glob patterns.
129
+ const isAllowed = (ip: string, patterns: string[]): boolean => {
130
+ const normalizedIPVariants = normalizeIP(ip);
177
131
  const expandedPatterns = patterns.flatMap(normalizeIP);
178
- // Check if any variant of the IP matches any expanded pattern
179
- return normalizeIP(value).some(ip =>
180
- expandedPatterns.some(pattern => plugins.minimatch(ip, pattern))
132
+ return normalizedIPVariants.some(ipVariant =>
133
+ expandedPatterns.some(pattern => plugins.minimatch(ipVariant, pattern))
181
134
  );
182
135
  };
183
136
 
184
- const findMatchingDomain = (serverName: string): IDomainConfig | undefined => {
185
- return this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
186
- };
137
+ // Find a matching domain config based on the SNI.
138
+ const findMatchingDomain = (serverName: string): IDomainConfig | undefined =>
139
+ this.settings.domains.find(config => plugins.minimatch(serverName, config.domain));
187
140
 
188
- // Create a plain net server for TLS passthrough.
189
141
  this.netServer = plugins.net.createServer((socket: plugins.net.Socket) => {
190
142
  const remoteIP = socket.remoteAddress || '';
191
-
192
- // Record start time for the incoming connection.
193
143
  this.activeConnections.add(socket);
194
144
  this.incomingConnectionTimes.set(socket, Date.now());
195
145
  console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
196
146
 
197
- // Flag to detect if we've received the first data chunk.
198
147
  let initialDataReceived = false;
199
-
200
- // Local termination reason trackers for each side.
201
- let incomingTermReason: string | null = null;
202
- let outgoingTermReason: string | null = null;
203
-
204
- // Immediately attach an error handler to catch early errors.
205
- socket.on('error', (err: Error) => {
206
- if (!initialDataReceived) {
207
- console.log(`(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`);
208
- } else {
209
- console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
210
- }
211
- });
148
+ let incomingTerminationReason: string | null = null;
149
+ let outgoingTerminationReason: string | null = null;
150
+ let targetSocket: plugins.net.Socket | null = null;
151
+ let connectionClosed = false;
212
152
 
213
153
  // Ensure cleanup happens only once.
214
- let connectionClosed = false;
215
154
  const cleanupOnce = () => {
216
155
  if (!connectionClosed) {
217
156
  connectionClosed = true;
218
- cleanUpSockets(socket, to || undefined);
157
+ cleanUpSockets(socket, targetSocket || undefined);
219
158
  this.incomingConnectionTimes.delete(socket);
220
- if (to) {
221
- this.outgoingConnectionTimes.delete(to);
159
+ if (targetSocket) {
160
+ this.outgoingConnectionTimes.delete(targetSocket);
222
161
  }
223
162
  if (this.activeConnections.has(socket)) {
224
163
  this.activeConnections.delete(socket);
@@ -227,10 +166,24 @@ export class PortProxy {
227
166
  }
228
167
  };
229
168
 
230
- // Outgoing connection placeholder.
231
- let to: plugins.net.Socket | null = null;
169
+ // Helper to reject an incoming connection.
170
+ const rejectIncomingConnection = (reason: string, logMessage: string) => {
171
+ console.log(logMessage);
172
+ socket.end();
173
+ if (incomingTerminationReason === null) {
174
+ incomingTerminationReason = reason;
175
+ this.incrementTerminationStat('incoming', reason);
176
+ }
177
+ cleanupOnce();
178
+ };
179
+
180
+ socket.on('error', (err: Error) => {
181
+ const errorMessage = initialDataReceived
182
+ ? `(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`
183
+ : `(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`;
184
+ console.log(errorMessage);
185
+ });
232
186
 
233
- // Handle errors by recording termination reason and cleaning up.
234
187
  const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
235
188
  const code = (err as any).code;
236
189
  let reason = 'error';
@@ -240,73 +193,47 @@ export class PortProxy {
240
193
  } else {
241
194
  console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
242
195
  }
243
- if (side === 'incoming' && incomingTermReason === null) {
244
- incomingTermReason = reason;
196
+ if (side === 'incoming' && incomingTerminationReason === null) {
197
+ incomingTerminationReason = reason;
245
198
  this.incrementTerminationStat('incoming', reason);
246
- } else if (side === 'outgoing' && outgoingTermReason === null) {
247
- outgoingTermReason = reason;
199
+ } else if (side === 'outgoing' && outgoingTerminationReason === null) {
200
+ outgoingTerminationReason = reason;
248
201
  this.incrementTerminationStat('outgoing', reason);
249
202
  }
250
203
  cleanupOnce();
251
204
  };
252
205
 
253
- // Handle close events. If no termination reason was recorded, mark as "normal".
254
206
  const handleClose = (side: 'incoming' | 'outgoing') => () => {
255
207
  console.log(`Connection closed on ${side} side from ${remoteIP}`);
256
- if (side === 'incoming' && incomingTermReason === null) {
257
- incomingTermReason = 'normal';
208
+ if (side === 'incoming' && incomingTerminationReason === null) {
209
+ incomingTerminationReason = 'normal';
258
210
  this.incrementTerminationStat('incoming', 'normal');
259
- } else if (side === 'outgoing' && outgoingTermReason === null) {
260
- outgoingTermReason = 'normal';
211
+ } else if (side === 'outgoing' && outgoingTerminationReason === null) {
212
+ outgoingTerminationReason = 'normal';
261
213
  this.incrementTerminationStat('outgoing', 'normal');
262
214
  }
263
215
  cleanupOnce();
264
216
  };
265
217
 
266
- // Setup connection, optionally accepting the initial data chunk.
267
218
  const setupConnection = (serverName: string, initialChunk?: Buffer) => {
268
- // Check if the IP is allowed by default.
269
- const isDefaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
270
- if (!isDefaultAllowed && serverName) {
219
+ const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
220
+
221
+ if (!defaultAllowed && serverName) {
271
222
  const domainConfig = findMatchingDomain(serverName);
272
223
  if (!domainConfig) {
273
- console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
274
- socket.end();
275
- if (incomingTermReason === null) {
276
- incomingTermReason = 'rejected';
277
- this.incrementTerminationStat('incoming', 'rejected');
278
- }
279
- cleanupOnce();
280
- return;
224
+ return rejectIncomingConnection('rejected', `Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
281
225
  }
282
226
  if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
283
- console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
284
- socket.end();
285
- if (incomingTermReason === null) {
286
- incomingTermReason = 'rejected';
287
- this.incrementTerminationStat('incoming', 'rejected');
288
- }
289
- cleanupOnce();
290
- return;
227
+ return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
291
228
  }
292
- } else if (!isDefaultAllowed && !serverName) {
293
- console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
294
- socket.end();
295
- if (incomingTermReason === null) {
296
- incomingTermReason = 'rejected';
297
- this.incrementTerminationStat('incoming', 'rejected');
298
- }
299
- cleanupOnce();
300
- return;
301
- } else {
229
+ } else if (!defaultAllowed && !serverName) {
230
+ return rejectIncomingConnection('rejected', `Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
231
+ } else if (defaultAllowed && !serverName) {
302
232
  console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
303
233
  }
304
234
 
305
- // Determine target host.
306
235
  const domainConfig = serverName ? findMatchingDomain(serverName) : undefined;
307
236
  const targetHost = domainConfig?.targetIP || this.settings.toHost!;
308
-
309
- // Create connection options.
310
237
  const connectionOptions: plugins.net.NetConnectOpts = {
311
238
  host: targetHost,
312
239
  port: this.settings.toPort,
@@ -315,76 +242,77 @@ export class PortProxy {
315
242
  connectionOptions.localAddress = remoteIP.replace('::ffff:', '');
316
243
  }
317
244
 
318
- // Establish outgoing connection.
319
- to = plugins.net.connect(connectionOptions);
320
- if (to) {
321
- this.outgoingConnectionTimes.set(to, Date.now());
245
+ targetSocket = plugins.net.connect(connectionOptions);
246
+ if (targetSocket) {
247
+ this.outgoingConnectionTimes.set(targetSocket, Date.now());
322
248
  }
323
- console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
324
-
325
- // Push back the initial chunk if provided.
249
+ console.log(
250
+ `Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}` +
251
+ `${serverName ? ` (SNI: ${serverName})` : ''}`
252
+ );
253
+
326
254
  if (initialChunk) {
327
255
  socket.unshift(initialChunk);
328
256
  }
329
257
  socket.setTimeout(120000);
330
- socket.pipe(to!);
331
- to!.pipe(socket);
258
+ socket.pipe(targetSocket);
259
+ targetSocket.pipe(socket);
332
260
 
333
- // Attach event handlers for both sockets.
334
261
  socket.on('error', handleError('incoming'));
335
- to!.on('error', handleError('outgoing'));
262
+ targetSocket.on('error', handleError('outgoing'));
336
263
  socket.on('close', handleClose('incoming'));
337
- to!.on('close', handleClose('outgoing'));
264
+ targetSocket.on('close', handleClose('outgoing'));
338
265
  socket.on('timeout', () => {
339
266
  console.log(`Timeout on incoming side from ${remoteIP}`);
340
- if (incomingTermReason === null) {
341
- incomingTermReason = 'timeout';
267
+ if (incomingTerminationReason === null) {
268
+ incomingTerminationReason = 'timeout';
342
269
  this.incrementTerminationStat('incoming', 'timeout');
343
270
  }
344
271
  cleanupOnce();
345
272
  });
346
- to!.on('timeout', () => {
273
+ targetSocket.on('timeout', () => {
347
274
  console.log(`Timeout on outgoing side from ${remoteIP}`);
348
- if (outgoingTermReason === null) {
349
- outgoingTermReason = 'timeout';
275
+ if (outgoingTerminationReason === null) {
276
+ outgoingTerminationReason = 'timeout';
350
277
  this.incrementTerminationStat('outgoing', 'timeout');
351
278
  }
352
279
  cleanupOnce();
353
280
  });
354
281
  socket.on('end', handleClose('incoming'));
355
- to!.on('end', handleClose('outgoing'));
282
+ targetSocket.on('end', handleClose('outgoing'));
356
283
  };
357
284
 
358
- // For SNI-enabled connections, peek at the first chunk.
359
285
  if (this.settings.sniEnabled) {
286
+ socket.setTimeout(5000, () => {
287
+ console.log(`Initial data timeout for ${remoteIP}`);
288
+ socket.end();
289
+ cleanupOnce();
290
+ });
291
+
360
292
  socket.once('data', (chunk: Buffer) => {
293
+ socket.setTimeout(0);
361
294
  initialDataReceived = true;
362
295
  const serverName = extractSNI(chunk) || '';
363
296
  console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
364
297
  setupConnection(serverName, chunk);
365
298
  });
366
299
  } else {
367
- // For non-SNI connections, simply check defaultAllowedIPs.
368
300
  initialDataReceived = true;
369
301
  if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
370
- console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
371
- socket.end();
372
- if (incomingTermReason === null) {
373
- incomingTermReason = 'rejected';
374
- this.incrementTerminationStat('incoming', 'rejected');
375
- }
376
- cleanupOnce();
377
- return;
302
+ return rejectIncomingConnection('rejected', `Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
378
303
  }
379
304
  setupConnection('');
380
305
  }
381
306
  })
382
- .on('error', (err: Error) => {
383
- console.log(`Server Error: ${err.message}`);
384
- })
385
- .listen(this.settings.fromPort, () => {
386
- console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
387
- });
307
+ .on('error', (err: Error) => {
308
+ console.log(`Server Error: ${err.message}`);
309
+ })
310
+ .listen(this.settings.fromPort, () => {
311
+ console.log(
312
+ `PortProxy -> OK: Now listening on port ${this.settings.fromPort}` +
313
+ `${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`
314
+ );
315
+ });
388
316
 
389
317
  // Log active connection count, longest running connection durations,
390
318
  // and termination statistics every 10 seconds.
@@ -392,19 +320,18 @@ export class PortProxy {
392
320
  const now = Date.now();
393
321
  let maxIncoming = 0;
394
322
  for (const startTime of this.incomingConnectionTimes.values()) {
395
- const duration = now - startTime;
396
- if (duration > maxIncoming) {
397
- maxIncoming = duration;
398
- }
323
+ maxIncoming = Math.max(maxIncoming, now - startTime);
399
324
  }
400
325
  let maxOutgoing = 0;
401
326
  for (const startTime of this.outgoingConnectionTimes.values()) {
402
- const duration = now - startTime;
403
- if (duration > maxOutgoing) {
404
- maxOutgoing = duration;
405
- }
327
+ maxOutgoing = Math.max(maxOutgoing, now - startTime);
406
328
  }
407
- 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)}`);
329
+ console.log(
330
+ `(Interval Log) Active connections: ${this.activeConnections.size}. ` +
331
+ `Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}. ` +
332
+ `Termination stats (incoming): ${JSON.stringify(this.terminationStats.incoming)}, ` +
333
+ `(outgoing): ${JSON.stringify(this.terminationStats.outgoing)}`
334
+ );
408
335
  }, 10000);
409
336
  }
410
337