@push.rocks/smartproxy 3.15.0 → 3.16.2

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@push.rocks/smartproxy',
-    version: '3.15.0',
+    version: '3.16.2',
     description: 'A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLGdNQUFnTTtDQUM5TSxDQUFBIn0=

package/dist_ts/classes.portproxy.d.ts

@@ -4,7 +4,7 @@ export interface IDomainConfig {
     domain: string;
     allowedIPs: string[];
     targetIP?: string;
-    portRanges: Array<{
+    portRanges?: Array<{
         from: number;
         to: number;
     }>;
@@ -13,7 +13,7 @@ export interface IDomainConfig {
 export interface IPortProxySettings extends plugins.tls.TlsOptions {
     fromPort: number;
     toPort: number;
-    toHost?: string;
+    targetIP?: string;
     domains: IDomainConfig[];
     sniEnabled?: boolean;
     defaultAllowedIPs?: string[];
@@ -23,6 +23,7 @@ export interface IPortProxySettings extends plugins.tls.TlsOptions {
         from: number;
         to: number;
     }>;
+    forwardAllGlobalRanges?: boolean;
 }
 export declare class PortProxy {
     netServer: plugins.net.Server;

package/dist_ts/classes.portproxy.js

@@ -71,7 +71,7 @@ export class PortProxy {
         };
         this.settings = {
             ...settingsArg,
-            toHost: settingsArg.toHost || 'localhost',
+            targetIP: settingsArg.targetIP || 'localhost',
             maxConnectionLifetime: settingsArg.maxConnectionLifetime || 600000,
         };
     }
@@ -204,7 +204,7 @@ export class PortProxy {
                 else if (defaultAllowed && !serverName) {
                     console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
                 }
-                const targetHost = domainConfig?.targetIP || this.settings.toHost;
+                const targetHost = domainConfig?.targetIP || this.settings.targetIP;
                 const connectionOptions = {
                     host: targetHost,
                     port: this.settings.toPort,
@@ -281,33 +281,43 @@ export class PortProxy {
                 }
             };
             // --- PORT RANGE-BASED HANDLING ---
-            // If global port ranges are defined, enforce port-based routing and ignore SNI.
-            if (this.settings.globalPortRanges && this.settings.globalPortRanges.length > 0) {
-                if (!isPortInRanges(localPort, this.settings.globalPortRanges)) {
-                    console.log(`Connection from ${remoteIP} rejected: port ${localPort} is not in global allowed ranges.`);
-                    socket.destroy();
-                    return;
-                }
-                // Find a matching domain config based on the incoming local port.
-                const forcedDomain = this.settings.domains.find(domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges));
-                if (!forcedDomain) {
-                    console.log(`Connection from ${remoteIP} rejected: port ${localPort} not configured in any domain's portRanges.`);
-                    socket.destroy();
+            // Check if the local port falls within any of the global port ranges.
+            const isLocalPortInGlobalRange = this.settings.globalPortRanges && isPortInRanges(localPort, this.settings.globalPortRanges);
+            if (isLocalPortInGlobalRange) {
+                if (this.settings.forwardAllGlobalRanges) {
+                    // Forward connection to the global targetIP regardless of domain config.
+                    if (this.settings.defaultAllowedIPs && !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
+                        console.log(`Connection from ${remoteIP} rejected: IP ${remoteIP} not allowed in global default allowed list.`);
+                        socket.end();
+                        return;
+                    }
+                    console.log(`Port-based connection from ${remoteIP} on port ${localPort} forwarded to global target IP ${this.settings.targetIP}.`);
+                    setupConnection('', undefined, {
+                        domain: 'global',
+                        allowedIPs: this.settings.defaultAllowedIPs || [],
+                        targetIP: this.settings.targetIP,
+                        portRanges: []
+                    });
                     return;
                 }
-                // Check allowed IPs for the forced domain.
-                const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
-                if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
-                    console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
-                    socket.end();
-                    return;
+                else {
+                    // Attempt to find a matching forced domain config based on the local port.
+                    const forcedDomain = this.settings.domains.find(domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges));
+                    if (forcedDomain) {
+                        const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
+                        if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
+                            console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
+                            socket.end();
+                            return;
+                        }
+                        console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
+                        setupConnection('', undefined, forcedDomain);
+                        return;
+                    }
+                    // If no forced domain config is found for this port, fall through to SNI/default handling.
                 }
-                console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
-                // Proceed immediately using the forced domain; ignore SNI.
-                setupConnection('', undefined, forcedDomain);
-                return;
             }
-            // --- FALLBACK: SNI-BASED HANDLING (if no global port ranges are defined) ---
+            // --- FALLBACK: SNI-BASED HANDLING (or default when SNI is disabled) ---
             if (this.settings.sniEnabled) {
                 socket.setTimeout(5000, () => {
                     console.log(`Initial data timeout for ${remoteIP}`);
@@ -366,4 +376,4 @@ export class PortProxy {
         await done.promise;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.portproxy.js","sourceRoot":"","sources":["../ts/classes.portproxy.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.portproxy.js","sourceRoot":"","sources":["../ts/classes.portproxy.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "3.15.0",
+  "version": "3.16.2",
   "private": false,
   "description": "A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.",
   "main": "dist_ts/index.js",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '3.15.0',
+  version: '3.16.2',
   description: 'A robust and versatile proxy package designed to handle high workloads, offering features like SSL redirection, port proxying, WebSocket support, and customizable routing and authentication.'
 }

package/ts/classes.portproxy.ts

@@ -5,20 +5,21 @@ export interface IDomainConfig {
   domain: string;         // Glob pattern for domain
   allowedIPs: string[];   // Glob patterns for allowed IPs
   targetIP?: string;      // Optional target IP for this domain
-  portRanges: Array<{ from: number; to: number }>; // Domain-specific allowed port ranges
+  portRanges?: Array<{ from: number; to: number }>; // Optional domain-specific allowed port ranges
 }
 
 /** Port proxy settings including global allowed port ranges */
 export interface IPortProxySettings extends plugins.tls.TlsOptions {
   fromPort: number;
   toPort: number;
-  toHost?: string; // Target host to proxy to, defaults to 'localhost'
+  targetIP?: string; // Global target host to proxy to, defaults to 'localhost'
   domains: IDomainConfig[];
   sniEnabled?: boolean;
   defaultAllowedIPs?: string[];
   preserveSourceIP?: boolean;
   maxConnectionLifetime?: number; // (ms) force cleanup of long-lived connections
   globalPortRanges: Array<{ from: number; to: number }>; // Global allowed port ranges
+  forwardAllGlobalRanges?: boolean; // When true, forwards all connections on global port ranges to the global targetIP
 }
 
 /**
@@ -111,7 +112,7 @@ export class PortProxy {
   constructor(settingsArg: IPortProxySettings) {
     this.settings = {
       ...settingsArg,
-      toHost: settingsArg.toHost || 'localhost',
+      targetIP: settingsArg.targetIP || 'localhost',
       maxConnectionLifetime: settingsArg.maxConnectionLifetime || 600000,
     };
   }
@@ -256,7 +257,7 @@ export class PortProxy {
         } else if (defaultAllowed && !serverName) {
           console.log(`Connection allowed: IP ${remoteIP} is in default allowed list`);
         }
-        const targetHost = domainConfig?.targetIP || this.settings.toHost!;
+        const targetHost = domainConfig?.targetIP || this.settings.targetIP!;
         const connectionOptions: plugins.net.NetConnectOpts = {
           host: targetHost,
           port: this.settings.toPort,
@@ -343,36 +344,47 @@ export class PortProxy {
       };
 
       // --- PORT RANGE-BASED HANDLING ---
-      // If global port ranges are defined, enforce port-based routing and ignore SNI.
-      if (this.settings.globalPortRanges && this.settings.globalPortRanges.length > 0) {
-        if (!isPortInRanges(localPort, this.settings.globalPortRanges)) {
-          console.log(`Connection from ${remoteIP} rejected: port ${localPort} is not in global allowed ranges.`);
-          socket.destroy();
-          return;
-        }
-        // Find a matching domain config based on the incoming local port.
-        const forcedDomain = this.settings.domains.find(
-          domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges)
-        );
-        if (!forcedDomain) {
-          console.log(`Connection from ${remoteIP} rejected: port ${localPort} not configured in any domain's portRanges.`);
-          socket.destroy();
-          return;
-        }
-        // Check allowed IPs for the forced domain.
-        const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
-        if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
-          console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
-          socket.end();
+      // Check if the local port falls within any of the global port ranges.
+      const isLocalPortInGlobalRange =
+        this.settings.globalPortRanges && isPortInRanges(localPort, this.settings.globalPortRanges);
+
+      if (isLocalPortInGlobalRange) {
+        if (this.settings.forwardAllGlobalRanges) {
+          // Forward connection to the global targetIP regardless of domain config.
+          if (this.settings.defaultAllowedIPs && !isAllowed(remoteIP, this.settings.defaultAllowedIPs)) {
+            console.log(`Connection from ${remoteIP} rejected: IP ${remoteIP} not allowed in global default allowed list.`);
+            socket.end();
+            return;
+          }
+          console.log(`Port-based connection from ${remoteIP} on port ${localPort} forwarded to global target IP ${this.settings.targetIP}.`);
+          setupConnection('', undefined, {
+            domain: 'global',
+            allowedIPs: this.settings.defaultAllowedIPs || [],
+            targetIP: this.settings.targetIP,
+            portRanges: []
+          });
           return;
+        } else {
+          // Attempt to find a matching forced domain config based on the local port.
+          const forcedDomain = this.settings.domains.find(
+            domain => domain.portRanges && domain.portRanges.length > 0 && isPortInRanges(localPort, domain.portRanges)
+          );
+          if (forcedDomain) {
+            const defaultAllowed = this.settings.defaultAllowedIPs && isAllowed(remoteIP, this.settings.defaultAllowedIPs);
+            if (!defaultAllowed && !isAllowed(remoteIP, forcedDomain.allowedIPs)) {
+              console.log(`Connection from ${remoteIP} rejected: IP not allowed for domain ${forcedDomain.domain} on port ${localPort}.`);
+              socket.end();
+              return;
+            }
+            console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
+            setupConnection('', undefined, forcedDomain);
+            return;
+          }
+          // If no forced domain config is found for this port, fall through to SNI/default handling.
         }
-        console.log(`Port-based connection from ${remoteIP} on port ${localPort} matched domain ${forcedDomain.domain}.`);
-        // Proceed immediately using the forced domain; ignore SNI.
-        setupConnection('', undefined, forcedDomain);
-        return;
       }
 
-      // --- FALLBACK: SNI-BASED HANDLING (if no global port ranges are defined) ---
+      // --- FALLBACK: SNI-BASED HANDLING (or default when SNI is disabled) ---
       if (this.settings.sniEnabled) {
         socket.setTimeout(5000, () => {
           console.log(`Initial data timeout for ${remoteIP}`);