3.9.4

changelog.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 2025-02-22 - 3.9.4 - fix(PortProxy)
+Ensure proper cleanup on connection rejection in PortProxy
+
+- Added cleanup calls after socket end in connection rejection scenarios within PortProxy
+
+## 2025-02-21 - 3.9.3 - fix(PortProxy)
+Fix handling of optional outgoing socket in PortProxy
+
+- Refactored the cleanUpSockets function to correctly handle cases where the outgoing socket may be undefined.
+- Ensured correct handling of socket events with non-null assertions where applicable.
+- Improved robustness in connection establishment and cleanup processes.
+
+## 2025-02-21 - 3.9.2 - fix(PortProxy)
+Improve timeout handling for port proxy connections
+
+- Added console logging for both incoming and outgoing side timeouts in the PortProxy class.
+- Updated the timeout event handlers to ensure proper cleanup of connections.
+
+## 2025-02-21 - 3.9.1 - fix(dependencies)
+Ensure correct ordering of dependencies and improve logging format.
+
+- Reorder dependencies in package.json for better readability.
+- Use pretty-ms for displaying time durations in logs.
+
 ## 2025-02-21 - 3.9.0 - feat(smartproxy.portproxy)
 Add logging of connection durations to PortProxy
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.9.0",
+  "version": "3.9.4",
   "private": false,
   "description": "a proxy for handling high workloads of proxying",
   "main": "dist_ts/index.js",
@@ -29,10 +29,11 @@
     "@push.rocks/smartrequest": "^2.0.23",
     "@push.rocks/smartstring": "^4.0.15",
     "@tsclass/tsclass": "^4.4.0",
+    "@types/minimatch": "^5.1.2",
     "@types/ws": "^8.5.14",
-    "ws": "^8.18.0",
     "minimatch": "^9.0.3",
-    "@types/minimatch": "^5.1.2"
+    "pretty-ms": "^9.2.0",
+    "ws": "^8.18.0"
   },
   "files": [
     "ts/**/*",

pnpm-lock.yaml

@@ -35,6 +35,9 @@ importers:
       minimatch:
         specifier: ^9.0.3
         version: 9.0.5
+      pretty-ms:
+        specifier: ^9.2.0
+        version: 9.2.0
       ws:
         specifier: ^8.18.0
         version: 8.18.0

ts/00_commitinfo_data.ts

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

ts/plugins.ts

@@ -22,8 +22,9 @@ import * as smartstring from '@push.rocks/smartstring';
 export { lik, smartdelay, smartrequest, smartpromise, smartstring };
 
 // third party scope
+import prettyMs from 'pretty-ms';
 import * as ws from 'ws';
 import wsDefault from 'ws';
 import { minimatch } from 'minimatch';
 
-export { wsDefault, ws, minimatch };
+export { prettyMs, ws, wsDefault, minimatch };

ts/smartproxy.portproxy.ts

@@ -131,15 +131,18 @@ export class PortProxy {
   }
 
   public async start() {
-    const cleanUpSockets = (from: plugins.net.Socket, to: plugins.net.Socket) => {
+    // Adjusted cleanUpSockets to allow an optional outgoing socket.
+    const cleanUpSockets = (from: plugins.net.Socket, to?: plugins.net.Socket) => {
       from.end();
-      to.end();
       from.removeAllListeners();
-      to.removeAllListeners();
       from.unpipe();
-      to.unpipe();
       from.destroy();
-      to.destroy();
+      if (to) {
+        to.end();
+        to.removeAllListeners();
+        to.unpipe();
+        to.destroy();
+      }
     };
 
     const normalizeIP = (ip: string): string[] => {
@@ -194,7 +197,7 @@ export class PortProxy {
       const cleanupOnce = () => {
         if (!connectionClosed) {
           connectionClosed = true;
-          cleanUpSockets(socket, to);
+          cleanUpSockets(socket, to || undefined);
           this.incomingConnectionTimes.delete(socket);
           if (to) {
             this.outgoingConnectionTimes.delete(to);
@@ -206,7 +209,8 @@ export class PortProxy {
         }
       };
 
-      let to: plugins.net.Socket;
+      // Declare the outgoing connection as possibly null.
+      let to: plugins.net.Socket | null = null;
 
       const handleError = (side: 'incoming' | 'outgoing') => (err: Error) => {
         const code = (err as any).code;
@@ -232,16 +236,19 @@ export class PortProxy {
           if (!domainConfig) {
             console.log(`Connection rejected: No matching domain config for ${serverName} from ${remoteIP}`);
             socket.end();
+            cleanupOnce();
             return;
           }
           if (!isAllowed(remoteIP, domainConfig.allowedIPs)) {
             console.log(`Connection rejected: IP ${remoteIP} not allowed for domain ${serverName}`);
             socket.end();
+            cleanupOnce();
             return;
           }
         } else if (!isDefaultAllowed && !serverName) {
           console.log(`Connection rejected: No SNI and IP ${remoteIP} not in default allowed list`);
           socket.end();
+          cleanupOnce();
           return;
         } else {
           console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
@@ -263,7 +270,9 @@ export class PortProxy {
         // Establish outgoing connection.
         to = plugins.net.connect(connectionOptions);
         // Record start time for the outgoing connection.
-        this.outgoingConnectionTimes.set(to, Date.now());
+        if (to) {
+          this.outgoingConnectionTimes.set(to, Date.now());
+        }
         console.log(`Connection established: ${remoteIP} -> ${targetHost}:${this.settings.toPort}${serverName ? ` (SNI: ${serverName})` : ''}`);
         
         // Push back the initial chunk if provided.
@@ -271,18 +280,25 @@ export class PortProxy {
           socket.unshift(initialChunk);
         }
         socket.setTimeout(120000);
-        socket.pipe(to);
+        // Since 'to' is not null here, we can use the non-null assertion.
-        to.pipe(socket);
+        socket.pipe(to!);
+        to!.pipe(socket);
 
         // Attach error and close handlers for both sockets.
         socket.on('error', handleError('incoming'));
-        to.on('error', handleError('outgoing'));
+        to!.on('error', handleError('outgoing'));
         socket.on('close', handleClose('incoming'));
-        to.on('close', handleClose('outgoing'));
+        to!.on('close', handleClose('outgoing'));
-        socket.on('timeout', handleError('incoming'));
+        socket.on('timeout', () => {
-        to.on('timeout', handleError('outgoing'));
+          console.log(`Timeout on incoming side from ${remoteIP}`);
+          cleanupOnce();
+        });
+        to!.on('timeout', () => {
+          console.log(`Timeout on outgoing side from ${remoteIP}`);
+          cleanupOnce();
+        });
         socket.on('end', handleClose('incoming'));
-        to.on('end', handleClose('outgoing'));
+        to!.on('end', handleClose('outgoing'));
       };
 
       // For SNI-enabled connections, peek at the first chunk.
@@ -300,6 +316,7 @@ 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();
+          cleanupOnce();
           return;
         }
         setupConnection('');
@@ -329,7 +346,7 @@ export class PortProxy {
           maxOutgoing = duration;
         }
       }
-      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${maxIncoming}ms, outgoing: ${maxOutgoing}ms`);
+      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
     }, 10000);
   }