update
This commit is contained in:
@ -1,28 +0,0 @@
|
||||
import type { IForwardConfig } from './forwarding-types.js';
|
||||
|
||||
/**
|
||||
* Domain configuration with unified forwarding configuration
|
||||
*/
|
||||
export interface IDomainConfig {
|
||||
// Core properties - domain patterns
|
||||
domains: string[];
|
||||
|
||||
// Unified forwarding configuration
|
||||
forwarding: IForwardConfig;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to create a domain configuration
|
||||
*/
|
||||
export function createDomainConfig(
|
||||
domains: string | string[],
|
||||
forwarding: IForwardConfig
|
||||
): IDomainConfig {
|
||||
// Normalize domains to an array
|
||||
const domainArray = Array.isArray(domains) ? domains : [domains];
|
||||
|
||||
return {
|
||||
domains: domainArray,
|
||||
forwarding
|
||||
};
|
||||
}
|
||||
@ -1,283 +0,0 @@
|
||||
import * as plugins from '../../plugins.js';
|
||||
import type { IDomainConfig } from './domain-config.js';
|
||||
import { ForwardingHandler } from '../handlers/base-handler.js';
|
||||
import { ForwardingHandlerEvents } from './forwarding-types.js';
|
||||
import { ForwardingHandlerFactory } from '../factory/forwarding-factory.js';
|
||||
|
||||
/**
|
||||
* Events emitted by the DomainManager
|
||||
*/
|
||||
export enum DomainManagerEvents {
|
||||
DOMAIN_ADDED = 'domain-added',
|
||||
DOMAIN_REMOVED = 'domain-removed',
|
||||
DOMAIN_MATCHED = 'domain-matched',
|
||||
DOMAIN_MATCH_FAILED = 'domain-match-failed',
|
||||
CERTIFICATE_NEEDED = 'certificate-needed',
|
||||
CERTIFICATE_LOADED = 'certificate-loaded',
|
||||
ERROR = 'error'
|
||||
}
|
||||
|
||||
/**
|
||||
* Manages domains and their forwarding handlers
|
||||
*/
|
||||
export class DomainManager extends plugins.EventEmitter {
|
||||
private domainConfigs: IDomainConfig[] = [];
|
||||
private domainHandlers: Map<string, ForwardingHandler> = new Map();
|
||||
|
||||
/**
|
||||
* Create a new DomainManager
|
||||
* @param initialDomains Optional initial domain configurations
|
||||
*/
|
||||
constructor(initialDomains?: IDomainConfig[]) {
|
||||
super();
|
||||
|
||||
if (initialDomains) {
|
||||
this.setDomainConfigs(initialDomains);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set or replace all domain configurations
|
||||
* @param configs Array of domain configurations
|
||||
*/
|
||||
public async setDomainConfigs(configs: IDomainConfig[]): Promise<void> {
|
||||
// Clear existing handlers
|
||||
this.domainHandlers.clear();
|
||||
|
||||
// Store new configurations
|
||||
this.domainConfigs = [...configs];
|
||||
|
||||
// Initialize handlers for each domain
|
||||
for (const config of this.domainConfigs) {
|
||||
await this.createHandlersForDomain(config);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new domain configuration
|
||||
* @param config The domain configuration to add
|
||||
*/
|
||||
public async addDomainConfig(config: IDomainConfig): Promise<void> {
|
||||
// Check if any of these domains already exist
|
||||
for (const domain of config.domains) {
|
||||
if (this.domainHandlers.has(domain)) {
|
||||
// Remove existing handler for this domain
|
||||
this.domainHandlers.delete(domain);
|
||||
}
|
||||
}
|
||||
|
||||
// Add the new configuration
|
||||
this.domainConfigs.push(config);
|
||||
|
||||
// Create handlers for the new domain
|
||||
await this.createHandlersForDomain(config);
|
||||
|
||||
this.emit(DomainManagerEvents.DOMAIN_ADDED, {
|
||||
domains: config.domains,
|
||||
forwardingType: config.forwarding.type
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a domain configuration
|
||||
* @param domain The domain to remove
|
||||
* @returns True if the domain was found and removed
|
||||
*/
|
||||
public removeDomainConfig(domain: string): boolean {
|
||||
// Find the config that includes this domain
|
||||
const index = this.domainConfigs.findIndex(config =>
|
||||
config.domains.includes(domain)
|
||||
);
|
||||
|
||||
if (index === -1) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Get the config
|
||||
const config = this.domainConfigs[index];
|
||||
|
||||
// Remove all handlers for this config
|
||||
for (const domainName of config.domains) {
|
||||
this.domainHandlers.delete(domainName);
|
||||
}
|
||||
|
||||
// Remove the config
|
||||
this.domainConfigs.splice(index, 1);
|
||||
|
||||
this.emit(DomainManagerEvents.DOMAIN_REMOVED, {
|
||||
domains: config.domains
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the handler for a domain
|
||||
* @param domain The domain to find a handler for
|
||||
* @returns The handler or undefined if no match
|
||||
*/
|
||||
public findHandlerForDomain(domain: string): ForwardingHandler | undefined {
|
||||
// Try exact match
|
||||
if (this.domainHandlers.has(domain)) {
|
||||
return this.domainHandlers.get(domain);
|
||||
}
|
||||
|
||||
// Try wildcard matches
|
||||
const wildcardHandler = this.findWildcardHandler(domain);
|
||||
if (wildcardHandler) {
|
||||
return wildcardHandler;
|
||||
}
|
||||
|
||||
// No match found
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a connection for a domain
|
||||
* @param domain The domain
|
||||
* @param socket The client socket
|
||||
* @returns True if the connection was handled
|
||||
*/
|
||||
public handleConnection(domain: string, socket: plugins.net.Socket): boolean {
|
||||
const handler = this.findHandlerForDomain(domain);
|
||||
|
||||
if (!handler) {
|
||||
this.emit(DomainManagerEvents.DOMAIN_MATCH_FAILED, {
|
||||
domain,
|
||||
remoteAddress: socket.remoteAddress
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
this.emit(DomainManagerEvents.DOMAIN_MATCHED, {
|
||||
domain,
|
||||
handlerType: handler.constructor.name,
|
||||
remoteAddress: socket.remoteAddress
|
||||
});
|
||||
|
||||
// Handle the connection
|
||||
handler.handleConnection(socket);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle an HTTP request for a domain
|
||||
* @param domain The domain
|
||||
* @param req The HTTP request
|
||||
* @param res The HTTP response
|
||||
* @returns True if the request was handled
|
||||
*/
|
||||
public handleHttpRequest(domain: string, req: plugins.http.IncomingMessage, res: plugins.http.ServerResponse): boolean {
|
||||
const handler = this.findHandlerForDomain(domain);
|
||||
|
||||
if (!handler) {
|
||||
this.emit(DomainManagerEvents.DOMAIN_MATCH_FAILED, {
|
||||
domain,
|
||||
remoteAddress: req.socket.remoteAddress
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
this.emit(DomainManagerEvents.DOMAIN_MATCHED, {
|
||||
domain,
|
||||
handlerType: handler.constructor.name,
|
||||
remoteAddress: req.socket.remoteAddress
|
||||
});
|
||||
|
||||
// Handle the request
|
||||
handler.handleHttpRequest(req, res);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create handlers for a domain configuration
|
||||
* @param config The domain configuration
|
||||
*/
|
||||
private async createHandlersForDomain(config: IDomainConfig): Promise<void> {
|
||||
try {
|
||||
// Create a handler for this forwarding configuration
|
||||
const handler = ForwardingHandlerFactory.createHandler(config.forwarding);
|
||||
|
||||
// Initialize the handler
|
||||
await handler.initialize();
|
||||
|
||||
// Set up event forwarding
|
||||
this.setupHandlerEvents(handler, config);
|
||||
|
||||
// Store the handler for each domain in the config
|
||||
for (const domain of config.domains) {
|
||||
this.domainHandlers.set(domain, handler);
|
||||
}
|
||||
} catch (error) {
|
||||
this.emit(DomainManagerEvents.ERROR, {
|
||||
domains: config.domains,
|
||||
error: error instanceof Error ? error.message : String(error)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set up event forwarding from a handler
|
||||
* @param handler The handler
|
||||
* @param config The domain configuration for this handler
|
||||
*/
|
||||
private setupHandlerEvents(handler: ForwardingHandler, config: IDomainConfig): void {
|
||||
// Forward relevant events
|
||||
handler.on(ForwardingHandlerEvents.CERTIFICATE_NEEDED, (data) => {
|
||||
this.emit(DomainManagerEvents.CERTIFICATE_NEEDED, {
|
||||
...data,
|
||||
domains: config.domains
|
||||
});
|
||||
});
|
||||
|
||||
handler.on(ForwardingHandlerEvents.CERTIFICATE_LOADED, (data) => {
|
||||
this.emit(DomainManagerEvents.CERTIFICATE_LOADED, {
|
||||
...data,
|
||||
domains: config.domains
|
||||
});
|
||||
});
|
||||
|
||||
handler.on(ForwardingHandlerEvents.ERROR, (data) => {
|
||||
this.emit(DomainManagerEvents.ERROR, {
|
||||
...data,
|
||||
domains: config.domains
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a handler for a domain using wildcard matching
|
||||
* @param domain The domain to find a handler for
|
||||
* @returns The handler or undefined if no match
|
||||
*/
|
||||
private findWildcardHandler(domain: string): ForwardingHandler | undefined {
|
||||
// Exact match already checked in findHandlerForDomain
|
||||
|
||||
// Try subdomain wildcard (*.example.com)
|
||||
if (domain.includes('.')) {
|
||||
const parts = domain.split('.');
|
||||
if (parts.length > 2) {
|
||||
const wildcardDomain = `*.${parts.slice(1).join('.')}`;
|
||||
if (this.domainHandlers.has(wildcardDomain)) {
|
||||
return this.domainHandlers.get(wildcardDomain);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Try full wildcard
|
||||
if (this.domainHandlers.has('*')) {
|
||||
return this.domainHandlers.get('*');
|
||||
}
|
||||
|
||||
// No match found
|
||||
return undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all domain configurations
|
||||
* @returns Array of domain configurations
|
||||
*/
|
||||
public getDomainConfigs(): IDomainConfig[] {
|
||||
return [...this.domainConfigs];
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,9 @@
|
||||
import type * as plugins from '../../plugins.js';
|
||||
|
||||
/**
|
||||
* @deprecated The legacy forwarding types are being replaced by the route-based configuration system.
|
||||
* See /ts/proxies/smart-proxy/models/route-types.ts for the new route-based configuration.
|
||||
*
|
||||
* The primary forwarding types supported by SmartProxy
|
||||
*/
|
||||
export type TForwardingType =
|
||||
@ -9,88 +12,6 @@ export type TForwardingType =
|
||||
| 'https-terminate-to-http' // Terminate TLS and forward to HTTP backend
|
||||
| 'https-terminate-to-https'; // Terminate TLS and forward to HTTPS backend
|
||||
|
||||
/**
|
||||
* Target configuration for forwarding
|
||||
*/
|
||||
export interface ITargetConfig {
|
||||
host: string | string[]; // Support single host or round-robin
|
||||
port: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* HTTP-specific options for forwarding
|
||||
*/
|
||||
export interface IHttpOptions {
|
||||
enabled?: boolean; // Whether HTTP is enabled
|
||||
redirectToHttps?: boolean; // Redirect HTTP to HTTPS
|
||||
headers?: Record<string, string>; // Custom headers for HTTP responses
|
||||
}
|
||||
|
||||
/**
|
||||
* HTTPS-specific options for forwarding
|
||||
*/
|
||||
export interface IHttpsOptions {
|
||||
customCert?: { // Use custom cert instead of auto-provisioned
|
||||
key: string;
|
||||
cert: string;
|
||||
};
|
||||
forwardSni?: boolean; // Forward SNI info in passthrough mode
|
||||
}
|
||||
|
||||
/**
|
||||
* ACME certificate handling options
|
||||
*/
|
||||
export interface IAcmeForwardingOptions {
|
||||
enabled?: boolean; // Enable ACME certificate provisioning
|
||||
maintenance?: boolean; // Auto-renew certificates
|
||||
production?: boolean; // Use production ACME servers
|
||||
forwardChallenges?: { // Forward ACME challenges
|
||||
host: string;
|
||||
port: number;
|
||||
useTls?: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Security options for forwarding
|
||||
*/
|
||||
export interface ISecurityOptions {
|
||||
allowedIps?: string[]; // IPs allowed to connect
|
||||
blockedIps?: string[]; // IPs blocked from connecting
|
||||
maxConnections?: number; // Max simultaneous connections
|
||||
}
|
||||
|
||||
/**
|
||||
* Advanced options for forwarding
|
||||
*/
|
||||
export interface IAdvancedOptions {
|
||||
portRanges?: Array<{ from: number; to: number }>; // Allowed port ranges
|
||||
networkProxyPort?: number; // Custom NetworkProxy port if using terminate mode
|
||||
keepAlive?: boolean; // Enable TCP keepalive
|
||||
timeout?: number; // Connection timeout in ms
|
||||
headers?: Record<string, string>; // Custom headers with support for variables like {sni}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unified forwarding configuration interface
|
||||
*/
|
||||
export interface IForwardConfig {
|
||||
// Define the primary forwarding type - use-case driven approach
|
||||
type: TForwardingType;
|
||||
|
||||
// Target configuration
|
||||
target: ITargetConfig;
|
||||
|
||||
// Protocol options
|
||||
http?: IHttpOptions;
|
||||
https?: IHttpsOptions;
|
||||
acme?: IAcmeForwardingOptions;
|
||||
|
||||
// Security and advanced options
|
||||
security?: ISecurityOptions;
|
||||
advanced?: IAdvancedOptions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Event types emitted by forwarding handlers
|
||||
*/
|
||||
@ -114,49 +35,100 @@ export interface IForwardingHandler extends plugins.EventEmitter {
|
||||
handleHttpRequest(req: plugins.http.IncomingMessage, res: plugins.http.ServerResponse): void;
|
||||
}
|
||||
|
||||
// Import and re-export the route-based helpers for seamless transition
|
||||
import {
|
||||
createHttpRoute,
|
||||
createHttpsTerminateRoute,
|
||||
createHttpsPassthroughRoute,
|
||||
createHttpToHttpsRedirect,
|
||||
createCompleteHttpsServer,
|
||||
createLoadBalancerRoute
|
||||
} from '../../proxies/smart-proxy/utils/route-helpers.js';
|
||||
|
||||
export {
|
||||
createHttpRoute,
|
||||
createHttpsTerminateRoute,
|
||||
createHttpsPassthroughRoute,
|
||||
createHttpToHttpsRedirect,
|
||||
createCompleteHttpsServer,
|
||||
createLoadBalancerRoute
|
||||
};
|
||||
|
||||
/**
|
||||
* Helper function types for common forwarding patterns
|
||||
* @deprecated These helper functions are maintained for backward compatibility.
|
||||
* Please use the route-based helpers instead:
|
||||
* - createHttpRoute
|
||||
* - createHttpsTerminateRoute
|
||||
* - createHttpsPassthroughRoute
|
||||
* - createHttpToHttpsRedirect
|
||||
*/
|
||||
import type { IRouteConfig } from '../../proxies/smart-proxy/models/route-types.js';
|
||||
import { domainConfigToRouteConfig } from '../../proxies/smart-proxy/utils/route-migration-utils.js';
|
||||
|
||||
// For backward compatibility
|
||||
export interface IForwardConfig {
|
||||
type: TForwardingType;
|
||||
target: {
|
||||
host: string | string[];
|
||||
port: number;
|
||||
};
|
||||
http?: any;
|
||||
https?: any;
|
||||
acme?: any;
|
||||
security?: any;
|
||||
advanced?: any;
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
export interface IDeprecatedForwardConfig {
|
||||
type: TForwardingType;
|
||||
target: {
|
||||
host: string | string[];
|
||||
port: number;
|
||||
};
|
||||
[key: string]: any;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Use createHttpRoute instead
|
||||
*/
|
||||
export const httpOnly = (
|
||||
partialConfig: Partial<IForwardConfig> & Pick<IForwardConfig, 'target'>
|
||||
): IForwardConfig => ({
|
||||
partialConfig: Partial<IDeprecatedForwardConfig> & Pick<IDeprecatedForwardConfig, 'target'>
|
||||
): IDeprecatedForwardConfig => ({
|
||||
type: 'http-only',
|
||||
target: partialConfig.target,
|
||||
http: { enabled: true, ...(partialConfig.http || {}) },
|
||||
...(partialConfig.security ? { security: partialConfig.security } : {}),
|
||||
...(partialConfig.advanced ? { advanced: partialConfig.advanced } : {})
|
||||
...(partialConfig)
|
||||
});
|
||||
|
||||
/**
|
||||
* @deprecated Use createHttpsTerminateRoute instead
|
||||
*/
|
||||
export const tlsTerminateToHttp = (
|
||||
partialConfig: Partial<IForwardConfig> & Pick<IForwardConfig, 'target'>
|
||||
): IForwardConfig => ({
|
||||
partialConfig: Partial<IDeprecatedForwardConfig> & Pick<IDeprecatedForwardConfig, 'target'>
|
||||
): IDeprecatedForwardConfig => ({
|
||||
type: 'https-terminate-to-http',
|
||||
target: partialConfig.target,
|
||||
https: { ...(partialConfig.https || {}) },
|
||||
acme: { enabled: true, maintenance: true, ...(partialConfig.acme || {}) },
|
||||
http: { enabled: true, redirectToHttps: true, ...(partialConfig.http || {}) },
|
||||
...(partialConfig.security ? { security: partialConfig.security } : {}),
|
||||
...(partialConfig.advanced ? { advanced: partialConfig.advanced } : {})
|
||||
...(partialConfig)
|
||||
});
|
||||
|
||||
/**
|
||||
* @deprecated Use createHttpsTerminateRoute with reencrypt option instead
|
||||
*/
|
||||
export const tlsTerminateToHttps = (
|
||||
partialConfig: Partial<IForwardConfig> & Pick<IForwardConfig, 'target'>
|
||||
): IForwardConfig => ({
|
||||
partialConfig: Partial<IDeprecatedForwardConfig> & Pick<IDeprecatedForwardConfig, 'target'>
|
||||
): IDeprecatedForwardConfig => ({
|
||||
type: 'https-terminate-to-https',
|
||||
target: partialConfig.target,
|
||||
https: { ...(partialConfig.https || {}) },
|
||||
acme: { enabled: true, maintenance: true, ...(partialConfig.acme || {}) },
|
||||
http: { enabled: true, redirectToHttps: true, ...(partialConfig.http || {}) },
|
||||
...(partialConfig.security ? { security: partialConfig.security } : {}),
|
||||
...(partialConfig.advanced ? { advanced: partialConfig.advanced } : {})
|
||||
...(partialConfig)
|
||||
});
|
||||
|
||||
/**
|
||||
* @deprecated Use createHttpsPassthroughRoute instead
|
||||
*/
|
||||
export const httpsPassthrough = (
|
||||
partialConfig: Partial<IForwardConfig> & Pick<IForwardConfig, 'target'>
|
||||
): IForwardConfig => ({
|
||||
partialConfig: Partial<IDeprecatedForwardConfig> & Pick<IDeprecatedForwardConfig, 'target'>
|
||||
): IDeprecatedForwardConfig => ({
|
||||
type: 'https-passthrough',
|
||||
target: partialConfig.target,
|
||||
https: { forwardSni: true, ...(partialConfig.https || {}) },
|
||||
...(partialConfig.security ? { security: partialConfig.security } : {}),
|
||||
...(partialConfig.advanced ? { advanced: partialConfig.advanced } : {})
|
||||
...(partialConfig)
|
||||
});
|
||||
@ -1,7 +1,9 @@
|
||||
/**
|
||||
* Forwarding configuration exports
|
||||
*
|
||||
* Note: The legacy domain-based configuration has been replaced by route-based configuration.
|
||||
* See /ts/proxies/smart-proxy/models/route-types.ts for the new route-based configuration.
|
||||
*/
|
||||
|
||||
export * from './forwarding-types.js';
|
||||
export * from './domain-config.js';
|
||||
export * from './domain-manager.js';
|
||||
export * from '../../proxies/smart-proxy/utils/route-helpers.js';
|
||||
@ -104,13 +104,15 @@ export abstract class ForwardingHandler extends plugins.EventEmitter implements
|
||||
|
||||
// Apply custom headers with variable substitution
|
||||
for (const [key, value] of Object.entries(customHeaders)) {
|
||||
if (typeof value !== 'string') continue;
|
||||
|
||||
let processedValue = value;
|
||||
|
||||
|
||||
// Replace variables in the header value
|
||||
for (const [varName, varValue] of Object.entries(variables)) {
|
||||
processedValue = processedValue.replace(`{${varName}}`, varValue);
|
||||
}
|
||||
|
||||
|
||||
result[key] = processedValue;
|
||||
}
|
||||
|
||||
|
||||
@ -5,8 +5,6 @@
|
||||
|
||||
// Export types and configuration
|
||||
export * from './config/forwarding-types.js';
|
||||
export * from './config/domain-config.js';
|
||||
export * from './config/domain-manager.js';
|
||||
|
||||
// Export handlers
|
||||
export { ForwardingHandler } from './handlers/base-handler.js';
|
||||
@ -26,6 +24,9 @@ import {
|
||||
httpsPassthrough
|
||||
} from './config/forwarding-types.js';
|
||||
|
||||
// Export route-based helpers from smart-proxy
|
||||
export * from '../proxies/smart-proxy/utils/route-helpers.js';
|
||||
|
||||
export const helpers = {
|
||||
httpOnly,
|
||||
tlsTerminateToHttp,
|
||||
|
||||
Reference in New Issue
Block a user