@push.rocks/smartproxy 3.9.3 → 3.10.0

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@push.rocks/smartproxy',
-    version: '3.9.3',
+    version: '3.10.0',
     description: 'a proxy for handling high workloads of proxying'
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGlEQUFpRDtDQUMvRCxDQUFBIn0=

package/dist_ts/smartproxy.portproxy.d.ts

@@ -20,7 +20,9 @@ export declare class PortProxy {
     private incomingConnectionTimes;
     private outgoingConnectionTimes;
     private connectionLogger;
+    private terminationStats;
     constructor(settings: IProxySettings);
+    private incrementTerminationStat;
     start(): Promise<void>;
     stop(): Promise<void>;
 }

package/dist_ts/smartproxy.portproxy.js

@@ -92,11 +92,25 @@ export class PortProxy {
         // Record start times for outgoing connections
         this.outgoingConnectionTimes = new Map();
         this.connectionLogger = null;
+        // Overall termination statistics
+        this.terminationStats = {
+            incoming: {},
+            outgoing: {},
+        };
         this.settings = {
             ...settings,
             toHost: settings.toHost || 'localhost'
         };
     }
+    // Helper to update termination stats.
+    incrementTerminationStat(side, reason) {
+        if (!this.terminationStats[side][reason]) {
+            this.terminationStats[side][reason] = 1;
+        }
+        else {
+            this.terminationStats[side][reason]++;
+        }
+    }
     async start() {
         // Adjusted cleanUpSockets to allow an optional outgoing socket.
         const cleanUpSockets = (from, to) => {
@@ -141,6 +155,9 @@ export class PortProxy {
             console.log(`New connection from ${remoteIP}. Active connections: ${this.activeConnections.size}`);
             // Flag to detect if we've received the first data chunk.
             let initialDataReceived = false;
+            // Local termination reason trackers for each side.
+            let incomingTermReason = null;
+            let outgoingTermReason = null;
             // Immediately attach an error handler to catch early errors.
             socket.on('error', (err) => {
                 if (!initialDataReceived) {
@@ -150,7 +167,7 @@ export class PortProxy {
                     console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
                 }
             });
-            // Flag to ensure cleanup happens only once.
+            // Ensure cleanup happens only once.
             let connectionClosed = false;
             const cleanupOnce = () => {
                 if (!connectionClosed) {
@@ -166,20 +183,40 @@ export class PortProxy {
                     }
                 }
             };
-            // Declare the outgoing connection as possibly null.
+            // Outgoing connection placeholder.
             let to = null;
+            // Handle errors by recording termination reason and cleaning up.
             const handleError = (side) => (err) => {
                 const code = err.code;
+                let reason = 'error';
                 if (code === 'ECONNRESET') {
+                    reason = 'econnreset';
                     console.log(`ECONNRESET on ${side} side from ${remoteIP}: ${err.message}`);
                 }
                 else {
                     console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
                 }
+                if (side === 'incoming' && incomingTermReason === null) {
+                    incomingTermReason = reason;
+                    this.incrementTerminationStat('incoming', reason);
+                }
+                else if (side === 'outgoing' && outgoingTermReason === null) {
+                    outgoingTermReason = reason;
+                    this.incrementTerminationStat('outgoing', reason);
+                }
                 cleanupOnce();
             };
+            // Handle close events. If no termination reason was recorded, mark as "normal".
             const handleClose = (side) => () => {
                 console.log(`Connection closed on ${side} side from ${remoteIP}`);
+                if (side === 'incoming' && incomingTermReason === null) {
+                    incomingTermReason = 'normal';
+                    this.incrementTerminationStat('incoming', 'normal');
+                }
+                else if (side === 'outgoing' && outgoingTermReason === null) {
+                    outgoingTermReason = 'normal';
+                    this.incrementTerminationStat('outgoing', 'normal');
+                }
                 cleanupOnce();
             };
             // Setup connection, optionally accepting the initial data chunk.
@@ -191,17 +228,32 @@ export class PortProxy {
                     if (!domainConfig) {
                         console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
                         socket.end();
+                        if (incomingTermReason === null) {
+                            incomingTermReason = 'rejected';
+                            this.incrementTerminationStat('incoming', 'rejected');
+                        }
+                        cleanupOnce();
                         return;
                     }
                     if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
                         console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
                         socket.end();
+                        if (incomingTermReason === null) {
+                            incomingTermReason = 'rejected';
+                            this.incrementTerminationStat('incoming', 'rejected');
+                        }
+                        cleanupOnce();
                         return;
                     }
                 }
                 else if (!isDefaultAllowed && !serverName) {
                     console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
                     socket.end();
+                    if (incomingTermReason === null) {
+                        incomingTermReason = 'rejected';
+                        this.incrementTerminationStat('incoming', 'rejected');
+                    }
+                    cleanupOnce();
                     return;
                 }
                 else {
@@ -220,7 +272,6 @@ export class PortProxy {
                 }
                 // Establish outgoing connection.
                 to = plugins.net.connect(connectionOptions);
-                // Record start time for the outgoing connection.
                 if (to) {
                     this.outgoingConnectionTimes.set(to, Date.now());
                 }
@@ -230,20 +281,27 @@ export class PortProxy {
                     socket.unshift(initialChunk);
                 }
                 socket.setTimeout(120000);
-                // Since 'to' is not null here, we can use the non-null assertion.
                 socket.pipe(to);
                 to.pipe(socket);
-                // Attach error and close handlers for both sockets.
+                // Attach event handlers for both sockets.
                 socket.on('error', handleError('incoming'));
                 to.on('error', handleError('outgoing'));
                 socket.on('close', handleClose('incoming'));
                 to.on('close', handleClose('outgoing'));
                 socket.on('timeout', () => {
                     console.log(`Timeout on incoming side from ${remoteIP}`);
+                    if (incomingTermReason === null) {
+                        incomingTermReason = 'timeout';
+                        this.incrementTerminationStat('incoming', 'timeout');
+                    }
                     cleanupOnce();
                 });
                 to.on('timeout', () => {
                     console.log(`Timeout on outgoing side from ${remoteIP}`);
+                    if (outgoingTermReason === null) {
+                        outgoingTermReason = 'timeout';
+                        this.incrementTerminationStat('outgoing', 'timeout');
+                    }
                     cleanupOnce();
                 });
                 socket.on('end', handleClose('incoming'));
@@ -253,7 +311,6 @@ export class PortProxy {
             if (this.settings.sniEnabled) {
                 socket.once('data', (chunk) => {
                     initialDataReceived = true;
-                    // Try to extract the server name from the ClientHello.
                     const serverName = extractSNI(chunk) || '';
                     console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
                     setupConnection(serverName, chunk);
@@ -265,6 +322,11 @@ export class PortProxy {
                 if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
                     console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
                     socket.end();
+                    if (incomingTermReason === null) {
+                        incomingTermReason = 'rejected';
+                        this.incrementTerminationStat('incoming', 'rejected');
+                    }
+                    cleanupOnce();
                     return;
                 }
                 setupConnection('');
@@ -276,7 +338,8 @@ export class PortProxy {
             .listen(this.settings.fromPort, () => {
             console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
         });
-        // Log active connection count and longest running connections every 10 seconds.
+        // Log active connection count, longest running connection durations,
+        // and termination statistics every 10 seconds.
         this.connectionLogger = setInterval(() => {
             const now = Date.now();
             let maxIncoming = 0;
@@ -293,7 +356,7 @@ export class PortProxy {
                     maxOutgoing = duration;
                 }
             }
-            console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
+            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)}`);
         }, 10000);
     }
     async stop() {
@@ -308,4 +371,4 @@ export class PortProxy {
         await done.promise;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartproxy.portproxy.js","sourceRoot":"","sources":["../ts/smartproxy.portproxy.ts"],"names":[],"mappings":"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"}
+//# 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

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.9.3",
+  "version": "3.10.0",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '3.9.3',
+  version: '3.10.0',
   description: 'a proxy for handling high workloads of proxying'
 }

package/ts/smartproxy.portproxy.ts

@@ -123,6 +123,15 @@ export class PortProxy {
   private outgoingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
   private connectionLogger: NodeJS.Timeout | null = null;
 
+  // Overall termination statistics
+  private terminationStats: {
+    incoming: Record<string, number>;
+    outgoing: Record<string, number>;
+  } = {
+    incoming: {},
+    outgoing: {},
+  };
+
   constructor(settings: IProxySettings) {
     this.settings = {
       ...settings,
@@ -130,6 +139,15 @@ export class PortProxy {
     };
   }
 
+  // Helper to update termination stats.
+  private incrementTerminationStat(side: 'incoming' | 'outgoing', reason: string): void {
+    if (!this.terminationStats[side][reason]) {
+      this.terminationStats[side][reason] = 1;
+    } else {
+      this.terminationStats[side][reason]++;
+    }
+  }
+
   public async start() {
     // Adjusted cleanUpSockets to allow an optional outgoing socket.
     const cleanUpSockets = (from: plugins.net.Socket, to?: plugins.net.Socket) => {
@@ -183,6 +201,10 @@ export class PortProxy {
       // Flag to detect if we've received the first data chunk.
       let initialDataReceived = false;
 
+      // Local termination reason trackers for each side.
+      let incomingTermReason: string | null = null;
+      let outgoingTermReason: string | null = null;
+
       // Immediately attach an error handler to catch early errors.
       socket.on('error', (err: Error) => {
         if (!initialDataReceived) {
@@ -192,7 +214,7 @@ export class PortProxy {
         }
       });
 
-      // Flag to ensure cleanup happens only once.
+      // Ensure cleanup happens only once.
       let connectionClosed = false;
       const cleanupOnce = () => {
         if (!connectionClosed) {
@@ -209,21 +231,39 @@ export class PortProxy {
         }
       };
 
-      // Declare the outgoing connection as possibly null.
+      // Outgoing connection placeholder.
       let to: plugins.net.Socket | null = null;
 
+      // Handle errors by recording termination reason and cleaning up.
       const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
         const code = (err as any).code;
+        let reason = 'error';
         if (code === 'ECONNRESET') {
+          reason = 'econnreset';
           console.log(`ECONNRESET on ${side} side from ${remoteIP}: ${err.message}`);
         } else {
           console.log(`Error on ${side} side from ${remoteIP}: ${err.message}`);
         }
+        if (side === 'incoming' && incomingTermReason === null) {
+          incomingTermReason = reason;
+          this.incrementTerminationStat('incoming', reason);
+        } else if (side === 'outgoing' && outgoingTermReason === null) {
+          outgoingTermReason = reason;
+          this.incrementTerminationStat('outgoing', reason);
+        }
         cleanupOnce();
       };
 
+      // Handle close events. If no termination reason was recorded, mark as "normal".
       const handleClose = (side: 'incoming' | 'outgoing') => () => {
         console.log(`Connection closed on ${side} side from ${remoteIP}`);
+        if (side === 'incoming' && incomingTermReason === null) {
+          incomingTermReason = 'normal';
+          this.incrementTerminationStat('incoming', 'normal');
+        } else if (side === 'outgoing' && outgoingTermReason === null) {
+          outgoingTermReason = 'normal';
+          this.incrementTerminationStat('outgoing', 'normal');
+        }
         cleanupOnce();
       };
 
@@ -236,16 +276,31 @@ export class PortProxy {
           if (!domainConfig) {
             console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
             socket.end();
+            if (incomingTermReason === null) {
+              incomingTermReason = 'rejected';
+              this.incrementTerminationStat('incoming', 'rejected');
+            }
+            cleanupOnce();
             return;
           }
           if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
             console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
             socket.end();
+            if (incomingTermReason === null) {
+              incomingTermReason = 'rejected';
+              this.incrementTerminationStat('incoming', 'rejected');
+            }
+            cleanupOnce();
             return;
           }
         } else if (!isDefaultAllowed && !serverName) {
           console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
           socket.end();
+          if (incomingTermReason === null) {
+            incomingTermReason = 'rejected';
+            this.incrementTerminationStat('incoming', 'rejected');
+          }
+          cleanupOnce();
           return;
         } else {
           console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
@@ -266,7 +321,6 @@ export class PortProxy {
 
         // Establish outgoing connection.
         to = plugins.net.connect(connectionOptions);
-        // Record start time for the outgoing connection.
         if (to) {
           this.outgoingConnectionTimes.set(to, Date.now());
         }
@@ -277,21 +331,28 @@ export class PortProxy {
           socket.unshift(initialChunk);
         }
         socket.setTimeout(120000);
-        // Since 'to' is not null here, we can use the non-null assertion.
         socket.pipe(to!);
         to!.pipe(socket);
 
-        // Attach error and close handlers for both sockets.
+        // Attach event handlers for both sockets.
         socket.on('error', handleError('incoming'));
         to!.on('error', handleError('outgoing'));
         socket.on('close', handleClose('incoming'));
         to!.on('close', handleClose('outgoing'));
         socket.on('timeout', () => {
           console.log(`Timeout on incoming side from ${remoteIP}`);
+          if (incomingTermReason === null) {
+            incomingTermReason = 'timeout';
+            this.incrementTerminationStat('incoming', 'timeout');
+          }
           cleanupOnce();
         });
         to!.on('timeout', () => {
           console.log(`Timeout on outgoing side from ${remoteIP}`);
+          if (outgoingTermReason === null) {
+            outgoingTermReason = 'timeout';
+            this.incrementTerminationStat('outgoing', 'timeout');
+          }
           cleanupOnce();
         });
         socket.on('end', handleClose('incoming'));
@@ -302,7 +363,6 @@ export class PortProxy {
       if (this.settings.sniEnabled) {
         socket.once('data', (chunk: Buffer) => {
           initialDataReceived = true;
-          // Try to extract the server name from the ClientHello.
           const serverName = extractSNI(chunk) || '';
           console.log(`Received connection from ${remoteIP} with SNI: ${serverName}`);
           setupConnection(serverName, chunk);
@@ -313,6 +373,11 @@ export class PortProxy {
         if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
           console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
           socket.end();
+          if (incomingTermReason === null) {
+            incomingTermReason = 'rejected';
+            this.incrementTerminationStat('incoming', 'rejected');
+          }
+          cleanupOnce();
           return;
         }
         setupConnection('');
@@ -325,7 +390,8 @@ export class PortProxy {
       console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
     });
 
-    // Log active connection count and longest running connections every 10 seconds.
+    // Log active connection count, longest running connection durations,
+    // and termination statistics every 10 seconds.
     this.connectionLogger = setInterval(() => {
       const now = Date.now();
       let maxIncoming = 0;
@@ -342,7 +408,7 @@ export class PortProxy {
           maxOutgoing = duration;
         }
       }
-      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
+      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)}`);
     }, 10000);
   }