@push.rocks/smartproxy 13.1.2 → 15.0.0

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.
Files changed (29) hide show
  1. package/dist_ts/00_commitinfo_data.js +3 -3
  2. package/dist_ts/proxies/smart-proxy/index.d.ts +5 -3
  3. package/dist_ts/proxies/smart-proxy/index.js +9 -5
  4. package/dist_ts/proxies/smart-proxy/models/index.d.ts +2 -0
  5. package/dist_ts/proxies/smart-proxy/models/index.js +2 -1
  6. package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +82 -15
  7. package/dist_ts/proxies/smart-proxy/models/interfaces.js +10 -1
  8. package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +133 -0
  9. package/dist_ts/proxies/smart-proxy/models/route-types.js +2 -0
  10. package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +55 -0
  11. package/dist_ts/proxies/smart-proxy/route-connection-handler.js +804 -0
  12. package/dist_ts/proxies/smart-proxy/route-helpers.d.ts +127 -0
  13. package/dist_ts/proxies/smart-proxy/route-helpers.js +196 -0
  14. package/dist_ts/proxies/smart-proxy/route-manager.d.ts +103 -0
  15. package/dist_ts/proxies/smart-proxy/route-manager.js +483 -0
  16. package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +19 -8
  17. package/dist_ts/proxies/smart-proxy/smart-proxy.js +239 -46
  18. package/package.json +2 -2
  19. package/readme.md +863 -423
  20. package/readme.plan.md +311 -250
  21. package/ts/00_commitinfo_data.ts +2 -2
  22. package/ts/proxies/smart-proxy/index.ts +20 -4
  23. package/ts/proxies/smart-proxy/models/index.ts +4 -0
  24. package/ts/proxies/smart-proxy/models/interfaces.ts +91 -13
  25. package/ts/proxies/smart-proxy/models/route-types.ts +184 -0
  26. package/ts/proxies/smart-proxy/route-connection-handler.ts +1117 -0
  27. package/ts/proxies/smart-proxy/route-helpers.ts +344 -0
  28. package/ts/proxies/smart-proxy/route-manager.ts +587 -0
  29. package/ts/proxies/smart-proxy/smart-proxy.ts +300 -69
@@ -0,0 +1,483 @@
1
+ import * as plugins from '../../plugins.js';
2
+ import { isRoutedOptions, isLegacyOptions } from './models/interfaces.js';
3
+ /**
4
+ * The RouteManager handles all routing decisions based on connections and attributes
5
+ */
6
+ export class RouteManager extends plugins.EventEmitter {
7
+ constructor(options) {
8
+ super();
9
+ this.routes = [];
10
+ this.portMap = new Map();
11
+ // We no longer support legacy options, always use provided options
12
+ this.options = options;
13
+ // Initialize routes from either source
14
+ this.updateRoutes(this.options.routes);
15
+ }
16
+ /**
17
+ * Update routes with new configuration
18
+ */
19
+ updateRoutes(routes = []) {
20
+ // Sort routes by priority (higher first)
21
+ this.routes = [...(routes || [])].sort((a, b) => {
22
+ const priorityA = a.priority ?? 0;
23
+ const priorityB = b.priority ?? 0;
24
+ return priorityB - priorityA;
25
+ });
26
+ // Rebuild port mapping for fast lookups
27
+ this.rebuildPortMap();
28
+ }
29
+ /**
30
+ * Rebuild the port mapping for fast lookups
31
+ */
32
+ rebuildPortMap() {
33
+ this.portMap.clear();
34
+ for (const route of this.routes) {
35
+ const ports = this.expandPortRange(route.match.ports);
36
+ for (const port of ports) {
37
+ if (!this.portMap.has(port)) {
38
+ this.portMap.set(port, []);
39
+ }
40
+ this.portMap.get(port).push(route);
41
+ }
42
+ }
43
+ }
44
+ /**
45
+ * Expand a port range specification into an array of individual ports
46
+ */
47
+ expandPortRange(portRange) {
48
+ if (typeof portRange === 'number') {
49
+ return [portRange];
50
+ }
51
+ if (Array.isArray(portRange)) {
52
+ // Handle array of port objects or numbers
53
+ return portRange.flatMap(item => {
54
+ if (typeof item === 'number') {
55
+ return [item];
56
+ }
57
+ else if (typeof item === 'object' && 'from' in item && 'to' in item) {
58
+ // Handle port range object
59
+ const ports = [];
60
+ for (let p = item.from; p <= item.to; p++) {
61
+ ports.push(p);
62
+ }
63
+ return ports;
64
+ }
65
+ return [];
66
+ });
67
+ }
68
+ return [];
69
+ }
70
+ /**
71
+ * Get all ports that should be listened on
72
+ */
73
+ getListeningPorts() {
74
+ return Array.from(this.portMap.keys());
75
+ }
76
+ /**
77
+ * Get all routes for a given port
78
+ */
79
+ getRoutesForPort(port) {
80
+ return this.portMap.get(port) || [];
81
+ }
82
+ /**
83
+ * Test if a pattern matches a domain using glob matching
84
+ */
85
+ matchDomain(pattern, domain) {
86
+ // Convert glob pattern to regex
87
+ const regexPattern = pattern
88
+ .replace(/\./g, '\\.') // Escape dots
89
+ .replace(/\*/g, '.*'); // Convert * to .*
90
+ const regex = new RegExp(`^${regexPattern}$`, 'i');
91
+ return regex.test(domain);
92
+ }
93
+ /**
94
+ * Match a domain against all patterns in a route
95
+ */
96
+ matchRouteDomain(route, domain) {
97
+ if (!route.match.domains) {
98
+ // If no domains specified, match all domains
99
+ return true;
100
+ }
101
+ const patterns = Array.isArray(route.match.domains)
102
+ ? route.match.domains
103
+ : [route.match.domains];
104
+ return patterns.some(pattern => this.matchDomain(pattern, domain));
105
+ }
106
+ /**
107
+ * Check if a client IP is allowed by a route's security settings
108
+ */
109
+ isClientIpAllowed(route, clientIp) {
110
+ const security = route.action.security;
111
+ if (!security) {
112
+ return true; // No security settings means allowed
113
+ }
114
+ // Check blocked IPs first
115
+ if (security.blockedIps && security.blockedIps.length > 0) {
116
+ for (const pattern of security.blockedIps) {
117
+ if (this.matchIpPattern(pattern, clientIp)) {
118
+ return false; // IP is blocked
119
+ }
120
+ }
121
+ }
122
+ // If there are allowed IPs, check them
123
+ if (security.allowedIps && security.allowedIps.length > 0) {
124
+ for (const pattern of security.allowedIps) {
125
+ if (this.matchIpPattern(pattern, clientIp)) {
126
+ return true; // IP is allowed
127
+ }
128
+ }
129
+ return false; // IP not in allowed list
130
+ }
131
+ // No allowed IPs specified, so IP is allowed
132
+ return true;
133
+ }
134
+ /**
135
+ * Match an IP against a pattern
136
+ */
137
+ matchIpPattern(pattern, ip) {
138
+ // Handle exact match
139
+ if (pattern === ip) {
140
+ return true;
141
+ }
142
+ // Handle CIDR notation (e.g., 192.168.1.0/24)
143
+ if (pattern.includes('/')) {
144
+ return this.matchIpCidr(pattern, ip);
145
+ }
146
+ // Handle glob pattern (e.g., 192.168.1.*)
147
+ if (pattern.includes('*')) {
148
+ const regexPattern = pattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
149
+ const regex = new RegExp(`^${regexPattern}$`);
150
+ return regex.test(ip);
151
+ }
152
+ return false;
153
+ }
154
+ /**
155
+ * Match an IP against a CIDR pattern
156
+ */
157
+ matchIpCidr(cidr, ip) {
158
+ try {
159
+ // In a real implementation, you'd use a proper IP library
160
+ // This is a simplified implementation
161
+ const [subnet, bits] = cidr.split('/');
162
+ const mask = parseInt(bits, 10);
163
+ // Convert IP addresses to numeric values
164
+ const ipNum = this.ipToNumber(ip);
165
+ const subnetNum = this.ipToNumber(subnet);
166
+ // Calculate subnet mask
167
+ const maskNum = ~(2 ** (32 - mask) - 1);
168
+ // Check if IP is in subnet
169
+ return (ipNum & maskNum) === (subnetNum & maskNum);
170
+ }
171
+ catch (e) {
172
+ console.error(`Error matching IP ${ip} against CIDR ${cidr}:`, e);
173
+ return false;
174
+ }
175
+ }
176
+ /**
177
+ * Convert an IP address to a numeric value
178
+ */
179
+ ipToNumber(ip) {
180
+ const parts = ip.split('.').map(part => parseInt(part, 10));
181
+ return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3];
182
+ }
183
+ /**
184
+ * Find the matching route for a connection
185
+ */
186
+ findMatchingRoute(options) {
187
+ const { port, domain, clientIp, path, tlsVersion } = options;
188
+ // Get all routes for this port
189
+ const routesForPort = this.getRoutesForPort(port);
190
+ // Find the first matching route based on priority order
191
+ for (const route of routesForPort) {
192
+ // Check domain match if specified
193
+ if (domain && !this.matchRouteDomain(route, domain)) {
194
+ continue;
195
+ }
196
+ // Check path match if specified in both route and request
197
+ if (path && route.match.path) {
198
+ if (!this.matchPath(route.match.path, path)) {
199
+ continue;
200
+ }
201
+ }
202
+ // Check client IP match
203
+ if (route.match.clientIp && !route.match.clientIp.some(pattern => this.matchIpPattern(pattern, clientIp))) {
204
+ continue;
205
+ }
206
+ // Check TLS version match
207
+ if (tlsVersion && route.match.tlsVersion &&
208
+ !route.match.tlsVersion.includes(tlsVersion)) {
209
+ continue;
210
+ }
211
+ // Check security settings
212
+ if (!this.isClientIpAllowed(route, clientIp)) {
213
+ continue;
214
+ }
215
+ // All checks passed, this route matches
216
+ return { route };
217
+ }
218
+ return null;
219
+ }
220
+ /**
221
+ * Match a path against a pattern
222
+ */
223
+ matchPath(pattern, path) {
224
+ // Convert the glob pattern to a regex
225
+ const regexPattern = pattern
226
+ .replace(/\./g, '\\.') // Escape dots
227
+ .replace(/\*/g, '.*') // Convert * to .*
228
+ .replace(/\//g, '\\/'); // Escape slashes
229
+ const regex = new RegExp(`^${regexPattern}$`);
230
+ return regex.test(path);
231
+ }
232
+ /**
233
+ * Convert a domain config to routes
234
+ * (For backward compatibility with code that still uses domainConfigs)
235
+ */
236
+ domainConfigToRoutes(domainConfig) {
237
+ const routes = [];
238
+ const { domains, forwarding } = domainConfig;
239
+ // Determine the action based on forwarding type
240
+ let action = {
241
+ type: 'forward',
242
+ target: {
243
+ host: forwarding.target.host,
244
+ port: forwarding.target.port
245
+ }
246
+ };
247
+ // Set TLS mode based on forwarding type
248
+ switch (forwarding.type) {
249
+ case 'http-only':
250
+ // No TLS settings needed
251
+ break;
252
+ case 'https-passthrough':
253
+ action.tls = { mode: 'passthrough' };
254
+ break;
255
+ case 'https-terminate-to-http':
256
+ action.tls = {
257
+ mode: 'terminate',
258
+ certificate: forwarding.https?.customCert ? {
259
+ key: forwarding.https.customCert.key,
260
+ cert: forwarding.https.customCert.cert
261
+ } : 'auto'
262
+ };
263
+ break;
264
+ case 'https-terminate-to-https':
265
+ action.tls = {
266
+ mode: 'terminate-and-reencrypt',
267
+ certificate: forwarding.https?.customCert ? {
268
+ key: forwarding.https.customCert.key,
269
+ cert: forwarding.https.customCert.cert
270
+ } : 'auto'
271
+ };
272
+ break;
273
+ }
274
+ // Add security settings if present
275
+ if (forwarding.security) {
276
+ action.security = {
277
+ allowedIps: forwarding.security.allowedIps,
278
+ blockedIps: forwarding.security.blockedIps,
279
+ maxConnections: forwarding.security.maxConnections
280
+ };
281
+ }
282
+ // Add advanced settings if present
283
+ if (forwarding.advanced) {
284
+ action.advanced = {
285
+ timeout: forwarding.advanced.timeout,
286
+ headers: forwarding.advanced.headers,
287
+ keepAlive: forwarding.advanced.keepAlive
288
+ };
289
+ }
290
+ // Determine which port to use based on forwarding type
291
+ const defaultPort = forwarding.type.startsWith('https') ? 443 : 80;
292
+ // Add the main route
293
+ routes.push({
294
+ match: {
295
+ ports: defaultPort,
296
+ domains
297
+ },
298
+ action,
299
+ name: `Route for ${domains.join(', ')}`
300
+ });
301
+ // Add HTTP redirect if needed
302
+ if (forwarding.http?.redirectToHttps) {
303
+ routes.push({
304
+ match: {
305
+ ports: 80,
306
+ domains
307
+ },
308
+ action: {
309
+ type: 'redirect',
310
+ redirect: {
311
+ to: 'https://{domain}{path}',
312
+ status: 301
313
+ }
314
+ },
315
+ name: `HTTP Redirect for ${domains.join(', ')}`,
316
+ priority: 100 // Higher priority for redirects
317
+ });
318
+ }
319
+ // Add port ranges if specified
320
+ if (forwarding.advanced?.portRanges) {
321
+ for (const range of forwarding.advanced.portRanges) {
322
+ routes.push({
323
+ match: {
324
+ ports: [{ from: range.from, to: range.to }],
325
+ domains
326
+ },
327
+ action,
328
+ name: `Port Range ${range.from}-${range.to} for ${domains.join(', ')}`
329
+ });
330
+ }
331
+ }
332
+ return routes;
333
+ }
334
+ /**
335
+ * Update routes based on domain configs
336
+ * (For backward compatibility with code that still uses domainConfigs)
337
+ */
338
+ updateFromDomainConfigs(domainConfigs) {
339
+ const routes = [];
340
+ // Convert each domain config to routes
341
+ for (const config of domainConfigs) {
342
+ routes.push(...this.domainConfigToRoutes(config));
343
+ }
344
+ // Merge with existing routes that aren't derived from domain configs
345
+ const nonDomainRoutes = this.routes.filter(r => !r.name || !r.name.includes('for '));
346
+ this.updateRoutes([...nonDomainRoutes, ...routes]);
347
+ }
348
+ /**
349
+ * Validate the route configuration and return any warnings
350
+ */
351
+ validateConfiguration() {
352
+ const warnings = [];
353
+ const duplicatePorts = new Map();
354
+ // Check for routes with the same exact match criteria
355
+ for (let i = 0; i < this.routes.length; i++) {
356
+ for (let j = i + 1; j < this.routes.length; j++) {
357
+ const route1 = this.routes[i];
358
+ const route2 = this.routes[j];
359
+ // Check if route match criteria are the same
360
+ if (this.areMatchesSimilar(route1.match, route2.match)) {
361
+ warnings.push(`Routes "${route1.name || i}" and "${route2.name || j}" have similar match criteria. ` +
362
+ `The route with higher priority (${Math.max(route1.priority || 0, route2.priority || 0)}) will be used.`);
363
+ }
364
+ }
365
+ }
366
+ // Check for routes that may never be matched due to priority
367
+ for (let i = 0; i < this.routes.length; i++) {
368
+ const route = this.routes[i];
369
+ const higherPriorityRoutes = this.routes.filter(r => (r.priority || 0) > (route.priority || 0));
370
+ for (const higherRoute of higherPriorityRoutes) {
371
+ if (this.isRouteShadowed(route, higherRoute)) {
372
+ warnings.push(`Route "${route.name || i}" may never be matched because it is shadowed by ` +
373
+ `higher priority route "${higherRoute.name || 'unnamed'}"`);
374
+ break;
375
+ }
376
+ }
377
+ }
378
+ return warnings;
379
+ }
380
+ /**
381
+ * Check if two route matches are similar (potential conflict)
382
+ */
383
+ areMatchesSimilar(match1, match2) {
384
+ // Check port overlap
385
+ const ports1 = new Set(this.expandPortRange(match1.ports));
386
+ const ports2 = new Set(this.expandPortRange(match2.ports));
387
+ let havePortOverlap = false;
388
+ for (const port of ports1) {
389
+ if (ports2.has(port)) {
390
+ havePortOverlap = true;
391
+ break;
392
+ }
393
+ }
394
+ if (!havePortOverlap) {
395
+ return false;
396
+ }
397
+ // Check domain overlap
398
+ if (match1.domains && match2.domains) {
399
+ const domains1 = Array.isArray(match1.domains) ? match1.domains : [match1.domains];
400
+ const domains2 = Array.isArray(match2.domains) ? match2.domains : [match2.domains];
401
+ // Check if any domain pattern from match1 could match any from match2
402
+ let haveDomainOverlap = false;
403
+ for (const domain1 of domains1) {
404
+ for (const domain2 of domains2) {
405
+ if (domain1 === domain2 ||
406
+ (domain1.includes('*') || domain2.includes('*'))) {
407
+ haveDomainOverlap = true;
408
+ break;
409
+ }
410
+ }
411
+ if (haveDomainOverlap)
412
+ break;
413
+ }
414
+ if (!haveDomainOverlap) {
415
+ return false;
416
+ }
417
+ }
418
+ else if (match1.domains || match2.domains) {
419
+ // One has domains, the other doesn't - they could overlap
420
+ // The one with domains is more specific, so it's not exactly a conflict
421
+ return false;
422
+ }
423
+ // Check path overlap
424
+ if (match1.path && match2.path) {
425
+ // This is a simplified check - in a real implementation,
426
+ // you'd need to check if the path patterns could match the same paths
427
+ return match1.path === match2.path ||
428
+ match1.path.includes('*') ||
429
+ match2.path.includes('*');
430
+ }
431
+ else if (match1.path || match2.path) {
432
+ // One has a path, the other doesn't
433
+ return false;
434
+ }
435
+ // If we get here, the matches have significant overlap
436
+ return true;
437
+ }
438
+ /**
439
+ * Check if a route is completely shadowed by a higher priority route
440
+ */
441
+ isRouteShadowed(route, higherPriorityRoute) {
442
+ // If they don't have similar match criteria, no shadowing occurs
443
+ if (!this.areMatchesSimilar(route.match, higherPriorityRoute.match)) {
444
+ return false;
445
+ }
446
+ // If higher priority route has more specific criteria, no shadowing
447
+ if (this.isRouteMoreSpecific(higherPriorityRoute.match, route.match)) {
448
+ return false;
449
+ }
450
+ // If higher priority route is equally or less specific but has higher priority,
451
+ // it shadows the lower priority route
452
+ return true;
453
+ }
454
+ /**
455
+ * Check if route1 is more specific than route2
456
+ */
457
+ isRouteMoreSpecific(match1, match2) {
458
+ // Check if match1 has more specific criteria
459
+ let match1Points = 0;
460
+ let match2Points = 0;
461
+ // Path is the most specific
462
+ if (match1.path)
463
+ match1Points += 3;
464
+ if (match2.path)
465
+ match2Points += 3;
466
+ // Domain is next most specific
467
+ if (match1.domains)
468
+ match1Points += 2;
469
+ if (match2.domains)
470
+ match2Points += 2;
471
+ // Client IP and TLS version are least specific
472
+ if (match1.clientIp)
473
+ match1Points += 1;
474
+ if (match2.clientIp)
475
+ match2Points += 1;
476
+ if (match1.tlsVersion)
477
+ match1Points += 1;
478
+ if (match2.tlsVersion)
479
+ match2Points += 1;
480
+ return match1Points > match2Points;
481
+ }
482
+ }
483
+ //# 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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"}
@@ -1,9 +1,8 @@
1
1
  import * as plugins from '../../plugins.js';
2
- import { DomainConfigManager } from './domain-config-manager.js';
3
2
  import type { ISmartProxyOptions, IDomainConfig } from './models/interfaces.js';
4
- export type { ISmartProxyOptions as IPortProxySettings, IDomainConfig };
3
+ import type { IRouteConfig } from './models/route-types.js';
5
4
  /**
6
- * SmartProxy - Main class that coordinates all components
5
+ * SmartProxy - Unified route-based API
7
6
  */
8
7
  export declare class SmartProxy extends plugins.EventEmitter {
9
8
  private netServers;
@@ -11,17 +10,21 @@ export declare class SmartProxy extends plugins.EventEmitter {
11
10
  private isShuttingDown;
12
11
  private connectionManager;
13
12
  private securityManager;
14
- domainConfigManager: DomainConfigManager;
13
+ private domainConfigManager;
15
14
  private tlsManager;
16
15
  private networkProxyBridge;
17
16
  private timeoutManager;
18
17
  private portRangeManager;
19
- private connectionHandler;
18
+ private routeManager;
19
+ private routeConnectionHandler;
20
20
  private port80Handler;
21
21
  private certProvisioner?;
22
+ /**
23
+ * Constructor that supports both legacy and route-based configuration
24
+ */
22
25
  constructor(settingsArg: ISmartProxyOptions);
23
26
  /**
24
- * The settings for the port proxy
27
+ * The settings for the SmartProxy
25
28
  */
26
29
  settings: ISmartProxyOptions;
27
30
  /**
@@ -29,17 +32,25 @@ export declare class SmartProxy extends plugins.EventEmitter {
29
32
  */
30
33
  private initializePort80Handler;
31
34
  /**
32
- * Start the proxy server
35
+ * Start the proxy server with support for both configuration types
33
36
  */
34
37
  start(): Promise<void>;
38
+ /**
39
+ * Extract domain configurations from routes for certificate provisioning
40
+ */
41
+ private extractDomainConfigsFromRoutes;
35
42
  /**
36
43
  * Stop the proxy server
37
44
  */
38
45
  stop(): Promise<void>;
39
46
  /**
40
- * Updates the domain configurations for the proxy
47
+ * Updates the domain configurations for the proxy (legacy support)
41
48
  */
42
49
  updateDomainConfigs(newDomainConfigs: IDomainConfig[]): Promise<void>;
50
+ /**
51
+ * Update routes with new configuration (new API)
52
+ */
53
+ updateRoutes(newRoutes: IRouteConfig[]): Promise<void>;
43
54
  /**
44
55
  * Request a certificate for a specific domain
45
56
  */