@push.rocks/smartproxy 25.17.10 → 26.1.0

package/dist_ts/proxies/smart-proxy/utils/route-helpers/socket-handlers.js

@@ -5,8 +5,43 @@
  * like echoing, proxying, HTTP responses, and redirects.
  */
 import * as plugins from '../../../../plugins.js';
-import { ProtocolDetector } from '../../../../detection/index.js';
 import { createSocketTracker } from '../../../../core/utils/socket-tracker.js';
+/**
+ * Minimal HTTP request parser for socket handlers.
+ * Parses method, path, and optionally headers from a raw buffer.
+ */
+function parseHttpRequest(data, extractHeaders = false) {
+    const str = data.toString('utf8');
+    const headerEnd = str.indexOf('\r\n\r\n');
+    const isComplete = headerEnd !== -1;
+    const headerSection = isComplete ? str.slice(0, headerEnd) : str;
+    const lines = headerSection.split('\r\n');
+    const requestLine = lines[0];
+    if (!requestLine)
+        return null;
+    const parts = requestLine.split(' ');
+    if (parts.length < 2)
+        return null;
+    const method = parts[0];
+    const path = parts[1];
+    // Quick check: valid HTTP method
+    const validMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'CONNECT', 'TRACE'];
+    if (!validMethods.includes(method))
+        return null;
+    const headers = {};
+    if (extractHeaders) {
+        for (let i = 1; i < lines.length; i++) {
+            const colonIdx = lines[i].indexOf(':');
+            if (colonIdx > 0) {
+                const name = lines[i].slice(0, colonIdx).trim().toLowerCase();
+                const value = lines[i].slice(colonIdx + 1).trim();
+                headers[name] = value;
+            }
+        }
+    }
+    const body = isComplete ? str.slice(headerEnd + 4) : undefined;
+    return { method, path, headers, isComplete, body };
+}
 /**
  * Pre-built socket handlers for common use cases
  */
@@ -92,23 +127,16 @@ export const SocketHandlers = {
     },
     /**
      * HTTP redirect handler
-     * Uses the centralized detection module for HTTP parsing
      */
     httpRedirect: (locationTemplate, statusCode = 301) => (socket, context) => {
         const tracker = createSocketTracker(socket);
-        const connectionId = ProtocolDetector.createConnectionId({
-            socketId: context.connectionId || `${Date.now()}-${Math.random()}`
-        });
-        const handleData = async (data) => {
-            // Use detection module for parsing
-            const detectionResult = await ProtocolDetector.detectWithConnectionTracking(data, connectionId, { extractFullHeaders: false } // We only need method and path
-            );
-            if (detectionResult.protocol === 'http' && detectionResult.connectionInfo.path) {
-                const method = detectionResult.connectionInfo.method || 'GET';
-                const path = detectionResult.connectionInfo.path || '/';
+        const handleData = (data) => {
+            const parsed = parseHttpRequest(data);
+            if (parsed) {
+                const path = parsed.path || '/';
                 const domain = context.domain || 'localhost';
                 const port = context.port;
-                let finalLocation = locationTemplate
+                const finalLocation = locationTemplate
                     .replace('{domain}', domain)
                     .replace('{port}', String(port))
                     .replace('{path}', path)
@@ -126,16 +154,11 @@ export const SocketHandlers = {
                 socket.write(response);
             }
             else {
-                // Not a valid HTTP request, close connection
                 socket.write('HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n');
             }
             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);
@@ -146,36 +169,26 @@ export const SocketHandlers = {
     },
     /**
      * HTTP server handler for ACME challenges and other HTTP needs
-     * Uses the centralized detection module for HTTP parsing
      */
     httpServer: (handler) => (socket, context) => {
         const tracker = createSocketTracker(socket);
         let requestParsed = false;
         let responseTimer = null;
-        const connectionId = ProtocolDetector.createConnectionId({
-            socketId: context.connectionId || `${Date.now()}-${Math.random()}`
-        });
-        const processData = async (data) => {
+        const processData = (data) => {
             if (requestParsed)
-                return; // Only handle the first request
-            // Use HttpDetector for parsing
-            const detectionResult = await ProtocolDetector.detectWithConnectionTracking(data, connectionId, { extractFullHeaders: true });
-            if (detectionResult.protocol !== 'http' || !detectionResult.isComplete) {
-                // Not a complete HTTP request yet
                 return;
+            const parsed = parseHttpRequest(data, true);
+            if (!parsed || !parsed.isComplete) {
+                return; // Not a complete HTTP request yet
             }
             requestParsed = true;
-            // Remove data listener after parsing request
             socket.removeListener('data', processData);
-            const connInfo = detectionResult.connectionInfo;
-            // Create request object from detection result
             const req = {
-                method: connInfo.method || 'GET',
-                url: connInfo.path || '/',
-                headers: connInfo.headers || {},
-                body: detectionResult.remainingBuffer?.toString() || ''
+                method: parsed.method,
+                url: parsed.path,
+                headers: parsed.headers,
+                body: parsed.body || ''
             };
-            // Create response object
             let statusCode = 200;
             const responseHeaders = {};
             let ended = false;
@@ -190,7 +203,6 @@ export const SocketHandlers = {
                     if (ended)
                         return;
                     ended = true;
-                    // Clear response timer since we're sending now
                     if (responseTimer) {
                         clearTimeout(responseTimer);
                         responseTimer = null;
@@ -222,14 +234,12 @@ export const SocketHandlers = {
             };
             try {
                 handler(req, res);
-                // Ensure response is sent even if handler doesn't call send()
                 responseTimer = setTimeout(() => {
                     if (!ended) {
                         res.send('');
                     }
                     responseTimer = null;
                 }, 1000);
-                // Track and unref the timer
                 tracker.addTimer(responseTimer);
             }
             catch (error) {
@@ -237,11 +247,9 @@ export const SocketHandlers = {
                     res.status(500);
                     res.send('Internal Server Error');
                 }
-                // Use safeDestroy for error cases
                 tracker.safeDestroy(error instanceof Error ? error : new Error('Handler error'));
             }
         };
-        // Use tracker to manage listeners
         tracker.addListener('data', processData);
         tracker.addListener('error', (err) => {
             if (!requestParsed) {
@@ -249,25 +257,16 @@ export const SocketHandlers = {
             }
         });
         tracker.addListener('close', () => {
-            // Clear any pending response timer
             if (responseTimer) {
                 clearTimeout(responseTimer);
                 responseTimer = null;
             }
-            // Clean up detection state
-            ProtocolDetector.cleanupConnections();
-            // Clean up all tracked resources
             tracker.cleanup();
         });
     }
 };
 /**
  * Create a socket handler route configuration
- * @param domains Domain(s) to match
- * @param ports Port(s) to listen on
- * @param handler Socket handler function
- * @param options Additional route options
- * @returns Route configuration object
  */
 export function createSocketHandlerRoute(domains, ports, handler, options = {}) {
     return {
@@ -284,4 +283,4 @@ export function createSocketHandlerRoute(domains, ports, handler, options = {})
         }
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"socket-handlers.js","sourceRoot":"","sources":["../../../../../ts/proxies/smart-proxy/utils/route-helpers/socket-handlers.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"socket-handlers.js","sourceRoot":"","sources":["../../../../../ts/proxies/smart-proxy/utils/route-helpers/socket-handlers.ts"],"names":[],"mappings":"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"}

package/dist_ts/routing/index.d.ts

@@ -2,4 +2,3 @@
  * Routing functionality module
  */
 export * from './models/http-types.js';
-export * from './router/index.js';

package/dist_ts/routing/index.js

@@ -3,6 +3,4 @@
  */
 // Export types and models
 export * from './models/http-types.js';
-// Export router functionality
-export * from './router/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yb3V0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsMEJBQTBCO0FBQzFCLGNBQWMsd0JBQXdCLENBQUM7QUFFdkMsOEJBQThCO0FBQzlCLGNBQWMsbUJBQW1CLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9yb3V0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsMEJBQTBCO0FBQzFCLGNBQWMsd0JBQXdCLENBQUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartproxy",
-  "version": "25.17.10",
+  "version": "26.1.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",

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartproxy',
-  version: '25.17.10',
+  version: '26.1.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.'
 }

package/ts/core/index.ts

@@ -5,4 +5,3 @@
 // Export submodules
 export * from './models/index.js';
 export * from './utils/index.js';
-export * from './events/index.js';

package/ts/core/models/index.ts

@@ -3,7 +3,6 @@
  */
 
 export * from './common-types.js';
-export * from './socket-augmentation.js';
 export * from './route-context.js';
 export * from './wrapped-socket.js';
 export * from './socket-types.js';

package/ts/core/utils/index.ts

@@ -2,16 +2,4 @@
  * Core utility functions
  */
 
-export * from './validation-utils.js';
-export * from './ip-utils.js';
-export * from './template-utils.js';
-export * from './security-utils.js';
-export * from './shared-security-manager.js';
-export * from './websocket-utils.js';
 export * from './logger.js';
-export * from './async-utils.js';
-export * from './fs-utils.js';
-export * from './lifecycle-component.js';
-export * from './binary-heap.js';
-export * from './enhanced-connection-pool.js';
-export * from './socket-utils.js';

package/ts/index.ts

@@ -11,18 +11,12 @@ export type { ISmartProxyOptions, IConnectionRecord, IRouteConfig, IRouteMatch,
 export type { TSmartProxyCertProvisionObject, ICertProvisionEventComms, ICertificateIssuedEvent, ICertificateFailedEvent } from './proxies/smart-proxy/models/interfaces.js';
 export * from './proxies/smart-proxy/utils/index.js';
 
-// Original: export * from './smartproxy/classes.pp.snihandler.js'
-// Now we export from the new module
-export { SniHandler } from './tls/sni/sni-handler.js';
-
 // Core types and utilities
 export * from './core/models/common-types.js';
 
 // Export IAcmeOptions from one place only
 export type { IAcmeOptions } from './proxies/smart-proxy/models/interfaces.js';
 
-// Modular exports for new architecture
-export * as tls from './tls/index.js';
+// Modular exports
 export * as routing from './routing/index.js';
-export * as detection from './detection/index.js';
 export * as protocols from './protocols/index.js';

package/ts/protocols/http/index.ts

@@ -4,5 +4,4 @@
  */
 
 export * from './constants.js';
-export * from './types.js';
-export * from './parser.js';
+export * from './types.js';

package/ts/protocols/index.ts

@@ -1,12 +1,5 @@
 /**
  * Protocol-specific modules for smartproxy
- * 
- * This directory contains generic protocol knowledge separated from
- * smartproxy-specific implementation details.
  */
 
-export * as common from './common/index.js';
-export * as tls from './tls/index.js';
 export * as http from './http/index.js';
-export * as proxy from './proxy/index.js';
-export * as websocket from './websocket/index.js';

package/ts/proxies/smart-proxy/models/metrics-types.ts

@@ -72,6 +72,7 @@ export interface IMetrics {
     byBackend(): Map<string, IBackendMetrics>;
     protocols(): Map<string, string>;
     topByErrors(limit?: number): Array<{ backend: string; errors: number }>;
+    detectedProtocols(): IProtocolCacheEntry[];
   };
 
   // UDP metrics
@@ -113,6 +114,26 @@ export interface IMetricsConfig {
   prometheusPrefix: string;        // Default: smartproxy_
 }
 
+/**
+ * Protocol cache entry from the Rust proxy's auto-detection cache.
+ * Shows which protocol (h1/h2/h3) is detected for each backend+domain pair,
+ * including failure suppression state with escalating cooldowns.
+ */
+export interface IProtocolCacheEntry {
+  host: string;
+  port: number;
+  domain: string | null;
+  protocol: string;
+  h3Port: number | null;
+  ageSecs: number;
+  h2Suppressed: boolean;
+  h3Suppressed: boolean;
+  h2CooldownRemainingSecs: number | null;
+  h3CooldownRemainingSecs: number | null;
+  h2ConsecutiveFailures: number | null;
+  h3ConsecutiveFailures: number | null;
+}
+
 /**
  * Per-backend metrics
  */

package/ts/proxies/smart-proxy/rust-metrics-adapter.ts

@@ -1,4 +1,4 @@
-import type { IMetrics, IBackendMetrics, IThroughputData, IThroughputHistoryPoint } from './models/metrics-types.js';
+import type { IMetrics, IBackendMetrics, IProtocolCacheEntry, IThroughputData, IThroughputHistoryPoint } from './models/metrics-types.js';
 import type { RustProxyBridge } from './rust-proxy-bridge.js';
 
 /**
@@ -216,6 +216,9 @@ export class RustMetricsAdapter implements IMetrics {
       result.sort((a, b) => b.errors - a.errors);
       return result.slice(0, limit);
     },
+    detectedProtocols: (): IProtocolCacheEntry[] => {
+      return this.cache?.detectedProtocols ?? [];
+    },
   };
 
   public udp = {

package/ts/proxies/smart-proxy/socket-handler-server.ts

@@ -274,6 +274,12 @@ export class SocketHandlerServer {
       backend.pipe(socket);
     });
 
+    // Track backend socket for cleanup on stop()
+    this.activeSockets.add(backend);
+    backend.on('close', () => {
+      this.activeSockets.delete(backend);
+    });
+
     // Connect timeout: if backend doesn't connect within 30s, destroy both
     backend.setTimeout(30_000);
 

package/ts/proxies/smart-proxy/utils/route-helpers/socket-handlers.ts

@@ -7,9 +7,54 @@
 
 import * as plugins from '../../../../plugins.js';
 import type { IRouteConfig, TPortRange, IRouteContext } from '../../models/route-types.js';
-import { ProtocolDetector } from '../../../../detection/index.js';
 import { createSocketTracker } from '../../../../core/utils/socket-tracker.js';
 
+/**
+ * Minimal HTTP request parser for socket handlers.
+ * Parses method, path, and optionally headers from a raw buffer.
+ */
+function parseHttpRequest(data: Buffer, extractHeaders: boolean = false): {
+  method: string;
+  path: string;
+  headers: Record<string, string>;
+  isComplete: boolean;
+  body?: string;
+} | null {
+  const str = data.toString('utf8');
+  const headerEnd = str.indexOf('\r\n\r\n');
+  const isComplete = headerEnd !== -1;
+  const headerSection = isComplete ? str.slice(0, headerEnd) : str;
+  const lines = headerSection.split('\r\n');
+  const requestLine = lines[0];
+  if (!requestLine) return null;
+
+  const parts = requestLine.split(' ');
+  if (parts.length < 2) return null;
+
+  const method = parts[0];
+  const path = parts[1];
+
+  // Quick check: valid HTTP method
+  const validMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'CONNECT', 'TRACE'];
+  if (!validMethods.includes(method)) return null;
+
+  const headers: Record<string, string> = {};
+  if (extractHeaders) {
+    for (let i = 1; i < lines.length; i++) {
+      const colonIdx = lines[i].indexOf(':');
+      if (colonIdx > 0) {
+        const name = lines[i].slice(0, colonIdx).trim().toLowerCase();
+        const value = lines[i].slice(colonIdx + 1).trim();
+        headers[name] = value;
+      }
+    }
+  }
+
+  const body = isComplete ? str.slice(headerEnd + 4) : undefined;
+
+  return { method, path, headers, isComplete, body };
+}
+
 /**
  * Pre-built socket handlers for common use cases
  */
@@ -104,30 +149,19 @@ export const SocketHandlers = {
 
   /**
    * HTTP redirect handler
-   * 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()}`
-    });
-
-    const handleData = async (data: Buffer) => {
-      // Use detection module for parsing
-      const detectionResult = await ProtocolDetector.detectWithConnectionTracking(
-        data,
-        connectionId,
-        { extractFullHeaders: false } // We only need method and path
-      );
 
-      if (detectionResult.protocol === 'http' && detectionResult.connectionInfo.path) {
-        const method = detectionResult.connectionInfo.method || 'GET';
-        const path = detectionResult.connectionInfo.path || '/';
+    const handleData = (data: Buffer) => {
+      const parsed = parseHttpRequest(data);
 
+      if (parsed) {
+        const path = parsed.path || '/';
         const domain = context.domain || 'localhost';
         const port = context.port;
 
-        let finalLocation = locationTemplate
+        const finalLocation = locationTemplate
           .replace('{domain}', domain)
           .replace('{port}', String(port))
           .replace('{path}', path)
@@ -146,18 +180,13 @@ export const SocketHandlers = {
 
         socket.write(response);
       } else {
-        // Not a valid HTTP request, close connection
         socket.write('HTTP/1.1 400 Bad Request\r\nConnection: close\r\n\r\n');
       }
 
       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) => {
@@ -171,45 +200,31 @@ export const SocketHandlers = {
 
   /**
    * HTTP server handler for ACME challenges and other HTTP needs
-   * 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()}`
-    });
 
-    const processData = async (data: Buffer) => {
-      if (requestParsed) return; // Only handle the first request
+    const processData = (data: Buffer) => {
+      if (requestParsed) return;
 
-      // Use HttpDetector for parsing
-      const detectionResult = await ProtocolDetector.detectWithConnectionTracking(
-        data,
-        connectionId,
-        { extractFullHeaders: true }
-      );
+      const parsed = parseHttpRequest(data, true);
 
-      if (detectionResult.protocol !== 'http' || !detectionResult.isComplete) {
-        // Not a complete HTTP request yet
-        return;
+      if (!parsed || !parsed.isComplete) {
+        return; // Not a complete HTTP request yet
       }
 
       requestParsed = true;
-      // Remove data listener after parsing request
       socket.removeListener('data', processData);
-      const connInfo = detectionResult.connectionInfo;
 
-      // Create request object from detection result
       const req = {
-        method: connInfo.method || 'GET',
-        url: connInfo.path || '/',
-        headers: connInfo.headers || {},
-        body: detectionResult.remainingBuffer?.toString() || ''
+        method: parsed.method,
+        url: parsed.path,
+        headers: parsed.headers,
+        body: parsed.body || ''
       };
 
-      // Create response object
       let statusCode = 200;
       const responseHeaders: Record<string, string> = {};
       let ended = false;
@@ -225,7 +240,6 @@ export const SocketHandlers = {
           if (ended) return;
           ended = true;
 
-          // Clear response timer since we're sending now
           if (responseTimer) {
             clearTimeout(responseTimer);
             responseTimer = null;
@@ -261,26 +275,22 @@ export const SocketHandlers = {
 
       try {
         handler(req, res);
-        // Ensure response is sent even if handler doesn't call send()
         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'));
       }
     };
 
-    // Use tracker to manage listeners
     tracker.addListener('data', processData);
 
     tracker.addListener('error', (err) => {
@@ -290,14 +300,10 @@ export const SocketHandlers = {
     });
 
     tracker.addListener('close', () => {
-      // Clear any pending response timer
       if (responseTimer) {
         clearTimeout(responseTimer);
         responseTimer = null;
       }
-      // Clean up detection state
-      ProtocolDetector.cleanupConnections();
-      // Clean up all tracked resources
       tracker.cleanup();
     });
   }
@@ -305,11 +311,6 @@ export const SocketHandlers = {
 
 /**
  * Create a socket handler route configuration
- * @param domains Domain(s) to match
- * @param ports Port(s) to listen on
- * @param handler Socket handler function
- * @param options Additional route options
- * @returns Route configuration object
  */
 export function createSocketHandlerRoute(
   domains: string | string[],

package/ts/routing/index.ts

@@ -4,6 +4,3 @@
 
 // Export types and models
 export * from './models/http-types.js';
-
-// Export router functionality
-export * from './router/index.js';