3.9.1

changelog.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 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
+
+- Track start times for incoming and outgoing connections.
+- Log duration of longest running incoming and outgoing connections every 10 seconds.
+
+## 2025-02-21 - 3.8.1 - fix(plugins)
+Simplified plugin import structure across codebase
+
+- Consolidated plugin imports under a single 'plugins.ts' file.
+- Replaced individual plugin imports in smartproxy files with the consolidated plugin imports.
+- Fixed error handling for early socket errors in PortProxy setup.
+
 ## 2025-02-21 - 3.8.0 - feat(PortProxy)
 Add active connection tracking and logging in PortProxy
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.8.0",
+  "version": "3.9.1",
   "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.8.0',
+  version: '3.9.1',
   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.classes.networkproxy.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartproxy.plugins.js';
+import * as plugins from './plugins.js';
 import { ProxyRouter } from './smartproxy.classes.router.js';
 import * as fs from 'fs';
 import * as path from 'path';

ts/smartproxy.classes.router.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartproxy.plugins.js';
+import * as plugins from './plugins.js';
 
 export class ProxyRouter {
   public reverseProxyConfigs: plugins.tsclass.network.IReverseProxyConfig[] = [];

ts/smartproxy.classes.sslredirect.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartproxy.plugins.js';
+import * as plugins from './plugins.js';
 
 export class SslRedirect {
   httpServer: plugins.http.Server;

ts/smartproxy.portproxy.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartproxy.plugins.js';
+import * as plugins from './plugins.js';
 
 export interface IDomainConfig {
   domain: string;         // glob pattern for domain
@@ -117,6 +117,10 @@ export class PortProxy {
   settings: IProxySettings;
   // Track active incoming connections
   private activeConnections: Set<plugins.net.Socket> = new Set();
+  // Record start times for incoming connections
+  private incomingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
+  // Record start times for outgoing connections
+  private outgoingConnectionTimes: Map<plugins.net.Socket, number> = new Map();
   private connectionLogger: NodeJS.Timeout | null = null;
 
   constructor(settings: IProxySettings) {
@@ -167,17 +171,34 @@ export class PortProxy {
     // Create a plain net server for TLS passthrough.
     this.netServer = plugins.net.createServer((socket: plugins.net.Socket) => {
       const remoteIP = socket.remoteAddress || '';
-      
-      // Track the new incoming connection.
+
+      // Record start time for the incoming connection.
       this.activeConnections.add(socket);
+      this.incomingConnectionTimes.set(socket, Date.now());
       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;
+
+      // Immediately attach an error handler to catch early errors.
+      socket.on('error', (err: Error) => {
+        if (!initialDataReceived) {
+          console.log(`(Premature) Incoming socket error from ${remoteIP} before data received: ${err.message}`);
+        } else {
+          console.log(`(Immediate) Incoming socket error from ${remoteIP}: ${err.message}`);
+        }
+      });
+
       // Flag to ensure cleanup happens only once.
       let connectionClosed = false;
       const cleanupOnce = () => {
         if (!connectionClosed) {
           connectionClosed = true;
           cleanUpSockets(socket, to);
+          this.incomingConnectionTimes.delete(socket);
+          if (to) {
+            this.outgoingConnectionTimes.delete(to);
+          }
           if (this.activeConnections.has(socket)) {
             this.activeConnections.delete(socket);
             console.log(`Connection from ${remoteIP} terminated. Active connections: ${this.activeConnections.size}`);
@@ -241,6 +262,8 @@ export class PortProxy {
 
         // Establish outgoing connection.
         to = plugins.net.connect(connectionOptions);
+        // Record start time for the outgoing connection.
+        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.
@@ -265,6 +288,7 @@ export class PortProxy {
       // For SNI-enabled connections, peek at the first chunk.
       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}`);
@@ -272,6 +296,7 @@ export class PortProxy {
         });
       } else {
         // For non-SNI connections, simply check defaultAllowedIPs.
+        initialDataReceived = true;
         if (!this.settings.defaultAllowedIPs || !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
           console.log(`Connection rejected: IP ${remoteIP} not allowed for non-SNI connection`);
           socket.end();
@@ -287,9 +312,24 @@ export class PortProxy {
       console.log(`PortProxy -> OK: Now listening on port ${this.settings.fromPort}${this.settings.sniEnabled ? ' (SNI passthrough enabled)' : ''}`);
     });
 
-    // Log active connection count every 10 seconds.
+    // Log active connection count and longest running connections every 10 seconds.
     this.connectionLogger = setInterval(() => {
-      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}`);
+      const now = Date.now();
+      let maxIncoming = 0;
+      for (const startTime of this.incomingConnectionTimes.values()) {
+        const duration = now - startTime;
+        if (duration > maxIncoming) {
+          maxIncoming = duration;
+        }
+      }
+      let maxOutgoing = 0;
+      for (const startTime of this.outgoingConnectionTimes.values()) {
+        const duration = now - startTime;
+        if (duration > maxOutgoing) {
+          maxOutgoing = duration;
+        }
+      }
+      console.log(`(Interval Log) Active connections: ${this.activeConnections.size}. Longest running incoming: ${plugins.prettyMs(maxIncoming)}, outgoing: ${plugins.prettyMs(maxOutgoing)}`);
     }, 10000);
   }