@push.rocks/smartproxy 15.0.0 → 15.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import type { IDomainConfig, ISmartProxyOptions } from './models/interfaces.js';
2
2
  import type { TForwardingType } from '../../forwarding/config/forwarding-types.js';
3
3
  import type { ForwardingHandler } from '../../forwarding/handlers/base-handler.js';
4
+ import { RouteManager } from './route-manager.js';
4
5
  /**
5
6
  * Manages domain configurations and target selection
6
7
  */
@@ -8,7 +9,21 @@ export declare class DomainConfigManager {
8
9
  private settings;
9
10
  private domainTargetIndices;
10
11
  private forwardingHandlers;
12
+ private derivedDomainConfigs;
13
+ private routeManager?;
11
14
  constructor(settings: ISmartProxyOptions);
15
+ /**
16
+ * Set the route manager reference for route-based queries
17
+ */
18
+ setRouteManager(routeManager: RouteManager): void;
19
+ /**
20
+ * Generate domain configs from routes
21
+ */
22
+ generateDomainConfigsFromRoutes(): void;
23
+ /**
24
+ * Convert a route to a domain config
25
+ */
26
+ private routeToDomainConfig;
12
27
  /**
13
28
  * Updates the domain configurations
14
29
  */
@@ -1,5 +1,6 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import { ForwardingHandlerFactory } from '../../forwarding/factory/forwarding-factory.js';
3
+ import { RouteManager } from './route-manager.js';
3
4
  /**
4
5
  * Manages domain configurations and target selection
5
6
  */
@@ -10,12 +11,100 @@ export class DomainConfigManager {
10
11
  this.domainTargetIndices = new Map();
11
12
  // Cache forwarding handlers for each domain config
12
13
  this.forwardingHandlers = new Map();
14
+ // Store derived domain configs from routes
15
+ this.derivedDomainConfigs = [];
16
+ // Initialize with derived domain configs if using route-based configuration
17
+ if (settings.routes && !settings.domainConfigs) {
18
+ this.generateDomainConfigsFromRoutes();
19
+ }
20
+ }
21
+ /**
22
+ * Set the route manager reference for route-based queries
23
+ */
24
+ setRouteManager(routeManager) {
25
+ this.routeManager = routeManager;
26
+ // Regenerate domain configs from routes if needed
27
+ if (this.settings.routes && (!this.settings.domainConfigs || this.settings.domainConfigs.length === 0)) {
28
+ this.generateDomainConfigsFromRoutes();
29
+ }
30
+ }
31
+ /**
32
+ * Generate domain configs from routes
33
+ */
34
+ generateDomainConfigsFromRoutes() {
35
+ this.derivedDomainConfigs = [];
36
+ if (!this.settings.routes)
37
+ return;
38
+ for (const route of this.settings.routes) {
39
+ if (route.action.type !== 'forward' || !route.match.domains)
40
+ continue;
41
+ // Convert route to domain config
42
+ const domainConfig = this.routeToDomainConfig(route);
43
+ if (domainConfig) {
44
+ this.derivedDomainConfigs.push(domainConfig);
45
+ }
46
+ }
47
+ }
48
+ /**
49
+ * Convert a route to a domain config
50
+ */
51
+ routeToDomainConfig(route) {
52
+ if (route.action.type !== 'forward' || !route.action.target)
53
+ return null;
54
+ // Get domains from route
55
+ const domains = Array.isArray(route.match.domains) ?
56
+ route.match.domains :
57
+ (route.match.domains ? [route.match.domains] : []);
58
+ if (domains.length === 0)
59
+ return null;
60
+ // Determine forwarding type based on TLS mode
61
+ let forwardingType = 'http-only';
62
+ if (route.action.tls) {
63
+ switch (route.action.tls.mode) {
64
+ case 'passthrough':
65
+ forwardingType = 'https-passthrough';
66
+ break;
67
+ case 'terminate':
68
+ forwardingType = 'https-terminate-to-http';
69
+ break;
70
+ case 'terminate-and-reencrypt':
71
+ forwardingType = 'https-terminate-to-https';
72
+ break;
73
+ }
74
+ }
75
+ // Create domain config
76
+ return {
77
+ domains,
78
+ forwarding: {
79
+ type: forwardingType,
80
+ target: {
81
+ host: route.action.target.host,
82
+ port: route.action.target.port
83
+ },
84
+ security: route.action.security ? {
85
+ allowedIps: route.action.security.allowedIps,
86
+ blockedIps: route.action.security.blockedIps,
87
+ maxConnections: route.action.security.maxConnections
88
+ } : undefined,
89
+ https: route.action.tls && route.action.tls.certificate !== 'auto' ? {
90
+ customCert: route.action.tls.certificate
91
+ } : undefined,
92
+ advanced: route.action.advanced
93
+ }
94
+ };
13
95
  }
14
96
  /**
15
97
  * Updates the domain configurations
16
98
  */
17
99
  updateDomainConfigs(newDomainConfigs) {
18
- this.settings.domainConfigs = newDomainConfigs;
100
+ // If we're using domainConfigs property, update it
101
+ if (this.settings.domainConfigs) {
102
+ this.settings.domainConfigs = newDomainConfigs;
103
+ }
104
+ else {
105
+ // Otherwise update our derived configs
106
+ this.derivedDomainConfigs = newDomainConfigs;
107
+ }
19
108
  // Reset target indices for removed configs
20
109
  const currentConfigSet = new Set(newDomainConfigs);
21
110
  for (const [config] of this.domainTargetIndices) {
@@ -51,7 +140,8 @@ export class DomainConfigManager {
51
140
  * Get all domain configurations
52
141
  */
53
142
  getDomainConfigs() {
54
- return this.settings.domainConfigs;
143
+ // Use domainConfigs from settings if available, otherwise use derived configs
144
+ return this.settings.domainConfigs || this.derivedDomainConfigs;
55
145
  }
56
146
  /**
57
147
  * Find domain config matching a server name
@@ -59,18 +149,59 @@ export class DomainConfigManager {
59
149
  findDomainConfig(serverName) {
60
150
  if (!serverName)
61
151
  return undefined;
62
- return this.settings.domainConfigs.find((config) => config.domains.some((d) => plugins.minimatch(serverName, d)));
152
+ // Get domain configs from the appropriate source
153
+ const domainConfigs = this.getDomainConfigs();
154
+ // Check for direct match
155
+ for (const config of domainConfigs) {
156
+ if (config.domains.some(d => plugins.minimatch(serverName, d))) {
157
+ return config;
158
+ }
159
+ }
160
+ // No match found
161
+ return undefined;
63
162
  }
64
163
  /**
65
164
  * Find domain config for a specific port
66
165
  */
67
166
  findDomainConfigForPort(port) {
68
- return this.settings.domainConfigs.find((domain) => {
167
+ // Get domain configs from the appropriate source
168
+ const domainConfigs = this.getDomainConfigs();
169
+ // Check if any domain config has a matching port range
170
+ for (const domain of domainConfigs) {
69
171
  const portRanges = domain.forwarding?.advanced?.portRanges;
70
- return portRanges &&
71
- portRanges.length > 0 &&
72
- this.isPortInRanges(port, portRanges);
73
- });
172
+ if (portRanges && portRanges.length > 0 && this.isPortInRanges(port, portRanges)) {
173
+ return domain;
174
+ }
175
+ }
176
+ // If we're in route-based mode, also check routes for this port
177
+ if (this.settings.routes && (!this.settings.domainConfigs || this.settings.domainConfigs.length === 0)) {
178
+ const routesForPort = this.settings.routes.filter(route => {
179
+ // Check if this port is in the route's ports
180
+ if (typeof route.match.ports === 'number') {
181
+ return route.match.ports === port;
182
+ }
183
+ else if (Array.isArray(route.match.ports)) {
184
+ return route.match.ports.some(p => {
185
+ if (typeof p === 'number') {
186
+ return p === port;
187
+ }
188
+ else if (p.from && p.to) {
189
+ return port >= p.from && port <= p.to;
190
+ }
191
+ return false;
192
+ });
193
+ }
194
+ return false;
195
+ });
196
+ // If we found any routes for this port, convert the first one to a domain config
197
+ if (routesForPort.length > 0 && routesForPort[0].action.type === 'forward') {
198
+ const domainConfig = this.routeToDomainConfig(routesForPort[0]);
199
+ if (domainConfig) {
200
+ return domainConfig;
201
+ }
202
+ }
203
+ }
204
+ return undefined;
74
205
  }
75
206
  /**
76
207
  * Check if a port is within any of the given ranges
@@ -252,4 +383,4 @@ export class DomainConfigManager {
252
383
  return false;
253
384
  }
254
385
  }
255
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"domain-config-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/domain-config-manager.ts"],"names":[],"mappings":"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"}
386
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"domain-config-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/domain-config-manager.ts"],"names":[],"mappings":"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"}
@@ -61,7 +61,7 @@ export interface IDomainConfig {
61
61
  };
62
62
  }
63
63
  /**
64
- * Helper functions for type checking - now always assume route-based config
64
+ * Helper functions for type checking configuration types
65
65
  */
66
66
  export declare function isLegacyOptions(options: any): boolean;
67
67
  export declare function isRoutedOptions(options: any): boolean;
@@ -1,11 +1,12 @@
1
1
  import * as plugins from '../../../plugins.js';
2
2
  /**
3
- * Helper functions for type checking - now always assume route-based config
3
+ * Helper functions for type checking configuration types
4
4
  */
5
5
  export function isLegacyOptions(options) {
6
- return false; // No longer supporting legacy options
6
+ return !!(options.domainConfigs && options.domainConfigs.length > 0 &&
7
+ (!options.routes || options.routes.length === 0));
7
8
  }
8
9
  export function isRoutedOptions(options) {
9
- return true; // Always assume routed options
10
+ return !!(options.routes && options.routes.length > 0);
10
11
  }
11
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL3Byb3hpZXMvc21hcnQtcHJveHkvbW9kZWxzL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQStEL0M7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZUFBZSxDQUFDLE9BQVk7SUFDMUMsT0FBTyxLQUFLLENBQUMsQ0FBQyxzQ0FBc0M7QUFDdEQsQ0FBQztBQUVELE1BQU0sVUFBVSxlQUFlLENBQUMsT0FBWTtJQUMxQyxPQUFPLElBQUksQ0FBQyxDQUFDLCtCQUErQjtBQUM5QyxDQUFDIn0=
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL3Byb3hpZXMvc21hcnQtcHJveHkvbW9kZWxzL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxxQkFBcUIsQ0FBQztBQStEL0M7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZUFBZSxDQUFDLE9BQVk7SUFDMUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsYUFBYSxJQUFJLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDMUQsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUM3RCxDQUFDO0FBRUQsTUFBTSxVQUFVLGVBQWUsQ0FBQyxPQUFZO0lBQzFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztBQUN6RCxDQUFDIn0=
@@ -76,11 +76,15 @@ export class SmartProxy extends plugins.EventEmitter {
76
76
  this.timeoutManager = new TimeoutManager(this.settings);
77
77
  this.securityManager = new SecurityManager(this.settings);
78
78
  this.connectionManager = new ConnectionManager(this.settings, this.securityManager, this.timeoutManager);
79
- // Create domain config manager and port range manager (for backward compatibility)
79
+ // Create the new route manager first
80
+ this.routeManager = new RouteManager(this.settings);
81
+ // Create domain config manager and port range manager
80
82
  this.domainConfigManager = new DomainConfigManager(this.settings);
83
+ // Share the route manager with the domain config manager
84
+ if (typeof this.domainConfigManager.setRouteManager === 'function') {
85
+ this.domainConfigManager.setRouteManager(this.routeManager);
86
+ }
81
87
  this.portRangeManager = new PortRangeManager(this.settings);
82
- // Create the new route manager
83
- this.routeManager = new RouteManager(this.settings);
84
88
  // Create other required components
85
89
  this.tlsManager = new TlsManager(this.settings);
86
90
  this.networkProxyBridge = new NetworkProxyBridge(this.settings);
@@ -120,10 +124,17 @@ export class SmartProxy extends plugins.EventEmitter {
120
124
  console.log("Cannot start SmartProxy while it's shutting down");
121
125
  return;
122
126
  }
123
- // If using legacy format, make sure domainConfigs are initialized
127
+ // Initialize domain config based on configuration type
124
128
  if (isLegacyOptions(this.settings)) {
125
- // Initialize domain config manager with the processed configs
126
- this.domainConfigManager.updateDomainConfigs(this.settings.domainConfigs);
129
+ // Initialize domain config manager with the legacy domain configs
130
+ this.domainConfigManager.updateDomainConfigs(this.settings.domainConfigs || []);
131
+ }
132
+ else if (isRoutedOptions(this.settings)) {
133
+ // For pure route-based configuration, the domain config is already initialized
134
+ // in the constructor, but we might need to regenerate it
135
+ if (typeof this.domainConfigManager.generateDomainConfigsFromRoutes === 'function') {
136
+ this.domainConfigManager.generateDomainConfigsFromRoutes();
137
+ }
127
138
  }
128
139
  // Initialize Port80Handler if enabled
129
140
  await this.initializePort80Handler();
@@ -713,4 +724,4 @@ export class SmartProxy extends plugins.EventEmitter {
713
724
  };
714
725
  }
715
726
  }
716
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/smart-proxy.ts"],"names":[],"mappings":"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"}
727
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smart-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/smart-proxy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "15.0.0",
3
+ "version": "15.0.1",
4
4
  "private": false,
5
5
  "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.",
6
6
  "main": "dist_ts/index.js",
@@ -3,6 +3,8 @@ import type { IDomainConfig, ISmartProxyOptions } from './models/interfaces.js';
3
3
  import type { TForwardingType, IForwardConfig } from '../../forwarding/config/forwarding-types.js';
4
4
  import type { ForwardingHandler } from '../../forwarding/handlers/base-handler.js';
5
5
  import { ForwardingHandlerFactory } from '../../forwarding/factory/forwarding-factory.js';
6
+ import type { IRouteConfig } from './models/route-types.js';
7
+ import { RouteManager } from './route-manager.js';
6
8
 
7
9
  /**
8
10
  * Manages domain configurations and target selection
@@ -14,13 +16,112 @@ export class DomainConfigManager {
14
16
  // Cache forwarding handlers for each domain config
15
17
  private forwardingHandlers: Map<IDomainConfig, ForwardingHandler> = new Map();
16
18
 
17
- constructor(private settings: ISmartProxyOptions) {}
18
-
19
+ // Store derived domain configs from routes
20
+ private derivedDomainConfigs: IDomainConfig[] = [];
21
+
22
+ // Reference to RouteManager for route-based configuration
23
+ private routeManager?: RouteManager;
24
+
25
+ constructor(private settings: ISmartProxyOptions) {
26
+ // Initialize with derived domain configs if using route-based configuration
27
+ if (settings.routes && !settings.domainConfigs) {
28
+ this.generateDomainConfigsFromRoutes();
29
+ }
30
+ }
31
+
32
+ /**
33
+ * Set the route manager reference for route-based queries
34
+ */
35
+ public setRouteManager(routeManager: RouteManager): void {
36
+ this.routeManager = routeManager;
37
+
38
+ // Regenerate domain configs from routes if needed
39
+ if (this.settings.routes && (!this.settings.domainConfigs || this.settings.domainConfigs.length === 0)) {
40
+ this.generateDomainConfigsFromRoutes();
41
+ }
42
+ }
43
+
44
+ /**
45
+ * Generate domain configs from routes
46
+ */
47
+ public generateDomainConfigsFromRoutes(): void {
48
+ this.derivedDomainConfigs = [];
49
+
50
+ if (!this.settings.routes) return;
51
+
52
+ for (const route of this.settings.routes) {
53
+ if (route.action.type !== 'forward' || !route.match.domains) continue;
54
+
55
+ // Convert route to domain config
56
+ const domainConfig = this.routeToDomainConfig(route);
57
+ if (domainConfig) {
58
+ this.derivedDomainConfigs.push(domainConfig);
59
+ }
60
+ }
61
+ }
62
+
63
+ /**
64
+ * Convert a route to a domain config
65
+ */
66
+ private routeToDomainConfig(route: IRouteConfig): IDomainConfig | null {
67
+ if (route.action.type !== 'forward' || !route.action.target) return null;
68
+
69
+ // Get domains from route
70
+ const domains = Array.isArray(route.match.domains) ?
71
+ route.match.domains :
72
+ (route.match.domains ? [route.match.domains] : []);
73
+
74
+ if (domains.length === 0) return null;
75
+
76
+ // Determine forwarding type based on TLS mode
77
+ let forwardingType: TForwardingType = 'http-only';
78
+ if (route.action.tls) {
79
+ switch (route.action.tls.mode) {
80
+ case 'passthrough':
81
+ forwardingType = 'https-passthrough';
82
+ break;
83
+ case 'terminate':
84
+ forwardingType = 'https-terminate-to-http';
85
+ break;
86
+ case 'terminate-and-reencrypt':
87
+ forwardingType = 'https-terminate-to-https';
88
+ break;
89
+ }
90
+ }
91
+
92
+ // Create domain config
93
+ return {
94
+ domains,
95
+ forwarding: {
96
+ type: forwardingType,
97
+ target: {
98
+ host: route.action.target.host,
99
+ port: route.action.target.port
100
+ },
101
+ security: route.action.security ? {
102
+ allowedIps: route.action.security.allowedIps,
103
+ blockedIps: route.action.security.blockedIps,
104
+ maxConnections: route.action.security.maxConnections
105
+ } : undefined,
106
+ https: route.action.tls && route.action.tls.certificate !== 'auto' ? {
107
+ customCert: route.action.tls.certificate
108
+ } : undefined,
109
+ advanced: route.action.advanced
110
+ }
111
+ };
112
+ }
113
+
19
114
  /**
20
115
  * Updates the domain configurations
21
116
  */
22
117
  public updateDomainConfigs(newDomainConfigs: IDomainConfig[]): void {
23
- this.settings.domainConfigs = newDomainConfigs;
118
+ // If we're using domainConfigs property, update it
119
+ if (this.settings.domainConfigs) {
120
+ this.settings.domainConfigs = newDomainConfigs;
121
+ } else {
122
+ // Otherwise update our derived configs
123
+ this.derivedDomainConfigs = newDomainConfigs;
124
+ }
24
125
 
25
126
  // Reset target indices for removed configs
26
127
  const currentConfigSet = new Set(newDomainConfigs);
@@ -60,7 +161,8 @@ export class DomainConfigManager {
60
161
  * Get all domain configurations
61
162
  */
62
163
  public getDomainConfigs(): IDomainConfig[] {
63
- return this.settings.domainConfigs;
164
+ // Use domainConfigs from settings if available, otherwise use derived configs
165
+ return this.settings.domainConfigs || this.derivedDomainConfigs;
64
166
  }
65
167
 
66
168
  /**
@@ -69,23 +171,64 @@ export class DomainConfigManager {
69
171
  public findDomainConfig(serverName: string): IDomainConfig | undefined {
70
172
  if (!serverName) return undefined;
71
173
 
72
- return this.settings.domainConfigs.find((config) =>
73
- config.domains.some((d) => plugins.minimatch(serverName, d))
74
- );
174
+ // Get domain configs from the appropriate source
175
+ const domainConfigs = this.getDomainConfigs();
176
+
177
+ // Check for direct match
178
+ for (const config of domainConfigs) {
179
+ if (config.domains.some(d => plugins.minimatch(serverName, d))) {
180
+ return config;
181
+ }
182
+ }
183
+
184
+ // No match found
185
+ return undefined;
75
186
  }
76
187
 
77
188
  /**
78
189
  * Find domain config for a specific port
79
190
  */
80
191
  public findDomainConfigForPort(port: number): IDomainConfig | undefined {
81
- return this.settings.domainConfigs.find(
82
- (domain) => {
83
- const portRanges = domain.forwarding?.advanced?.portRanges;
84
- return portRanges &&
85
- portRanges.length > 0 &&
86
- this.isPortInRanges(port, portRanges);
192
+ // Get domain configs from the appropriate source
193
+ const domainConfigs = this.getDomainConfigs();
194
+
195
+ // Check if any domain config has a matching port range
196
+ for (const domain of domainConfigs) {
197
+ const portRanges = domain.forwarding?.advanced?.portRanges;
198
+ if (portRanges && portRanges.length > 0 && this.isPortInRanges(port, portRanges)) {
199
+ return domain;
87
200
  }
88
- );
201
+ }
202
+
203
+ // If we're in route-based mode, also check routes for this port
204
+ if (this.settings.routes && (!this.settings.domainConfigs || this.settings.domainConfigs.length === 0)) {
205
+ const routesForPort = this.settings.routes.filter(route => {
206
+ // Check if this port is in the route's ports
207
+ if (typeof route.match.ports === 'number') {
208
+ return route.match.ports === port;
209
+ } else if (Array.isArray(route.match.ports)) {
210
+ return route.match.ports.some(p => {
211
+ if (typeof p === 'number') {
212
+ return p === port;
213
+ } else if (p.from && p.to) {
214
+ return port >= p.from && port <= p.to;
215
+ }
216
+ return false;
217
+ });
218
+ }
219
+ return false;
220
+ });
221
+
222
+ // If we found any routes for this port, convert the first one to a domain config
223
+ if (routesForPort.length > 0 && routesForPort[0].action.type === 'forward') {
224
+ const domainConfig = this.routeToDomainConfig(routesForPort[0]);
225
+ if (domainConfig) {
226
+ return domainConfig;
227
+ }
228
+ }
229
+ }
230
+
231
+ return undefined;
89
232
  }
90
233
 
91
234
  /**
@@ -62,14 +62,15 @@ export interface IDomainConfig {
62
62
  }
63
63
 
64
64
  /**
65
- * Helper functions for type checking - now always assume route-based config
65
+ * Helper functions for type checking configuration types
66
66
  */
67
67
  export function isLegacyOptions(options: any): boolean {
68
- return false; // No longer supporting legacy options
68
+ return !!(options.domainConfigs && options.domainConfigs.length > 0 &&
69
+ (!options.routes || options.routes.length === 0));
69
70
  }
70
71
 
71
72
  export function isRoutedOptions(options: any): boolean {
72
- return true; // Always assume routed options
73
+ return !!(options.routes && options.routes.length > 0);
73
74
  }
74
75
 
75
76
  /**
@@ -113,13 +113,19 @@ export class SmartProxy extends plugins.EventEmitter {
113
113
  this.timeoutManager
114
114
  );
115
115
 
116
- // Create domain config manager and port range manager (for backward compatibility)
116
+ // Create the new route manager first
117
+ this.routeManager = new RouteManager(this.settings);
118
+
119
+ // Create domain config manager and port range manager
117
120
  this.domainConfigManager = new DomainConfigManager(this.settings);
121
+
122
+ // Share the route manager with the domain config manager
123
+ if (typeof this.domainConfigManager.setRouteManager === 'function') {
124
+ this.domainConfigManager.setRouteManager(this.routeManager);
125
+ }
126
+
118
127
  this.portRangeManager = new PortRangeManager(this.settings);
119
128
 
120
- // Create the new route manager
121
- this.routeManager = new RouteManager(this.settings);
122
-
123
129
  // Create other required components
124
130
  this.tlsManager = new TlsManager(this.settings);
125
131
  this.networkProxyBridge = new NetworkProxyBridge(this.settings);
@@ -178,10 +184,16 @@ export class SmartProxy extends plugins.EventEmitter {
178
184
  return;
179
185
  }
180
186
 
181
- // If using legacy format, make sure domainConfigs are initialized
187
+ // Initialize domain config based on configuration type
182
188
  if (isLegacyOptions(this.settings)) {
183
- // Initialize domain config manager with the processed configs
184
- this.domainConfigManager.updateDomainConfigs(this.settings.domainConfigs);
189
+ // Initialize domain config manager with the legacy domain configs
190
+ this.domainConfigManager.updateDomainConfigs(this.settings.domainConfigs || []);
191
+ } else if (isRoutedOptions(this.settings)) {
192
+ // For pure route-based configuration, the domain config is already initialized
193
+ // in the constructor, but we might need to regenerate it
194
+ if (typeof this.domainConfigManager.generateDomainConfigsFromRoutes === 'function') {
195
+ this.domainConfigManager.generateDomainConfigsFromRoutes();
196
+ }
185
197
  }
186
198
 
187
199
  // Initialize Port80Handler if enabled