v22.0.0

Replaced legacy route-validators.ts with a unified route-validator.ts that provides a class-based RouteValidator plus the previous functional API (isValidPort, isValidDomain, validateRouteMatch, validateRouteAction, validateRouteConfig, validateRoutes, hasRequiredPropertiesForAction, assertValidRoute) for backwards compatibility. Updated utils exports and all imports/tests to reference the new module. Also switched static file loading in certificate manager to use SmartFileFactory.nodeFs(), and added @push.rocks/smartserve to devDependencies.

certs/static-route/meta.json

@@ -1,5 +1,5 @@
 {
-  "expiryDate": "2025-10-19T23:55:27.838Z",
-  "issueDate": "2025-07-21T23:55:27.838Z",
-  "savedAt": "2025-07-21T23:55:27.838Z"
+  "expiryDate": "2026-03-09T00:26:32.907Z",
+  "issueDate": "2025-12-09T00:26:32.907Z",
+  "savedAt": "2025-12-09T00:26:32.907Z"
 }

changelog.md

@@ -1,5 +1,64 @@
 # Changelog
 
+## 2025-12-09 - 22.0.0 - BREAKING CHANGE(smart-proxy/utils/route-validator)
+Consolidate and refactor route validators; move to class-based API and update usages
+
+Replaced legacy route-validators.ts with a unified route-validator.ts that provides a class-based RouteValidator plus the previous functional API (isValidPort, isValidDomain, validateRouteMatch, validateRouteAction, validateRouteConfig, validateRoutes, hasRequiredPropertiesForAction, assertValidRoute) for backwards compatibility. Updated utils exports and all imports/tests to reference the new module. Also switched static file loading in certificate manager to use SmartFileFactory.nodeFs(), and added @push.rocks/smartserve to devDependencies.
+
+- Rename and consolidate validator module: route-validators.ts removed; route-validator.ts added with RouteValidator class and duplicated functional API for compatibility.
+- Updated exports in ts/proxies/smart-proxy/utils/index.ts and all internal imports/tests to reference './route-validator.js' instead of './route-validators.js'.
+- Certificate manager now uses plugins.smartfile.SmartFileFactory.nodeFs() to load key/cert files (safer factory usage instead of direct static calls).
+- Added @push.rocks/smartserve to devDependencies in package.json.
+- Because the validator filename and some import paths changed, this is a breaking change for consumers importing the old module path.
+
+## 2025-08-19 - 21.1.7 - fix(route-validator)
+Relax domain validation to accept 'localhost', prefix wildcards (e.g. *example.com) and IP literals; add comprehensive domain validation tests
+
+- Allow 'localhost' as a valid domain pattern in route validation
+- Support prefix wildcard patterns like '*example.com' in addition to '*.example.com'
+- Accept IPv4 and IPv6 literal addresses in domain validation
+- Add test coverage: new test/test.domain-validation.ts with many real-world and edge-case patterns
+
+## 2025-08-19 - 21.1.6 - fix(ip-utils)
+Fix IP wildcard/shorthand handling and add validation test
+
+- Support shorthand IPv4 wildcard patterns (e.g. '10.*', '192.168.*') by expanding them to full 4-octet patterns before matching
+- Normalize and expand patterns in IpUtils.isGlobIPMatch and SharedSecurityManager IP checks to ensure consistent minimatch comparisons
+- Relax route validator wildcard checks to accept 1-4 octet wildcard specifications for IPv4 patterns
+- Add test harness test-ip-validation.ts to exercise common wildcard/shorthand IP patterns
+
+## 2025-08-19 - 21.1.5 - fix(core)
+Prepare patch release: documentation, tests and stability fixes (metrics, ACME, connection cleanup)
+
+- Byte counting and throughput: per-route and per-IP throughput trackers with per-second sampling; removed double-counting and improved sampling buffers for accurate rates
+- HttpProxy and forwarding: Ensure metricsCollector.recordBytes() is called in forwarding paths so throughput is recorded reliably
+- ACME / Certificate Manager: support for custom certProvisionFunction with configurable fallback to ACME (http01) and improved challenge route lifecycle
+- Connection lifecycle and cleanup: improved lifecycle component timer/listener cleanup, better cleanup queue batching and zombie/half-zombie detection
+- Various utilities and stability improvements: enhanced IP utils, path/domain matching improvements, safer socket handling and more robust fragment/ClientHello handling
+- Tests and docs: many test files and readme.hints.md updated with byte-counting audit, connection cleanup and ACME guidance
+
+## 2025-08-14 - 21.1.4 - fix(security)
+Critical security and stability fixes
+
+- Fixed critical socket.emit override vulnerability that was breaking TLS connections
+- Implemented comprehensive socket cleanup with new socket tracker utility
+- Improved code organization by extracting RouteOrchestrator from SmartProxy
+- Fixed IPv6 loopback detection for proper IPv6 support
+- Added memory bounds to prevent unbounded collection growth
+- Fixed certificate manager race conditions with proper synchronization
+- Unreferenced long-lived timers to prevent process hanging
+- Enhanced route validation for socket-handler actions
+- Fixed header parsing when extractFullHeaders option is enabled
+
+## 2025-07-22 - 21.1.1 - fix(detection)
+Fix SNI detection in TLS detector
+
+- Restored proper TLS detector implementation with ClientHello parsing
+- Fixed imports to use new protocols module locations
+- Added missing detectWithContext method for fragmented detection
+- Fixed method names to match BufferAccumulator interface
+- Removed unused import readUInt24BE
+
 ## 2025-07-21 - 21.1.0 - feat(protocols)
 Refactor protocol utilities into centralized protocols module
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "21.1.0",
+  "version": "22.0.0",
   "private": false,
   "description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
   "main": "dist_ts/index.js",
@@ -15,31 +15,33 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.6.4",
-    "@git.zone/tsrun": "^1.2.44",
-    "@git.zone/tstest": "^2.3.1",
-    "@types/node": "^22.15.29",
-    "typescript": "^5.8.3"
+    "@git.zone/tsbuild": "^3.1.2",
+    "@git.zone/tsrun": "^2.0.0",
+    "@git.zone/tstest": "^3.1.3",
+    "@push.rocks/smartserve": "^1.4.0",
+    "@types/node": "^24.10.2",
+    "typescript": "^5.9.3",
+    "why-is-node-running": "^3.2.2"
   },
   "dependencies": {
     "@push.rocks/lik": "^6.2.2",
     "@push.rocks/smartacme": "^8.0.0",
     "@push.rocks/smartcrypto": "^2.0.4",
     "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartfile": "^11.2.5",
-    "@push.rocks/smartlog": "^3.1.8",
-    "@push.rocks/smartnetwork": "^4.0.2",
+    "@push.rocks/smartfile": "^13.1.0",
+    "@push.rocks/smartlog": "^3.1.10",
+    "@push.rocks/smartnetwork": "^4.4.0",
     "@push.rocks/smartpromise": "^4.2.3",
-    "@push.rocks/smartrequest": "^2.1.0",
+    "@push.rocks/smartrequest": "^5.0.1",
     "@push.rocks/smartrx": "^3.0.10",
-    "@push.rocks/smartstring": "^4.0.15",
-    "@push.rocks/taskbuffer": "^3.1.7",
-    "@tsclass/tsclass": "^9.2.0",
-    "@types/minimatch": "^5.1.2",
+    "@push.rocks/smartstring": "^4.1.0",
+    "@push.rocks/taskbuffer": "^3.5.0",
+    "@tsclass/tsclass": "^9.3.0",
+    "@types/minimatch": "^6.0.0",
     "@types/ws": "^8.18.1",
-    "minimatch": "^10.0.1",
-    "pretty-ms": "^9.2.0",
-    "ws": "^8.18.2"
+    "minimatch": "^10.1.1",
+    "pretty-ms": "^9.3.0",
+    "ws": "^8.18.3"
   },
   "files": [
     "ts/**/*",

test/test.acme-http-challenge.ts

@@ -124,4 +124,4 @@ tap.test('should parse HTTP headers correctly', async (tools) => {
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.acme-http01-challenge.ts

@@ -159,4 +159,4 @@ tap.test('should return 404 for non-existent challenge tokens', async (tapTest)
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.acme-route-creation.ts

@@ -215,4 +215,4 @@ tap.test('should handle HTTP request parsing correctly', async (tools) => {
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.acme-simple.ts

@@ -117,4 +117,4 @@ tap.test('should configure ACME challenge route', async () => {
   expect(challengeRoute.action.socketHandler).toBeDefined();
 });
 
-tap.start();
+export default tap.start();

test/test.acme-timing-simple.ts

@@ -119,4 +119,4 @@ tap.test('should defer certificate provisioning until ports are ready', async (t
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.certificate-provisioning.ts

@@ -238,4 +238,4 @@ tap.test('should renew certificates', async () => {
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.certificate-simple.ts

@@ -57,4 +57,4 @@ tap.test('should handle socket handler route type', async () => {
   expect(route.action.socketHandler).toBeDefined();
 });
 
-tap.start();
+export default tap.start();

test/test.cleanup-queue-bug.node.ts

@@ -143,4 +143,4 @@ tap.test('cleanup queue bug - verify queue processing handles more than batch si
   console.log('\n✓ Test complete: Cleanup queue now correctly processes all connections');
 });
 
-tap.start();
+export default tap.start();

test/test.connect-disconnect-cleanup.node.ts

@@ -10,7 +10,6 @@ tap.test('should handle clients that connect and immediately disconnect without
   
   // Create a SmartProxy instance
   const proxy = new SmartProxy({
-    ports: [8560],
     enableDetailedLogging: false,
     initialDataTimeout: 5000, // 5 second timeout for initial data
     routes: [{
@@ -166,7 +165,6 @@ tap.test('should handle clients that error during connection', async () => {
   console.log('\n=== Testing Connection Error Cleanup ===');
   
   const proxy = new SmartProxy({
-    ports: [8561],
     enableDetailedLogging: false,
     routes: [{
       name: 'test-route',
@@ -239,4 +237,4 @@ tap.test('should handle clients that error during connection', async () => {
   console.log('\n✅ PASS: Connection error cleanup working correctly!');
 });
 
-tap.start();
+export default tap.start();

test/test.connection-cleanup-comprehensive.node.ts

@@ -10,7 +10,6 @@ tap.test('comprehensive connection cleanup test - all scenarios', async () => {
   
   // Create a SmartProxy instance
   const proxy = new SmartProxy({
-    ports: [8570, 8571], // One for immediate routing, one for TLS
     enableDetailedLogging: false,
     initialDataTimeout: 2000,
     socketTimeout: 5000,
@@ -207,7 +206,6 @@ tap.test('comprehensive connection cleanup test - all scenarios', async () => {
   // Test 5: NFTables route (should cleanup properly)
   console.log('\n--- Test 5: NFTables route cleanup ---');
   const nftProxy = new SmartProxy({
-    ports: [8572],
     enableDetailedLogging: false,
     routes: [{
       name: 'nftables-route',
@@ -276,4 +274,4 @@ tap.test('comprehensive connection cleanup test - all scenarios', async () => {
   console.log('- NFTables connections');
 });
 
-tap.start();
+export default tap.start();

test/test.connection-limits.node.ts

@@ -120,7 +120,7 @@ tap.test('Per-IP connection limits', async () => {
   // Try to create one more connection - should fail
   try {
     await createConcurrentConnections(PROXY_PORT, 1);
-    expect.fail('Should not allow more than 3 connections per IP');
+    throw new Error('Should not allow more than 3 connections per IP');
   } catch (err) {
     expect(err.message).toInclude('ECONNRESET');
   }
@@ -144,7 +144,7 @@ tap.test('Route-level connection limits', async () => {
   // Try to exceed route limit
   try {
     await createConcurrentConnections(PROXY_PORT, 1);
-    expect.fail('Should not allow more than 5 connections for this route');
+    throw new Error('Should not allow more than 5 connections for this route');
   } catch (err) {
     expect(err.message).toInclude('ECONNRESET');
   }
@@ -221,7 +221,7 @@ tap.test('HttpProxy per-IP validation', async () => {
   // Should reject additional connections
   try {
     await createConcurrentConnections(PROXY_PORT + 10, 1);
-    expect.fail('HttpProxy should enforce per-IP limits');
+    throw new Error('HttpProxy should enforce per-IP limits');
   } catch (err) {
     expect(err.message).toInclude('ECONNRESET');
   }
@@ -296,4 +296,4 @@ tap.test('Cleanup and shutdown', async () => {
   allServers.length = 0;
 });
 
-tap.start();
+export default tap.start();

test/test.detection.ts

@@ -80,28 +80,38 @@ tap.test('Protocol Detection - Unknown Protocol', async () => {
 });
 
 tap.test('Protocol Detection - Fragmented HTTP', async () => {
-  const connectionId = 'test-connection-1';
+  // Create connection context
+  const context = smartproxy.detection.ProtocolDetector.createConnectionContext({
+    sourceIp: '127.0.0.1',
+    sourcePort: 12345,
+    destIp: '127.0.0.1',
+    destPort: 80,
+    socketId: 'test-connection-1'
+  });
   
   // First fragment
   const fragment1 = Buffer.from('GET /test HT');
-  let result = await smartproxy.detection.ProtocolDetector.detectWithConnectionTracking(
+  let result = await smartproxy.detection.ProtocolDetector.detectWithContext(
     fragment1,
-    connectionId
+    context
   );
   expect(result.protocol).toEqual('http');
   expect(result.isComplete).toEqual(false);
   
   // Second fragment
   const fragment2 = Buffer.from('TP/1.1\r\nHost: example.com\r\n\r\n');
-  result = await smartproxy.detection.ProtocolDetector.detectWithConnectionTracking(
+  result = await smartproxy.detection.ProtocolDetector.detectWithContext(
     fragment2,
-    connectionId
+    context
   );
   expect(result.protocol).toEqual('http');
   expect(result.isComplete).toEqual(true);
   expect(result.connectionInfo.method).toEqual('GET');
   expect(result.connectionInfo.path).toEqual('/test');
   expect(result.connectionInfo.domain).toEqual('example.com');
+  
+  // Clean up fragments
+  smartproxy.detection.ProtocolDetector.cleanupConnection(context);
 });
 
 tap.test('Protocol Detection - HTTP Methods', async () => {
@@ -128,4 +138,9 @@ tap.test('Protocol Detection - Invalid Data', async () => {
   expect(result.protocol).toEqual('unknown');
 });
 
-tap.start();
+tap.test('cleanup detection', async () => {
+  // Clean up the protocol detector instance
+  smartproxy.detection.ProtocolDetector.destroy();
+});
+
+export default tap.start();

test/test.domain-validation.ts

@@ -0,0 +1,189 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+import { RouteValidator } from '../ts/proxies/smart-proxy/utils/route-validator.js';
+
+tap.test('Domain Validation - Standard wildcard patterns', async () => {
+  const testPatterns = [
+    { pattern: '*.example.com', shouldPass: true, description: 'Standard wildcard subdomain' },
+    { pattern: '*.sub.example.com', shouldPass: true, description: 'Nested wildcard subdomain' },
+    { pattern: 'example.com', shouldPass: true, description: 'Plain domain' },
+    { pattern: 'sub.example.com', shouldPass: true, description: 'Subdomain' },
+    { pattern: '*', shouldPass: true, description: 'Catch-all wildcard' },
+    { pattern: 'localhost', shouldPass: true, description: 'Localhost' },
+    { pattern: '192.168.1.1', shouldPass: true, description: 'IPv4 address' },
+  ];
+
+  for (const { pattern, shouldPass, description } of testPatterns) {
+    const route = {
+      name: 'test',
+      match: { 
+        ports: 443,
+        domains: pattern
+      },
+      action: { 
+        type: 'forward' as const, 
+        targets: [{ host: 'localhost', port: 8080 }] 
+      }
+    };
+    
+    const result = RouteValidator.validateRoute(route);
+    
+    if (shouldPass) {
+      expect(result.valid).toEqual(true);
+      console.log(`✅ Domain '${pattern}' correctly accepted (${description})`);
+    } else {
+      expect(result.valid).toEqual(false);
+      console.log(`✅ Domain '${pattern}' correctly rejected (${description})`);
+    }
+  }
+});
+
+tap.test('Domain Validation - Prefix wildcard patterns (*domain)', async () => {
+  const testPatterns = [
+    { pattern: '*nevermind.cloud', shouldPass: true, description: 'Prefix wildcard without dot' },
+    { pattern: '*example.com', shouldPass: true, description: 'Prefix wildcard for TLD' },
+    { pattern: '*sub.example.com', shouldPass: true, description: 'Prefix wildcard for subdomain' },
+    { pattern: '*api.service.io', shouldPass: true, description: 'Prefix wildcard for nested domain' },
+  ];
+
+  for (const { pattern, shouldPass, description } of testPatterns) {
+    const route = {
+      name: 'test',
+      match: { 
+        ports: 443,
+        domains: pattern
+      },
+      action: { 
+        type: 'forward' as const, 
+        targets: [{ host: 'localhost', port: 8080 }] 
+      }
+    };
+    
+    const result = RouteValidator.validateRoute(route);
+    
+    if (shouldPass) {
+      expect(result.valid).toEqual(true);
+      console.log(`✅ Domain '${pattern}' correctly accepted (${description})`);
+    } else {
+      expect(result.valid).toEqual(false);
+      console.log(`✅ Domain '${pattern}' correctly rejected (${description})`);
+    }
+  }
+});
+
+tap.test('Domain Validation - Invalid patterns', async () => {
+  const invalidPatterns = [
+    // Note: Empty string validation is handled differently in the validator
+    // { pattern: '', description: 'Empty string' },
+    { pattern: '*.', description: 'Wildcard with trailing dot' },
+    { pattern: '.example.com', description: 'Leading dot' },
+    { pattern: 'example..com', description: 'Double dots' },
+    { pattern: 'exam ple.com', description: 'Space in domain' },
+    { pattern: 'example-.com', description: 'Hyphen at end of label' },
+    { pattern: '-example.com', description: 'Hyphen at start of label' },
+  ];
+
+  for (const { pattern, description } of invalidPatterns) {
+    const route = {
+      name: 'test',
+      match: { 
+        ports: 443,
+        domains: pattern
+      },
+      action: { 
+        type: 'forward' as const, 
+        targets: [{ host: 'localhost', port: 8080 }] 
+      }
+    };
+    
+    const result = RouteValidator.validateRoute(route);
+    if (result.valid === false) {
+      console.log(`✅ Domain '${pattern}' correctly rejected (${description})`);
+    } else {
+      console.log(`❌ Domain '${pattern}' was unexpectedly accepted! (${description})`);
+      console.log(`   Errors: ${result.errors.join(', ')}`);
+    }
+    expect(result.valid).toEqual(false);
+  }
+});
+
+tap.test('Domain Validation - Multiple domains in array', async () => {
+  const route = {
+    name: 'test',
+    match: { 
+      ports: 443,
+      domains: [
+        '*.example.com',
+        '*nevermind.cloud',
+        'api.service.io',
+        'localhost'
+      ]
+    },
+    action: { 
+      type: 'forward' as const, 
+      targets: [{ host: 'localhost', port: 8080 }] 
+    }
+  };
+  
+  const result = RouteValidator.validateRoute(route);
+  expect(result.valid).toEqual(true);
+  console.log('✅ Multiple valid domains in array correctly accepted');
+});
+
+tap.test('Domain Validation - Mixed valid and invalid domains', async () => {
+  const route = {
+    name: 'test',
+    match: { 
+      ports: 443,
+      domains: [
+        '*.example.com',  // valid
+        '',               // invalid - empty
+        'localhost'       // valid
+      ]
+    },
+    action: { 
+      type: 'forward' as const, 
+      targets: [{ host: 'localhost', port: 8080 }] 
+    }
+  };
+  
+  const result = RouteValidator.validateRoute(route);
+  expect(result.valid).toEqual(false);
+  expect(result.errors.some(e => e.includes('Invalid domain pattern'))).toEqual(true);
+  console.log('✅ Mixed valid/invalid domains correctly rejected');
+});
+
+tap.test('Domain Validation - Real-world patterns from email routes', async () => {
+  // These are the patterns that were failing from the email conversion
+  const realWorldPatterns = [
+    { pattern: '*nevermind.cloud', shouldPass: true, description: 'nevermind.cloud wildcard' },
+    { pattern: '*push.email', shouldPass: true, description: 'push.email wildcard' },
+    { pattern: '*.bleu.de', shouldPass: true, description: 'bleu.de subdomain wildcard' },
+    { pattern: '*bleu.de', shouldPass: true, description: 'bleu.de prefix wildcard' },
+  ];
+
+  for (const { pattern, shouldPass, description } of realWorldPatterns) {
+    const route = {
+      name: 'email-route',
+      match: { 
+        ports: 443,
+        domains: pattern
+      },
+      action: { 
+        type: 'forward' as const, 
+        targets: [{ host: 'mail.server.com', port: 8080 }] 
+      }
+    };
+    
+    const result = RouteValidator.validateRoute(route);
+    
+    if (shouldPass) {
+      expect(result.valid).toEqual(true);
+      console.log(`✅ Real-world domain '${pattern}' correctly accepted (${description})`);
+    } else {
+      expect(result.valid).toEqual(false);
+      console.log(`✅ Real-world domain '${pattern}' correctly rejected (${description})`);
+    }
+  }
+});
+
+export default tap.start();

test/test.fix-verification.ts

@@ -79,4 +79,4 @@ tap.test('should verify certificate manager callback is preserved on updateRoute
   console.log('Fix verified: Certificate manager callback is preserved on updateRoutes');
 });
 
-tap.start();
+export default tap.start();

test/test.forwarding.examples.ts

@@ -46,7 +46,7 @@ tap.test('Route-based configuration examples', async (tools) => {
 
   expect(httpsPassthroughRoute).toBeTruthy();
   expect(httpsPassthroughRoute.action.tls?.mode).toEqual('passthrough');
-  expect(Array.isArray(httpsPassthroughRoute.action.target?.host)).toBeTrue();
+  expect(Array.isArray(httpsPassthroughRoute.action.targets)).toBeTrue();
 
   // Example 3: HTTPS Termination to HTTP Backend
   const terminateToHttpRoute = createHttpsTerminateRoute(
@@ -90,7 +90,7 @@ tap.test('Route-based configuration examples', async (tools) => {
 
   expect(loadBalancerRoute).toBeTruthy();
   expect(loadBalancerRoute.action.tls?.mode).toEqual('terminate-and-reencrypt');
-  expect(Array.isArray(loadBalancerRoute.action.target?.host)).toBeTrue();
+  expect(Array.isArray(loadBalancerRoute.action.targets)).toBeTrue();
 
   // Example 5: API Route
   const apiRoute = createApiRoute(

test/test.http-fix-unit.ts

@@ -180,4 +180,4 @@ tap.test('should handle ACME HTTP-01 challenges on port 80 with HttpProxy', asyn
   console.log('Test passed: ACME HTTP-01 challenges on port 80 use HttpProxy');
 });
 
-tap.start();
+export default tap.start();

test/test.http-port8080-simple.ts

@@ -242,4 +242,4 @@ tap.test('should handle ACME challenges on port 8080 with improved port binding
   }
 });
 
-tap.start();
+export default tap.start();

test/test.http-proxy-security-limits.node.ts

@@ -117,4 +117,4 @@ tap.test('Cleanup HttpProxy SecurityManager', async () => {
   securityManager.clearIPTracking();
 });
 
-tap.start();
+export default tap.start();

test/test.ip-validation.ts

@@ -0,0 +1,128 @@
+import { expect, tap } from '@git.zone/tstest/tapbundle';
+import * as smartproxy from '../ts/index.js';
+import { RouteValidator } from '../ts/proxies/smart-proxy/utils/route-validator.js';
+import { IpUtils } from '../ts/core/utils/ip-utils.js';
+
+tap.test('IP Validation - Shorthand patterns', async () => {
+  
+  // Test shorthand patterns are now accepted
+  const testPatterns = [
+    { pattern: '192.168.*', shouldPass: true },
+    { pattern: '192.168.*.*', shouldPass: true },
+    { pattern: '10.*', shouldPass: true },
+    { pattern: '10.*.*.*', shouldPass: true },
+    { pattern: '172.16.*', shouldPass: true },
+    { pattern: '10.0.0.0/8', shouldPass: true },
+    { pattern: '192.168.0.0/16', shouldPass: true },
+    { pattern: '192.168.1.100', shouldPass: true },
+    { pattern: '*', shouldPass: true },
+    { pattern: '192.168.1.1-192.168.1.100', shouldPass: true },
+  ];
+
+  for (const { pattern, shouldPass } of testPatterns) {
+    const route = {
+      name: 'test',
+      match: { ports: 80 },
+      action: { type: 'forward' as const, targets: [{ host: 'localhost', port: 8080 }] },
+      security: { ipAllowList: [pattern] }
+    };
+    
+    const result = RouteValidator.validateRoute(route);
+    
+    if (shouldPass) {
+      expect(result.valid).toEqual(true);
+      console.log(`✅ Pattern '${pattern}' correctly accepted`);
+    } else {
+      expect(result.valid).toEqual(false);
+      console.log(`✅ Pattern '${pattern}' correctly rejected`);
+    }
+  }
+});
+
+tap.test('IP Matching - Runtime shorthand pattern matching', async () => {
+  
+  // Test runtime matching with shorthand patterns
+  const testCases = [
+    { ip: '192.168.1.100', patterns: ['192.168.*'], expected: true },
+    { ip: '192.168.1.100', patterns: ['192.168.1.*'], expected: true },
+    { ip: '192.168.1.100', patterns: ['192.168.2.*'], expected: false },
+    { ip: '10.0.0.1', patterns: ['10.*'], expected: true },
+    { ip: '10.1.2.3', patterns: ['10.*'], expected: true },
+    { ip: '172.16.0.1', patterns: ['10.*'], expected: false },
+    { ip: '192.168.1.1', patterns: ['192.168.*.*'], expected: true },
+  ];
+
+  for (const { ip, patterns, expected } of testCases) {
+    const result = IpUtils.isGlobIPMatch(ip, patterns);
+    expect(result).toEqual(expected);
+    console.log(`✅ IP ${ip} with pattern ${patterns[0]} = ${result} (expected ${expected})`);
+  }
+});
+
+tap.test('IP Matching - CIDR notation', async () => {
+  
+  // Test CIDR notation matching
+  const cidrTests = [
+    { ip: '10.0.0.1', cidr: '10.0.0.0/8', expected: true },
+    { ip: '10.255.255.255', cidr: '10.0.0.0/8', expected: true },
+    { ip: '11.0.0.1', cidr: '10.0.0.0/8', expected: false },
+    { ip: '192.168.1.1', cidr: '192.168.0.0/16', expected: true },
+    { ip: '192.168.255.255', cidr: '192.168.0.0/16', expected: true },
+    { ip: '192.169.0.1', cidr: '192.168.0.0/16', expected: false },
+    { ip: '192.168.1.100', cidr: '192.168.1.0/24', expected: true },
+    { ip: '192.168.2.100', cidr: '192.168.1.0/24', expected: false },
+  ];
+
+  for (const { ip, cidr, expected } of cidrTests) {
+    const result = IpUtils.isGlobIPMatch(ip, [cidr]);
+    expect(result).toEqual(expected);
+    console.log(`✅ IP ${ip} in CIDR ${cidr} = ${result} (expected ${expected})`);
+  }
+});
+
+tap.test('IP Matching - Range notation', async () => {
+  
+  // Test range notation matching
+  const rangeTests = [
+    { ip: '192.168.1.1', range: '192.168.1.1-192.168.1.100', expected: true },
+    { ip: '192.168.1.50', range: '192.168.1.1-192.168.1.100', expected: true },
+    { ip: '192.168.1.100', range: '192.168.1.1-192.168.1.100', expected: true },
+    { ip: '192.168.1.101', range: '192.168.1.1-192.168.1.100', expected: false },
+    { ip: '192.168.2.50', range: '192.168.1.1-192.168.1.100', expected: false },
+  ];
+
+  for (const { ip, range, expected } of rangeTests) {
+    const result = IpUtils.isGlobIPMatch(ip, [range]);
+    expect(result).toEqual(expected);
+    console.log(`✅ IP ${ip} in range ${range} = ${result} (expected ${expected})`);
+  }
+});
+
+tap.test('IP Matching - Mixed patterns', async () => {
+  
+  // Test with mixed pattern types
+  const allowList = [
+    '10.0.0.0/8',      // CIDR
+    '192.168.*',       // Shorthand glob
+    '172.16.1.*',      // Specific subnet glob
+    '8.8.8.8',         // Single IP
+    '1.1.1.1-1.1.1.10' // Range
+  ];
+  
+  const tests = [
+    { ip: '10.1.2.3', expected: true },      // Matches CIDR
+    { ip: '192.168.100.1', expected: true }, // Matches shorthand glob
+    { ip: '172.16.1.5', expected: true },    // Matches specific glob
+    { ip: '8.8.8.8', expected: true },       // Matches single IP
+    { ip: '1.1.1.5', expected: true },       // Matches range
+    { ip: '9.9.9.9', expected: false },      // Doesn't match any
+  ];
+  
+  for (const { ip, expected } of tests) {
+    const result = IpUtils.isGlobIPMatch(ip, allowList);
+    expect(result).toEqual(expected);
+    console.log(`✅ IP ${ip} in mixed patterns = ${result} (expected ${expected})`);
+  }
+});
+
+export default tap.start();

test/test.keepalive-support.node.ts

@@ -18,7 +18,7 @@ tap.test('keepalive support - verify keepalive connections are properly handled'
       }
     });
     
-    socket.on('error', (err) => {
+    socket.on('error', (err: NodeJS.ErrnoException) => {
       // Ignore errors from backend sockets
       console.log(`Backend socket error (expected during cleanup): ${err.code}`);
     });
@@ -56,7 +56,7 @@ tap.test('keepalive support - verify keepalive connections are properly handled'
   const client1 = net.connect(8590, 'localhost');
   
   // Add error handler to prevent unhandled errors
-  client1.on('error', (err) => {
+  client1.on('error', (err: NodeJS.ErrnoException) => {
     console.log(`Client1 error (expected during cleanup): ${err.code}`);
   });
   
@@ -133,7 +133,7 @@ tap.test('keepalive support - verify keepalive connections are properly handled'
   const client2 = net.connect(8591, 'localhost');
   
   // Add error handler to prevent unhandled errors
-  client2.on('error', (err) => {
+  client2.on('error', (err: NodeJS.ErrnoException) => {
     console.log(`Client2 error (expected during cleanup): ${err.code}`);
   });
   
@@ -193,7 +193,7 @@ tap.test('keepalive support - verify keepalive connections are properly handled'
   const client3 = net.connect(8592, 'localhost');
   
   // Add error handler to prevent unhandled errors
-  client3.on('error', (err) => {
+  client3.on('error', (err: NodeJS.ErrnoException) => {
     console.log(`Client3 error (expected during cleanup): ${err.code}`);
   });
   
@@ -247,4 +247,4 @@ tap.test('keepalive support - verify keepalive connections are properly handled'
   console.log('  - Zombie detection respects keepalive settings');
 });
 
-tap.start();
+export default tap.start();

test/test.log-deduplication.node.ts

@@ -109,4 +109,4 @@ tap.test('Cleanup deduplicator', async () => {
   expect(deduplicator).toBeInstanceOf(LogDeduplicator);
 });
 
-tap.start();
+export default tap.start();

test/test.memory-leak-check.node.ts

@@ -31,7 +31,6 @@ tap.test('should not have memory leaks in long-running operations', async (tools
   routes[0].match.ports = 8080;
   
   const proxy = new SmartProxy({
-    ports: [8080], // Use non-privileged port
     routes: routes
   });
   await proxy.start();
@@ -143,10 +142,10 @@ tap.test('should not have memory leaks in long-running operations', async (tools
 
   // Cleanup
   await proxy.stop();
-  await new Promise<void>((resolve) => targetServer.close(resolve));
+  await new Promise<void>((resolve) => targetServer.close(() => resolve()));
 
   console.log('Memory leak test completed successfully');
 });
 
 // Run with: node --expose-gc test.memory-leak-check.node.ts
-tap.start();
+export default tap.start();

test/test.memory-leak-simple.ts

@@ -6,7 +6,6 @@ tap.test('memory leak fixes verification', async () => {
   // Test 1: MetricsCollector requestTimestamps cleanup
   console.log('\n=== Test 1: MetricsCollector requestTimestamps cleanup ===');
   const proxy = new SmartProxy({
-    ports: [8081],
     routes: [
       createHttpRoute('test.local', { host: 'localhost', port: 3200 }, {
         match: { 
@@ -40,7 +39,7 @@ tap.test('memory leak fixes verification', async () => {
   
   // Check RequestHandler has destroy method
   const { RequestHandler } = await import('../ts/proxies/http-proxy/request-handler.js');
-  const requestHandler = new RequestHandler({}, null as any);
+  const requestHandler = new RequestHandler({ port: 8080 }, null as any);
   expect(typeof requestHandler.destroy).toEqual('function');
   console.log('✓ RequestHandler has destroy method');
   
@@ -57,4 +56,4 @@ tap.test('memory leak fixes verification', async () => {
   console.log('\n✅ All memory leak fixes verified!');
 });
 
-tap.start();
+export default tap.start();

test/test.memory-leak-unit.ts

@@ -29,7 +29,7 @@ tap.test('memory leak fixes - unit tests', async () => {
   
   // Add 6000 timestamps
   for (let i = 0; i < 6000; i++) {
-    collector.recordRequest();
+    collector.recordRequest(`conn-${i}`, 'test-route', '127.0.0.1');
   }
   
   // Access private property for testing
@@ -37,7 +37,7 @@ tap.test('memory leak fixes - unit tests', async () => {
   console.log(`Timestamps after 6000 requests: ${timestamps.length}`);
   
   // Force one more request to trigger cleanup
-  collector.recordRequest();
+  collector.recordRequest('conn-final', 'test-route', '127.0.0.1');
   timestamps = (collector as any).requestTimestamps;
   console.log(`Timestamps after cleanup trigger: ${timestamps.length}`);
   
@@ -64,7 +64,7 @@ tap.test('memory leak fixes - unit tests', async () => {
   
   // Add new timestamps to exceed limit
   for (let i = 0; i < 3000; i++) {
-    collector.recordRequest();
+    collector.recordRequest(`conn-new-${i}`, 'test-route', '127.0.0.1');
   }
   
   timestamps = (collector as any).requestTimestamps;
@@ -110,7 +110,7 @@ tap.test('memory leak fixes - unit tests', async () => {
   };
   
   const handler = new RequestHandler(
-    { logLevel: 'error' },
+    { port: 8080, logLevel: 'error' },
     mockConnectionPool as any
   );
   
@@ -128,4 +128,4 @@ tap.test('memory leak fixes - unit tests', async () => {
   console.log('\n✅ All memory leak fixes verified!');
 });
 
-tap.start();
+export default tap.start();

test/test.metrics-new.ts

@@ -29,10 +29,8 @@ tap.test('should create SmartProxy instance with new metrics', async () => {
     routes: [{
       name: 'test-route',
       match: {
-        matchType: 'startsWith',
-        matchAgainst: 'domain',
-        value: ['*'],
-        ports: [proxyPort]  // Add the port to match on
+        ports: [proxyPort],
+        domains: '*'
       },
       action: {
         type: 'forward',
@@ -45,9 +43,11 @@ tap.test('should create SmartProxy instance with new metrics', async () => {
         }
       }
     }],
-    defaultTarget: {
-      host: 'localhost',
-      port: echoServerPort
+    defaults: {
+      target: {
+        host: 'localhost',
+        port: echoServerPort
+      }
     },
     metrics: {
       enabled: true,
@@ -258,4 +258,4 @@ tap.test('should clean up resources', async () => {
   });
 });
 
-tap.start();
+export default tap.start();

test/test.nftables-manager.ts

@@ -71,8 +71,12 @@ const SKIP_TESTS = true;
 tap.skip.test('NFTablesManager setup test', async () => {
   // Test will be skipped if not running as root due to tap.skip.test
 
+  // Create a SmartProxy instance first
+  const { SmartProxy } = await import('../ts/proxies/smart-proxy/smart-proxy.js');
+  const proxy = new SmartProxy(sampleOptions);
+
   // Create a new instance of NFTablesManager
-  manager = new NFTablesManager(sampleOptions);
+  manager = new NFTablesManager(proxy);
 
   // Verify the instance was created successfully
   expect(manager).toBeTruthy();

test/test.nftables-status.ts

@@ -32,7 +32,9 @@ if (!isRoot) {
 const testFn = isRoot ? tap.test : tap.skip.test;
 
 testFn('NFTablesManager status functionality', async () => {
-  const nftablesManager = new NFTablesManager({ routes: [] });
+  const { SmartProxy } = await import('../ts/proxies/smart-proxy/smart-proxy.js');
+  const proxy = new SmartProxy({ routes: [] });
+  const nftablesManager = new NFTablesManager(proxy);
   
   // Create test routes
   const testRoutes = [

test/test.proxy-chain-cleanup.node.ts

@@ -31,7 +31,6 @@ tap.test('setup two smartproxies in a chain configuration', async () => {
     acceptProxyProtocol: true,
     sendProxyProtocol: false,
     enableDetailedLogging: true,
-    connectionCleanupInterval: 5000, // More frequent cleanup for testing
     inactivityTimeout: 10000 // Shorter timeout for testing
   });
   await innerProxy.start();
@@ -61,7 +60,6 @@ tap.test('setup two smartproxies in a chain configuration', async () => {
     },
     sendProxyProtocol: true,
     enableDetailedLogging: true,
-    connectionCleanupInterval: 5000, // More frequent cleanup for testing
     inactivityTimeout: 10000 // Shorter timeout for testing
   });
   await outerProxy.start();

test/test.proxy-chain-simple.node.ts

@@ -24,7 +24,6 @@ tap.test('simple proxy chain test - identify connection accumulation', async ()
   
   // Create SmartProxy2 (downstream)
   const proxy2 = new SmartProxy({
-    ports: [8591],
     enableDetailedLogging: true,
     socketTimeout: 5000,
     routes: [{
@@ -42,7 +41,6 @@ tap.test('simple proxy chain test - identify connection accumulation', async ()
   
   // Create SmartProxy1 (upstream)
   const proxy1 = new SmartProxy({
-    ports: [8590],
     enableDetailedLogging: true,
     socketTimeout: 5000,
     routes: [{
@@ -91,7 +89,7 @@ tap.test('simple proxy chain test - identify connection accumulation', async ()
         dataReceived = true;
       });
       
-      client.on('error', (err) => {
+      client.on('error', (err: NodeJS.ErrnoException) => {
         console.log(`Client error: ${err.code}`);
         resolve();
       });
@@ -192,4 +190,4 @@ tap.test('simple proxy chain test - identify connection accumulation', async ()
   expect(finalCounts.proxy2).toEqual(0);
 });
 
-tap.start();
+export default tap.start();

test/test.proxy-chaining-accumulation.node.ts

@@ -11,7 +11,6 @@ tap.test('should handle proxy chaining without connection accumulation', async (
   
   // Create SmartProxy2 (downstream proxy)
   const proxy2 = new SmartProxy({
-    ports: [8581],
     enableDetailedLogging: false,
     socketTimeout: 5000,
     routes: [{
@@ -29,7 +28,6 @@ tap.test('should handle proxy chaining without connection accumulation', async (
   
   // Create SmartProxy1 (upstream proxy)
   const proxy1 = new SmartProxy({
-    ports: [8580],
     enableDetailedLogging: false,
     socketTimeout: 5000,
     routes: [{
@@ -71,7 +69,7 @@ tap.test('should handle proxy chaining without connection accumulation', async (
   await new Promise<void>((resolve) => {
     const client = new net.Socket();
     
-    client.on('error', (err) => {
+    client.on('error', (err: NodeJS.ErrnoException) => {
       console.log(`Client received error: ${err.code}`);
       resolve();
     });
@@ -261,7 +259,6 @@ tap.test('should handle proxy chain with HTTP traffic', async () => {
   
   // Create SmartProxy2 with HTTP handling
   const proxy2 = new SmartProxy({
-    ports: [8583],
     useHttpProxy: [8583],  // Enable HTTP proxy handling
     httpProxyPort: 8584,
     enableDetailedLogging: false,
@@ -280,7 +277,6 @@ tap.test('should handle proxy chain with HTTP traffic', async () => {
   
   // Create SmartProxy1 with HTTP handling
   const proxy1 = new SmartProxy({
-    ports: [8582],
     useHttpProxy: [8582],  // Enable HTTP proxy handling
     httpProxyPort: 8585,
     enableDetailedLogging: false,

test/test.proxy-protocol.ts

@@ -130,4 +130,4 @@ tap.test('PROXY protocol v1 generator', async () => {
 // Skipping integration tests for now - focus on unit tests
 // Integration tests would require more complex setup and teardown
 
-tap.start();
+export default tap.start();

test/test.rapid-retry-cleanup.node.ts

@@ -10,7 +10,6 @@ tap.test('should handle rapid connection retries without leaking connections', a
   
   // Create a SmartProxy instance
   const proxy = new SmartProxy({
-    ports: [8550],
     enableDetailedLogging: false,
     maxConnectionLifetime: 10000,
     socketTimeout: 5000,
@@ -128,7 +127,6 @@ tap.test('should handle routing failures without leaking connections', async ()
   
   // Create a SmartProxy instance with no routes
   const proxy = new SmartProxy({
-    ports: [8551],
     enableDetailedLogging: false,
     maxConnectionLifetime: 10000,
     socketTimeout: 5000,
@@ -198,4 +196,4 @@ tap.test('should handle routing failures without leaking connections', async ()
   console.log('\n✅ PASS: Routing failures cleaned up correctly!');
 });
 
-tap.start();
+export default tap.start();

test/test.route-callback-simple.ts

@@ -113,4 +113,4 @@ tap.test('should set update routes callback on certificate manager', async () =>
   await proxy.stop();
 });
 
-tap.start();
+export default tap.start();

test/test.route-config.ts

@@ -26,7 +26,7 @@ import {
   isValidPort,
   hasRequiredPropertiesForAction,
   assertValidRoute
-} from '../ts/proxies/smart-proxy/utils/route-validators.js';
+} from '../ts/proxies/smart-proxy/utils/route-validator.js';
 
 import {
   createHttpRoute,
@@ -209,10 +209,10 @@ tap.test('SmartProxy: Should create instance with route-based config', async ()
       })
     ],
     defaults: {
-      targets: [{
+      target: {
         host: 'localhost',
         port: 8080
-      }],
+      },
       security: {
         ipAllowList: ['127.0.0.1', '192.168.0.*'],
         maxConnections: 100

test/test.route-security-unit.ts

@@ -58,4 +58,4 @@ tap.test('route security should be correctly configured', async () => {
   expect(isBlockedIPAllowed).toBeFalse();
 });
 
-tap.start();
+export default tap.start();

test/test.route-update-callback.node.ts

@@ -336,4 +336,4 @@ tap.test('real code integration test - verify fix is applied', async () => {
   console.log('Real code integration test passed - fix is correctly applied!');
 });
 
-tap.start();
+export default tap.start();

test/test.route-utils.ts

@@ -24,7 +24,7 @@ import {
   validateRouteAction,
   hasRequiredPropertiesForAction,
   assertValidRoute
-} from '../ts/proxies/smart-proxy/utils/route-validators.js';
+} from '../ts/proxies/smart-proxy/utils/route-validator.js';
 
 import {
   // Route utilities

test/test.shared-security-manager-limits.node.ts

@@ -154,4 +154,4 @@ tap.test('Cleanup SharedSecurityManager', async () => {
   securityManager.clearIPTracking();
 });
 
-tap.start();
+export default tap.start();

test/test.smartacme-integration.ts

@@ -51,4 +51,4 @@ tap.test('should verify SmartAcme cert managers are accessible', async () => {
   expect(memoryCertManager).toBeDefined();
 });
 
-tap.start();
+export default tap.start();

test/test.stuck-connection-cleanup.node.ts

@@ -141,4 +141,4 @@ tap.test('stuck connection cleanup - verify connections to hanging backends are
   console.log('✓ Test complete: Stuck connections are properly detected and cleaned up');
 });
 
-tap.start();
+export default tap.start();

test/test.websocket-keepalive.node.ts

@@ -7,7 +7,6 @@ tap.test('websocket keep-alive settings for SNI passthrough', async (tools) => {
   console.log('\n=== Test 1: Grace periods for encrypted connections ===');
   
   const proxy = new SmartProxy({
-    ports: [8443],
     keepAliveTreatment: 'extended',
     keepAliveInactivityMultiplier: 10,
     inactivityTimeout: 60000, // 1 minute for testing
@@ -100,7 +99,6 @@ tap.test('long-lived connection survival test', async (tools) => {
   
   // Create proxy with immortal keep-alive
   const proxy = new SmartProxy({
-    ports: [8444],
     keepAliveTreatment: 'immortal', // Never timeout
     routes: [
       {
@@ -150,9 +148,9 @@ tap.test('long-lived connection survival test', async (tools) => {
   clearInterval(pingInterval);
   client.destroy();
   await proxy.stop();
-  await new Promise<void>((resolve) => echoServer.close(resolve));
+  await new Promise<void>((resolve) => echoServer.close(() => resolve()));
   
   console.log('✅ Long-lived connection survived past 30-second timeout!');
 });
 
-tap.start();
+export default tap.start();

test/test.zombie-connection-cleanup.node.ts

@@ -43,7 +43,6 @@ tap.test('zombie connection cleanup - verify inactivity check detects and cleans
   
   // Create InnerProxy with faster inactivity check for testing
   const innerProxy = new SmartProxy({
-    ports: [8591],
     enableDetailedLogging: true,
     inactivityTimeout: 5000, // 5 seconds for faster testing
     inactivityCheckInterval: 1000, // Check every second
@@ -62,7 +61,6 @@ tap.test('zombie connection cleanup - verify inactivity check detects and cleans
   
   // Create OuterProxy with faster inactivity check
   const outerProxy = new SmartProxy({
-    ports: [8590],
     enableDetailedLogging: true,
     inactivityTimeout: 5000, // 5 seconds for faster testing
     inactivityCheckInterval: 1000, // Check every second
@@ -303,4 +301,4 @@ tap.test('zombie connection cleanup - verify inactivity check detects and cleans
   expect(details.inner.halfZombies.length).toEqual(0);
 });
 
-tap.start();
+export default tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '19.5.19',
+  version: '22.0.0',
   description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
 }

ts/core/models/socket-augmentation.ts

@@ -12,6 +12,11 @@ declare module 'net' {
     getTLSVersion?(): string;  // Returns the TLS version (e.g., 'TLSv1.2', 'TLSv1.3')
     getPeerCertificate?(detailed?: boolean): any;  // Returns the peer's certificate
     getSession?(): Buffer;   // Returns the TLS session data
+    
+    // Connection tracking properties (used by HttpProxy)
+    _connectionId?: string;   // Unique identifier for the connection
+    _remoteIP?: string;       // Remote IP address
+    _realRemoteIP?: string;   // Real remote IP (when proxied)
   }
 }
 

ts/core/utils/ip-utils.ts

@@ -21,13 +21,47 @@ export class IpUtils {
     const normalizedIPVariants = this.normalizeIP(ip);
     if (normalizedIPVariants.length === 0) return false;
 
-    // Normalize the pattern IPs for consistent comparison
-    const expandedPatterns = patterns.flatMap(pattern => this.normalizeIP(pattern));
+    // Check each pattern
+    for (const pattern of patterns) {
+      // Handle CIDR notation
+      if (pattern.includes('/')) {
+        if (this.matchCIDR(ip, pattern)) {
+          return true;
+        }
+        continue;
+      }
 
-    // Check for any match between normalized IP variants and patterns
-    return normalizedIPVariants.some((ipVariant) =>
-      expandedPatterns.some((pattern) => plugins.minimatch(ipVariant, pattern))
-    );
+      // Handle range notation
+      if (pattern.includes('-') && !pattern.includes('*')) {
+        if (this.matchIPRange(ip, pattern)) {
+          return true;
+        }
+        continue;
+      }
+
+      // Expand shorthand patterns for glob matching
+      let expandedPattern = pattern;
+      if (pattern.includes('*') && !pattern.includes(':')) {
+        const parts = pattern.split('.');
+        while (parts.length < 4) {
+          parts.push('*');
+        }
+        expandedPattern = parts.join('.');
+      }
+
+      // Normalize and check with minimatch
+      const normalizedPatterns = this.normalizeIP(expandedPattern);
+      
+      for (const ipVariant of normalizedIPVariants) {
+        for (const normalizedPattern of normalizedPatterns) {
+          if (plugins.minimatch(ipVariant, normalizedPattern)) {
+            return true;
+          }
+        }
+      }
+    }
+
+    return false;
   }
 
   /**
@@ -124,6 +158,100 @@ export class IpUtils {
     return !this.isPrivateIP(ip);
   }
 
+  /**
+   * Check if an IP matches a CIDR notation
+   * 
+   * @param ip The IP address to check
+   * @param cidr The CIDR notation (e.g., "192.168.1.0/24")
+   * @returns true if IP is within the CIDR range
+   */
+  private static matchCIDR(ip: string, cidr: string): boolean {
+    if (!cidr.includes('/')) return false;
+    
+    const [networkAddr, prefixStr] = cidr.split('/');
+    const prefix = parseInt(prefixStr, 10);
+    
+    // Handle IPv4-mapped IPv6 in the IP being checked
+    let checkIP = ip;
+    if (checkIP.startsWith('::ffff:')) {
+      checkIP = checkIP.slice(7);
+    }
+    
+    // Handle IPv6 CIDR
+    if (networkAddr.includes(':')) {
+      // TODO: Implement IPv6 CIDR matching
+      return false;
+    }
+    
+    // IPv4 CIDR matching
+    if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(checkIP)) return false;
+    if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(networkAddr)) return false;
+    if (isNaN(prefix) || prefix < 0 || prefix > 32) return false;
+    
+    const ipParts = checkIP.split('.').map(Number);
+    const netParts = networkAddr.split('.').map(Number);
+    
+    // Validate IP parts
+    for (const part of [...ipParts, ...netParts]) {
+      if (part < 0 || part > 255) return false;
+    }
+    
+    // Convert to 32-bit integers
+    const ipNum = (ipParts[0] << 24) | (ipParts[1] << 16) | (ipParts[2] << 8) | ipParts[3];
+    const netNum = (netParts[0] << 24) | (netParts[1] << 16) | (netParts[2] << 8) | netParts[3];
+    
+    // Create mask
+    const mask = (-1 << (32 - prefix)) >>> 0;
+    
+    // Check if IP is in network range
+    return (ipNum & mask) === (netNum & mask);
+  }
+
+  /**
+   * Check if an IP matches a range notation
+   * 
+   * @param ip The IP address to check
+   * @param range The range notation (e.g., "192.168.1.1-192.168.1.100")
+   * @returns true if IP is within the range
+   */
+  private static matchIPRange(ip: string, range: string): boolean {
+    if (!range.includes('-')) return false;
+    
+    const [startIP, endIP] = range.split('-').map(s => s.trim());
+    
+    // Handle IPv4-mapped IPv6 in the IP being checked
+    let checkIP = ip;
+    if (checkIP.startsWith('::ffff:')) {
+      checkIP = checkIP.slice(7);
+    }
+    
+    // Only handle IPv4 for now
+    if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(checkIP)) return false;
+    if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(startIP)) return false;
+    if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(endIP)) return false;
+    
+    const ipParts = checkIP.split('.').map(Number);
+    const startParts = startIP.split('.').map(Number);
+    const endParts = endIP.split('.').map(Number);
+    
+    // Validate parts
+    for (const part of [...ipParts, ...startParts, ...endParts]) {
+      if (part < 0 || part > 255) return false;
+    }
+    
+    // Convert to 32-bit integers for comparison
+    const ipNum = (ipParts[0] << 24) | (ipParts[1] << 16) | (ipParts[2] << 8) | ipParts[3];
+    const startNum = (startParts[0] << 24) | (startParts[1] << 16) | (startParts[2] << 8) | startParts[3];
+    const endNum = (endParts[0] << 24) | (endParts[1] << 16) | (endParts[2] << 8) | endParts[3];
+    
+    // Convert to unsigned for proper comparison
+    const ipUnsigned = ipNum >>> 0;
+    const startUnsigned = startNum >>> 0;
+    const endUnsigned = endNum >>> 0;
+    
+    return ipUnsigned >= startUnsigned && ipUnsigned <= endUnsigned;
+  }
+
   /**
    * Convert a subnet CIDR to an IP range for filtering
    * 

ts/core/utils/socket-tracker.ts

@@ -0,0 +1,63 @@
+/**
+ * Socket Tracker Utility
+ * Provides standardized socket cleanup with proper listener and timer management
+ */
+
+import type { Socket } from 'net';
+
+export type SocketTracked = {
+  cleanup: () => void;
+  addListener: <E extends string>(event: E, listener: (...args: any[]) => void) => void;
+  addTimer: (t: NodeJS.Timeout | null | undefined) => void;
+  safeDestroy: (reason?: Error) => void;
+};
+
+/**
+ * Create a socket tracker to manage listeners and timers
+ * Ensures proper cleanup and prevents memory leaks
+ */
+export function createSocketTracker(socket: Socket): SocketTracked {
+  const listeners: Array<{ event: string; listener: (...args: any[]) => void }> = [];
+  const timers: NodeJS.Timeout[] = [];
+  let cleaned = false;
+
+  const addListener = (event: string, listener: (...args: any[]) => void) => {
+    socket.on(event, listener);
+    listeners.push({ event, listener });
+  };
+
+  const addTimer = (t: NodeJS.Timeout | null | undefined) => {
+    if (!t) return;
+    timers.push(t);
+    // Unref timer so it doesn't keep process alive
+    if (typeof t.unref === 'function') {
+      t.unref();
+    }
+  };
+
+  const cleanup = () => {
+    if (cleaned) return;
+    cleaned = true;
+    
+    // Clear all tracked timers
+    for (const t of timers) {
+      clearTimeout(t);
+    }
+    timers.length = 0;
+    
+    // Remove all tracked listeners
+    for (const { event, listener } of listeners) {
+      socket.off(event, listener);
+    }
+    listeners.length = 0;
+  };
+
+  const safeDestroy = (reason?: Error) => {
+    cleanup();
+    if (!socket.destroyed) {
+      socket.destroy(reason);
+    }
+  };
+
+  return { cleanup, addListener, addTimer, safeDestroy };
+}

ts/detection/detectors/http-detector.ts

@@ -11,6 +11,7 @@ import type { THttpMethod } from '../../protocols/http/index.js';
 import { QuickProtocolDetector } from './quick-detector.js';
 import { RoutingExtractor } from './routing-extractor.js';
 import { DetectionFragmentManager } from '../utils/fragment-manager.js';
+import { HttpParser } from '../../protocols/http/parser.js';
 
 /**
  * Simplified HTTP detector
@@ -49,11 +50,26 @@ export class HttpDetector implements IProtocolDetector {
       return null;
     }
     
+    // Check if we have complete headers first
+    const headersEnd = buffer.indexOf('\r\n\r\n');
+    const isComplete = headersEnd !== -1;
+    
     // Extract routing information
     const routing = RoutingExtractor.extract(buffer, 'http');
     
-    // If we don't need full headers, we can return early
-    if (quickResult.confidence >= 95 && !options?.extractFullHeaders) {
+    // Extract headers if requested and we have complete headers
+    let headers: Record<string, string> | undefined;
+    if (options?.extractFullHeaders && isComplete) {
+      const headerSection = buffer.slice(0, headersEnd).toString();
+      const lines = headerSection.split('\r\n');
+      if (lines.length > 1) {
+        // Skip the request line and parse headers
+        headers = HttpParser.parseHeaders(lines.slice(1));
+      }
+    }
+    
+    // If we don't need full headers and we have complete headers, we can return early
+    if (quickResult.confidence >= 95 && !options?.extractFullHeaders && isComplete) {
       return {
         protocol: 'http',
         connectionInfo: { 
@@ -66,17 +82,14 @@ export class HttpDetector implements IProtocolDetector {
       };
     }
     
-    // Check if we have complete headers
-    const headersEnd = buffer.indexOf('\r\n\r\n');
-    const isComplete = headersEnd !== -1;
-    
     return {
       protocol: 'http',
       connectionInfo: {
         protocol: 'http',
         domain: routing?.domain,
         path: routing?.path,
-        method: quickResult.metadata?.method as THttpMethod
+        method: quickResult.metadata?.method as THttpMethod,
+        headers: headers
       },
       isComplete,
       bytesNeeded: isComplete ? undefined : buffer.length + 512 // Need more for headers

ts/detection/detectors/tls-detector.ts

@@ -5,7 +5,7 @@
 // TLS detector doesn't need plugins imports
 import type { IProtocolDetector } from '../models/interfaces.js';
 import type { IDetectionResult, IDetectionOptions, IConnectionInfo } from '../models/detection-types.js';
-import { readUInt16BE, BufferAccumulator } from '../utils/buffer-utils.js';
+import { readUInt16BE } from '../utils/buffer-utils.js';
 import { tlsVersionToString } from '../utils/parser-utils.js';
 
 // Import from protocols
@@ -24,17 +24,6 @@ export class TlsDetector implements IProtocolDetector {
    */
   private static readonly MIN_TLS_HEADER_SIZE = 5;
   
-  /**
-   * Fragment tracking for incomplete handshakes
-   */
-  private static fragmentedBuffers = new Map<string, BufferAccumulator>();
-  
-  /**
-   * Create connection ID from context
-   */
-  private createConnectionId(context: { sourceIp?: string; sourcePort?: number; destIp?: string; destPort?: number }): string {
-    return `${context.sourceIp || 'unknown'}:${context.sourcePort || 0}->${context.destIp || 'unknown'}:${context.destPort || 0}`;
-  }
   
   /**
    * Detect TLS protocol from buffer
@@ -224,29 +213,11 @@ export class TlsDetector implements IProtocolDetector {
    */
   detectWithContext(
     buffer: Buffer,
-    context: { sourceIp?: string; sourcePort?: number; destIp?: string; destPort?: number },
+    _context: { sourceIp?: string; sourcePort?: number; destIp?: string; destPort?: number },
     options?: IDetectionOptions
   ): IDetectionResult | null {
-    const connectionId = this.createConnectionId(context);
-    
-    // Get or create buffer accumulator for this connection
-    let accumulator = TlsDetector.fragmentedBuffers.get(connectionId);
-    if (!accumulator) {
-      accumulator = new BufferAccumulator();
-      TlsDetector.fragmentedBuffers.set(connectionId, accumulator);
-    }
-    
-    // Add new data
-    accumulator.append(buffer);
-    
-    // Try detection on accumulated data
-    const result = this.detect(accumulator.getBuffer(), options);
-    
-    // If detection is complete or we have too much data, clean up
-    if (result?.isComplete || accumulator.length() > 65536) {
-      TlsDetector.fragmentedBuffers.delete(connectionId);
-    }
-    
-    return result;
+    // This method is deprecated - TLS detection should use the fragment manager
+    // from the parent detector system, not maintain its own fragments
+    return this.detect(buffer, options);
   }
 }

ts/detection/protocol-detector.ts

@@ -18,6 +18,7 @@ export class ProtocolDetector {
   private fragmentManager: DetectionFragmentManager;
   private tlsDetector: TlsDetector;
   private httpDetector: HttpDetector;
+  private connectionProtocols: Map<string, 'tls' | 'http'> = new Map();
   
   constructor() {
     this.fragmentManager = new DetectionFragmentManager();
@@ -120,18 +121,82 @@ export class ProtocolDetector {
       };
     }
     
-    // First peek to determine protocol type
-    if (this.tlsDetector.canHandle(buffer)) {
-      const result = this.tlsDetector.detectWithContext(buffer, context, options);
+    const connectionId = DetectionFragmentManager.createConnectionId(context);
+    
+    // Check if we already know the protocol for this connection
+    const knownProtocol = this.connectionProtocols.get(connectionId);
+    
+    if (knownProtocol === 'http') {
+      const result = this.httpDetector.detectWithContext(buffer, context, options);
       if (result) {
+        if (result.isComplete) {
+          this.connectionProtocols.delete(connectionId);
+        }
+        return result;
+      }
+    } else if (knownProtocol === 'tls') {
+      // Handle TLS with fragment accumulation
+      const handler = this.fragmentManager.getHandler('tls');
+      const fragmentResult = handler.addFragment(connectionId, buffer);
+      
+      if (fragmentResult.error) {
+        handler.complete(connectionId);
+        this.connectionProtocols.delete(connectionId);
+        return {
+          protocol: 'unknown',
+          connectionInfo: { protocol: 'unknown' },
+          isComplete: true
+        };
+      }
+      
+      const result = this.tlsDetector.detect(fragmentResult.buffer!, options);
+      if (result) {
+        if (result.isComplete) {
+          handler.complete(connectionId);
+          this.connectionProtocols.delete(connectionId);
+        }
         return result;
       }
     }
     
-    if (this.httpDetector.canHandle(buffer)) {
-      const result = this.httpDetector.detectWithContext(buffer, context, options);
-      if (result) {
-        return result;
+    // If we don't know the protocol yet, try to detect it
+    if (!knownProtocol) {
+      // First peek to determine protocol type
+      if (this.tlsDetector.canHandle(buffer)) {
+        this.connectionProtocols.set(connectionId, 'tls');
+        // Handle TLS with fragment accumulation
+        const handler = this.fragmentManager.getHandler('tls');
+        const fragmentResult = handler.addFragment(connectionId, buffer);
+        
+        if (fragmentResult.error) {
+          handler.complete(connectionId);
+          this.connectionProtocols.delete(connectionId);
+          return {
+            protocol: 'unknown',
+            connectionInfo: { protocol: 'unknown' },
+            isComplete: true
+          };
+        }
+        
+        const result = this.tlsDetector.detect(fragmentResult.buffer!, options);
+        if (result) {
+          if (result.isComplete) {
+            handler.complete(connectionId);
+            this.connectionProtocols.delete(connectionId);
+          }
+          return result;
+        }
+      }
+      
+      if (this.httpDetector.canHandle(buffer)) {
+        this.connectionProtocols.set(connectionId, 'http');
+        const result = this.httpDetector.detectWithContext(buffer, context, options);
+        if (result) {
+          if (result.isComplete) {
+            this.connectionProtocols.delete(connectionId);
+          }
+          return result;
+        }
       }
     }
     
@@ -168,18 +233,34 @@ export class ProtocolDetector {
   
   private destroyInstance(): void {
     this.fragmentManager.destroy();
+    this.connectionProtocols.clear();
   }
   
   /**
    * Clean up old connection tracking entries
    * 
-   * @param maxAge Maximum age in milliseconds (default: 30 seconds)
+   * @param _maxAge Maximum age in milliseconds (default: 30 seconds)
    */
-  static cleanupConnections(maxAge: number = 30000): void {
+  static cleanupConnections(_maxAge: number = 30000): void {
     // Cleanup is now handled internally by the fragment manager
     this.getInstance().fragmentManager.cleanup();
   }
   
+  /**
+   * Clean up fragments for a specific connection
+   */
+  static cleanupConnection(context: IConnectionContext): void {
+    const instance = this.getInstance();
+    const connectionId = DetectionFragmentManager.createConnectionId(context);
+    
+    // Clean up both TLS and HTTP fragments for this connection
+    instance.fragmentManager.getHandler('tls').complete(connectionId);
+    instance.fragmentManager.getHandler('http').complete(connectionId);
+    
+    // Remove from connection protocols tracking
+    instance.connectionProtocols.delete(connectionId);
+  }
+  
   /**
    * Extract domain from connection info
    */

ts/proxies/http-proxy/http-proxy.ts

@@ -35,7 +35,7 @@ export class HttpProxy implements IMetricsTracker {
   public routes: IRouteConfig[] = [];
 
   // Server instances (HTTP/2 with HTTP/1 fallback)
-  public httpsServer: any;
+  public httpsServer: plugins.http2.Http2SecureServer;
 
   // Core components
   private certificateManager: CertificateManager;
@@ -196,8 +196,9 @@ export class HttpProxy implements IMetricsTracker {
       this.options.keepAliveTimeout = keepAliveTimeout;
       
       if (this.httpsServer) {
-        this.httpsServer.keepAliveTimeout = keepAliveTimeout;
-        this.logger.info(`Updated keep-alive timeout to ${keepAliveTimeout}ms`);
+        // HTTP/2 servers have setTimeout method for timeout management
+        this.httpsServer.setTimeout(keepAliveTimeout);
+        this.logger.info(`Updated server timeout to ${keepAliveTimeout}ms`);
       }
     }
     
@@ -249,18 +250,19 @@ export class HttpProxy implements IMetricsTracker {
     this.setupConnectionTracking();
 
     // Handle incoming HTTP/2 streams
-    this.httpsServer.on('stream', (stream: any, headers: any) => {
+    this.httpsServer.on('stream', (stream: plugins.http2.ServerHttp2Stream, headers: plugins.http2.IncomingHttpHeaders) => {
       this.requestHandler.handleHttp2(stream, headers);
     });
     // Handle HTTP/1.x fallback requests
-    this.httpsServer.on('request', (req: any, res: any) => {
+    this.httpsServer.on('request', (req: plugins.http.IncomingMessage, res: plugins.http.ServerResponse) => {
       this.requestHandler.handleRequest(req, res);
     });
 
     // Share server with certificate manager for dynamic contexts
-    this.certificateManager.setHttpsServer(this.httpsServer);
+    // Cast to https.Server as Http2SecureServer is compatible for certificate contexts
+    this.certificateManager.setHttpsServer(this.httpsServer as any);
     // Setup WebSocket support on HTTP/1 fallback
-    this.webSocketHandler.initialize(this.httpsServer);
+    this.webSocketHandler.initialize(this.httpsServer as any);
     // Start metrics logging
     this.setupMetricsCollection();
     // Start periodic connection pool cleanup
@@ -275,6 +277,21 @@ export class HttpProxy implements IMetricsTracker {
     });
   }
 
+  /**
+   * Check if an address is a loopback address (IPv4 or IPv6)
+   */
+  private isLoopback(addr?: string): boolean {
+    if (!addr) return false;
+    // Check for IPv6 loopback
+    if (addr === '::1') return true;
+    // Handle IPv6-mapped IPv4 addresses
+    if (addr.startsWith('::ffff:')) {
+      addr = addr.substring(7);
+    }
+    // Check for IPv4 loopback range (127.0.0.0/8)
+    return addr.startsWith('127.');
+  }
+
   /**
    * Sets up tracking of TCP connections
    */
@@ -282,30 +299,47 @@ export class HttpProxy implements IMetricsTracker {
     this.httpsServer.on('connection', (connection: plugins.net.Socket) => {
       let remoteIP = connection.remoteAddress || '';
       const connectionId = Math.random().toString(36).substring(2, 15);
-      const isFromSmartProxy = this.options.portProxyIntegration && connection.remoteAddress?.includes('127.0.0.1');
+      const isFromSmartProxy = this.options.portProxyIntegration && this.isLoopback(connection.remoteAddress);
       
       // For SmartProxy connections, wait for CLIENT_IP header
       if (isFromSmartProxy) {
-        let headerBuffer = Buffer.alloc(0);
-        let headerParsed = false;
+        const MAX_PREFACE = 256; // bytes - prevent DoS
+        const HEADER_TIMEOUT_MS = 2000; // timeout for header parsing (increased for slow networks)
+        let headerTimer: NodeJS.Timeout | undefined;
+        let buffered = Buffer.alloc(0);
 
-        const parseHeader = (data: Buffer) => {
-          if (headerParsed) return data;
+        const onData = (chunk: Buffer) => {
+          buffered = Buffer.concat([buffered, chunk]);
           
-          headerBuffer = Buffer.concat([headerBuffer, data]);
-          const headerStr = headerBuffer.toString();
-          const headerEnd = headerStr.indexOf('\r\n');
+          // Prevent unbounded growth
+          if (buffered.length > MAX_PREFACE) {
+            connection.removeListener('data', onData);
+            if (headerTimer) clearTimeout(headerTimer);
+            this.logger.warn('Header preface too large, closing connection');
+            connection.destroy();
+            return;
+          }
           
-          if (headerEnd !== -1) {
-            const header = headerStr.substring(0, headerEnd);
-            if (header.startsWith('CLIENT_IP:')) {
-              remoteIP = header.substring(10); // Extract IP after "CLIENT_IP:"
+          const idx = buffered.indexOf('\r\n');
+          if (idx !== -1) {
+            const headerLine = buffered.slice(0, idx).toString('utf8');
+            if (headerLine.startsWith('CLIENT_IP:')) {
+              remoteIP = headerLine.substring(10).trim();
               this.logger.debug(`Extracted client IP from SmartProxy: ${remoteIP}`);
             }
-            headerParsed = true;
+            
+            // Clean up listener and timer
+            connection.removeListener('data', onData);
+            if (headerTimer) clearTimeout(headerTimer);
+            
+            // Put remaining data back onto the stream
+            const remaining = buffered.slice(idx + 2);
+            if (remaining.length > 0) {
+              connection.unshift(remaining);
+            }
             
             // Store the real IP on the connection
-            (connection as any)._realRemoteIP = remoteIP;
+            connection._realRemoteIP = remoteIP;
             
             // Validate the real IP
             const ipValidation = this.securityManager.validateIP(remoteIP);
@@ -318,35 +352,26 @@ export class HttpProxy implements IMetricsTracker {
                 remoteIP
               );
               connection.destroy();
-              return null;
+              return;
             }
             
             // Track connection by real IP
             this.securityManager.trackConnectionByIP(remoteIP, connectionId);
-            
-            // Return remaining data after header
-            return headerBuffer.slice(headerEnd + 2);
           }
-          return null;
         };
 
-        // Override the first data handler to parse header
-        const originalEmit = connection.emit;
-        connection.emit = function(event: string, ...args: any[]) {
-          if (event === 'data' && !headerParsed) {
-            const remaining = parseHeader(args[0]);
-            if (remaining && remaining.length > 0) {
-              // Call original emit with remaining data
-              return originalEmit.apply(connection, ['data', remaining]);
-            } else if (headerParsed) {
-              // Header parsed but no remaining data
-              return true;
-            }
-            // Header not complete yet, suppress this data event
-            return true;
-          }
-          return originalEmit.apply(connection, [event, ...args]);
-        } as any;
+        // Set timeout for header parsing
+        headerTimer = setTimeout(() => {
+          connection.removeListener('data', onData);
+          this.logger.warn('Header parsing timeout, closing connection');
+          connection.destroy();
+        }, HEADER_TIMEOUT_MS);
+        
+        // Unref the timer so it doesn't keep the process alive
+        if (headerTimer.unref) headerTimer.unref();
+
+        // Use prependListener to get data first
+        connection.prependListener('data', onData);
       } else {
         // Direct connection - validate immediately
         const ipValidation = this.securityManager.validateIP(remoteIP);
@@ -385,8 +410,8 @@ export class HttpProxy implements IMetricsTracker {
       }
       
       // Add connection to tracking with metadata
-      (connection as any)._connectionId = connectionId;
-      (connection as any)._remoteIP = remoteIP;
+      connection._connectionId = connectionId;
+      connection._remoteIP = remoteIP;
       this.socketMap.add(connection);
       this.connectedClients = this.socketMap.getArray().length;
       
@@ -409,8 +434,8 @@ export class HttpProxy implements IMetricsTracker {
           this.connectedClients = this.socketMap.getArray().length;
           
           // Remove IP tracking
-          const connId = (connection as any)._connectionId;
-          const connIP = (connection as any)._realRemoteIP || (connection as any)._remoteIP;
+          const connId = connection._connectionId;
+          const connIP = connection._realRemoteIP || connection._remoteIP;
           if (connId && connIP) {
             this.securityManager.removeConnectionByIP(connIP, connId);
           }

ts/proxies/nftables-proxy/nftables-proxy.ts

@@ -76,7 +76,8 @@ export class NfTablesProxy {
 
     // Register cleanup handlers if deleteOnExit is true
     if (this.settings.deleteOnExit) {
-      const cleanup = () => {
+      // Synchronous cleanup for 'exit' event (only sync code runs here)
+      const syncCleanup = () => {
         try {
           this.stopSync();
         } catch (err) {
@@ -84,14 +85,21 @@ export class NfTablesProxy {
         }
       };
 
-      process.on('exit', cleanup);
+      // Async cleanup for signal handlers (preferred, non-blocking)
+      const asyncCleanup = async () => {
+        try {
+          await this.stop();
+        } catch (err) {
+          this.log('error', 'Error cleaning nftables rules on signal:', { error: err.message });
+        }
+      };
+
+      process.on('exit', syncCleanup);
       process.on('SIGINT', () => {
-        cleanup();
-        process.exit();
+        asyncCleanup().finally(() => process.exit());
       });
       process.on('SIGTERM', () => {
-        cleanup();
-        process.exit();
+        asyncCleanup().finally(() => process.exit());
       });
     }
   }
@@ -219,37 +227,17 @@ export class NfTablesProxy {
   }
 
   /**
-   * Execute system command synchronously with multiple attempts
-   * @deprecated This method blocks the event loop and should be avoided. Use executeWithRetry instead.
-   * WARNING: This method contains a busy wait loop that will block the entire Node.js event loop!
+   * Execute system command synchronously (single attempt, no retry)
+   * Used only for exit handlers where the process is terminating anyway.
+   * For normal operations, use the async executeWithRetry method.
    */
-  private executeWithRetrySync(command: string, maxRetries = 3, retryDelayMs = 1000): string {
-    // Log deprecation warning
-    console.warn('[DEPRECATION WARNING] executeWithRetrySync blocks the event loop and should not be used. Consider using the async executeWithRetry method instead.');
-    
-    let lastError: Error | undefined;
-    
-    for (let i = 0; i < maxRetries; i++) {
-      try {
-        return execSync(command).toString();
-      } catch (err) {
-        lastError = err;
-        this.log('warn', `Command failed (attempt ${i+1}/${maxRetries}): ${command}`, { error: err.message });
-        
-        // Wait before retry, unless it's the last attempt
-        if (i < maxRetries - 1) {
-          // CRITICAL: This busy wait loop blocks the entire event loop!
-          // This is a temporary fallback for sync contexts only.
-          // TODO: Remove this method entirely and make all callers async
-          const waitUntil = Date.now() + retryDelayMs;
-          while (Date.now() < waitUntil) {
-            // Busy wait - blocks event loop
-          }
-        }
-      }
+  private executeSync(command: string): string {
+    try {
+      return execSync(command, { timeout: 5000 }).toString();
+    } catch (err) {
+      this.log('warn', `Sync command failed: ${command}`, { error: err.message });
+      throw err;
     }
-    
-    throw new NftExecutionError(`Failed after ${maxRetries} attempts: ${lastError?.message || 'Unknown error'}`);
   }
 
   /**
@@ -1649,7 +1637,8 @@ export class NfTablesProxy {
   }
 
   /**
-   * Synchronous version of stop, for use in exit handlers
+   * Synchronous version of stop, for use in exit handlers only.
+   * Uses single-attempt commands without retry (process is exiting anyway).
    */
   public stopSync(): void {
     try {
@@ -1671,12 +1660,8 @@ export class NfTablesProxy {
         // Write to temporary file
         fs.writeFileSync(this.tempFilePath, rulesetContent);
 
-        // Apply the ruleset
-        this.executeWithRetrySync(
-          `${NfTablesProxy.NFT_CMD} -f ${this.tempFilePath}`,
-          this.settings.maxRetries,
-          this.settings.retryDelayMs
-        );
+        // Apply the ruleset (single attempt, no retry - process is exiting)
+        this.executeSync(`${NfTablesProxy.NFT_CMD} -f ${this.tempFilePath}`);
 
         this.log('info', 'Removed all added rules');
 
@@ -1687,7 +1672,11 @@ export class NfTablesProxy {
         });
 
         // Remove temporary file
-        fs.unlinkSync(this.tempFilePath);
+        try {
+          fs.unlinkSync(this.tempFilePath);
+        } catch {
+          // Ignore - process is exiting
+        }
       }
 
       // Clean up IP sets if we created any
@@ -1696,12 +1685,10 @@ export class NfTablesProxy {
           const [family, setName] = key.split(':');
 
           try {
-            this.executeWithRetrySync(
-              `${NfTablesProxy.NFT_CMD} delete set ${family} ${this.tableName} ${setName}`,
-              this.settings.maxRetries,
-              this.settings.retryDelayMs
+            this.executeSync(
+              `${NfTablesProxy.NFT_CMD} delete set ${family} ${this.tableName} ${setName}`
             );
-          } catch (err) {
+          } catch {
             // Non-critical error, continue
           }
         }
@@ -1760,7 +1747,7 @@ export class NfTablesProxy {
   }
 
   /**
-   * Synchronous version of cleanupEmptyTables
+   * Synchronous version of cleanupEmptyTables (for exit handlers only)
    */
   private cleanupEmptyTablesSync(): void {
     // Check if tables are empty, and if so, delete them
@@ -1772,10 +1759,8 @@ export class NfTablesProxy {
 
       try {
         // Check if table exists
-        const tableExistsOutput = this.executeWithRetrySync(
-          `${NfTablesProxy.NFT_CMD} list tables ${family}`,
-          this.settings.maxRetries,
-          this.settings.retryDelayMs
+        const tableExistsOutput = this.executeSync(
+          `${NfTablesProxy.NFT_CMD} list tables ${family}`
         );
 
         const tableExists = tableExistsOutput.includes(`table ${family} ${this.tableName}`);
@@ -1785,20 +1770,16 @@ export class NfTablesProxy {
         }
 
         // Check if the table has any rules
-        const stdout = this.executeWithRetrySync(
-          `${NfTablesProxy.NFT_CMD} list table ${family} ${this.tableName}`,
-          this.settings.maxRetries,
-          this.settings.retryDelayMs
+        const stdout = this.executeSync(
+          `${NfTablesProxy.NFT_CMD} list table ${family} ${this.tableName}`
         );
 
         const hasRules = stdout.includes('rule');
 
         if (!hasRules) {
           // Table is empty, delete it
-          this.executeWithRetrySync(
-            `${NfTablesProxy.NFT_CMD} delete table ${family} ${this.tableName}`,
-            this.settings.maxRetries,
-            this.settings.retryDelayMs
+          this.executeSync(
+            `${NfTablesProxy.NFT_CMD} delete table ${family} ${this.tableName}`
           );
 
           this.log('info', `Deleted empty table ${family} ${this.tableName}`);

ts/proxies/smart-proxy/certificate-manager.ts

@@ -110,6 +110,14 @@ export class SmartCertManager {
     this.certProvisionFallbackToAcme = fallback;
   }
   
+  /**
+   * Update the routes array to keep it in sync with SmartProxy
+   * This prevents stale route data when adding/removing challenge routes
+   */
+  public setRoutes(routes: IRouteConfig[]): void {
+    this.routes = routes;
+  }
+  
   /**
    * Set callback for updating routes (used for challenge routes)
    */
@@ -381,25 +389,25 @@ export class SmartCertManager {
       let cert: string = certConfig.cert;
       
       // Load from files if paths are provided
+      const smartFileFactory = plugins.smartfile.SmartFileFactory.nodeFs();
       if (certConfig.keyFile) {
-        const keyFile = await plugins.smartfile.SmartFile.fromFilePath(certConfig.keyFile);
+        const keyFile = await smartFileFactory.fromFilePath(certConfig.keyFile);
         key = keyFile.contents.toString();
       }
       if (certConfig.certFile) {
-        const certFile = await plugins.smartfile.SmartFile.fromFilePath(certConfig.certFile);
+        const certFile = await smartFileFactory.fromFilePath(certConfig.certFile);
         cert = certFile.contents.toString();
       }
       
       // Parse certificate to get dates
-      // Parse certificate to get dates - for now just use defaults
-      // TODO: Implement actual certificate parsing if needed
-      const certInfo = { validTo: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000), validFrom: new Date() };
+      const expiryDate = this.extractExpiryDate(cert);
+      const issueDate = new Date(); // Current date as issue date
       
       const certData: ICertificateData = {
         cert,
         key,
-        expiryDate: certInfo.validTo,
-        issueDate: certInfo.validFrom,
+        expiryDate,
+        issueDate,
         source: 'static'
       };
       
@@ -573,6 +581,8 @@ export class SmartCertManager {
       // With the re-ordering of start(), port binding should already be done
       // This updateRoutes call should just add the route without binding again
       await this.updateRoutesCallback(updatedRoutes);
+      // Keep local routes in sync after updating
+      this.routes = updatedRoutes;
       this.challengeRouteActive = true;
       
       // Register with state manager
@@ -662,6 +672,8 @@ export class SmartCertManager {
     try {
       const filteredRoutes = this.routes.filter(r => r.name !== 'acme-challenge');
       await this.updateRoutesCallback(filteredRoutes);
+      // Keep local routes in sync after updating
+      this.routes = filteredRoutes;
       this.challengeRouteActive = false;
       
       // Remove from state manager
@@ -697,6 +709,11 @@ export class SmartCertManager {
       this.checkAndRenewCertificates();
     }, 12 * 60 * 60 * 1000);
     
+    // Unref the timer so it doesn't keep the process alive
+    if (this.renewalTimer.unref) {
+      this.renewalTimer.unref();
+    }
+    
     // Also do an immediate check
     this.checkAndRenewCertificates();
   }

ts/proxies/smart-proxy/connection-manager.ts

@@ -5,6 +5,7 @@ import { connectionLogDeduplicator } from '../../core/utils/log-deduplicator.js'
 import { LifecycleComponent } from '../../core/utils/lifecycle-component.js';
 import { cleanupSocket } from '../../core/utils/socket-utils.js';
 import { WrappedSocket } from '../../core/models/wrapped-socket.js';
+import { ProtocolDetector } from '../../detection/index.js';
 import type { SmartProxy } from './smart-proxy.js';
 
 /**
@@ -323,6 +324,18 @@ export class ConnectionManager extends LifecycleComponent {
         this.smartProxy.metricsCollector.removeConnection(record.id);
       }
 
+      // Clean up protocol detection fragments
+      const context = ProtocolDetector.createConnectionContext({
+        sourceIp: record.remoteIP,
+        sourcePort: record.incoming?.remotePort || 0,
+        destIp: record.incoming?.localAddress || '',
+        destPort: record.localPort,
+        socketId: record.id
+      });
+      
+      // Clean up any pending detection fragments for this connection
+      ProtocolDetector.cleanupConnection(context);
+
       if (record.cleanupTimer) {
         clearTimeout(record.cleanupTimer);
         record.cleanupTimer = undefined;

ts/proxies/smart-proxy/http-proxy-bridge.ts

@@ -110,16 +110,45 @@ export class HttpProxyBridge {
       throw new Error('HttpProxy not initialized');
     }
 
+    // Check if client socket is already destroyed before proceeding
+    const underlyingSocket = socket instanceof WrappedSocket ? socket.socket : socket;
+    if (underlyingSocket.destroyed) {
+      console.log(`[${connectionId}] Client socket already destroyed, skipping HttpProxy forwarding`);
+      cleanupCallback('client_disconnected_before_proxy');
+      return;
+    }
+
     const proxySocket = new plugins.net.Socket();
 
-    await new Promise<void>((resolve, reject) => {
-      proxySocket.connect(httpProxyPort, 'localhost', () => {
-        console.log(`[${connectionId}] Connected to HttpProxy for termination`);
-        resolve();
-      });
+    // Handle client disconnect during proxy connection setup
+    const clientDisconnectHandler = () => {
+      console.log(`[${connectionId}] Client disconnected during HttpProxy connection setup`);
+      proxySocket.destroy();
+      cleanupCallback('client_disconnected_during_setup');
+    };
+    underlyingSocket.once('close', clientDisconnectHandler);
 
-      proxySocket.on('error', reject);
-    });
+    try {
+      await new Promise<void>((resolve, reject) => {
+        proxySocket.connect(httpProxyPort, 'localhost', () => {
+          console.log(`[${connectionId}] Connected to HttpProxy for termination`);
+          resolve();
+        });
+
+        proxySocket.on('error', reject);
+      });
+    } finally {
+      // Remove the disconnect handler after connection attempt
+      underlyingSocket.removeListener('close', clientDisconnectHandler);
+    }
+
+    // Double-check client socket is still connected after async operation
+    if (underlyingSocket.destroyed) {
+      console.log(`[${connectionId}] Client disconnected while connecting to HttpProxy`);
+      proxySocket.destroy();
+      cleanupCallback('client_disconnected_after_proxy_connect');
+      return;
+    }
     
     // Send client IP information header first (custom protocol)
     // Format: "CLIENT_IP:<ip>\r\n"
@@ -136,10 +165,7 @@ export class HttpProxyBridge {
       proxySocket.write(initialChunk);
     }
     
-    // Use centralized bidirectional forwarding
-    // Extract underlying socket if it's a WrappedSocket
-    const underlyingSocket = socket instanceof WrappedSocket ? socket.socket : socket;
-    
+    // Use centralized bidirectional forwarding (underlyingSocket already extracted above)
     setupBidirectionalForwarding(underlyingSocket, proxySocket, {
       onClientData: (chunk) => {
         // Update stats - this is the ONLY place bytes are counted for HttpProxy connections

ts/proxies/smart-proxy/index.ts

@@ -20,6 +20,7 @@ export { HttpProxyBridge } from './http-proxy-bridge.js';
 export { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
 export { RouteConnectionHandler } from './route-connection-handler.js';
 export { NFTablesManager } from './nftables-manager.js';
+export { RouteOrchestrator } from './route-orchestrator.js';
 
 // Export certificate management
 export { SmartCertManager } from './certificate-manager.js';

ts/proxies/smart-proxy/metrics-collector.ts

@@ -33,6 +33,11 @@ export class MetricsCollector implements IMetrics {
   private readonly sampleIntervalMs: number;
   private readonly retentionSeconds: number;
   
+  // Track connection durations for percentile calculations
+  private connectionDurations: number[] = [];
+  private bytesInArray: number[] = [];
+  private bytesOutArray: number[] = [];
+  
   constructor(
     private smartProxy: SmartProxy,
     config?: {
@@ -211,21 +216,39 @@ export class MetricsCollector implements IMetrics {
     }
   };
   
-  // Percentiles implementation (placeholder for now)
+  // Helper to calculate percentiles from an array
+  private calculatePercentile(arr: number[], percentile: number): number {
+    if (arr.length === 0) return 0;
+    const sorted = [...arr].sort((a, b) => a - b);
+    const index = Math.floor((sorted.length - 1) * percentile);
+    return sorted[index];
+  }
+  
+  // Percentiles implementation
   public percentiles = {
     connectionDuration: (): { p50: number; p95: number; p99: number } => {
-      // TODO: Implement percentile calculations
-      return { p50: 0, p95: 0, p99: 0 };
+      return {
+        p50: this.calculatePercentile(this.connectionDurations, 0.5),
+        p95: this.calculatePercentile(this.connectionDurations, 0.95),
+        p99: this.calculatePercentile(this.connectionDurations, 0.99)
+      };
     },
     
     bytesTransferred: (): { 
       in: { p50: number; p95: number; p99: number };
       out: { p50: number; p95: number; p99: number };
     } => {
-      // TODO: Implement percentile calculations
       return {
-        in: { p50: 0, p95: 0, p99: 0 },
-        out: { p50: 0, p95: 0, p99: 0 }
+        in: {
+          p50: this.calculatePercentile(this.bytesInArray, 0.5),
+          p95: this.calculatePercentile(this.bytesInArray, 0.95),
+          p99: this.calculatePercentile(this.bytesInArray, 0.99)
+        },
+        out: {
+          p50: this.calculatePercentile(this.bytesOutArray, 0.5),
+          p95: this.calculatePercentile(this.bytesOutArray, 0.95),
+          p99: this.calculatePercentile(this.bytesOutArray, 0.99)
+        }
       };
     }
   };
@@ -298,6 +321,30 @@ export class MetricsCollector implements IMetrics {
    * Clean up tracking for a closed connection
    */
   public removeConnection(connectionId: string): void {
+    const tracker = this.connectionByteTrackers.get(connectionId);
+    if (tracker) {
+      // Calculate connection duration
+      const duration = Date.now() - tracker.startTime;
+      
+      // Add to arrays for percentile calculations (bounded to prevent memory growth)
+      const MAX_SAMPLES = 5000;
+      
+      this.connectionDurations.push(duration);
+      if (this.connectionDurations.length > MAX_SAMPLES) {
+        this.connectionDurations.shift();
+      }
+      
+      this.bytesInArray.push(tracker.bytesIn);
+      if (this.bytesInArray.length > MAX_SAMPLES) {
+        this.bytesInArray.shift();
+      }
+      
+      this.bytesOutArray.push(tracker.bytesOut);
+      if (this.bytesOutArray.length > MAX_SAMPLES) {
+        this.bytesOutArray.shift();
+      }
+    }
+    
     this.connectionByteTrackers.delete(connectionId);
   }
   
@@ -349,6 +396,11 @@ export class MetricsCollector implements IMetrics {
       }
     }, this.sampleIntervalMs);
     
+    // Unref the interval so it doesn't keep the process alive
+    if (this.samplingInterval.unref) {
+      this.samplingInterval.unref();
+    }
+    
     // Subscribe to new connections
     this.connectionSubscription = this.smartProxy.routeConnectionHandler.newConnectionSubject.subscribe({
       next: (record) => {

ts/proxies/smart-proxy/models/interfaces.ts

@@ -89,7 +89,6 @@ export interface ISmartProxyOptions {
   enableDetailedLogging?: boolean; // Enable detailed connection logging
   enableTlsDebugLogging?: boolean; // Enable TLS handshake debug logging
   enableRandomizedTimeouts?: boolean; // Randomize timeouts slightly to prevent thundering herd
-  allowSessionTicket?: boolean; // Allow TLS session ticket for reconnection (default: true)
 
   // Rate limiting and security
   maxConnectionsPerIP?: number; // Maximum simultaneous connections from a single IP

ts/proxies/smart-proxy/route-connection-handler.ts

@@ -192,6 +192,20 @@ export class RouteConnectionHandler {
               route.action.tls.mode === 'passthrough');
     });
 
+    // Auto-calculate session ticket handling based on route configuration
+    // If any route on this port terminates TLS, allow session tickets (HttpProxy handles resumption)
+    // Otherwise, block session tickets (need SNI for passthrough routing)
+    const hasTlsTermination = allRoutes.some(route => {
+      const matchesPort = this.smartProxy.routeManager.getRoutesForPort(localPort).includes(route);
+
+      return matchesPort &&
+             route.action.type === 'forward' &&
+             route.action.tls &&
+             (route.action.tls.mode === 'terminate' ||
+              route.action.tls.mode === 'terminate-and-reencrypt');
+    });
+    const allowSessionTicket = hasTlsTermination;
+
     // If no routes require TLS handling and it's not port 443, route immediately
     if (!needsTlsHandling && localPort !== 443) {
       // Extract underlying socket for socket-utils functions
@@ -303,18 +317,18 @@ export class RouteConnectionHandler {
 
     // Handler for processing initial data (after potential PROXY protocol)
     const processInitialData = async (chunk: Buffer) => {
-      // Use ProtocolDetector to identify protocol
-      const connectionId = ProtocolDetector.createConnectionId({
+      // Create connection context for protocol detection
+      const context = ProtocolDetector.createConnectionContext({
         sourceIp: record.remoteIP,
-        sourcePort: socket.remotePort,
-        destIp: socket.localAddress,
-        destPort: socket.localPort,
+        sourcePort: socket.remotePort || 0,
+        destIp: socket.localAddress || '',
+        destPort: socket.localPort || 0,
         socketId: record.id
       });
       
-      const detectionResult = await ProtocolDetector.detectWithConnectionTracking(
+      const detectionResult = await ProtocolDetector.detectWithContext(
         chunk,
-        connectionId,
+        context,
         { extractFullHeaders: false } // Only extract essential info for routing
       );
       
@@ -345,7 +359,7 @@ export class RouteConnectionHandler {
         record.lockedDomain = serverName;
 
         // Check if we should reject connections without SNI
-        if (!serverName && this.smartProxy.settings.allowSessionTicket === false) {
+        if (!serverName && allowSessionTicket === false) {
           logger.log('warn', `No SNI detected in TLS ClientHello for connection ${record.id}; sending TLS alert`, {
             connectionId: record.id,
             component: 'route-handler'

ts/proxies/smart-proxy/route-orchestrator.ts

@@ -0,0 +1,297 @@
+import { logger } from '../../core/utils/logger.js';
+import type { IRouteConfig } from './models/route-types.js';
+import type { ILogger } from '../http-proxy/models/types.js';
+import { RouteValidator } from './utils/route-validator.js';
+import { Mutex } from './utils/mutex.js';
+import type { PortManager } from './port-manager.js';
+import type { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
+import type { HttpProxyBridge } from './http-proxy-bridge.js';
+import type { NFTablesManager } from './nftables-manager.js';
+import type { SmartCertManager } from './certificate-manager.js';
+
+/**
+ * Orchestrates route updates and coordination between components
+ * Extracted from SmartProxy to reduce class complexity
+ */
+export class RouteOrchestrator {
+  private routeUpdateLock: Mutex;
+  private portManager: PortManager;
+  private routeManager: RouteManager;
+  private httpProxyBridge: HttpProxyBridge;
+  private nftablesManager: NFTablesManager;
+  private certManager: SmartCertManager | null = null;
+  private logger: ILogger;
+  
+  constructor(
+    portManager: PortManager,
+    routeManager: RouteManager,
+    httpProxyBridge: HttpProxyBridge,
+    nftablesManager: NFTablesManager,
+    certManager: SmartCertManager | null,
+    logger: ILogger
+  ) {
+    this.portManager = portManager;
+    this.routeManager = routeManager;
+    this.httpProxyBridge = httpProxyBridge;
+    this.nftablesManager = nftablesManager;
+    this.certManager = certManager;
+    this.logger = logger;
+    this.routeUpdateLock = new Mutex();
+  }
+  
+  /**
+   * Set or update certificate manager reference
+   */
+  public setCertManager(certManager: SmartCertManager | null): void {
+    this.certManager = certManager;
+  }
+  
+  /**
+   * Get certificate manager reference
+   */
+  public getCertManager(): SmartCertManager | null {
+    return this.certManager;
+  }
+  
+  /**
+   * Update routes with validation and coordination
+   */
+  public async updateRoutes(
+    oldRoutes: IRouteConfig[],
+    newRoutes: IRouteConfig[],
+    options: {
+      acmePort?: number;
+      acmeOptions?: any;
+      acmeState?: any;
+      globalChallengeRouteActive?: boolean;
+      createCertificateManager?: (
+        routes: IRouteConfig[],
+        certStore: string,
+        acmeOptions?: any,
+        initialState?: any
+      ) => Promise<SmartCertManager>;
+      verifyChallengeRouteRemoved?: () => Promise<void>;
+    } = {}
+  ): Promise<{
+    portUsageMap: Map<number, Set<string>>;
+    newChallengeRouteActive: boolean;
+    newCertManager?: SmartCertManager;
+  }> {
+    return this.routeUpdateLock.runExclusive(async () => {
+      // Validate route configurations
+      const validation = RouteValidator.validateRoutes(newRoutes);
+      if (!validation.valid) {
+        RouteValidator.logValidationErrors(validation.errors);
+        throw new Error(`Route validation failed: ${validation.errors.size} route(s) have errors`);
+      }
+      
+      // Track port usage before and after updates
+      const oldPortUsage = this.updatePortUsageMap(oldRoutes);
+      const newPortUsage = this.updatePortUsageMap(newRoutes);
+      
+      // Get the lists of currently listening ports and new ports needed
+      const currentPorts = new Set(this.portManager.getListeningPorts());
+      const newPortsSet = new Set(newPortUsage.keys());
+      
+      // Log the port usage for debugging
+      this.logger.debug(`Current listening ports: ${Array.from(currentPorts).join(', ')}`);
+      this.logger.debug(`Ports needed for new routes: ${Array.from(newPortsSet).join(', ')}`);
+      
+      // Find orphaned ports - ports that no longer have any routes
+      const orphanedPorts = this.findOrphanedPorts(oldPortUsage, newPortUsage);
+      
+      // Find new ports that need binding (only ports that we aren't already listening on)
+      const newBindingPorts = Array.from(newPortsSet).filter(p => !currentPorts.has(p));
+      
+      // Check for ACME challenge port to give it special handling
+      const acmePort = options.acmePort || 80;
+      const acmePortNeeded = newPortsSet.has(acmePort);
+      const acmePortListed = newBindingPorts.includes(acmePort);
+      
+      if (acmePortNeeded && acmePortListed) {
+        this.logger.info(`Adding ACME challenge port ${acmePort} to routes`);
+      }
+      
+      // Update NFTables routes
+      await this.updateNfTablesRoutes(oldRoutes, newRoutes);
+      
+      // Update routes in RouteManager
+      this.routeManager.updateRoutes(newRoutes);
+      
+      // Release orphaned ports first to free resources
+      if (orphanedPorts.length > 0) {
+        this.logger.info(`Releasing ${orphanedPorts.length} orphaned ports: ${orphanedPorts.join(', ')}`);
+        await this.portManager.removePorts(orphanedPorts);
+      }
+      
+      // Add new ports if needed
+      if (newBindingPorts.length > 0) {
+        this.logger.info(`Binding to ${newBindingPorts.length} new ports: ${newBindingPorts.join(', ')}`);
+        
+        // Handle port binding with improved error recovery
+        try {
+          await this.portManager.addPorts(newBindingPorts);
+        } catch (error) {
+          // Special handling for port binding errors
+          if ((error as any).code === 'EADDRINUSE') {
+            const port = (error as any).port || newBindingPorts[0];
+            const isAcmePort = port === acmePort;
+            
+            if (isAcmePort) {
+              this.logger.warn(`Could not bind to ACME challenge port ${port}. It may be in use by another application.`);
+              
+              // Re-throw with more helpful message
+              throw new Error(
+                `ACME challenge port ${port} is already in use by another application. ` +
+                `Configure a different port in settings.acme.port (e.g., 8080) or free up port ${port}.`
+              );
+            }
+          }
+          
+          // Re-throw the original error for other cases
+          throw error;
+        }
+      }
+      
+      // If HttpProxy is initialized, resync the configurations
+      if (this.httpProxyBridge.getHttpProxy()) {
+        await this.httpProxyBridge.syncRoutesToHttpProxy(newRoutes);
+      }
+      
+      // Update certificate manager if needed
+      let newCertManager: SmartCertManager | undefined;
+      let newChallengeRouteActive = options.globalChallengeRouteActive || false;
+      
+      if (this.certManager && options.createCertificateManager) {
+        const existingAcmeOptions = this.certManager.getAcmeOptions();
+        const existingState = this.certManager.getState();
+        
+        // Store global state before stopping
+        newChallengeRouteActive = existingState.challengeRouteActive;
+        
+        // Keep certificate manager routes in sync before stopping
+        this.certManager.setRoutes(newRoutes);
+        
+        await this.certManager.stop();
+        
+        // Verify the challenge route has been properly removed
+        if (options.verifyChallengeRouteRemoved) {
+          await options.verifyChallengeRouteRemoved();
+        }
+        
+        // Create new certificate manager with preserved state
+        newCertManager = await options.createCertificateManager(
+          newRoutes,
+          './certs',
+          existingAcmeOptions,
+          { challengeRouteActive: newChallengeRouteActive }
+        );
+        
+        this.certManager = newCertManager;
+      }
+      
+      return {
+        portUsageMap: newPortUsage,
+        newChallengeRouteActive,
+        newCertManager
+      };
+    });
+  }
+  
+  /**
+   * Update port usage map based on the provided routes
+   */
+  public updatePortUsageMap(routes: IRouteConfig[]): Map<number, Set<string>> {
+    const portUsage = new Map<number, Set<string>>();
+    
+    for (const route of routes) {
+      // Get the ports for this route
+      const portsConfig = Array.isArray(route.match.ports) 
+        ? route.match.ports 
+        : [route.match.ports];
+      
+      // Expand port range objects to individual port numbers
+      const expandedPorts: number[] = [];
+      for (const portConfig of portsConfig) {
+        if (typeof portConfig === 'number') {
+          expandedPorts.push(portConfig);
+        } else if (typeof portConfig === 'object' && 'from' in portConfig && 'to' in portConfig) {
+          // Expand the port range
+          for (let p = portConfig.from; p <= portConfig.to; p++) {
+            expandedPorts.push(p);
+          }
+        }
+      }
+      
+      // Use route name if available, otherwise generate a unique ID
+      const routeName = route.name || `unnamed_${Math.random().toString(36).substring(2, 9)}`;
+      
+      // Add each port to the usage map
+      for (const port of expandedPorts) {
+        if (!portUsage.has(port)) {
+          portUsage.set(port, new Set());
+        }
+        portUsage.get(port)!.add(routeName);
+      }
+    }
+    
+    // Log port usage for debugging
+    for (const [port, routes] of portUsage.entries()) {
+      this.logger.debug(`Port ${port} is used by ${routes.size} routes: ${Array.from(routes).join(', ')}`);
+    }
+    
+    return portUsage;
+  }
+  
+  /**
+   * Find ports that have no routes in the new configuration
+   */
+  private findOrphanedPorts(oldUsage: Map<number, Set<string>>, newUsage: Map<number, Set<string>>): number[] {
+    const orphanedPorts: number[] = [];
+    
+    for (const [port, routes] of oldUsage.entries()) {
+      if (!newUsage.has(port) || newUsage.get(port)!.size === 0) {
+        orphanedPorts.push(port);
+      }
+    }
+    
+    return orphanedPorts;
+  }
+  
+  /**
+   * Update NFTables routes
+   */
+  private async updateNfTablesRoutes(oldRoutes: IRouteConfig[], newRoutes: IRouteConfig[]): Promise<void> {
+    // Get existing routes that use NFTables and update them
+    const oldNfTablesRoutes = oldRoutes.filter(
+      r => r.action.forwardingEngine === 'nftables'
+    );
+    
+    const newNfTablesRoutes = newRoutes.filter(
+      r => r.action.forwardingEngine === 'nftables'
+    );
+    
+    // Update existing NFTables routes
+    for (const oldRoute of oldNfTablesRoutes) {
+      const newRoute = newNfTablesRoutes.find(r => r.name === oldRoute.name);
+      
+      if (!newRoute) {
+        // Route was removed
+        await this.nftablesManager.deprovisionRoute(oldRoute);
+      } else {
+        // Route was updated
+        await this.nftablesManager.updateRoute(oldRoute, newRoute);
+      }
+    }
+    
+    // Add new NFTables routes
+    for (const newRoute of newNfTablesRoutes) {
+      const oldRoute = oldNfTablesRoutes.find(r => r.name === newRoute.name);
+      
+      if (!oldRoute) {
+        // New route
+        await this.nftablesManager.provisionRoute(newRoute);
+      }
+    }
+  }
+}

ts/proxies/smart-proxy/security-manager.ts

@@ -127,8 +127,20 @@ export class SecurityManager {
     const normalizedIPVariants = normalizeIP(ip);
     if (normalizedIPVariants.length === 0) return false;
 
-    // Normalize the pattern IPs for consistent comparison
-    const expandedPatterns = patterns.flatMap(normalizeIP);
+    // Expand shorthand patterns and normalize IPs for consistent comparison
+    const expandShorthand = (pattern: string): string => {
+      // Expand shorthand IP patterns like '192.168.*' to '192.168.*.*'
+      if (pattern.includes('*') && !pattern.includes(':')) {
+        const parts = pattern.split('.');
+        while (parts.length < 4) {
+          parts.push('*');
+        }
+        return parts.join('.');
+      }
+      return pattern;
+    };
+    
+    const expandedPatterns = patterns.map(expandShorthand).flatMap(normalizeIP);
 
     // Check for any match between normalized IP variants and patterns
     return normalizedIPVariants.some((ipVariant) =>

ts/proxies/smart-proxy/smart-proxy.ts

@@ -25,6 +25,12 @@ import type { IRouteConfig } from './models/route-types.js';
 // Import mutex for route update synchronization
 import { Mutex } from './utils/mutex.js';
 
+// Import route validator
+import { RouteValidator } from './utils/route-validator.js';
+
+// Import route orchestrator for route management
+import { RouteOrchestrator } from './route-orchestrator.js';
+
 // Import ACME state manager
 import { AcmeStateManager } from './acme-state-manager.js';
 
@@ -66,12 +72,15 @@ export class SmartProxy extends plugins.EventEmitter {
   
   // Global challenge route tracking
   private globalChallengeRouteActive: boolean = false;
-  private routeUpdateLock: any = null; // Will be initialized as AsyncMutex
+  private routeUpdateLock: Mutex;
   public acmeStateManager: AcmeStateManager;
   
   // Metrics collector
   public metricsCollector: MetricsCollector;
   
+  // Route orchestrator for managing route updates
+  private routeOrchestrator: RouteOrchestrator;
+  
   // Track port usage across route updates
   private portUsageMap: Map<number, Set<string>> = new Map();
   
@@ -128,8 +137,6 @@ export class SmartProxy extends plugins.EventEmitter {
       enableDetailedLogging: settingsArg.enableDetailedLogging || false,
       enableTlsDebugLogging: settingsArg.enableTlsDebugLogging || false,
       enableRandomizedTimeouts: settingsArg.enableRandomizedTimeouts || false,
-      allowSessionTicket:
-        settingsArg.allowSessionTicket !== undefined ? settingsArg.allowSessionTicket : true,
       maxConnectionsPerIP: settingsArg.maxConnectionsPerIP || 100,
       connectionRateLimitPerMinute: settingsArg.connectionRateLimitPerMinute || 300,
       keepAliveTreatment: settingsArg.keepAliveTreatment || 'extended',
@@ -175,6 +182,15 @@ export class SmartProxy extends plugins.EventEmitter {
       error: (message: string, data?: any) => logger.log('error', message, data)
     };
     
+    // Validate initial routes
+    if (this.settings.routes && this.settings.routes.length > 0) {
+      const validation = RouteValidator.validateRoutes(this.settings.routes);
+      if (!validation.valid) {
+        RouteValidator.logValidationErrors(validation.errors);
+        throw new Error(`Initial route validation failed: ${validation.errors.size} route(s) have errors`);
+      }
+    }
+    
     this.routeManager = new RouteManager({
       logger: loggerAdapter,
       enableDetailedLogging: this.settings.enableDetailedLogging,
@@ -206,6 +222,16 @@ export class SmartProxy extends plugins.EventEmitter {
       sampleIntervalMs: this.settings.metrics?.sampleIntervalMs,
       retentionSeconds: this.settings.metrics?.retentionSeconds
     });
+    
+    // Initialize route orchestrator for managing route updates
+    this.routeOrchestrator = new RouteOrchestrator(
+      this.portManager,
+      this.routeManager,
+      this.httpProxyBridge,
+      this.nftablesManager,
+      null, // certManager will be set later
+      loggerAdapter
+    );
   }
   
   /**
@@ -354,8 +380,8 @@ export class SmartProxy extends plugins.EventEmitter {
     // Get listening ports from RouteManager
     const listeningPorts = this.routeManager.getListeningPorts();
 
-    // Initialize port usage tracking
-    this.portUsageMap = this.updatePortUsageMap(this.settings.routes);
+    // Initialize port usage tracking using RouteOrchestrator
+    this.portUsageMap = this.routeOrchestrator.updatePortUsageMap(this.settings.routes);
     
     // Log port usage for startup
     logger.log('info', `SmartProxy starting with ${listeningPorts.length} ports: ${listeningPorts.join(', ')}`, {
@@ -516,7 +542,7 @@ export class SmartProxy extends plugins.EventEmitter {
     logger.log('info', 'All servers closed. Cleaning up active connections...');
 
     // Clean up all active connections
-    this.connectionManager.clearConnections();
+    await this.connectionManager.clearConnections();
 
     // Stop HttpProxy
     await this.httpProxyBridge.stop();
@@ -527,6 +553,10 @@ export class SmartProxy extends plugins.EventEmitter {
     // Stop metrics collector
     this.metricsCollector.stop();
     
+    // Clean up ProtocolDetector singleton
+    const detection = await import('../../detection/index.js');
+    detection.ProtocolDetector.destroy();
+    
     // Flush any pending deduplicated logs
     connectionLogDeduplicator.flushAll();
 
@@ -606,202 +636,46 @@ export class SmartProxy extends plugins.EventEmitter {
       try {
         logger.log('info', `Updating routes (${newRoutes.length} routes)`, { 
           routeCount: newRoutes.length, 
-          component: 'route-manager' 
+          component: 'smart-proxy' 
         });
       } catch (error) {
         // Silently handle logging errors
         console.log(`[INFO] Updating routes (${newRoutes.length} routes)`);
       }
 
-      // Track port usage before and after updates
-      const oldPortUsage = this.updatePortUsageMap(this.settings.routes);
-      const newPortUsage = this.updatePortUsageMap(newRoutes);
-      
-      // Get the lists of currently listening ports and new ports needed
-      const currentPorts = new Set(this.portManager.getListeningPorts());
-      const newPortsSet = new Set(newPortUsage.keys());
-      
-      // Log the port usage for debugging
-      try {
-        logger.log('debug', `Current listening ports: ${Array.from(currentPorts).join(', ')}`, {
-          ports: Array.from(currentPorts),
-          component: 'smart-proxy'
-        });
-        
-        logger.log('debug', `Ports needed for new routes: ${Array.from(newPortsSet).join(', ')}`, {
-          ports: Array.from(newPortsSet),
-          component: 'smart-proxy'
-        });
-      } catch (error) {
-        // Silently handle logging errors
-        console.log(`[DEBUG] Current listening ports: ${Array.from(currentPorts).join(', ')}`);
-        console.log(`[DEBUG] Ports needed for new routes: ${Array.from(newPortsSet).join(', ')}`);
+      // Update route orchestrator dependencies if cert manager changed
+      if (this.certManager && !this.routeOrchestrator.getCertManager()) {
+        this.routeOrchestrator.setCertManager(this.certManager);
       }
       
-      // Find orphaned ports - ports that no longer have any routes
-      const orphanedPorts = this.findOrphanedPorts(oldPortUsage, newPortUsage);
-      
-      // Find new ports that need binding (only ports that we aren't already listening on)
-      const newBindingPorts = Array.from(newPortsSet).filter(p => !currentPorts.has(p));
-      
-      // Check for ACME challenge port to give it special handling
-      const acmePort = this.settings.acme?.port || 80;
-      const acmePortNeeded = newPortsSet.has(acmePort);
-      const acmePortListed = newBindingPorts.includes(acmePort);
-      
-      if (acmePortNeeded && acmePortListed) {
-        try {
-          logger.log('info', `Adding ACME challenge port ${acmePort} to routes`, { 
-            port: acmePort,
-            component: 'smart-proxy'
-          });
-        } catch (error) {
-          // Silently handle logging errors
-          console.log(`[INFO] Adding ACME challenge port ${acmePort} to routes`);
+      // Delegate the complex route update logic to RouteOrchestrator
+      const updateResult = await this.routeOrchestrator.updateRoutes(
+        this.settings.routes,
+        newRoutes,
+        {
+          acmePort: this.settings.acme?.port || 80,
+          acmeOptions: this.certManager?.getAcmeOptions(),
+          acmeState: this.certManager?.getState(),
+          globalChallengeRouteActive: this.globalChallengeRouteActive,
+          createCertificateManager: this.createCertificateManager.bind(this),
+          verifyChallengeRouteRemoved: this.verifyChallengeRouteRemoved.bind(this)
         }
-      }
-
-      // Get existing routes that use NFTables and update them
-      const oldNfTablesRoutes = this.settings.routes.filter(
-        r => r.action.forwardingEngine === 'nftables'
       );
       
-      const newNfTablesRoutes = newRoutes.filter(
-        r => r.action.forwardingEngine === 'nftables'
-      );
-      
-      // Update existing NFTables routes
-      for (const oldRoute of oldNfTablesRoutes) {
-        const newRoute = newNfTablesRoutes.find(r => r.name === oldRoute.name);
-        
-        if (!newRoute) {
-          // Route was removed
-          await this.nftablesManager.deprovisionRoute(oldRoute);
-        } else {
-          // Route was updated
-          await this.nftablesManager.updateRoute(oldRoute, newRoute);
-        }
-      }
-      
-      // Add new NFTables routes
-      for (const newRoute of newNfTablesRoutes) {
-        const oldRoute = oldNfTablesRoutes.find(r => r.name === newRoute.name);
-        
-        if (!oldRoute) {
-          // New route
-          await this.nftablesManager.provisionRoute(newRoute);
-        }
-      }
-
-      // Update routes in RouteManager
-      this.routeManager.updateRoutes(newRoutes);
-
-      // Release orphaned ports first to free resources
-      if (orphanedPorts.length > 0) {
-        try {
-          logger.log('info', `Releasing ${orphanedPorts.length} orphaned ports: ${orphanedPorts.join(', ')}`, { 
-            ports: orphanedPorts,
-            component: 'smart-proxy'
-          });
-        } catch (error) {
-          // Silently handle logging errors
-          console.log(`[INFO] Releasing ${orphanedPorts.length} orphaned ports: ${orphanedPorts.join(', ')}`);
-        }
-        await this.portManager.removePorts(orphanedPorts);
-      }
-      
-      // Add new ports if needed
-      if (newBindingPorts.length > 0) {
-        try {
-          logger.log('info', `Binding to ${newBindingPorts.length} new ports: ${newBindingPorts.join(', ')}`, { 
-            ports: newBindingPorts,
-            component: 'smart-proxy'
-          });
-        } catch (error) {
-          // Silently handle logging errors
-          console.log(`[INFO] Binding to ${newBindingPorts.length} new ports: ${newBindingPorts.join(', ')}`);
-        }
-        
-        // Handle port binding with improved error recovery
-        try {
-          await this.portManager.addPorts(newBindingPorts);
-        } catch (error) {
-          // Special handling for port binding errors
-          // This provides better diagnostics for ACME challenge port conflicts
-          if ((error as any).code === 'EADDRINUSE') {
-            const port = (error as any).port || newBindingPorts[0];
-            const isAcmePort = port === acmePort;
-            
-            if (isAcmePort) {
-              try {
-                logger.log('warn', `Could not bind to ACME challenge port ${port}. It may be in use by another application.`, {
-                  port,
-                  component: 'smart-proxy'
-                });
-              } catch (logError) {
-                console.log(`[WARN] Could not bind to ACME challenge port ${port}. It may be in use by another application.`);
-              }
-              
-              // Re-throw with more helpful message
-              throw new Error(
-                `ACME challenge port ${port} is already in use by another application. ` +
-                `Configure a different port in settings.acme.port (e.g., 8080) or free up port ${port}.`
-              );
-            }
-          }
-          
-          // Re-throw the original error for other cases
-          throw error;
-        }
-      }
-      
       // Update settings with the new routes
       this.settings.routes = newRoutes;
       
-      // Save the new port usage map for future reference
-      this.portUsageMap = newPortUsage;
+      // Update global state from orchestrator results
+      this.globalChallengeRouteActive = updateResult.newChallengeRouteActive;
       
-      // If HttpProxy is initialized, resync the configurations
-      if (this.httpProxyBridge.getHttpProxy()) {
-        await this.httpProxyBridge.syncRoutesToHttpProxy(newRoutes);
-      }
+      // Update port usage map from orchestrator
+      this.portUsageMap = updateResult.portUsageMap;
       
-      // Update certificate manager with new routes
-      if (this.certManager) {
-        const existingAcmeOptions = this.certManager.getAcmeOptions();
-        const existingState = this.certManager.getState();
-        
-        // Store global state before stopping
-        this.globalChallengeRouteActive = existingState.challengeRouteActive;
-        
-        // Only stop the cert manager if absolutely necessary
-        // First check if there's an ACME route on the same port already
-        const acmePort = existingAcmeOptions?.port || 80;
-        const acmePortInUse = newPortUsage.has(acmePort) && newPortUsage.get(acmePort)!.size > 0;
-        
-        try {
-          logger.log('debug', `ACME port ${acmePort} ${acmePortInUse ? 'is' : 'is not'} already in use by other routes`, {
-            port: acmePort,
-            inUse: acmePortInUse,
-            component: 'smart-proxy'
-          });
-        } catch (error) {
-          // Silently handle logging errors
-          console.log(`[DEBUG] ACME port ${acmePort} ${acmePortInUse ? 'is' : 'is not'} already in use by other routes`);
-        }
-        
-        await this.certManager.stop();
-        
-        // Verify the challenge route has been properly removed
-        await this.verifyChallengeRouteRemoved();
-        
-        // Create new certificate manager with preserved state
-        this.certManager = await this.createCertificateManager(
-          newRoutes,
-          './certs',
-          existingAcmeOptions,
-          { challengeRouteActive: this.globalChallengeRouteActive }
-        );
+      // If certificate manager was recreated, update our reference
+      if (updateResult.newCertManager) {
+        this.certManager = updateResult.newCertManager;
+        // Update the orchestrator's reference too
+        this.routeOrchestrator.setCertManager(this.certManager);
       }
     });
   }
@@ -822,87 +696,7 @@ export class SmartProxy extends plugins.EventEmitter {
     await this.certManager.provisionCertificate(route);
   }
 
-  /**
-   * Update the port usage map based on the provided routes
-   * 
-   * This tracks which ports are used by which routes, allowing us to
-   * detect when a port is no longer needed and can be released.
-   */
-  private updatePortUsageMap(routes: IRouteConfig[]): Map<number, Set<string>> {
-    // Reset the usage map
-    const portUsage = new Map<number, Set<string>>();
-    
-    for (const route of routes) {
-      // Get the ports for this route
-      const portsConfig = Array.isArray(route.match.ports) 
-        ? route.match.ports 
-        : [route.match.ports];
-      
-      // Expand port range objects to individual port numbers
-      const expandedPorts: number[] = [];
-      for (const portConfig of portsConfig) {
-        if (typeof portConfig === 'number') {
-          expandedPorts.push(portConfig);
-        } else if (typeof portConfig === 'object' && 'from' in portConfig && 'to' in portConfig) {
-          // Expand the port range
-          for (let p = portConfig.from; p <= portConfig.to; p++) {
-            expandedPorts.push(p);
-          }
-        }
-      }
-      
-      // Use route name if available, otherwise generate a unique ID
-      const routeName = route.name || `unnamed_${Math.random().toString(36).substring(2, 9)}`;
-      
-      // Add each port to the usage map
-      for (const port of expandedPorts) {
-        if (!portUsage.has(port)) {
-          portUsage.set(port, new Set());
-        }
-        portUsage.get(port)!.add(routeName);
-      }
-    }
-    
-    // Log port usage for debugging
-    for (const [port, routes] of portUsage.entries()) {
-      try {
-        logger.log('debug', `Port ${port} is used by ${routes.size} routes: ${Array.from(routes).join(', ')}`, {
-          port,
-          routeCount: routes.size,
-          component: 'smart-proxy'
-        });
-      } catch (error) {
-        // Silently handle logging errors
-        console.log(`[DEBUG] Port ${port} is used by ${routes.size} routes: ${Array.from(routes).join(', ')}`);
-      }
-    }
-    
-    return portUsage;
-  }
-  
-  /**
-   * Find ports that have no routes in the new configuration
-   */
-  private findOrphanedPorts(oldUsage: Map<number, Set<string>>, newUsage: Map<number, Set<string>>): number[] {
-    const orphanedPorts: number[] = [];
-    
-    for (const [port, routes] of oldUsage.entries()) {
-      if (!newUsage.has(port) || newUsage.get(port)!.size === 0) {
-        orphanedPorts.push(port);
-        try {
-          logger.log('info', `Port ${port} no longer has any associated routes, will be released`, {
-            port,
-            component: 'smart-proxy'
-          });
-        } catch (error) {
-          // Silently handle logging errors
-          console.log(`[INFO] Port ${port} no longer has any associated routes, will be released`);
-        }
-      }
-    }
-    
-    return orphanedPorts;
-  }
+  // Port usage tracking methods moved to RouteOrchestrator
   
   /**
    * Force renewal of a certificate
@@ -1024,9 +818,9 @@ export class SmartProxy extends plugins.EventEmitter {
       terminationStats,
       acmeEnabled: !!this.certManager,
       port80HandlerPort: this.certManager ? 80 : null,
-      routes: this.routeManager.getListeningPorts().length,
-      listeningPorts: this.portManager.getListeningPorts(),
-      activePorts: this.portManager.getListeningPorts().length
+      routeCount: this.settings.routes.length,
+      activePorts: this.portManager.getListeningPorts().length,
+      listeningPorts: this.portManager.getListeningPorts()
     };
   }
   

ts/proxies/smart-proxy/tls-manager.ts

@@ -50,43 +50,7 @@ export class TlsManager {
     );
   }
   
-  /**
-   * Handle session resumption attempts
-   */
-  public handleSessionResumption(
-    chunk: Buffer, 
-    connectionId: string,
-    hasSNI: boolean
-  ): { shouldBlock: boolean; reason?: string } {
-    // Skip if session tickets are allowed
-    if (this.smartProxy.settings.allowSessionTicket !== false) {
-      return { shouldBlock: false };
-    }
-    
-    // Check for session resumption attempt
-    const resumptionInfo = SniHandler.hasSessionResumption(
-      chunk,
-      this.smartProxy.settings.enableTlsDebugLogging || false
-    );
-    
-    // If this is a resumption attempt without SNI, block it
-    if (resumptionInfo.isResumption && !hasSNI && !resumptionInfo.hasSNI) {
-      if (this.smartProxy.settings.enableTlsDebugLogging) {
-        console.log(
-          `[${connectionId}] Session resumption detected without SNI and allowSessionTicket=false. ` +
-          `Terminating connection to force new TLS handshake.`
-        );
-      }
-      return { 
-        shouldBlock: true, 
-        reason: 'session_ticket_blocked' 
-      };
-    }
-    
-    return { shouldBlock: false };
-  }
-  
-  /**
+/**
    * Check for SNI mismatch during renegotiation
    */
   public checkRenegotiationSNI(

ts/proxies/smart-proxy/utils/index.ts

@@ -8,8 +8,8 @@
 // Export route helpers for creating route configurations
 export * from './route-helpers.js';
 
-// Export route validators for validating route configurations
-export * from './route-validators.js';
+// Export route validator (class-based and functional API)
+export * from './route-validator.js';
 
 // Export route utilities for route operations
 export * from './route-utils.js';
@@ -21,5 +21,3 @@ export {
   addBasicAuth,
   addJwtAuth
 } from './route-helpers.js';
-
-// Migration utilities have been removed as they are no longer needed

ts/proxies/smart-proxy/utils/route-helpers.ts

@@ -22,6 +22,7 @@ import * as plugins from '../../../plugins.js';
 import type { IRouteConfig, IRouteMatch, IRouteAction, IRouteTarget, TPortRange, IRouteContext } from '../models/route-types.js';
 import { mergeRouteConfigs } from './route-utils.js';
 import { ProtocolDetector, HttpDetector } from '../../../detection/index.js';
+import { createSocketTracker } from '../../../core/utils/socket-tracker.js';
 
 /**
  * Create an HTTP-only route configuration
@@ -960,11 +961,12 @@ export const SocketHandlers = {
    * Now uses the centralized detection module for HTTP parsing
    */
   httpRedirect: (locationTemplate: string, statusCode: number = 301) => (socket: plugins.net.Socket, context: IRouteContext) => {
+    const tracker = createSocketTracker(socket);
     const connectionId = ProtocolDetector.createConnectionId({
       socketId: context.connectionId || `${Date.now()}-${Math.random()}`
     });
     
-    socket.once('data', async (data) => {
+    const handleData = async (data: Buffer) => {
       // Use detection module for parsing
       const detectionResult = await ProtocolDetector.detectWithConnectionTracking(
         data,
@@ -1005,6 +1007,19 @@ export const SocketHandlers = {
       socket.end();
       // Clean up detection state
       ProtocolDetector.cleanupConnections();
+      // Clean up all tracked resources
+      tracker.cleanup();
+    };
+    
+    // Use tracker to manage the listener
+    socket.once('data', handleData);
+    
+    tracker.addListener('error', (err) => {
+      tracker.safeDestroy(err);
+    });
+    
+    tracker.addListener('close', () => {
+      tracker.cleanup();
     });
   },
   
@@ -1013,7 +1028,9 @@ export const SocketHandlers = {
    * Now uses the centralized detection module for HTTP parsing
    */
   httpServer: (handler: (req: { method: string; url: string; headers: Record<string, string>; body?: string }, res: { status: (code: number) => void; header: (name: string, value: string) => void; send: (data: string) => void; end: () => void }) => void) => (socket: plugins.net.Socket, context: IRouteContext) => {
+    const tracker = createSocketTracker(socket);
     let requestParsed = false;
+    let responseTimer: NodeJS.Timeout | null = null;
     const connectionId = ProtocolDetector.createConnectionId({
       socketId: context.connectionId || `${Date.now()}-${Math.random()}`
     });
@@ -1034,6 +1051,8 @@ export const SocketHandlers = {
       }
       
       requestParsed = true;
+      // Remove data listener after parsing request
+      socket.removeListener('data', processData);
       const connInfo = detectionResult.connectionInfo;
       
       // Create request object from detection result
@@ -1060,6 +1079,12 @@ export const SocketHandlers = {
           if (ended) return;
           ended = true;
           
+          // Clear response timer since we're sending now
+          if (responseTimer) {
+            clearTimeout(responseTimer);
+            responseTimer = null;
+          }
+          
           if (!responseHeaders['content-type']) {
             responseHeaders['content-type'] = 'text/plain';
           }
@@ -1091,30 +1116,44 @@ export const SocketHandlers = {
       try {
         handler(req, res);
         // Ensure response is sent even if handler doesn't call send()
-        setTimeout(() => {
+        responseTimer = setTimeout(() => {
           if (!ended) {
             res.send('');
           }
+          responseTimer = null;
         }, 1000);
+        // Track and unref the timer
+        tracker.addTimer(responseTimer);
       } catch (error) {
         if (!ended) {
           res.status(500);
           res.send('Internal Server Error');
         }
+        // Use safeDestroy for error cases
+        tracker.safeDestroy(error instanceof Error ? error : new Error('Handler error'));
       }
     };
     
-    socket.on('data', processData);
+    // Use tracker to manage listeners
+    tracker.addListener('data', processData);
     
-    socket.on('error', () => {
+    tracker.addListener('error', (err) => {
       if (!requestParsed) {
-        socket.end();
+        tracker.safeDestroy(err);
       }
     });
     
-    socket.on('close', () => {
+    tracker.addListener('close', () => {
+      // Cleanup is handled by tracker
+      // Clear any pending response timer
+      if (responseTimer) {
+        clearTimeout(responseTimer);
+        responseTimer = null;
+      }
       // Clean up detection state
       ProtocolDetector.cleanupConnections();
+      // Clean up all tracked resources
+      tracker.cleanup();
     });
   }
 };

ts/proxies/smart-proxy/utils/route-utils.ts

@@ -6,7 +6,7 @@
  */
 
 import type { IRouteConfig, IRouteMatch } from '../models/route-types.js';
-import { validateRouteConfig } from './route-validators.js';
+import { validateRouteConfig } from './route-validator.js';
 
 /**
  * Merge two route configurations

ts/proxies/smart-proxy/utils/route-validator.ts

@@ -0,0 +1,736 @@
+import { logger } from '../../../core/utils/logger.js';
+import type { IRouteConfig, IRouteMatch, IRouteAction, TPortRange } from '../models/route-types.js';
+
+/**
+ * Validates route configurations for correctness and safety
+ */
+export class RouteValidator {
+  private static readonly VALID_TLS_MODES = ['terminate', 'passthrough', 'terminate-and-reencrypt'];
+  private static readonly VALID_ACTION_TYPES = ['forward', 'socket-handler'];
+  private static readonly VALID_PROTOCOLS = ['tcp', 'http', 'https', 'ws', 'wss'];
+  private static readonly MAX_PORTS = 100;
+  private static readonly MAX_DOMAINS = 1000;
+  private static readonly MAX_HEADER_SIZE = 8192;
+
+  /**
+   * Validate a single route configuration
+   */
+  public static validateRoute(route: IRouteConfig): { valid: boolean; errors: string[] } {
+    const errors: string[] = [];
+
+    // Validate route has a name
+    if (!route.name || typeof route.name !== 'string') {
+      errors.push('Route must have a valid name');
+    }
+
+    // Validate match criteria
+    if (!route.match) {
+      errors.push('Route must have match criteria');
+    } else {
+      // Validate ports
+      if (route.match.ports) {
+        const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
+        
+        if (ports.length > this.MAX_PORTS) {
+          errors.push(`Too many ports specified (max ${this.MAX_PORTS})`);
+        }
+        
+        for (const port of ports) {
+          if (typeof port === 'number') {
+            if (!this.isValidPort(port)) {
+              errors.push(`Invalid port: ${port}. Must be between 1 and 65535`);
+            }
+          } else if (typeof port === 'object' && 'from' in port && 'to' in port) {
+            if (!this.isValidPort(port.from)) {
+              errors.push(`Invalid port range start: ${port.from}. Must be between 1 and 65535`);
+            }
+            if (!this.isValidPort(port.to)) {
+              errors.push(`Invalid port range end: ${port.to}. Must be between 1 and 65535`);
+            }
+            if (port.from > port.to) {
+              errors.push(`Invalid port range: ${port.from}-${port.to} (start > end)`);
+            }
+          } else {
+            errors.push(`Invalid port configuration: ${JSON.stringify(port)}`);
+          }
+        }
+      }
+
+      // Validate domains
+      if (route.match.domains) {
+        const domains = Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains];
+        
+        if (domains.length > this.MAX_DOMAINS) {
+          errors.push(`Too many domains specified (max ${this.MAX_DOMAINS})`);
+        }
+        
+        for (const domain of domains) {
+          if (!this.isValidDomain(domain)) {
+            errors.push(`Invalid domain pattern: ${domain}`);
+          }
+        }
+      }
+
+      // Validate paths
+      if (route.match.path) {
+        const paths = Array.isArray(route.match.path) ? route.match.path : [route.match.path];
+        
+        for (const path of paths) {
+          if (!this.isValidPath(path)) {
+            errors.push(`Invalid path pattern: ${path}`);
+          }
+        }
+      }
+
+      // Validate client IPs
+      if (route.match.clientIp) {
+        const ips = Array.isArray(route.match.clientIp) ? route.match.clientIp : [route.match.clientIp];
+        
+        for (const ip of ips) {
+          if (!this.isValidIPPattern(ip)) {
+            errors.push(`Invalid IP pattern: ${ip}`);
+          }
+        }
+      }
+
+      // Validate headers
+      if (route.match.headers) {
+        for (const [key, value] of Object.entries(route.match.headers)) {
+          if (key.length > 256) {
+            errors.push(`Header name too long: ${key}`);
+          }
+          
+          const headerValue = String(value);
+          if (headerValue.length > this.MAX_HEADER_SIZE) {
+            errors.push(`Header value too long for ${key} (max ${this.MAX_HEADER_SIZE} bytes)`);
+          }
+          
+          if (!/^[\x20-\x7E]+$/.test(key)) {
+            errors.push(`Invalid header name: ${key} (must be printable ASCII)`);
+          }
+        }
+      }
+
+      // Protocol validation removed - not part of IRouteMatch interface
+    }
+
+    // Validate action
+    if (!route.action) {
+      errors.push('Route must have an action');
+    } else {
+      // Validate action type
+      if (!route.action.type || !this.VALID_ACTION_TYPES.includes(route.action.type)) {
+        errors.push(`Invalid action type: ${route.action.type}. Must be one of: ${this.VALID_ACTION_TYPES.join(', ')}`);
+      }
+
+      // Validate socket-handler
+      if (route.action.type === 'socket-handler') {
+        if (typeof route.action.socketHandler !== 'function') {
+          errors.push('socket-handler action requires a socketHandler function');
+        }
+      }
+
+      // Validate forward target
+      if (route.action.type === 'forward') {
+        if (!route.action.targets || route.action.targets.length === 0) {
+          errors.push('Forward action must have at least one target');
+        } else {
+          for (const target of route.action.targets) {
+            if (!target.host) {
+              errors.push('Target must have a host');
+            } else if (typeof target.host !== 'string' && !Array.isArray(target.host) && typeof target.host !== 'function') {
+              errors.push('Target host must be a string, array of strings, or function');
+            }
+            
+            if (target.port) {
+              if (typeof target.port === 'number' && !this.isValidPort(target.port)) {
+                errors.push(`Invalid target port: ${target.port}`);
+              } else if (target.port !== 'preserve' && typeof target.port !== 'function' && typeof target.port !== 'number') {
+                errors.push(`Invalid target port configuration: ${target.port}`);
+              }
+            }
+          }
+        }
+      }
+
+      // Validate TLS settings
+      if (route.action.tls) {
+        if (route.action.tls.mode && !this.VALID_TLS_MODES.includes(route.action.tls.mode)) {
+          errors.push(`Invalid TLS mode: ${route.action.tls.mode}. Must be one of: ${this.VALID_TLS_MODES.join(', ')}`);
+        }
+
+        if (route.action.tls.certificate) {
+          if (route.action.tls.certificate !== 'auto' && typeof route.action.tls.certificate !== 'object') {
+            errors.push('TLS certificate must be "auto" or a certificate configuration object');
+          }
+        }
+
+        if (route.action.tls.versions) {
+          for (const version of route.action.tls.versions) {
+            if (!['TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3'].includes(version)) {
+              errors.push(`Invalid TLS version: ${version}`);
+            }
+          }
+        }
+      }
+    }
+
+    // Validate security settings
+    if (route.security) {
+      // Validate IP allow/block lists
+      if (route.security.ipAllowList) {
+        const allowList = Array.isArray(route.security.ipAllowList) ? route.security.ipAllowList : [route.security.ipAllowList];
+        
+        for (const ip of allowList) {
+          if (!this.isValidIPPattern(ip)) {
+            errors.push(`Invalid IP pattern in allow list: ${ip}`);
+          }
+        }
+      }
+
+      if (route.security.ipBlockList) {
+        const blockList = Array.isArray(route.security.ipBlockList) ? route.security.ipBlockList : [route.security.ipBlockList];
+        
+        for (const ip of blockList) {
+          if (!this.isValidIPPattern(ip)) {
+            errors.push(`Invalid IP pattern in block list: ${ip}`);
+          }
+        }
+      }
+
+      // Validate rate limits
+      if (route.security.rateLimit) {
+        if (route.security.rateLimit.maxRequests && route.security.rateLimit.maxRequests < 0) {
+          errors.push('Rate limit maxRequests must be positive');
+        }
+        
+        if (route.security.rateLimit.window && route.security.rateLimit.window < 0) {
+          errors.push('Rate limit window must be positive');
+        }
+      }
+
+      // Validate connection limits
+      if (route.security.maxConnections && route.security.maxConnections < 0) {
+        errors.push('Max connections must be positive');
+      }
+    }
+
+    // Validate priority
+    if (route.priority !== undefined && (route.priority < 0 || route.priority > 10000)) {
+      errors.push('Priority must be between 0 and 10000');
+    }
+
+    return {
+      valid: errors.length === 0,
+      errors
+    };
+  }
+
+  /**
+   * Validate multiple route configurations
+   */
+  public static validateRoutes(routes: IRouteConfig[]): { valid: boolean; errors: Map<string, string[]> } {
+    const errorMap = new Map<string, string[]>();
+    let valid = true;
+
+    // Check for duplicate route names
+    const routeNames = new Set<string>();
+    for (const route of routes) {
+      if (route.name && routeNames.has(route.name)) {
+        const existingErrors = errorMap.get(route.name) || [];
+        existingErrors.push('Duplicate route name');
+        errorMap.set(route.name, existingErrors);
+        valid = false;
+      }
+      routeNames.add(route.name);
+    }
+
+    // Validate each route
+    for (const route of routes) {
+      const result = this.validateRoute(route);
+      if (!result.valid) {
+        errorMap.set(route.name || 'unnamed', result.errors);
+        valid = false;
+      }
+    }
+
+    // Check for conflicting routes
+    const conflicts = this.findRouteConflicts(routes);
+    if (conflicts.length > 0) {
+      for (const conflict of conflicts) {
+        const existingErrors = errorMap.get(conflict.route) || [];
+        existingErrors.push(conflict.message);
+        errorMap.set(conflict.route, existingErrors);
+      }
+      valid = false;
+    }
+
+    return { valid, errors: errorMap };
+  }
+
+  /**
+   * Find potential conflicts between routes
+   */
+  private static findRouteConflicts(routes: IRouteConfig[]): Array<{ route: string; message: string }> {
+    const conflicts: Array<{ route: string; message: string }> = [];
+    
+    // Group routes by port
+    const portMap = new Map<number, IRouteConfig[]>();
+    
+    for (const route of routes) {
+      if (route.match?.ports) {
+        const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
+        
+        // Expand port ranges to individual ports
+        const expandedPorts: number[] = [];
+        for (const port of ports) {
+          if (typeof port === 'number') {
+            expandedPorts.push(port);
+          } else if (typeof port === 'object' && 'from' in port && 'to' in port) {
+            for (let p = port.from; p <= port.to; p++) {
+              expandedPorts.push(p);
+            }
+          }
+        }
+        
+        for (const port of expandedPorts) {
+          const routesOnPort = portMap.get(port) || [];
+          routesOnPort.push(route);
+          portMap.set(port, routesOnPort);
+        }
+      }
+    }
+
+    // Check for conflicting catch-all routes on the same port
+    for (const [port, routesOnPort] of portMap) {
+      const catchAllRoutes = routesOnPort.filter(r => 
+        !r.match.domains || 
+        (Array.isArray(r.match.domains) && r.match.domains.includes('*')) ||
+        r.match.domains === '*'
+      );
+      
+      if (catchAllRoutes.length > 1) {
+        for (const route of catchAllRoutes) {
+          conflicts.push({
+            route: route.name,
+            message: `Multiple catch-all routes on port ${port}`
+          });
+        }
+      }
+    }
+
+    return conflicts;
+  }
+
+  /**
+   * Validate port number
+   */
+  private static isValidPort(port: number): boolean {
+    return Number.isInteger(port) && port >= 1 && port <= 65535;
+  }
+
+  /**
+   * Validate domain pattern
+   */
+  private static isValidDomain(domain: string): boolean {
+    if (!domain || typeof domain !== 'string') return false;
+    if (domain === '*') return true;
+    if (domain === 'localhost') return true;
+    
+    // Allow both *.domain and *domain patterns
+    // Also allow regular domains and subdomains
+    const domainPatterns = [
+      // Standard domain with optional wildcard subdomain (*.example.com)
+      /^(\*\.)?([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/,
+      // Wildcard prefix without dot (*example.com)
+      /^\*[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?))*$/,
+      // IP address
+      /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/,
+      // IPv6 address
+      /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/
+    ];
+    
+    return domainPatterns.some(pattern => pattern.test(domain));
+  }
+
+  /**
+   * Validate path pattern
+   */
+  private static isValidPath(path: string): boolean {
+    if (!path || typeof path !== 'string') return false;
+    if (!path.startsWith('/')) return false;
+    
+    // Check for invalid characters
+    if (!/^[a-zA-Z0-9/_*:{}.-]+$/.test(path)) return false;
+    
+    // Validate parameter syntax
+    const paramPattern = /\{[a-zA-Z_][a-zA-Z0-9_]*\}/g;
+    const params = path.match(paramPattern) || [];
+    
+    for (const param of params) {
+      if (param.length > 32) return false;
+    }
+    
+    return true;
+  }
+
+  /**
+   * Validate IP pattern
+   */
+  private static isValidIPPattern(ip: string): boolean {
+    if (!ip || typeof ip !== 'string') return false;
+    if (ip === '*') return true;
+    
+    // Check for CIDR notation
+    if (ip.includes('/')) {
+      const [addr, prefix] = ip.split('/');
+      const prefixNum = parseInt(prefix, 10);
+      
+      if (addr.includes(':')) {
+        // IPv6 CIDR
+        return this.isValidIPv6(addr) && prefixNum >= 0 && prefixNum <= 128;
+      } else {
+        // IPv4 CIDR
+        return this.isValidIPv4(addr) && prefixNum >= 0 && prefixNum <= 32;
+      }
+    }
+    
+    // Check for range
+    if (ip.includes('-')) {
+      const [start, end] = ip.split('-');
+      return (this.isValidIPv4(start) && this.isValidIPv4(end)) ||
+             (this.isValidIPv6(start) && this.isValidIPv6(end));
+    }
+    
+    // Check for wildcards in IPv4
+    if (ip.includes('*') && !ip.includes(':')) {
+      const parts = ip.split('.');
+      // Allow 1-4 parts for wildcard patterns (e.g., '10.*', '192.168.*', '192.168.1.*')
+      if (parts.length < 1 || parts.length > 4) return false;
+      
+      for (const part of parts) {
+        if (part !== '*' && !/^\d{1,3}$/.test(part)) return false;
+        if (part !== '*' && parseInt(part, 10) > 255) return false;
+      }
+      
+      return true;
+    }
+    
+    // Regular IP address
+    return this.isValidIPv4(ip) || this.isValidIPv6(ip);
+  }
+
+  /**
+   * Validate IPv4 address
+   */
+  private static isValidIPv4(ip: string): boolean {
+    const parts = ip.split('.');
+    if (parts.length !== 4) return false;
+    
+    for (const part of parts) {
+      const num = parseInt(part, 10);
+      if (isNaN(num) || num < 0 || num > 255) return false;
+    }
+    
+    return true;
+  }
+
+  /**
+   * Validate IPv6 address
+   */
+  private static isValidIPv6(ip: string): boolean {
+    // Simple IPv6 validation
+    const ipv6Pattern = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|::[0-9a-fA-F]{0,4}(:[0-9a-fA-F]{1,4}){0,6}|::1|::)$/;
+    return ipv6Pattern.test(ip);
+  }
+
+  /**
+   * Log validation errors
+   */
+  public static logValidationErrors(errors: Map<string, string[]>): void {
+    for (const [routeName, routeErrors] of errors) {
+      logger.log('error', `Route validation failed for ${routeName}:`, {
+        route: routeName,
+        errors: routeErrors,
+        component: 'route-validator'
+      });
+
+      for (const error of routeErrors) {
+        logger.log('error', `  - ${error}`, {
+          route: routeName,
+          component: 'route-validator'
+        });
+      }
+    }
+  }
+}
+
+// ============================================================================
+// Functional API (for backwards compatibility with route-validators.ts)
+// ============================================================================
+
+/**
+ * Validates a port range or port number
+ * @param port Port number, port range, or port function
+ * @returns True if valid, false otherwise
+ */
+export function isValidPort(port: any): boolean {
+  if (typeof port === 'number') {
+    return port > 0 && port < 65536;
+  } else if (Array.isArray(port)) {
+    return port.every(p =>
+      (typeof p === 'number' && p > 0 && p < 65536) ||
+      (typeof p === 'object' && 'from' in p && 'to' in p &&
+       p.from > 0 && p.from < 65536 && p.to > 0 && p.to < 65536)
+    );
+  } else if (typeof port === 'function') {
+    return true;
+  } else if (typeof port === 'object' && 'from' in port && 'to' in port) {
+    return port.from > 0 && port.from < 65536 && port.to > 0 && port.to < 65536;
+  }
+  return false;
+}
+
+/**
+ * Validates a domain string - supports wildcards, localhost, and IP addresses
+ * @param domain Domain string to validate
+ * @returns True if valid, false otherwise
+ */
+export function isValidDomain(domain: string): boolean {
+  if (!domain || typeof domain !== 'string') return false;
+  if (domain === '*') return true;
+  if (domain === 'localhost') return true;
+
+  const domainPatterns = [
+    // Standard domain with optional wildcard subdomain (*.example.com)
+    /^(\*\.)?([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/,
+    // Wildcard prefix without dot (*example.com)
+    /^\*[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?))*$/,
+    // IP address
+    /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/,
+    // IPv6 address
+    /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/
+  ];
+
+  return domainPatterns.some(pattern => pattern.test(domain));
+}
+
+/**
+ * Validates a route match configuration
+ * @param match Route match configuration to validate
+ * @returns { valid: boolean, errors: string[] } Validation result
+ */
+export function validateRouteMatch(match: IRouteMatch): { valid: boolean; errors: string[] } {
+  const errors: string[] = [];
+
+  if (match.ports !== undefined) {
+    if (!isValidPort(match.ports)) {
+      errors.push('Invalid port number or port range in match.ports');
+    }
+  }
+
+  if (match.domains !== undefined) {
+    if (typeof match.domains === 'string') {
+      if (!isValidDomain(match.domains)) {
+        errors.push(`Invalid domain format: ${match.domains}`);
+      }
+    } else if (Array.isArray(match.domains)) {
+      for (const domain of match.domains) {
+        if (!isValidDomain(domain)) {
+          errors.push(`Invalid domain format: ${domain}`);
+        }
+      }
+    } else {
+      errors.push('Domains must be a string or an array of strings');
+    }
+  }
+
+  if (match.path !== undefined) {
+    if (typeof match.path !== 'string' || !match.path.startsWith('/')) {
+      errors.push('Path must be a string starting with /');
+    }
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+
+/**
+ * Validates a route action configuration
+ * @param action Route action configuration to validate
+ * @returns { valid: boolean, errors: string[] } Validation result
+ */
+export function validateRouteAction(action: IRouteAction): { valid: boolean; errors: string[] } {
+  const errors: string[] = [];
+
+  if (!action.type) {
+    errors.push('Action type is required');
+  } else if (!['forward', 'socket-handler'].includes(action.type)) {
+    errors.push(`Invalid action type: ${action.type}`);
+  }
+
+  if (action.type === 'forward') {
+    if (!action.targets || !Array.isArray(action.targets) || action.targets.length === 0) {
+      errors.push('Targets array is required for forward action');
+    } else {
+      action.targets.forEach((target, index) => {
+        if (!target.host) {
+          errors.push(`Target[${index}] host is required`);
+        } else if (typeof target.host !== 'string' &&
+                  !Array.isArray(target.host) &&
+                  typeof target.host !== 'function') {
+          errors.push(`Target[${index}] host must be a string, array of strings, or function`);
+        }
+
+        if (target.port === undefined) {
+          errors.push(`Target[${index}] port is required`);
+        } else if (typeof target.port !== 'number' &&
+                  typeof target.port !== 'function' &&
+                  target.port !== 'preserve') {
+          errors.push(`Target[${index}] port must be a number, 'preserve', or a function`);
+        } else if (typeof target.port === 'number' && !isValidPort(target.port)) {
+          errors.push(`Target[${index}] port must be between 1 and 65535`);
+        }
+
+        if (target.match) {
+          if (target.match.ports && !Array.isArray(target.match.ports)) {
+            errors.push(`Target[${index}] match.ports must be an array`);
+          }
+          if (target.match.method && !Array.isArray(target.match.method)) {
+            errors.push(`Target[${index}] match.method must be an array`);
+          }
+        }
+      });
+    }
+
+    if (action.tls) {
+      if (!['passthrough', 'terminate', 'terminate-and-reencrypt'].includes(action.tls.mode)) {
+        errors.push(`Invalid TLS mode: ${action.tls.mode}`);
+      }
+
+      if (['terminate', 'terminate-and-reencrypt'].includes(action.tls.mode)) {
+        if (action.tls.certificate !== 'auto' &&
+            (!action.tls.certificate || !action.tls.certificate.key || !action.tls.certificate.cert)) {
+          errors.push('Certificate must be "auto" or an object with key and cert properties');
+        }
+      }
+    }
+  }
+
+  if (action.type === 'socket-handler') {
+    if (!action.socketHandler) {
+      errors.push('Socket handler function is required for socket-handler action');
+    } else if (typeof action.socketHandler !== 'function') {
+      errors.push('Socket handler must be a function');
+    }
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+
+/**
+ * Validates a complete route configuration
+ * @param route Route configuration to validate
+ * @returns { valid: boolean, errors: string[] } Validation result
+ */
+export function validateRouteConfig(route: IRouteConfig): { valid: boolean; errors: string[] } {
+  const errors: string[] = [];
+
+  if (!route.match) {
+    errors.push('Route match configuration is required');
+  }
+
+  if (!route.action) {
+    errors.push('Route action configuration is required');
+  }
+
+  if (route.match) {
+    const matchValidation = validateRouteMatch(route.match);
+    if (!matchValidation.valid) {
+      errors.push(...matchValidation.errors.map(err => `Match: ${err}`));
+    }
+  }
+
+  if (route.action) {
+    const actionValidation = validateRouteAction(route.action);
+    if (!actionValidation.valid) {
+      errors.push(...actionValidation.errors.map(err => `Action: ${err}`));
+    }
+  }
+
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+
+/**
+ * Validate an array of route configurations
+ * @param routes Array of route configurations to validate
+ * @returns { valid: boolean, errors: { index: number, errors: string[] }[] } Validation result
+ */
+export function validateRoutes(routes: IRouteConfig[]): {
+  valid: boolean;
+  errors: { index: number; errors: string[] }[]
+} {
+  const results: { index: number; errors: string[] }[] = [];
+
+  routes.forEach((route, index) => {
+    const validation = validateRouteConfig(route);
+    if (!validation.valid) {
+      results.push({
+        index,
+        errors: validation.errors
+      });
+    }
+  });
+
+  return {
+    valid: results.length === 0,
+    errors: results
+  };
+}
+
+/**
+ * Check if a route configuration has the required properties for a specific action type
+ * @param route Route configuration to check
+ * @param actionType Expected action type
+ * @returns True if the route has the necessary properties, false otherwise
+ */
+export function hasRequiredPropertiesForAction(route: IRouteConfig, actionType: string): boolean {
+  if (!route.action || route.action.type !== actionType) {
+    return false;
+  }
+
+  switch (actionType) {
+    case 'forward':
+      return !!route.action.targets &&
+             Array.isArray(route.action.targets) &&
+             route.action.targets.length > 0 &&
+             route.action.targets.every(t => t.host && t.port !== undefined);
+    case 'socket-handler':
+      return !!route.action.socketHandler && typeof route.action.socketHandler === 'function';
+    default:
+      return false;
+  }
+}
+
+/**
+ * Throws an error if the route config is invalid, returns the config if valid
+ * Useful for immediate validation when creating routes
+ * @param route Route configuration to validate
+ * @returns The validated route configuration
+ * @throws Error if the route configuration is invalid
+ */
+export function assertValidRoute(route: IRouteConfig): IRouteConfig {
+  const validation = validateRouteConfig(route);
+  if (!validation.valid) {
+    throw new Error(`Invalid route configuration: ${validation.errors.join(', ')}`);
+  }
+  return route;
+}

ts/proxies/smart-proxy/utils/route-validators.ts

@@ -1,283 +0,0 @@
-/**
- * Route Validators
- * 
- * This file provides utility functions for validating route configurations.
- * These validators help ensure that route configurations are valid and correctly structured.
- */
-
-import type { IRouteConfig, IRouteMatch, IRouteAction, TPortRange } from '../models/route-types.js';
-
-/**
- * Validates a port range or port number
- * @param port Port number, port range, or port function
- * @returns True if valid, false otherwise
- */
-export function isValidPort(port: any): boolean {
-  if (typeof port === 'number') {
-    return port > 0 && port < 65536; // Valid port range is 1-65535
-  } else if (Array.isArray(port)) {
-    return port.every(p =>
-      (typeof p === 'number' && p > 0 && p < 65536) ||
-      (typeof p === 'object' && 'from' in p && 'to' in p &&
-       p.from > 0 && p.from < 65536 && p.to > 0 && p.to < 65536)
-    );
-  } else if (typeof port === 'function') {
-    // For function-based ports, we can't validate the result at config time
-    // so we just check that it's a function
-    return true;
-  } else if (typeof port === 'object' && 'from' in port && 'to' in port) {
-    return port.from > 0 && port.from < 65536 && port.to > 0 && port.to < 65536;
-  }
-  return false;
-}
-
-/**
- * Validates a domain string
- * @param domain Domain string to validate
- * @returns True if valid, false otherwise
- */
-export function isValidDomain(domain: string): boolean {
-  // Basic domain validation regex - allows wildcards (*.example.com)
-  const domainRegex = /^(\*\.)?([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
-  return domainRegex.test(domain);
-}
-
-/**
- * Validates a route match configuration
- * @param match Route match configuration to validate
- * @returns { valid: boolean, errors: string[] } Validation result
- */
-export function validateRouteMatch(match: IRouteMatch): { valid: boolean; errors: string[] } {
-  const errors: string[] = [];
-
-  // Validate ports
-  if (match.ports !== undefined) {
-    if (!isValidPort(match.ports)) {
-      errors.push('Invalid port number or port range in match.ports');
-    }
-  }
-
-  // Validate domains
-  if (match.domains !== undefined) {
-    if (typeof match.domains === 'string') {
-      if (!isValidDomain(match.domains)) {
-        errors.push(`Invalid domain format: ${match.domains}`);
-      }
-    } else if (Array.isArray(match.domains)) {
-      for (const domain of match.domains) {
-        if (!isValidDomain(domain)) {
-          errors.push(`Invalid domain format: ${domain}`);
-        }
-      }
-    } else {
-      errors.push('Domains must be a string or an array of strings');
-    }
-  }
-
-  // Validate path
-  if (match.path !== undefined) {
-    if (typeof match.path !== 'string' || !match.path.startsWith('/')) {
-      errors.push('Path must be a string starting with /');
-    }
-  }
-
-  return {
-    valid: errors.length === 0,
-    errors
-  };
-}
-
-/**
- * Validates a route action configuration
- * @param action Route action configuration to validate
- * @returns { valid: boolean, errors: string[] } Validation result
- */
-export function validateRouteAction(action: IRouteAction): { valid: boolean; errors: string[] } {
-  const errors: string[] = [];
-
-  // Validate action type
-  if (!action.type) {
-    errors.push('Action type is required');
-  } else if (!['forward', 'socket-handler'].includes(action.type)) {
-    errors.push(`Invalid action type: ${action.type}`);
-  }
-
-  // Validate targets for 'forward' action
-  if (action.type === 'forward') {
-    if (!action.targets || !Array.isArray(action.targets) || action.targets.length === 0) {
-      errors.push('Targets array is required for forward action');
-    } else {
-      // Validate each target
-      action.targets.forEach((target, index) => {
-        // Validate target host
-        if (!target.host) {
-          errors.push(`Target[${index}] host is required`);
-        } else if (typeof target.host !== 'string' &&
-                  !Array.isArray(target.host) &&
-                  typeof target.host !== 'function') {
-          errors.push(`Target[${index}] host must be a string, array of strings, or function`);
-        }
-
-        // Validate target port
-        if (target.port === undefined) {
-          errors.push(`Target[${index}] port is required`);
-        } else if (typeof target.port !== 'number' &&
-                  typeof target.port !== 'function' &&
-                  target.port !== 'preserve') {
-          errors.push(`Target[${index}] port must be a number, 'preserve', or a function`);
-        } else if (typeof target.port === 'number' && !isValidPort(target.port)) {
-          errors.push(`Target[${index}] port must be between 1 and 65535`);
-        }
-        
-        // Validate match criteria if present
-        if (target.match) {
-          if (target.match.ports && !Array.isArray(target.match.ports)) {
-            errors.push(`Target[${index}] match.ports must be an array`);
-          }
-          if (target.match.method && !Array.isArray(target.match.method)) {
-            errors.push(`Target[${index}] match.method must be an array`);
-          }
-        }
-      });
-    }
-
-    // Validate TLS options for forward actions
-    if (action.tls) {
-      if (!['passthrough', 'terminate', 'terminate-and-reencrypt'].includes(action.tls.mode)) {
-        errors.push(`Invalid TLS mode: ${action.tls.mode}`);
-      }
-
-      // For termination modes, validate certificate
-      if (['terminate', 'terminate-and-reencrypt'].includes(action.tls.mode)) {
-        if (action.tls.certificate !== 'auto' && 
-            (!action.tls.certificate || !action.tls.certificate.key || !action.tls.certificate.cert)) {
-          errors.push('Certificate must be "auto" or an object with key and cert properties');
-        }
-      }
-    }
-  }
-
-  // Validate socket handler for 'socket-handler' action
-  if (action.type === 'socket-handler') {
-    if (!action.socketHandler) {
-      errors.push('Socket handler function is required for socket-handler action');
-    } else if (typeof action.socketHandler !== 'function') {
-      errors.push('Socket handler must be a function');
-    }
-  }
-
-  return {
-    valid: errors.length === 0,
-    errors
-  };
-}
-
-/**
- * Validates a complete route configuration
- * @param route Route configuration to validate
- * @returns { valid: boolean, errors: string[] } Validation result
- */
-export function validateRouteConfig(route: IRouteConfig): { valid: boolean; errors: string[] } {
-  const errors: string[] = [];
-
-  // Check for required properties
-  if (!route.match) {
-    errors.push('Route match configuration is required');
-  }
-
-  if (!route.action) {
-    errors.push('Route action configuration is required');
-  }
-
-  // Validate match configuration
-  if (route.match) {
-    const matchValidation = validateRouteMatch(route.match);
-    if (!matchValidation.valid) {
-      errors.push(...matchValidation.errors.map(err => `Match: ${err}`));
-    }
-  }
-
-  // Validate action configuration
-  if (route.action) {
-    const actionValidation = validateRouteAction(route.action);
-    if (!actionValidation.valid) {
-      errors.push(...actionValidation.errors.map(err => `Action: ${err}`));
-    }
-  }
-
-  // Ensure the route has a unique identifier
-  if (!route.id && !route.name) {
-    errors.push('Route should have either an id or a name for identification');
-  }
-
-  return {
-    valid: errors.length === 0,
-    errors
-  };
-}
-
-/**
- * Validate an array of route configurations
- * @param routes Array of route configurations to validate
- * @returns { valid: boolean, errors: { index: number, errors: string[] }[] } Validation result
- */
-export function validateRoutes(routes: IRouteConfig[]): { 
-  valid: boolean; 
-  errors: { index: number; errors: string[] }[] 
-} {
-  const results: { index: number; errors: string[] }[] = [];
-
-  routes.forEach((route, index) => {
-    const validation = validateRouteConfig(route);
-    if (!validation.valid) {
-      results.push({
-        index,
-        errors: validation.errors
-      });
-    }
-  });
-
-  return {
-    valid: results.length === 0,
-    errors: results
-  };
-}
-
-/**
- * Check if a route configuration has the required properties for a specific action type
- * @param route Route configuration to check
- * @param actionType Expected action type
- * @returns True if the route has the necessary properties, false otherwise
- */
-export function hasRequiredPropertiesForAction(route: IRouteConfig, actionType: string): boolean {
-  if (!route.action || route.action.type !== actionType) {
-    return false;
-  }
-
-  switch (actionType) {
-    case 'forward':
-      return !!route.action.targets && 
-             Array.isArray(route.action.targets) && 
-             route.action.targets.length > 0 &&
-             route.action.targets.every(t => t.host && t.port !== undefined);
-    case 'socket-handler':
-      return !!route.action.socketHandler && typeof route.action.socketHandler === 'function';
-    default:
-      return false;
-  }
-}
-
-/**
- * Throws an error if the route config is invalid, returns the config if valid
- * Useful for immediate validation when creating routes
- * @param route Route configuration to validate
- * @returns The validated route configuration
- * @throws Error if the route configuration is invalid
- */
-export function assertValidRoute(route: IRouteConfig): IRouteConfig {
-  const validation = validateRouteConfig(route);
-  if (!validation.valid) {
-    throw new Error(`Invalid route configuration: ${validation.errors.join(', ')}`);
-  }
-  return route;
-}