@push.rocks/smartproxy 23.0.0 → 23.1.1

package/dist_ts/proxies/smart-proxy/route-manager.d.ts

@@ -1,112 +0,0 @@
-import * as plugins from '../../plugins.js';
-import type { IRouteConfig, TPortRange } from './models/route-types.js';
-import type { ISmartProxyOptions } from './models/interfaces.js';
-/**
- * Result of route matching
- */
-export interface IRouteMatchResult {
-    route: IRouteConfig;
-    params?: Record<string, string>;
-}
-/**
- * The RouteManager handles all routing decisions based on connections and attributes
- */
-export declare class RouteManager extends plugins.EventEmitter {
-    private routes;
-    private portMap;
-    private options;
-    constructor(options: ISmartProxyOptions);
-    /**
-     * Update routes with new configuration
-     */
-    updateRoutes(routes?: IRouteConfig[]): void;
-    /**
-     * Rebuild the port mapping for fast lookups
-     * Also logs information about the ports being listened on
-     */
-    private rebuildPortMap;
-    /**
-     * Expand a port range specification into an array of individual ports
-     * Uses caching to improve performance for frequently used port ranges
-     *
-     * @public - Made public to allow external code to interpret port ranges
-     */
-    expandPortRange(portRange: TPortRange): number[];
-    /**
-     * Memoization cache for expanded port ranges
-     */
-    private portRangeCache;
-    /**
-     * Get all ports that should be listened on
-     * This method automatically infers all required ports from route configurations
-     */
-    getListeningPorts(): number[];
-    /**
-     * Get all routes for a given port
-     */
-    getRoutesForPort(port: number): IRouteConfig[];
-    /**
-     * Get all routes
-     */
-    getAllRoutes(): IRouteConfig[];
-    /**
-     * Test if a pattern matches a domain using glob matching
-     */
-    private matchDomain;
-    /**
-     * Match a domain against all patterns in a route
-     */
-    private matchRouteDomain;
-    /**
-     * Check if a client IP is allowed by a route's security settings
-     * @deprecated Security is now checked in route-connection-handler.ts after route matching
-     */
-    private isClientIpAllowed;
-    /**
-     * Match an IP against a pattern
-     */
-    private matchIpPattern;
-    /**
-     * Match an IP against a CIDR pattern
-     */
-    private matchIpCidr;
-    /**
-     * Convert an IP address to a numeric value
-     */
-    private ipToNumber;
-    /**
-     * Find the matching route for a connection
-     */
-    findMatchingRoute(options: {
-        port: number;
-        domain?: string;
-        clientIp: string;
-        path?: string;
-        tlsVersion?: string;
-        skipDomainCheck?: boolean;
-    }): IRouteMatchResult | null;
-    /**
-     * Match a path against a pattern
-     */
-    private matchPath;
-    /**
-     * Domain-based configuration methods have been removed
-     * as part of the migration to pure route-based configuration
-     */
-    /**
-     * Validate the route configuration and return any warnings
-     */
-    validateConfiguration(): string[];
-    /**
-     * Check if two route matches are similar (potential conflict)
-     */
-    private areMatchesSimilar;
-    /**
-     * Check if a route is completely shadowed by a higher priority route
-     */
-    private isRouteShadowed;
-    /**
-     * Check if route1 is more specific than route2
-     */
-    private isRouteMoreSpecific;
-}

package/dist_ts/proxies/smart-proxy/route-manager.js

@@ -1,453 +0,0 @@
-import * as plugins from '../../plugins.js';
-/**
- * The RouteManager handles all routing decisions based on connections and attributes
- */
-export class RouteManager extends plugins.EventEmitter {
-    constructor(options) {
-        super();
-        this.routes = [];
-        this.portMap = new Map();
-        /**
-         * Memoization cache for expanded port ranges
-         */
-        this.portRangeCache = new Map();
-        // Store options
-        this.options = options;
-        // Initialize routes from either source
-        this.updateRoutes(this.options.routes);
-    }
-    /**
-     * Update routes with new configuration
-     */
-    updateRoutes(routes = []) {
-        // Sort routes by priority (higher first)
-        this.routes = [...(routes || [])].sort((a, b) => {
-            const priorityA = a.priority ?? 0;
-            const priorityB = b.priority ?? 0;
-            return priorityB - priorityA;
-        });
-        // Rebuild port mapping for fast lookups
-        this.rebuildPortMap();
-    }
-    /**
-     * Rebuild the port mapping for fast lookups
-     * Also logs information about the ports being listened on
-     */
-    rebuildPortMap() {
-        this.portMap.clear();
-        this.portRangeCache.clear(); // Clear cache when rebuilding
-        // Track ports for logging
-        const portToRoutesMap = new Map();
-        for (const route of this.routes) {
-            const ports = this.expandPortRange(route.match.ports);
-            // Skip if no ports were found
-            if (ports.length === 0) {
-                console.warn(`Route ${route.name || 'unnamed'} has no valid ports to listen on`);
-                continue;
-            }
-            for (const port of ports) {
-                // Add to portMap for routing
-                if (!this.portMap.has(port)) {
-                    this.portMap.set(port, []);
-                }
-                this.portMap.get(port).push(route);
-                // Add to tracking for logging
-                if (!portToRoutesMap.has(port)) {
-                    portToRoutesMap.set(port, []);
-                }
-                portToRoutesMap.get(port).push(route.name || 'unnamed');
-            }
-        }
-        // Log summary of ports and routes
-        const totalPorts = this.portMap.size;
-        const totalRoutes = this.routes.length;
-        console.log(`Route manager configured with ${totalRoutes} routes across ${totalPorts} ports`);
-        // Log port details if detailed logging is enabled
-        const enableDetailedLogging = this.options.enableDetailedLogging;
-        if (enableDetailedLogging) {
-            for (const [port, routes] of this.portMap.entries()) {
-                console.log(`Port ${port}: ${routes.length} routes (${portToRoutesMap.get(port).join(', ')})`);
-            }
-        }
-    }
-    /**
-     * Expand a port range specification into an array of individual ports
-     * Uses caching to improve performance for frequently used port ranges
-     *
-     * @public - Made public to allow external code to interpret port ranges
-     */
-    expandPortRange(portRange) {
-        // For simple number, return immediately
-        if (typeof portRange === 'number') {
-            return [portRange];
-        }
-        // Create a cache key for this port range
-        const cacheKey = JSON.stringify(portRange);
-        // Check if we have a cached result
-        if (this.portRangeCache.has(cacheKey)) {
-            return this.portRangeCache.get(cacheKey);
-        }
-        // Process the port range
-        let result = [];
-        if (Array.isArray(portRange)) {
-            // Handle array of port objects or numbers
-            result = portRange.flatMap(item => {
-                if (typeof item === 'number') {
-                    return [item];
-                }
-                else if (typeof item === 'object' && 'from' in item && 'to' in item) {
-                    // Handle port range object - check valid range
-                    if (item.from > item.to) {
-                        console.warn(`Invalid port range: from (${item.from}) > to (${item.to})`);
-                        return [];
-                    }
-                    // Handle port range object
-                    const ports = [];
-                    for (let p = item.from; p <= item.to; p++) {
-                        ports.push(p);
-                    }
-                    return ports;
-                }
-                return [];
-            });
-        }
-        // Cache the result
-        this.portRangeCache.set(cacheKey, result);
-        return result;
-    }
-    /**
-     * Get all ports that should be listened on
-     * This method automatically infers all required ports from route configurations
-     */
-    getListeningPorts() {
-        // Return the unique set of ports from all routes
-        return Array.from(this.portMap.keys());
-    }
-    /**
-     * Get all routes for a given port
-     */
-    getRoutesForPort(port) {
-        return this.portMap.get(port) || [];
-    }
-    /**
-     * Get all routes
-     */
-    getAllRoutes() {
-        return [...this.routes];
-    }
-    /**
-     * Test if a pattern matches a domain using glob matching
-     */
-    matchDomain(pattern, domain) {
-        // Convert glob pattern to regex
-        const regexPattern = pattern
-            .replace(/\./g, '\\.') // Escape dots
-            .replace(/\*/g, '.*'); // Convert * to .*
-        const regex = new RegExp(`^${regexPattern}$`, 'i');
-        return regex.test(domain);
-    }
-    /**
-     * Match a domain against all patterns in a route
-     */
-    matchRouteDomain(route, domain) {
-        if (!route.match.domains) {
-            // If no domains specified, match all domains
-            return true;
-        }
-        const patterns = Array.isArray(route.match.domains)
-            ? route.match.domains
-            : [route.match.domains];
-        return patterns.some(pattern => this.matchDomain(pattern, domain));
-    }
-    /**
-     * Check if a client IP is allowed by a route's security settings
-     * @deprecated Security is now checked in route-connection-handler.ts after route matching
-     */
-    isClientIpAllowed(route, clientIp) {
-        const security = route.security;
-        if (!security) {
-            return true; // No security settings means allowed
-        }
-        // Check blocked IPs first
-        if (security.ipBlockList && security.ipBlockList.length > 0) {
-            for (const pattern of security.ipBlockList) {
-                if (this.matchIpPattern(pattern, clientIp)) {
-                    return false; // IP is blocked
-                }
-            }
-        }
-        // If there are allowed IPs, check them
-        if (security.ipAllowList && security.ipAllowList.length > 0) {
-            for (const pattern of security.ipAllowList) {
-                if (this.matchIpPattern(pattern, clientIp)) {
-                    return true; // IP is allowed
-                }
-            }
-            return false; // IP not in allowed list
-        }
-        // No allowed IPs specified, so IP is allowed
-        return true;
-    }
-    /**
-     * Match an IP against a pattern
-     */
-    matchIpPattern(pattern, ip) {
-        // Normalize IPv6-mapped IPv4 addresses
-        const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
-        const normalizedPattern = pattern.startsWith('::ffff:') ? pattern.substring(7) : pattern;
-        // Handle exact match with normalized addresses
-        if (pattern === ip || normalizedPattern === normalizedIp ||
-            pattern === normalizedIp || normalizedPattern === ip) {
-            return true;
-        }
-        // Handle CIDR notation (e.g., 192.168.1.0/24)
-        if (pattern.includes('/')) {
-            return this.matchIpCidr(pattern, normalizedIp) ||
-                (normalizedPattern !== pattern && this.matchIpCidr(normalizedPattern, normalizedIp));
-        }
-        // Handle glob pattern (e.g., 192.168.1.*)
-        if (pattern.includes('*')) {
-            const regexPattern = pattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
-            const regex = new RegExp(`^${regexPattern}$`);
-            if (regex.test(ip) || regex.test(normalizedIp)) {
-                return true;
-            }
-            // If pattern was normalized, also test with normalized pattern
-            if (normalizedPattern !== pattern) {
-                const normalizedRegexPattern = normalizedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
-                const normalizedRegex = new RegExp(`^${normalizedRegexPattern}$`);
-                return normalizedRegex.test(ip) || normalizedRegex.test(normalizedIp);
-            }
-        }
-        return false;
-    }
-    /**
-     * Match an IP against a CIDR pattern
-     */
-    matchIpCidr(cidr, ip) {
-        try {
-            // In a real implementation, you'd use a proper IP library
-            // This is a simplified implementation
-            const [subnet, bits] = cidr.split('/');
-            const mask = parseInt(bits, 10);
-            // Normalize IPv6-mapped IPv4 addresses
-            const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
-            const normalizedSubnet = subnet.startsWith('::ffff:') ? subnet.substring(7) : subnet;
-            // Convert IP addresses to numeric values
-            const ipNum = this.ipToNumber(normalizedIp);
-            const subnetNum = this.ipToNumber(normalizedSubnet);
-            // Calculate subnet mask
-            const maskNum = ~(2 ** (32 - mask) - 1);
-            // Check if IP is in subnet
-            return (ipNum & maskNum) === (subnetNum & maskNum);
-        }
-        catch (e) {
-            console.error(`Error matching IP ${ip} against CIDR ${cidr}:`, e);
-            return false;
-        }
-    }
-    /**
-     * Convert an IP address to a numeric value
-     */
-    ipToNumber(ip) {
-        // Normalize IPv6-mapped IPv4 addresses
-        const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
-        const parts = normalizedIp.split('.').map(part => parseInt(part, 10));
-        return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3];
-    }
-    /**
-     * Find the matching route for a connection
-     */
-    findMatchingRoute(options) {
-        const { port, domain, clientIp, path, tlsVersion, skipDomainCheck } = options;
-        // Get all routes for this port
-        const routesForPort = this.getRoutesForPort(port);
-        // Find the first matching route based on priority order
-        for (const route of routesForPort) {
-            // Check domain match
-            // If the route has domain restrictions and we have a domain to check
-            if (route.match.domains && !skipDomainCheck) {
-                // If no domain was provided (non-TLS or no SNI), this route doesn't match
-                if (!domain) {
-                    continue;
-                }
-                // If domain is provided but doesn't match the route's domains, skip
-                if (!this.matchRouteDomain(route, domain)) {
-                    continue;
-                }
-            }
-            // If route has no domain restrictions, it matches all domains
-            // If skipDomainCheck is true, we skip domain validation for HTTP connections
-            // Check path match if specified in both route and request
-            if (path && route.match.path) {
-                if (!this.matchPath(route.match.path, path)) {
-                    continue;
-                }
-            }
-            // Check client IP match
-            if (route.match.clientIp && !route.match.clientIp.some(pattern => this.matchIpPattern(pattern, clientIp))) {
-                continue;
-            }
-            // Check TLS version match
-            if (tlsVersion && route.match.tlsVersion &&
-                !route.match.tlsVersion.includes(tlsVersion)) {
-                continue;
-            }
-            // All checks passed, this route matches
-            // NOTE: Security is checked AFTER route matching in route-connection-handler.ts
-            return { route };
-        }
-        return null;
-    }
-    /**
-     * Match a path against a pattern
-     */
-    matchPath(pattern, path) {
-        // Convert the glob pattern to a regex
-        const regexPattern = pattern
-            .replace(/\./g, '\\.') // Escape dots
-            .replace(/\*/g, '.*') // Convert * to .*
-            .replace(/\//g, '\\/'); // Escape slashes
-        const regex = new RegExp(`^${regexPattern}$`);
-        return regex.test(path);
-    }
-    /**
-     * Domain-based configuration methods have been removed
-     * as part of the migration to pure route-based configuration
-     */
-    /**
-     * Validate the route configuration and return any warnings
-     */
-    validateConfiguration() {
-        const warnings = [];
-        const duplicatePorts = new Map();
-        // Check for routes with the same exact match criteria
-        for (let i = 0; i < this.routes.length; i++) {
-            for (let j = i + 1; j < this.routes.length; j++) {
-                const route1 = this.routes[i];
-                const route2 = this.routes[j];
-                // Check if route match criteria are the same
-                if (this.areMatchesSimilar(route1.match, route2.match)) {
-                    warnings.push(`Routes "${route1.name || i}" and "${route2.name || j}" have similar match criteria. ` +
-                        `The route with higher priority (${Math.max(route1.priority || 0, route2.priority || 0)}) will be used.`);
-                }
-            }
-        }
-        // Check for routes that may never be matched due to priority
-        for (let i = 0; i < this.routes.length; i++) {
-            const route = this.routes[i];
-            const higherPriorityRoutes = this.routes.filter(r => (r.priority || 0) > (route.priority || 0));
-            for (const higherRoute of higherPriorityRoutes) {
-                if (this.isRouteShadowed(route, higherRoute)) {
-                    warnings.push(`Route "${route.name || i}" may never be matched because it is shadowed by ` +
-                        `higher priority route "${higherRoute.name || 'unnamed'}"`);
-                    break;
-                }
-            }
-        }
-        return warnings;
-    }
-    /**
-     * Check if two route matches are similar (potential conflict)
-     */
-    areMatchesSimilar(match1, match2) {
-        // Check port overlap
-        const ports1 = new Set(this.expandPortRange(match1.ports));
-        const ports2 = new Set(this.expandPortRange(match2.ports));
-        let havePortOverlap = false;
-        for (const port of ports1) {
-            if (ports2.has(port)) {
-                havePortOverlap = true;
-                break;
-            }
-        }
-        if (!havePortOverlap) {
-            return false;
-        }
-        // Check domain overlap
-        if (match1.domains && match2.domains) {
-            const domains1 = Array.isArray(match1.domains) ? match1.domains : [match1.domains];
-            const domains2 = Array.isArray(match2.domains) ? match2.domains : [match2.domains];
-            // Check if any domain pattern from match1 could match any from match2
-            let haveDomainOverlap = false;
-            for (const domain1 of domains1) {
-                for (const domain2 of domains2) {
-                    if (domain1 === domain2 ||
-                        (domain1.includes('*') || domain2.includes('*'))) {
-                        haveDomainOverlap = true;
-                        break;
-                    }
-                }
-                if (haveDomainOverlap)
-                    break;
-            }
-            if (!haveDomainOverlap) {
-                return false;
-            }
-        }
-        else if (match1.domains || match2.domains) {
-            // One has domains, the other doesn't - they could overlap
-            // The one with domains is more specific, so it's not exactly a conflict
-            return false;
-        }
-        // Check path overlap
-        if (match1.path && match2.path) {
-            // This is a simplified check - in a real implementation,
-            // you'd need to check if the path patterns could match the same paths
-            return match1.path === match2.path ||
-                match1.path.includes('*') ||
-                match2.path.includes('*');
-        }
-        else if (match1.path || match2.path) {
-            // One has a path, the other doesn't
-            return false;
-        }
-        // If we get here, the matches have significant overlap
-        return true;
-    }
-    /**
-     * Check if a route is completely shadowed by a higher priority route
-     */
-    isRouteShadowed(route, higherPriorityRoute) {
-        // If they don't have similar match criteria, no shadowing occurs
-        if (!this.areMatchesSimilar(route.match, higherPriorityRoute.match)) {
-            return false;
-        }
-        // If higher priority route has more specific criteria, no shadowing
-        if (this.isRouteMoreSpecific(higherPriorityRoute.match, route.match)) {
-            return false;
-        }
-        // If higher priority route is equally or less specific but has higher priority,
-        // it shadows the lower priority route
-        return true;
-    }
-    /**
-     * Check if route1 is more specific than route2
-     */
-    isRouteMoreSpecific(match1, match2) {
-        // Check if match1 has more specific criteria
-        let match1Points = 0;
-        let match2Points = 0;
-        // Path is the most specific
-        if (match1.path)
-            match1Points += 3;
-        if (match2.path)
-            match2Points += 3;
-        // Domain is next most specific
-        if (match1.domains)
-            match1Points += 2;
-        if (match2.domains)
-            match2Points += 2;
-        // Client IP and TLS version are least specific
-        if (match1.clientIp)
-            match1Points += 1;
-        if (match2.clientIp)
-            match2Points += 1;
-        if (match1.tlsVersion)
-            match1Points += 1;
-        if (match2.tlsVersion)
-            match2Points += 1;
-        return match1Points > match2Points;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/route-manager.ts"],"names":[],"mappings":"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"}

package/dist_ts/proxies/smart-proxy/route-orchestrator.d.ts

@@ -1,56 +0,0 @@
-import type { IRouteConfig } from './models/route-types.js';
-import type { ILogger } from '../http-proxy/models/types.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 declare class RouteOrchestrator {
-    private routeUpdateLock;
-    private portManager;
-    private routeManager;
-    private httpProxyBridge;
-    private nftablesManager;
-    private certManager;
-    private logger;
-    constructor(portManager: PortManager, routeManager: RouteManager, httpProxyBridge: HttpProxyBridge, nftablesManager: NFTablesManager, certManager: SmartCertManager | null, logger: ILogger);
-    /**
-     * Set or update certificate manager reference
-     */
-    setCertManager(certManager: SmartCertManager | null): void;
-    /**
-     * Get certificate manager reference
-     */
-    getCertManager(): SmartCertManager | null;
-    /**
-     * Update routes with validation and coordination
-     */
-    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;
-    }>;
-    /**
-     * Update port usage map based on the provided routes
-     */
-    updatePortUsageMap(routes: IRouteConfig[]): Map<number, Set<string>>;
-    /**
-     * Find ports that have no routes in the new configuration
-     */
-    private findOrphanedPorts;
-    /**
-     * Update NFTables routes
-     */
-    private updateNfTablesRoutes;
-}