@push.rocks/smartproxy 19.5.18 → 19.5.20
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.
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/core/models/index.d.ts +2 -0
- package/dist_ts/core/models/index.js +3 -1
- package/dist_ts/core/models/socket-types.d.ts +14 -0
- package/dist_ts/core/models/socket-types.js +15 -0
- package/dist_ts/core/models/wrapped-socket.d.ts +34 -0
- package/dist_ts/core/models/wrapped-socket.js +82 -0
- package/dist_ts/core/routing/index.d.ts +11 -0
- package/dist_ts/core/routing/index.js +17 -0
- package/dist_ts/core/routing/matchers/domain.d.ts +34 -0
- package/dist_ts/core/routing/matchers/domain.js +91 -0
- package/dist_ts/core/routing/matchers/header.d.ts +32 -0
- package/dist_ts/core/routing/matchers/header.js +94 -0
- package/dist_ts/core/routing/matchers/index.d.ts +18 -0
- package/dist_ts/core/routing/matchers/index.js +20 -0
- package/dist_ts/core/routing/matchers/ip.d.ts +53 -0
- package/dist_ts/core/routing/matchers/ip.js +169 -0
- package/dist_ts/core/routing/matchers/path.d.ts +44 -0
- package/dist_ts/core/routing/matchers/path.js +148 -0
- package/dist_ts/core/routing/route-manager.d.ts +88 -0
- package/dist_ts/core/routing/route-manager.js +342 -0
- package/dist_ts/core/routing/route-utils.d.ts +28 -0
- package/dist_ts/core/routing/route-utils.js +67 -0
- package/dist_ts/core/routing/specificity.d.ts +30 -0
- package/dist_ts/core/routing/specificity.js +115 -0
- package/dist_ts/core/routing/types.d.ts +41 -0
- package/dist_ts/core/routing/types.js +5 -0
- package/dist_ts/core/utils/index.d.ts +0 -2
- package/dist_ts/core/utils/index.js +1 -3
- package/dist_ts/core/utils/route-manager.d.ts +0 -30
- package/dist_ts/core/utils/route-manager.js +6 -47
- package/dist_ts/core/utils/route-utils.d.ts +2 -68
- package/dist_ts/core/utils/route-utils.js +21 -218
- package/dist_ts/core/utils/security-utils.js +4 -4
- package/dist_ts/core/utils/socket-utils.d.ts +0 -15
- package/dist_ts/core/utils/socket-utils.js +1 -35
- package/dist_ts/forwarding/handlers/https-terminate-to-http-handler.js +47 -32
- package/dist_ts/forwarding/handlers/https-terminate-to-https-handler.js +51 -32
- package/dist_ts/index.d.ts +2 -5
- package/dist_ts/index.js +5 -11
- package/dist_ts/proxies/http-proxy/http-proxy.d.ts +0 -1
- package/dist_ts/proxies/http-proxy/http-proxy.js +15 -60
- package/dist_ts/proxies/http-proxy/models/types.d.ts +0 -90
- package/dist_ts/proxies/http-proxy/models/types.js +1 -242
- package/dist_ts/proxies/http-proxy/request-handler.d.ts +3 -5
- package/dist_ts/proxies/http-proxy/request-handler.js +20 -171
- package/dist_ts/proxies/http-proxy/websocket-handler.d.ts +2 -5
- package/dist_ts/proxies/http-proxy/websocket-handler.js +15 -23
- package/dist_ts/proxies/index.d.ts +2 -2
- package/dist_ts/proxies/index.js +4 -3
- package/dist_ts/proxies/smart-proxy/connection-manager.d.ts +3 -1
- package/dist_ts/proxies/smart-proxy/connection-manager.js +15 -7
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.d.ts +2 -1
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +5 -2
- package/dist_ts/proxies/smart-proxy/index.d.ts +1 -1
- package/dist_ts/proxies/smart-proxy/index.js +2 -2
- package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +6 -2
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +1 -1
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +48 -25
- package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +1 -1
- package/dist_ts/proxies/smart-proxy/smart-proxy.js +15 -4
- package/dist_ts/proxies/smart-proxy/utils/route-utils.js +10 -43
- package/dist_ts/routing/router/http-router.d.ts +89 -0
- package/dist_ts/routing/router/http-router.js +205 -0
- package/dist_ts/routing/router/index.d.ts +2 -5
- package/dist_ts/routing/router/index.js +3 -4
- package/package.json +1 -1
- package/readme.delete.md +187 -0
- package/readme.hints.md +210 -1
- package/readme.plan.md +621 -0
- package/readme.routing.md +341 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/core/models/index.ts +2 -0
- package/ts/core/models/socket-types.ts +21 -0
- package/ts/core/models/wrapped-socket.ts +99 -0
- package/ts/core/routing/index.ts +21 -0
- package/ts/core/routing/matchers/domain.ts +119 -0
- package/ts/core/routing/matchers/header.ts +120 -0
- package/ts/core/routing/matchers/index.ts +22 -0
- package/ts/core/routing/matchers/ip.ts +207 -0
- package/ts/core/routing/matchers/path.ts +184 -0
- package/ts/core/{utils → routing}/route-manager.ts +7 -57
- package/ts/core/routing/route-utils.ts +88 -0
- package/ts/core/routing/specificity.ts +141 -0
- package/ts/core/routing/types.ts +49 -0
- package/ts/core/utils/index.ts +0 -2
- package/ts/core/utils/security-utils.ts +3 -7
- package/ts/core/utils/socket-utils.ts +0 -44
- package/ts/forwarding/handlers/https-terminate-to-http-handler.ts +47 -33
- package/ts/forwarding/handlers/https-terminate-to-https-handler.ts +55 -35
- package/ts/index.ts +4 -14
- package/ts/proxies/http-proxy/http-proxy.ts +13 -68
- package/ts/proxies/http-proxy/models/types.ts +0 -324
- package/ts/proxies/http-proxy/request-handler.ts +15 -186
- package/ts/proxies/http-proxy/websocket-handler.ts +15 -26
- package/ts/proxies/index.ts +3 -2
- package/ts/proxies/smart-proxy/connection-manager.ts +15 -7
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +6 -2
- package/ts/proxies/smart-proxy/index.ts +1 -1
- package/ts/proxies/smart-proxy/models/interfaces.ts +8 -2
- package/ts/proxies/smart-proxy/route-connection-handler.ts +58 -30
- package/ts/proxies/smart-proxy/smart-proxy.ts +15 -3
- package/ts/proxies/smart-proxy/utils/route-utils.ts +11 -49
- package/ts/routing/router/http-router.ts +266 -0
- package/ts/routing/router/index.ts +3 -8
- package/readme.problems.md +0 -170
- package/ts/core/utils/route-utils.ts +0 -312
- package/ts/proxies/smart-proxy/route-manager.ts +0 -554
- package/ts/routing/router/proxy-router.ts +0 -437
- package/ts/routing/router/route-router.ts +0 -482
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
|
-
import { createLogger,
|
|
2
|
+
import { createLogger, } from './models/types.js';
|
|
3
|
+
import { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
|
|
3
4
|
import { createBaseRouteContext } from '../../core/models/route-context.js';
|
|
4
5
|
import { CertificateManager } from './certificate-manager.js';
|
|
5
6
|
import { ConnectionPool } from './connection-pool.js';
|
|
6
7
|
import { RequestHandler } from './request-handler.js';
|
|
7
8
|
import { WebSocketHandler } from './websocket-handler.js';
|
|
8
|
-
import {
|
|
9
|
-
import { RouteRouter } from '../../routing/router/route-router.js';
|
|
9
|
+
import { HttpRouter } from '../../routing/router/index.js';
|
|
10
10
|
import { cleanupSocket } from '../../core/utils/socket-utils.js';
|
|
11
11
|
import { FunctionCache } from './function-cache.js';
|
|
12
12
|
/**
|
|
@@ -24,8 +24,7 @@ export class HttpProxy {
|
|
|
24
24
|
*/
|
|
25
25
|
constructor(optionsArg) {
|
|
26
26
|
this.routes = [];
|
|
27
|
-
this.
|
|
28
|
-
this.router = new RouteRouter(); // New modern router
|
|
27
|
+
this.router = new HttpRouter(); // Unified HTTP router
|
|
29
28
|
// State tracking
|
|
30
29
|
this.socketMap = new plugins.lik.ObjectMap();
|
|
31
30
|
this.activeContexts = new Set();
|
|
@@ -52,7 +51,6 @@ export class HttpProxy {
|
|
|
52
51
|
// Defaults for SmartProxy integration
|
|
53
52
|
connectionPoolSize: optionsArg.connectionPoolSize || 50,
|
|
54
53
|
portProxyIntegration: optionsArg.portProxyIntegration || false,
|
|
55
|
-
useExternalPort80Handler: optionsArg.useExternalPort80Handler || false,
|
|
56
54
|
// Backend protocol (http1 or http2)
|
|
57
55
|
backendProtocol: optionsArg.backendProtocol || 'http1',
|
|
58
56
|
// Default ACME options
|
|
@@ -70,7 +68,11 @@ export class HttpProxy {
|
|
|
70
68
|
// Initialize logger
|
|
71
69
|
this.logger = createLogger(this.options.logLevel);
|
|
72
70
|
// Initialize route manager
|
|
73
|
-
this.routeManager = new RouteManager(
|
|
71
|
+
this.routeManager = new RouteManager({
|
|
72
|
+
logger: this.logger,
|
|
73
|
+
enableDetailedLogging: this.options.logLevel === 'debug',
|
|
74
|
+
routes: []
|
|
75
|
+
});
|
|
74
76
|
// Initialize function cache
|
|
75
77
|
this.functionCache = new FunctionCache(this.logger, {
|
|
76
78
|
maxCacheSize: this.options.functionCacheSize || 1000,
|
|
@@ -79,10 +81,8 @@ export class HttpProxy {
|
|
|
79
81
|
// Initialize other components
|
|
80
82
|
this.certificateManager = new CertificateManager(this.options);
|
|
81
83
|
this.connectionPool = new ConnectionPool(this.options);
|
|
82
|
-
this.requestHandler = new RequestHandler(this.options, this.connectionPool, this.
|
|
83
|
-
this.
|
|
84
|
-
);
|
|
85
|
-
this.webSocketHandler = new WebSocketHandler(this.options, this.connectionPool, this.legacyRouter, this.routes // Pass current routes to WebSocketHandler
|
|
84
|
+
this.requestHandler = new RequestHandler(this.options, this.connectionPool, this.routeManager, this.functionCache, this.router);
|
|
85
|
+
this.webSocketHandler = new WebSocketHandler(this.options, this.connectionPool, this.routes // Pass current routes to WebSocketHandler
|
|
86
86
|
);
|
|
87
87
|
// Connect request handler to this metrics tracker
|
|
88
88
|
this.requestHandler.setMetricsTracker(this);
|
|
@@ -335,56 +335,11 @@ export class HttpProxy {
|
|
|
335
335
|
this.activeContexts.delete(hostname);
|
|
336
336
|
}
|
|
337
337
|
}
|
|
338
|
-
//
|
|
339
|
-
|
|
340
|
-
const defaultPort = 443; // Default port for HTTPS when using 'preserve'
|
|
341
|
-
// and will be removed in the future
|
|
342
|
-
const legacyConfigs = [];
|
|
343
|
-
for (const domain of currentHostnames) {
|
|
344
|
-
// Find route for this domain
|
|
345
|
-
const route = routes.find(r => {
|
|
346
|
-
const domains = Array.isArray(r.match.domains) ? r.match.domains : [r.match.domains];
|
|
347
|
-
return domains.includes(domain);
|
|
348
|
-
});
|
|
349
|
-
if (!route || route.action.type !== 'forward' || !route.action.target) {
|
|
350
|
-
continue;
|
|
351
|
-
}
|
|
352
|
-
// Skip routes with function-based targets - we'll handle them during request processing
|
|
353
|
-
if (typeof route.action.target.host === 'function' || typeof route.action.target.port === 'function') {
|
|
354
|
-
this.logger.info(`Domain ${domain} uses function-based targets - will be handled at request time`);
|
|
355
|
-
continue;
|
|
356
|
-
}
|
|
357
|
-
// Extract static target information
|
|
358
|
-
const targetHosts = Array.isArray(route.action.target.host)
|
|
359
|
-
? route.action.target.host
|
|
360
|
-
: [route.action.target.host];
|
|
361
|
-
// Handle 'preserve' port value
|
|
362
|
-
const targetPort = route.action.target.port === 'preserve' ? defaultPort : route.action.target.port;
|
|
363
|
-
// Get certificate information
|
|
364
|
-
const certData = certificateUpdates.get(domain);
|
|
365
|
-
const defaultCerts = this.certificateManager.getDefaultCertificates();
|
|
366
|
-
legacyConfigs.push({
|
|
367
|
-
hostName: domain,
|
|
368
|
-
destinationIps: targetHosts,
|
|
369
|
-
destinationPorts: [targetPort],
|
|
370
|
-
privateKey: certData?.key || defaultCerts.key,
|
|
371
|
-
publicKey: certData?.cert || defaultCerts.cert
|
|
372
|
-
});
|
|
373
|
-
}
|
|
374
|
-
// Update the router with legacy configs
|
|
375
|
-
// Handle both old and new router interfaces
|
|
376
|
-
if (typeof this.router.setRoutes === 'function') {
|
|
377
|
-
this.router.setRoutes(routes);
|
|
378
|
-
}
|
|
379
|
-
else if (typeof this.router.setNewProxyConfigs === 'function') {
|
|
380
|
-
this.router.setNewProxyConfigs(legacyConfigs);
|
|
381
|
-
}
|
|
382
|
-
else {
|
|
383
|
-
this.logger.warn('Router has no recognized configuration method');
|
|
384
|
-
}
|
|
338
|
+
// Update the router with new routes
|
|
339
|
+
this.router.setRoutes(routes);
|
|
385
340
|
// Update WebSocket handler with new routes
|
|
386
341
|
this.webSocketHandler.setRoutes(routes);
|
|
387
|
-
this.logger.info(`Route configuration updated with ${routes.length} routes
|
|
342
|
+
this.logger.info(`Route configuration updated with ${routes.length} routes`);
|
|
388
343
|
}
|
|
389
344
|
// Legacy methods have been removed.
|
|
390
345
|
// Please use updateRouteConfigs() directly with modern route-based configuration.
|
|
@@ -455,4 +410,4 @@ export class HttpProxy {
|
|
|
455
410
|
return this.routeManager.getRoutes();
|
|
456
411
|
}
|
|
457
412
|
}
|
|
458
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/http-proxy/http-proxy.ts"],"names":[],"mappings":"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"}
|
|
413
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-proxy.js","sourceRoot":"","sources":["../../../ts/proxies/http-proxy/http-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ export interface IAcmeOptions {
|
|
|
12
12
|
skipConfiguredCerts?: boolean;
|
|
13
13
|
}
|
|
14
14
|
import type { IRouteConfig } from '../../smart-proxy/models/route-types.js';
|
|
15
|
-
import type { IRouteContext } from '../../../core/models/route-context.js';
|
|
16
15
|
/**
|
|
17
16
|
* Configuration options for HttpProxy
|
|
18
17
|
*/
|
|
@@ -30,7 +29,6 @@ export interface IHttpProxyOptions {
|
|
|
30
29
|
};
|
|
31
30
|
connectionPoolSize?: number;
|
|
32
31
|
portProxyIntegration?: boolean;
|
|
33
|
-
useExternalPort80Handler?: boolean;
|
|
34
32
|
backendProtocol?: 'http1' | 'http2';
|
|
35
33
|
functionCacheSize?: number;
|
|
36
34
|
functionCacheTtl?: number;
|
|
@@ -45,94 +43,6 @@ export interface ICertificateEntry {
|
|
|
45
43
|
cert: string;
|
|
46
44
|
expires?: Date;
|
|
47
45
|
}
|
|
48
|
-
/**
|
|
49
|
-
* @deprecated Use IRouteConfig instead. This interface will be removed in a future release.
|
|
50
|
-
*
|
|
51
|
-
* IMPORTANT: This is a legacy interface maintained only for backward compatibility.
|
|
52
|
-
* New code should use IRouteConfig for all configuration purposes.
|
|
53
|
-
*
|
|
54
|
-
* @see IRouteConfig for the modern, recommended configuration format
|
|
55
|
-
*/
|
|
56
|
-
export interface IReverseProxyConfig {
|
|
57
|
-
/** Target hostnames/IPs to proxy requests to */
|
|
58
|
-
destinationIps: string[];
|
|
59
|
-
/** Target ports to proxy requests to */
|
|
60
|
-
destinationPorts: number[];
|
|
61
|
-
/** Hostname to match for routing */
|
|
62
|
-
hostName: string;
|
|
63
|
-
/** SSL private key for this host (PEM format) */
|
|
64
|
-
privateKey: string;
|
|
65
|
-
/** SSL public key/certificate for this host (PEM format) */
|
|
66
|
-
publicKey: string;
|
|
67
|
-
/** Basic authentication configuration */
|
|
68
|
-
authentication?: {
|
|
69
|
-
type: 'Basic';
|
|
70
|
-
user: string;
|
|
71
|
-
pass: string;
|
|
72
|
-
};
|
|
73
|
-
/** Whether to rewrite the Host header to match the target */
|
|
74
|
-
rewriteHostHeader?: boolean;
|
|
75
|
-
/**
|
|
76
|
-
* Protocol to use when proxying to this backend: 'http1' or 'http2'.
|
|
77
|
-
* Overrides the global backendProtocol option if set.
|
|
78
|
-
*/
|
|
79
|
-
backendProtocol?: 'http1' | 'http2';
|
|
80
|
-
}
|
|
81
|
-
/**
|
|
82
|
-
* Convert a legacy IReverseProxyConfig to the modern IRouteConfig format
|
|
83
|
-
*
|
|
84
|
-
* @deprecated This function is maintained for backward compatibility.
|
|
85
|
-
* New code should create IRouteConfig objects directly.
|
|
86
|
-
*
|
|
87
|
-
* @param legacyConfig The legacy configuration to convert
|
|
88
|
-
* @param proxyPort The port the proxy listens on
|
|
89
|
-
* @returns A modern route configuration equivalent to the legacy config
|
|
90
|
-
*/
|
|
91
|
-
export declare function convertLegacyConfigToRouteConfig(legacyConfig: IReverseProxyConfig, proxyPort: number): IRouteConfig;
|
|
92
|
-
/**
|
|
93
|
-
* Route manager for NetworkProxy
|
|
94
|
-
* Handles route matching and configuration
|
|
95
|
-
*/
|
|
96
|
-
export declare class RouteManager {
|
|
97
|
-
private routes;
|
|
98
|
-
private logger;
|
|
99
|
-
constructor(logger: ILogger);
|
|
100
|
-
/**
|
|
101
|
-
* Update the routes configuration
|
|
102
|
-
*/
|
|
103
|
-
updateRoutes(routes: IRouteConfig[]): void;
|
|
104
|
-
/**
|
|
105
|
-
* Get all routes
|
|
106
|
-
*/
|
|
107
|
-
getRoutes(): IRouteConfig[];
|
|
108
|
-
/**
|
|
109
|
-
* Find the first matching route for a context
|
|
110
|
-
*/
|
|
111
|
-
findMatchingRoute(context: IRouteContext): IRouteConfig | null;
|
|
112
|
-
/**
|
|
113
|
-
* Check if a route matches the given context
|
|
114
|
-
*/
|
|
115
|
-
private matchesRoute;
|
|
116
|
-
/**
|
|
117
|
-
* Match a domain pattern against a domain
|
|
118
|
-
*/
|
|
119
|
-
private matchDomain;
|
|
120
|
-
/**
|
|
121
|
-
* Match a path pattern against a path
|
|
122
|
-
*/
|
|
123
|
-
private matchPath;
|
|
124
|
-
/**
|
|
125
|
-
* Match an IP pattern against an IP
|
|
126
|
-
* Supports exact matches, wildcard patterns, and CIDR notation
|
|
127
|
-
*/
|
|
128
|
-
private matchIp;
|
|
129
|
-
/**
|
|
130
|
-
* Convert an IP address to its binary representation
|
|
131
|
-
* @param ip The IP address to convert
|
|
132
|
-
* @returns Binary string representation or null if invalid
|
|
133
|
-
*/
|
|
134
|
-
private ipToBinary;
|
|
135
|
-
}
|
|
136
46
|
/**
|
|
137
47
|
* Interface for connection tracking in the pool
|
|
138
48
|
*/
|
|
@@ -1,245 +1,4 @@
|
|
|
1
1
|
import * as plugins from '../../../plugins.js';
|
|
2
|
-
/**
|
|
3
|
-
* Convert a legacy IReverseProxyConfig to the modern IRouteConfig format
|
|
4
|
-
*
|
|
5
|
-
* @deprecated This function is maintained for backward compatibility.
|
|
6
|
-
* New code should create IRouteConfig objects directly.
|
|
7
|
-
*
|
|
8
|
-
* @param legacyConfig The legacy configuration to convert
|
|
9
|
-
* @param proxyPort The port the proxy listens on
|
|
10
|
-
* @returns A modern route configuration equivalent to the legacy config
|
|
11
|
-
*/
|
|
12
|
-
export function convertLegacyConfigToRouteConfig(legacyConfig, proxyPort) {
|
|
13
|
-
// Create basic route configuration
|
|
14
|
-
const routeConfig = {
|
|
15
|
-
// Match properties
|
|
16
|
-
match: {
|
|
17
|
-
ports: proxyPort,
|
|
18
|
-
domains: legacyConfig.hostName
|
|
19
|
-
},
|
|
20
|
-
// Action properties
|
|
21
|
-
action: {
|
|
22
|
-
type: 'forward',
|
|
23
|
-
target: {
|
|
24
|
-
host: legacyConfig.destinationIps,
|
|
25
|
-
port: legacyConfig.destinationPorts[0]
|
|
26
|
-
},
|
|
27
|
-
// TLS mode is always 'terminate' for legacy configs
|
|
28
|
-
tls: {
|
|
29
|
-
mode: 'terminate',
|
|
30
|
-
certificate: {
|
|
31
|
-
key: legacyConfig.privateKey,
|
|
32
|
-
cert: legacyConfig.publicKey
|
|
33
|
-
}
|
|
34
|
-
},
|
|
35
|
-
// Advanced options
|
|
36
|
-
advanced: {
|
|
37
|
-
// Rewrite host header if specified
|
|
38
|
-
headers: legacyConfig.rewriteHostHeader ? { 'host': '{domain}' } : {}
|
|
39
|
-
}
|
|
40
|
-
},
|
|
41
|
-
// Metadata
|
|
42
|
-
name: `Legacy Config - ${legacyConfig.hostName}`,
|
|
43
|
-
priority: 0, // Default priority
|
|
44
|
-
enabled: true
|
|
45
|
-
};
|
|
46
|
-
// Add authentication if present
|
|
47
|
-
if (legacyConfig.authentication) {
|
|
48
|
-
routeConfig.security = {
|
|
49
|
-
authentication: {
|
|
50
|
-
type: 'basic',
|
|
51
|
-
credentials: [{
|
|
52
|
-
username: legacyConfig.authentication.user,
|
|
53
|
-
password: legacyConfig.authentication.pass
|
|
54
|
-
}]
|
|
55
|
-
}
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
// Add backend protocol if specified
|
|
59
|
-
if (legacyConfig.backendProtocol) {
|
|
60
|
-
if (!routeConfig.action.options) {
|
|
61
|
-
routeConfig.action.options = {};
|
|
62
|
-
}
|
|
63
|
-
routeConfig.action.options.backendProtocol = legacyConfig.backendProtocol;
|
|
64
|
-
}
|
|
65
|
-
return routeConfig;
|
|
66
|
-
}
|
|
67
|
-
/**
|
|
68
|
-
* Route manager for NetworkProxy
|
|
69
|
-
* Handles route matching and configuration
|
|
70
|
-
*/
|
|
71
|
-
export class RouteManager {
|
|
72
|
-
constructor(logger) {
|
|
73
|
-
this.routes = [];
|
|
74
|
-
this.logger = logger;
|
|
75
|
-
}
|
|
76
|
-
/**
|
|
77
|
-
* Update the routes configuration
|
|
78
|
-
*/
|
|
79
|
-
updateRoutes(routes) {
|
|
80
|
-
// Sort routes by priority (higher first)
|
|
81
|
-
this.routes = [...routes].sort((a, b) => {
|
|
82
|
-
const priorityA = a.priority ?? 0;
|
|
83
|
-
const priorityB = b.priority ?? 0;
|
|
84
|
-
return priorityB - priorityA;
|
|
85
|
-
});
|
|
86
|
-
this.logger.info(`Updated RouteManager with ${this.routes.length} routes`);
|
|
87
|
-
}
|
|
88
|
-
/**
|
|
89
|
-
* Get all routes
|
|
90
|
-
*/
|
|
91
|
-
getRoutes() {
|
|
92
|
-
return [...this.routes];
|
|
93
|
-
}
|
|
94
|
-
/**
|
|
95
|
-
* Find the first matching route for a context
|
|
96
|
-
*/
|
|
97
|
-
findMatchingRoute(context) {
|
|
98
|
-
for (const route of this.routes) {
|
|
99
|
-
if (this.matchesRoute(route, context)) {
|
|
100
|
-
return route;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
return null;
|
|
104
|
-
}
|
|
105
|
-
/**
|
|
106
|
-
* Check if a route matches the given context
|
|
107
|
-
*/
|
|
108
|
-
matchesRoute(route, context) {
|
|
109
|
-
// Skip disabled routes
|
|
110
|
-
if (route.enabled === false) {
|
|
111
|
-
return false;
|
|
112
|
-
}
|
|
113
|
-
// Check domain match if specified
|
|
114
|
-
if (route.match.domains && context.domain) {
|
|
115
|
-
const domains = Array.isArray(route.match.domains)
|
|
116
|
-
? route.match.domains
|
|
117
|
-
: [route.match.domains];
|
|
118
|
-
if (!domains.some(domainPattern => this.matchDomain(domainPattern, context.domain))) {
|
|
119
|
-
return false;
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
// Check path match if specified
|
|
123
|
-
if (route.match.path && context.path) {
|
|
124
|
-
if (!this.matchPath(route.match.path, context.path)) {
|
|
125
|
-
return false;
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
// Check client IP match if specified
|
|
129
|
-
if (route.match.clientIp && context.clientIp) {
|
|
130
|
-
if (!route.match.clientIp.some(ip => this.matchIp(ip, context.clientIp))) {
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
// Check TLS version match if specified
|
|
135
|
-
if (route.match.tlsVersion && context.tlsVersion) {
|
|
136
|
-
if (!route.match.tlsVersion.includes(context.tlsVersion)) {
|
|
137
|
-
return false;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
// All criteria matched
|
|
141
|
-
return true;
|
|
142
|
-
}
|
|
143
|
-
/**
|
|
144
|
-
* Match a domain pattern against a domain
|
|
145
|
-
*/
|
|
146
|
-
matchDomain(pattern, domain) {
|
|
147
|
-
if (pattern === domain) {
|
|
148
|
-
return true;
|
|
149
|
-
}
|
|
150
|
-
if (pattern.includes('*')) {
|
|
151
|
-
const regexPattern = pattern
|
|
152
|
-
.replace(/\./g, '\\.')
|
|
153
|
-
.replace(/\*/g, '.*');
|
|
154
|
-
const regex = new RegExp(`^${regexPattern}$`, 'i');
|
|
155
|
-
return regex.test(domain);
|
|
156
|
-
}
|
|
157
|
-
return false;
|
|
158
|
-
}
|
|
159
|
-
/**
|
|
160
|
-
* Match a path pattern against a path
|
|
161
|
-
*/
|
|
162
|
-
matchPath(pattern, path) {
|
|
163
|
-
if (pattern === path) {
|
|
164
|
-
return true;
|
|
165
|
-
}
|
|
166
|
-
if (pattern.endsWith('*')) {
|
|
167
|
-
const prefix = pattern.slice(0, -1);
|
|
168
|
-
return path.startsWith(prefix);
|
|
169
|
-
}
|
|
170
|
-
return false;
|
|
171
|
-
}
|
|
172
|
-
/**
|
|
173
|
-
* Match an IP pattern against an IP
|
|
174
|
-
* Supports exact matches, wildcard patterns, and CIDR notation
|
|
175
|
-
*/
|
|
176
|
-
matchIp(pattern, ip) {
|
|
177
|
-
// Exact match
|
|
178
|
-
if (pattern === ip) {
|
|
179
|
-
return true;
|
|
180
|
-
}
|
|
181
|
-
// Wildcard matching (e.g., 192.168.0.*)
|
|
182
|
-
if (pattern.includes('*')) {
|
|
183
|
-
const regexPattern = pattern
|
|
184
|
-
.replace(/\./g, '\\.')
|
|
185
|
-
.replace(/\*/g, '.*');
|
|
186
|
-
const regex = new RegExp(`^${regexPattern}$`);
|
|
187
|
-
return regex.test(ip);
|
|
188
|
-
}
|
|
189
|
-
// CIDR matching (e.g., 192.168.0.0/24)
|
|
190
|
-
if (pattern.includes('/')) {
|
|
191
|
-
try {
|
|
192
|
-
const [subnet, bits] = pattern.split('/');
|
|
193
|
-
// Convert IP addresses to numeric format for comparison
|
|
194
|
-
const ipBinary = this.ipToBinary(ip);
|
|
195
|
-
const subnetBinary = this.ipToBinary(subnet);
|
|
196
|
-
if (!ipBinary || !subnetBinary) {
|
|
197
|
-
return false;
|
|
198
|
-
}
|
|
199
|
-
// Get the subnet mask from CIDR notation
|
|
200
|
-
const mask = parseInt(bits, 10);
|
|
201
|
-
if (isNaN(mask) || mask < 0 || mask > 32) {
|
|
202
|
-
return false;
|
|
203
|
-
}
|
|
204
|
-
// Check if the first 'mask' bits match between IP and subnet
|
|
205
|
-
return ipBinary.slice(0, mask) === subnetBinary.slice(0, mask);
|
|
206
|
-
}
|
|
207
|
-
catch (error) {
|
|
208
|
-
// If we encounter any error during CIDR matching, return false
|
|
209
|
-
return false;
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
return false;
|
|
213
|
-
}
|
|
214
|
-
/**
|
|
215
|
-
* Convert an IP address to its binary representation
|
|
216
|
-
* @param ip The IP address to convert
|
|
217
|
-
* @returns Binary string representation or null if invalid
|
|
218
|
-
*/
|
|
219
|
-
ipToBinary(ip) {
|
|
220
|
-
// Handle IPv4 addresses only for now
|
|
221
|
-
const parts = ip.split('.');
|
|
222
|
-
// Validate IP format
|
|
223
|
-
if (parts.length !== 4) {
|
|
224
|
-
return null;
|
|
225
|
-
}
|
|
226
|
-
// Convert each octet to 8-bit binary and concatenate
|
|
227
|
-
try {
|
|
228
|
-
return parts
|
|
229
|
-
.map(part => {
|
|
230
|
-
const num = parseInt(part, 10);
|
|
231
|
-
if (isNaN(num) || num < 0 || num > 255) {
|
|
232
|
-
throw new Error('Invalid IP octet');
|
|
233
|
-
}
|
|
234
|
-
return num.toString(2).padStart(8, '0');
|
|
235
|
-
})
|
|
236
|
-
.join('');
|
|
237
|
-
}
|
|
238
|
-
catch (error) {
|
|
239
|
-
return null;
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
2
|
/**
|
|
244
3
|
* Creates a logger based on the specified log level
|
|
245
4
|
*/
|
|
@@ -273,4 +32,4 @@ export function createLogger(logLevel = 'info') {
|
|
|
273
32
|
}
|
|
274
33
|
};
|
|
275
34
|
}
|
|
276
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9wcm94aWVzL2h0dHAtcHJveHkvbW9kZWxzL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUF1Ri9DOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FBQyxXQUFtQixNQUFNO0lBQ3BELE1BQU0sU0FBUyxHQUFHO1FBQ2hCLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxFQUFFLENBQUM7UUFDUCxJQUFJLEVBQUUsQ0FBQztRQUNQLEtBQUssRUFBRSxDQUFDO0tBQ1QsQ0FBQztJQUVGLE9BQU87UUFDTCxLQUFLLEVBQUUsQ0FBQyxPQUFlLEVBQUUsSUFBVSxFQUFFLEVBQUU7WUFDckMsSUFBSSxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUMzQyxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsT0FBTyxFQUFFLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ2hELENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxFQUFFLENBQUMsT0FBZSxFQUFFLElBQVUsRUFBRSxFQUFFO1lBQ3BDLElBQUksU0FBUyxDQUFDLFFBQVEsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDMUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLE9BQU8sRUFBRSxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQztZQUMvQyxDQUFDO1FBQ0gsQ0FBQztRQUNELElBQUksRUFBRSxDQUFDLE9BQWUsRUFBRSxJQUFVLEVBQUUsRUFBRTtZQUNwQyxJQUFJLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQzFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxPQUFPLEVBQUUsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7WUFDaEQsQ0FBQztRQUNILENBQUM7UUFDRCxLQUFLLEVBQUUsQ0FBQyxPQUFlLEVBQUUsSUFBVSxFQUFFLEVBQUU7WUFDckMsSUFBSSxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUMzQyxPQUFPLENBQUMsS0FBSyxDQUFDLFdBQVcsT0FBTyxFQUFFLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQ2xELENBQUM7UUFDSCxDQUFDO0tBQ0YsQ0FBQztBQUNKLENBQUMifQ==
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import '../../core/models/socket-augmentation.js';
|
|
3
|
-
import { type IHttpProxyOptions
|
|
3
|
+
import { type IHttpProxyOptions } from './models/types.js';
|
|
4
|
+
import { SharedRouteManager as RouteManager } from '../../core/routing/route-manager.js';
|
|
4
5
|
import { ConnectionPool } from './connection-pool.js';
|
|
5
|
-
import { ProxyRouter } from '../../routing/router/index.js';
|
|
6
6
|
import { SecurityManager } from './security-manager.js';
|
|
7
7
|
/**
|
|
8
8
|
* Interface for tracking metrics
|
|
@@ -18,7 +18,6 @@ export type MetricsTracker = IMetricsTracker;
|
|
|
18
18
|
export declare class RequestHandler {
|
|
19
19
|
private options;
|
|
20
20
|
private connectionPool;
|
|
21
|
-
private legacyRouter;
|
|
22
21
|
private routeManager?;
|
|
23
22
|
private functionCache?;
|
|
24
23
|
private router?;
|
|
@@ -28,8 +27,7 @@ export declare class RequestHandler {
|
|
|
28
27
|
private h2Sessions;
|
|
29
28
|
private contextCreator;
|
|
30
29
|
securityManager: SecurityManager;
|
|
31
|
-
constructor(options: IHttpProxyOptions, connectionPool: ConnectionPool,
|
|
32
|
-
routeManager?: RouteManager, functionCache?: any, // FunctionCache - using any to avoid circular dependency
|
|
30
|
+
constructor(options: IHttpProxyOptions, connectionPool: ConnectionPool, routeManager?: RouteManager, functionCache?: any, // FunctionCache - using any to avoid circular dependency
|
|
33
31
|
router?: any);
|
|
34
32
|
/**
|
|
35
33
|
* Set the route manager instance
|