@push.rocks/smartproxy 12.0.0 → 13.1.2

package/ts/{smartproxy/classes.smartproxy.ts → proxies/smart-proxy/smart-proxy.ts}

@@ -1,21 +1,26 @@
-import * as plugins from '../plugins.js';
-
-import { ConnectionManager } from './classes.pp.connectionmanager.js';
-import { SecurityManager } from './classes.pp.securitymanager.js';
-import { DomainConfigManager } from './classes.pp.domainconfigmanager.js';
-import { TlsManager } from './classes.pp.tlsmanager.js';
-import { NetworkProxyBridge } from './classes.pp.networkproxybridge.js';
-import { TimeoutManager } from './classes.pp.timeoutmanager.js';
-import { PortRangeManager } from './classes.pp.portrangemanager.js';
-import { ConnectionHandler } from './classes.pp.connectionhandler.js';
-import { Port80Handler } from '../port80handler/classes.port80handler.js';
-import { CertProvisioner } from './classes.pp.certprovisioner.js';
-import type { ICertificateData } from '../common/types.js';
-import { buildPort80Handler } from '../common/acmeFactory.js';
-import type { ForwardingType } from './types/forwarding.types.js';
-import { createPort80HandlerOptions } from '../common/port80-adapter.js';
-
-import type { ISmartProxyOptions, IDomainConfig } from './classes.pp.interfaces.js';
+import * as plugins from '../../plugins.js';
+
+// Importing from the new structure
+import { ConnectionManager } from './connection-manager.js';
+import { SecurityManager } from './security-manager.js';
+import { DomainConfigManager } from './domain-config-manager.js';
+import { TlsManager } from './tls-manager.js';
+import { NetworkProxyBridge } from './network-proxy-bridge.js';
+import { TimeoutManager } from './timeout-manager.js';
+import { PortRangeManager } from './port-range-manager.js';
+import { ConnectionHandler } from './connection-handler.js';
+
+// External dependencies from migrated modules
+import { Port80Handler } from '../../http/port80/port80-handler.js';
+import { CertProvisioner } from '../../certificate/providers/cert-provisioner.js';
+import type { ICertificateData } from '../../certificate/models/certificate-types.js';
+import { buildPort80Handler } from '../../certificate/acme/acme-factory.js';
+import type { TForwardingType } from '../../forwarding/config/forwarding-types.js';
+import { createPort80HandlerOptions } from '../../common/port80-adapter.js';
+
+// Import types from models
+import type { ISmartProxyOptions, IDomainConfig } from './models/interfaces.js';
+// Provide backward compatibility types
 export type { ISmartProxyOptions as IPortProxySettings, IDomainConfig };
 
 /**
@@ -58,12 +63,12 @@ export class SmartProxy extends plugins.EventEmitter {
       keepAliveInitialDelay: settingsArg.keepAliveInitialDelay || 10000,
       maxPendingDataSize: settingsArg.maxPendingDataSize || 10 * 1024 * 1024,
       disableInactivityCheck: settingsArg.disableInactivityCheck || false,
-      enableKeepAliveProbes: 
+      enableKeepAliveProbes:
         settingsArg.enableKeepAliveProbes !== undefined ? settingsArg.enableKeepAliveProbes : true,
       enableDetailedLogging: settingsArg.enableDetailedLogging || false,
       enableTlsDebugLogging: settingsArg.enableTlsDebugLogging || false,
       enableRandomizedTimeouts: settingsArg.enableRandomizedTimeouts || false,
-      allowSessionTicket: 
+      allowSessionTicket:
         settingsArg.allowSessionTicket !== undefined ? settingsArg.allowSessionTicket : true,
       maxConnectionsPerIP: settingsArg.maxConnectionsPerIP || 100,
       connectionRateLimitPerMinute: settingsArg.connectionRateLimitPerMinute || 300,
@@ -154,7 +159,7 @@ export class SmartProxy extends plugins.EventEmitter {
   public async start() {
     // Don't start if already shutting down
     if (this.isShuttingDown) {
-      console.log("Cannot start PortProxy while it's shutting down");
+      console.log("Cannot start SmartProxy while it's shutting down");
       return;
     }
 
@@ -262,7 +267,7 @@ export class SmartProxy extends plugins.EventEmitter {
       server.listen(port, () => {
         const isNetworkProxyPort = this.settings.useNetworkProxy?.includes(port);
         console.log(
-          `PortProxy -> OK: Now listening on port ${port}${
+          `SmartProxy -> OK: Now listening on port ${port}${
             this.settings.sniEnabled && !isNetworkProxyPort ? ' (SNI passthrough enabled)' : ''
           }${isNetworkProxyPort ? ' (NetworkProxy forwarding enabled)' : ''}`
         );
@@ -347,7 +352,7 @@ export class SmartProxy extends plugins.EventEmitter {
    * Stop the proxy server
    */
   public async stop() {
-    console.log('PortProxy shutting down...');
+    console.log('SmartProxy shutting down...');
     this.isShuttingDown = true;
     // Stop CertProvisioner if active
     if (this.certProvisioner) {
@@ -402,7 +407,7 @@ export class SmartProxy extends plugins.EventEmitter {
     // Clear all servers
     this.netServers = [];
 
-    console.log('PortProxy shutdown complete.');
+    console.log('SmartProxy shutdown complete.');
   }
   
   /**

package/ts/{smartproxy/classes.pp.timeoutmanager.ts → proxies/smart-proxy/timeout-manager.ts}

@@ -1,4 +1,4 @@
-import type { IConnectionRecord, ISmartProxyOptions } from './classes.pp.interfaces.js';
+import type { IConnectionRecord, ISmartProxyOptions } from './models/interfaces.js';
 
 /**
  * Manages timeouts and inactivity tracking for connections
@@ -36,7 +36,7 @@ export class TimeoutManager {
       record.inactivityWarningIssued = false;
     }
   }
-  
+
   /**
    * Calculate effective inactivity timeout based on connection type
    */
@@ -91,7 +91,7 @@ export class TimeoutManager {
    * @returns The cleanup timer
    */
   public setupConnectionTimeout(
-    record: IConnectionRecord, 
+    record: IConnectionRecord,
     onTimeout: (record: IConnectionRecord, reason: string) => void
   ): NodeJS.Timeout {
     // Clear any existing timer

package/ts/{smartproxy/classes.pp.tlsmanager.ts → proxies/smart-proxy/tls-manager.ts}

@@ -1,6 +1,6 @@
-import * as plugins from '../plugins.js';
-import type { ISmartProxyOptions } from './classes.pp.interfaces.js';
-import { SniHandler } from './classes.pp.snihandler.js';
+import * as plugins from '../../plugins.js';
+import type { ISmartProxyOptions } from './models/interfaces.js';
+import { SniHandler } from '../../tls/sni/sni-handler.js';
 
 /**
  * Interface for connection information used for SNI extraction

package/ts/tls/alerts/index.ts

@@ -0,0 +1,3 @@
+/**
+ * TLS alerts
+ */

package/ts/{smartproxy/classes.pp.tlsalert.ts → tls/alerts/tls-alert.ts}

@@ -1,52 +1,53 @@
-import * as plugins from '../plugins.js';
+import * as plugins from '../../plugins.js';
+import { TlsAlertLevel, TlsAlertDescription, TlsVersion } from '../utils/tls-utils.js';
 
 /**
- * TlsAlert class for managing TLS alert messages
+ * TlsAlert class for creating and sending TLS alert messages
  */
 export class TlsAlert {
-  // TLS Alert Levels
-  static readonly LEVEL_WARNING = 0x01;
-  static readonly LEVEL_FATAL = 0x02;
-  
-  // TLS Alert Description Codes - RFC 8446 (TLS 1.3) / RFC 5246 (TLS 1.2)
-  static readonly CLOSE_NOTIFY = 0x00;
-  static readonly UNEXPECTED_MESSAGE = 0x0A;
-  static readonly BAD_RECORD_MAC = 0x14;
-  static readonly DECRYPTION_FAILED = 0x15; // TLS 1.0 only
-  static readonly RECORD_OVERFLOW = 0x16;
-  static readonly DECOMPRESSION_FAILURE = 0x1E; // TLS 1.2 and below
-  static readonly HANDSHAKE_FAILURE = 0x28;
-  static readonly NO_CERTIFICATE = 0x29; // SSLv3 only
-  static readonly BAD_CERTIFICATE = 0x2A;
-  static readonly UNSUPPORTED_CERTIFICATE = 0x2B;
-  static readonly CERTIFICATE_REVOKED = 0x2C;
-  static readonly CERTIFICATE_EXPIRED = 0x2F;
-  static readonly CERTIFICATE_UNKNOWN = 0x30;
-  static readonly ILLEGAL_PARAMETER = 0x2F;
-  static readonly UNKNOWN_CA = 0x30;
-  static readonly ACCESS_DENIED = 0x31;
-  static readonly DECODE_ERROR = 0x32;
-  static readonly DECRYPT_ERROR = 0x33;
-  static readonly EXPORT_RESTRICTION = 0x3C; // TLS 1.0 only
-  static readonly PROTOCOL_VERSION = 0x46;
-  static readonly INSUFFICIENT_SECURITY = 0x47;
-  static readonly INTERNAL_ERROR = 0x50;
-  static readonly INAPPROPRIATE_FALLBACK = 0x56;
-  static readonly USER_CANCELED = 0x5A;
-  static readonly NO_RENEGOTIATION = 0x64; // TLS 1.2 and below
-  static readonly MISSING_EXTENSION = 0x6D; // TLS 1.3
-  static readonly UNSUPPORTED_EXTENSION = 0x6E; // TLS 1.3
-  static readonly CERTIFICATE_REQUIRED = 0x6F; // TLS 1.3
-  static readonly UNRECOGNIZED_NAME = 0x70;
-  static readonly BAD_CERTIFICATE_STATUS_RESPONSE = 0x71;
-  static readonly BAD_CERTIFICATE_HASH_VALUE = 0x72; // TLS 1.2 and below
-  static readonly UNKNOWN_PSK_IDENTITY = 0x73;
-  static readonly CERTIFICATE_REQUIRED_1_3 = 0x74; // TLS 1.3
-  static readonly NO_APPLICATION_PROTOCOL = 0x78;
+  // Use enum values from TlsAlertLevel
+  static readonly LEVEL_WARNING = TlsAlertLevel.WARNING;
+  static readonly LEVEL_FATAL = TlsAlertLevel.FATAL;
+
+  // Use enum values from TlsAlertDescription
+  static readonly CLOSE_NOTIFY = TlsAlertDescription.CLOSE_NOTIFY;
+  static readonly UNEXPECTED_MESSAGE = TlsAlertDescription.UNEXPECTED_MESSAGE;
+  static readonly BAD_RECORD_MAC = TlsAlertDescription.BAD_RECORD_MAC;
+  static readonly DECRYPTION_FAILED = TlsAlertDescription.DECRYPTION_FAILED;
+  static readonly RECORD_OVERFLOW = TlsAlertDescription.RECORD_OVERFLOW;
+  static readonly DECOMPRESSION_FAILURE = TlsAlertDescription.DECOMPRESSION_FAILURE;
+  static readonly HANDSHAKE_FAILURE = TlsAlertDescription.HANDSHAKE_FAILURE;
+  static readonly NO_CERTIFICATE = TlsAlertDescription.NO_CERTIFICATE;
+  static readonly BAD_CERTIFICATE = TlsAlertDescription.BAD_CERTIFICATE;
+  static readonly UNSUPPORTED_CERTIFICATE = TlsAlertDescription.UNSUPPORTED_CERTIFICATE;
+  static readonly CERTIFICATE_REVOKED = TlsAlertDescription.CERTIFICATE_REVOKED;
+  static readonly CERTIFICATE_EXPIRED = TlsAlertDescription.CERTIFICATE_EXPIRED;
+  static readonly CERTIFICATE_UNKNOWN = TlsAlertDescription.CERTIFICATE_UNKNOWN;
+  static readonly ILLEGAL_PARAMETER = TlsAlertDescription.ILLEGAL_PARAMETER;
+  static readonly UNKNOWN_CA = TlsAlertDescription.UNKNOWN_CA;
+  static readonly ACCESS_DENIED = TlsAlertDescription.ACCESS_DENIED;
+  static readonly DECODE_ERROR = TlsAlertDescription.DECODE_ERROR;
+  static readonly DECRYPT_ERROR = TlsAlertDescription.DECRYPT_ERROR;
+  static readonly EXPORT_RESTRICTION = TlsAlertDescription.EXPORT_RESTRICTION;
+  static readonly PROTOCOL_VERSION = TlsAlertDescription.PROTOCOL_VERSION;
+  static readonly INSUFFICIENT_SECURITY = TlsAlertDescription.INSUFFICIENT_SECURITY;
+  static readonly INTERNAL_ERROR = TlsAlertDescription.INTERNAL_ERROR;
+  static readonly INAPPROPRIATE_FALLBACK = TlsAlertDescription.INAPPROPRIATE_FALLBACK;
+  static readonly USER_CANCELED = TlsAlertDescription.USER_CANCELED;
+  static readonly NO_RENEGOTIATION = TlsAlertDescription.NO_RENEGOTIATION;
+  static readonly MISSING_EXTENSION = TlsAlertDescription.MISSING_EXTENSION;
+  static readonly UNSUPPORTED_EXTENSION = TlsAlertDescription.UNSUPPORTED_EXTENSION;
+  static readonly CERTIFICATE_REQUIRED = TlsAlertDescription.CERTIFICATE_REQUIRED;
+  static readonly UNRECOGNIZED_NAME = TlsAlertDescription.UNRECOGNIZED_NAME;
+  static readonly BAD_CERTIFICATE_STATUS_RESPONSE = TlsAlertDescription.BAD_CERTIFICATE_STATUS_RESPONSE;
+  static readonly BAD_CERTIFICATE_HASH_VALUE = TlsAlertDescription.BAD_CERTIFICATE_HASH_VALUE;
+  static readonly UNKNOWN_PSK_IDENTITY = TlsAlertDescription.UNKNOWN_PSK_IDENTITY;
+  static readonly CERTIFICATE_REQUIRED_1_3 = TlsAlertDescription.CERTIFICATE_REQUIRED_1_3;
+  static readonly NO_APPLICATION_PROTOCOL = TlsAlertDescription.NO_APPLICATION_PROTOCOL;
   
   /**
    * Create a TLS alert buffer with the specified level and description code
-   * 
+   *
    * @param level Alert level (warning or fatal)
    * @param description Alert description code
    * @param tlsVersion TLS version bytes (default is TLS 1.2: 0x0303)
@@ -55,7 +56,7 @@ export class TlsAlert {
   static create(
     level: number,
     description: number,
-    tlsVersion: [number, number] = [0x03, 0x03]
+    tlsVersion: [number, number] = [TlsVersion.TLS1_2[0], TlsVersion.TLS1_2[1]]
   ): Buffer {
     return Buffer.from([
       0x15, // Alert record type

package/ts/tls/index.ts

@@ -0,0 +1,33 @@
+/**
+ * TLS module providing SNI extraction, TLS alerts, and other TLS-related utilities
+ */
+
+// Export TLS alert functionality
+export * from './alerts/tls-alert.js';
+
+// Export SNI handling
+export * from './sni/sni-handler.js';
+export * from './sni/sni-extraction.js';
+export * from './sni/client-hello-parser.js';
+
+// Export TLS utilities
+export * from './utils/tls-utils.js';
+
+// Create a namespace for SNI utilities
+import { SniHandler } from './sni/sni-handler.js';
+import { SniExtraction } from './sni/sni-extraction.js';
+import { ClientHelloParser } from './sni/client-hello-parser.js';
+
+// Export utility objects for convenience
+export const SNI = {
+  // Main handler class (for backward compatibility)
+  Handler: SniHandler,
+
+  // Utility classes
+  Extraction: SniExtraction,
+  Parser: ClientHelloParser,
+
+  // Convenience functions
+  extractSNI: SniHandler.extractSNI,
+  processTlsPacket: SniHandler.processTlsPacket,
+};