fix(strcuture): refactor responsibilities

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

@@ -4,7 +4,7 @@ import * as plugins from '../../plugins.js';
 import { ConnectionManager } from './connection-manager.js';
 import { SecurityManager } from './security-manager.js';
 import { TlsManager } from './tls-manager.js';
-import { NetworkProxyBridge } from './network-proxy-bridge.js';
+import { HttpProxyBridge } from './http-proxy-bridge.js';
 import { TimeoutManager } from './timeout-manager.js';
 import { PortManager } from './port-manager.js';
 import { RouteManager } from './route-manager.js';
@@ -49,7 +49,7 @@ export class SmartProxy extends plugins.EventEmitter {
   private connectionManager: ConnectionManager;
   private securityManager: SecurityManager;
   private tlsManager: TlsManager;
-  private networkProxyBridge: NetworkProxyBridge;
+  private httpProxyBridge: HttpProxyBridge;
   private timeoutManager: TimeoutManager;
   public routeManager: RouteManager; // Made public for route management
   private routeConnectionHandler: RouteConnectionHandler;
@@ -123,7 +123,7 @@ export class SmartProxy extends plugins.EventEmitter {
       keepAliveTreatment: settingsArg.keepAliveTreatment || 'extended',
       keepAliveInactivityMultiplier: settingsArg.keepAliveInactivityMultiplier || 6,
       extendedKeepAliveLifetime: settingsArg.extendedKeepAliveLifetime || 7 * 24 * 60 * 60 * 1000,
-      networkProxyPort: settingsArg.networkProxyPort || 8443,
+      httpProxyPort: settingsArg.httpProxyPort || 8443,
     };
     
     // Normalize ACME options if provided (support both email and accountEmail)
@@ -164,7 +164,7 @@ export class SmartProxy extends plugins.EventEmitter {
     
     // Create other required components
     this.tlsManager = new TlsManager(this.settings);
-    this.networkProxyBridge = new NetworkProxyBridge(this.settings);
+    this.httpProxyBridge = new HttpProxyBridge(this.settings);
     
     // Initialize connection handler with route support
     this.routeConnectionHandler = new RouteConnectionHandler(
@@ -172,7 +172,7 @@ export class SmartProxy extends plugins.EventEmitter {
       this.connectionManager,
       this.securityManager,
       this.tlsManager,
-      this.networkProxyBridge,
+      this.httpProxyBridge,
       this.timeoutManager,
       this.routeManager
     );
@@ -212,9 +212,9 @@ export class SmartProxy extends plugins.EventEmitter {
       await this.updateRoutes(routes);
     });
     
-    // Connect with NetworkProxy if available
-    if (this.networkProxyBridge.getNetworkProxy()) {
-      certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
+    // Connect with HttpProxy if available
+    if (this.httpProxyBridge.getHttpProxy()) {
+      certManager.setHttpProxy(this.httpProxyBridge.getHttpProxy());
     }
     
     // Set the ACME state manager
@@ -312,16 +312,16 @@ export class SmartProxy extends plugins.EventEmitter {
     // Initialize certificate manager before starting servers
     await this.initializeCertificateManager();
 
-    // Initialize and start NetworkProxy if needed
-    if (this.settings.useNetworkProxy && this.settings.useNetworkProxy.length > 0) {
-      await this.networkProxyBridge.initialize();
+    // Initialize and start HttpProxy if needed
+    if (this.settings.useHttpProxy && this.settings.useHttpProxy.length > 0) {
+      await this.httpProxyBridge.initialize();
       
-      // Connect NetworkProxy with certificate manager
+      // Connect HttpProxy with certificate manager
       if (this.certManager) {
-        this.certManager.setNetworkProxy(this.networkProxyBridge.getNetworkProxy());
+        this.certManager.setHttpProxy(this.httpProxyBridge.getHttpProxy());
       }
       
-      await this.networkProxyBridge.start();
+      await this.httpProxyBridge.start();
     }
 
     // Validate the route configuration
@@ -368,7 +368,7 @@ export class SmartProxy extends plugins.EventEmitter {
       let completedTlsHandshakes = 0;
       let pendingTlsHandshakes = 0;
       let keepAliveConnections = 0;
-      let networkProxyConnections = 0;
+      let httpProxyConnections = 0;
       
       // Get connection records for analysis
       const connectionRecords = this.connectionManager.getConnections();
@@ -392,7 +392,7 @@ export class SmartProxy extends plugins.EventEmitter {
         }
 
         if (record.usingNetworkProxy) {
-          networkProxyConnections++;
+          httpProxyConnections++;
         }
 
         maxIncoming = Math.max(maxIncoming, now - record.incomingStartTime);
@@ -408,7 +408,7 @@ export class SmartProxy extends plugins.EventEmitter {
       console.log(
         `Active connections: ${connectionRecords.size}. ` +
         `Types: TLS=${tlsConnections} (Completed=${completedTlsHandshakes}, Pending=${pendingTlsHandshakes}), ` +
-        `Non-TLS=${nonTlsConnections}, KeepAlive=${keepAliveConnections}, NetworkProxy=${networkProxyConnections}. ` +
+        `Non-TLS=${nonTlsConnections}, KeepAlive=${keepAliveConnections}, HttpProxy=${httpProxyConnections}. ` +
         `Longest running: IN=${plugins.prettyMs(maxIncoming)}, OUT=${plugins.prettyMs(maxOutgoing)}. ` +
         `Termination stats: ${JSON.stringify({
           IN: terminationStats.incoming,
@@ -460,8 +460,8 @@ export class SmartProxy extends plugins.EventEmitter {
     // Clean up all active connections
     this.connectionManager.clearConnections();
 
-    // Stop NetworkProxy
-    await this.networkProxyBridge.stop();
+    // Stop HttpProxy
+    await this.httpProxyBridge.stop();
     
     // Clear ACME state manager
     this.acmeStateManager.clear();
@@ -574,9 +574,9 @@ export class SmartProxy extends plugins.EventEmitter {
       // Update settings with the new routes
       this.settings.routes = newRoutes;
 
-      // If NetworkProxy is initialized, resync the configurations
-      if (this.networkProxyBridge.getNetworkProxy()) {
-        await this.networkProxyBridge.syncRoutesToNetworkProxy(newRoutes);
+      // If HttpProxy is initialized, resync the configurations
+      if (this.httpProxyBridge.getHttpProxy()) {
+        await this.httpProxyBridge.syncRoutesToHttpProxy(newRoutes);
       }
 
       // Update certificate manager with new routes
@@ -711,14 +711,14 @@ export class SmartProxy extends plugins.EventEmitter {
     let tlsConnections = 0;
     let nonTlsConnections = 0;
     let keepAliveConnections = 0;
-    let networkProxyConnections = 0;
+    let httpProxyConnections = 0;
     
     // Analyze active connections
     for (const record of connectionRecords.values()) {
       if (record.isTLS) tlsConnections++;
       else nonTlsConnections++;
       if (record.hasKeepAlive) keepAliveConnections++;
-      if (record.usingNetworkProxy) networkProxyConnections++;
+      if (record.usingNetworkProxy) httpProxyConnections++;
     }
     
     return {
@@ -726,7 +726,7 @@ export class SmartProxy extends plugins.EventEmitter {
       tlsConnections,
       nonTlsConnections,
       keepAliveConnections,
-      networkProxyConnections,
+      httpProxyConnections,
       terminationStats,
       acmeEnabled: !!this.certManager,
       port80HandlerPort: this.certManager ? 80 : null,