@push.rocks/smartproxy 15.0.2 → 16.0.3

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 (160) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/certificate/index.d.ts +10 -4
  3. package/dist_ts/certificate/index.js +5 -7
  4. package/dist_ts/certificate/models/certificate-types.d.ts +35 -15
  5. package/dist_ts/certificate/providers/cert-provisioner.d.ts +41 -15
  6. package/dist_ts/certificate/providers/cert-provisioner.js +201 -41
  7. package/dist_ts/core/models/index.d.ts +2 -0
  8. package/dist_ts/core/models/index.js +3 -1
  9. package/dist_ts/core/models/route-context.d.ts +62 -0
  10. package/dist_ts/core/models/route-context.js +43 -0
  11. package/dist_ts/core/models/socket-augmentation.d.ts +12 -0
  12. package/dist_ts/core/models/socket-augmentation.js +18 -0
  13. package/dist_ts/core/utils/event-system.d.ts +200 -0
  14. package/dist_ts/core/utils/event-system.js +224 -0
  15. package/dist_ts/core/utils/index.d.ts +7 -0
  16. package/dist_ts/core/utils/index.js +8 -1
  17. package/dist_ts/core/utils/route-manager.d.ts +118 -0
  18. package/dist_ts/core/utils/route-manager.js +383 -0
  19. package/dist_ts/core/utils/route-utils.d.ts +94 -0
  20. package/dist_ts/core/utils/route-utils.js +264 -0
  21. package/dist_ts/core/utils/security-utils.d.ts +111 -0
  22. package/dist_ts/core/utils/security-utils.js +212 -0
  23. package/dist_ts/core/utils/shared-security-manager.d.ts +110 -0
  24. package/dist_ts/core/utils/shared-security-manager.js +252 -0
  25. package/dist_ts/core/utils/template-utils.d.ts +37 -0
  26. package/dist_ts/core/utils/template-utils.js +104 -0
  27. package/dist_ts/core/utils/websocket-utils.d.ts +23 -0
  28. package/dist_ts/core/utils/websocket-utils.js +86 -0
  29. package/dist_ts/forwarding/config/forwarding-types.d.ts +40 -76
  30. package/dist_ts/forwarding/config/forwarding-types.js +19 -18
  31. package/dist_ts/forwarding/config/index.d.ts +4 -2
  32. package/dist_ts/forwarding/config/index.js +5 -3
  33. package/dist_ts/forwarding/handlers/base-handler.js +3 -1
  34. package/dist_ts/forwarding/index.d.ts +5 -6
  35. package/dist_ts/forwarding/index.js +3 -3
  36. package/dist_ts/http/models/http-types.js +1 -1
  37. package/dist_ts/http/port80/acme-interfaces.d.ts +30 -0
  38. package/dist_ts/http/port80/acme-interfaces.js +46 -1
  39. package/dist_ts/http/port80/port80-handler.d.ts +17 -2
  40. package/dist_ts/http/port80/port80-handler.js +49 -11
  41. package/dist_ts/http/router/index.d.ts +5 -1
  42. package/dist_ts/http/router/index.js +4 -2
  43. package/dist_ts/http/router/route-router.d.ts +108 -0
  44. package/dist_ts/http/router/route-router.js +393 -0
  45. package/dist_ts/index.d.ts +8 -2
  46. package/dist_ts/index.js +10 -3
  47. package/dist_ts/proxies/index.d.ts +7 -2
  48. package/dist_ts/proxies/index.js +10 -4
  49. package/dist_ts/proxies/network-proxy/certificate-manager.d.ts +21 -0
  50. package/dist_ts/proxies/network-proxy/certificate-manager.js +92 -1
  51. package/dist_ts/proxies/network-proxy/context-creator.d.ts +34 -0
  52. package/dist_ts/proxies/network-proxy/context-creator.js +108 -0
  53. package/dist_ts/proxies/network-proxy/function-cache.d.ts +90 -0
  54. package/dist_ts/proxies/network-proxy/function-cache.js +198 -0
  55. package/dist_ts/proxies/network-proxy/http-request-handler.d.ts +40 -0
  56. package/dist_ts/proxies/network-proxy/http-request-handler.js +256 -0
  57. package/dist_ts/proxies/network-proxy/http2-request-handler.d.ts +24 -0
  58. package/dist_ts/proxies/network-proxy/http2-request-handler.js +201 -0
  59. package/dist_ts/proxies/network-proxy/models/types.d.ts +73 -1
  60. package/dist_ts/proxies/network-proxy/models/types.js +242 -1
  61. package/dist_ts/proxies/network-proxy/network-proxy.d.ts +23 -20
  62. package/dist_ts/proxies/network-proxy/network-proxy.js +147 -60
  63. package/dist_ts/proxies/network-proxy/request-handler.d.ts +38 -5
  64. package/dist_ts/proxies/network-proxy/request-handler.js +584 -198
  65. package/dist_ts/proxies/network-proxy/security-manager.d.ts +65 -0
  66. package/dist_ts/proxies/network-proxy/security-manager.js +255 -0
  67. package/dist_ts/proxies/network-proxy/websocket-handler.d.ts +13 -2
  68. package/dist_ts/proxies/network-proxy/websocket-handler.js +238 -20
  69. package/dist_ts/proxies/smart-proxy/index.d.ts +1 -1
  70. package/dist_ts/proxies/smart-proxy/index.js +3 -3
  71. package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +5 -66
  72. package/dist_ts/proxies/smart-proxy/models/interfaces.js +5 -4
  73. package/dist_ts/proxies/smart-proxy/models/route-types.d.ts +173 -6
  74. package/dist_ts/proxies/smart-proxy/network-proxy-bridge.d.ts +20 -7
  75. package/dist_ts/proxies/smart-proxy/network-proxy-bridge.js +49 -108
  76. package/dist_ts/proxies/smart-proxy/port-manager.d.ts +81 -0
  77. package/dist_ts/proxies/smart-proxy/port-manager.js +166 -0
  78. package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +7 -5
  79. package/dist_ts/proxies/smart-proxy/route-connection-handler.js +155 -160
  80. package/dist_ts/proxies/smart-proxy/route-helpers/index.d.ts +9 -0
  81. package/dist_ts/proxies/smart-proxy/route-helpers/index.js +11 -0
  82. package/dist_ts/proxies/smart-proxy/route-helpers.d.ts +5 -125
  83. package/dist_ts/proxies/smart-proxy/route-helpers.js +8 -195
  84. package/dist_ts/proxies/smart-proxy/route-manager.d.ts +14 -11
  85. package/dist_ts/proxies/smart-proxy/route-manager.js +81 -124
  86. package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +101 -12
  87. package/dist_ts/proxies/smart-proxy/smart-proxy.js +178 -306
  88. package/dist_ts/proxies/smart-proxy/timeout-manager.js +3 -3
  89. package/dist_ts/proxies/smart-proxy/utils/index.d.ts +12 -0
  90. package/dist_ts/proxies/smart-proxy/utils/index.js +19 -0
  91. package/dist_ts/proxies/smart-proxy/utils/route-helpers.d.ts +240 -0
  92. package/dist_ts/proxies/smart-proxy/utils/route-helpers.js +451 -0
  93. package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.d.ts +51 -0
  94. package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.js +124 -0
  95. package/dist_ts/proxies/smart-proxy/utils/route-patterns.d.ts +131 -0
  96. package/dist_ts/proxies/smart-proxy/utils/route-patterns.js +217 -0
  97. package/dist_ts/proxies/smart-proxy/utils/route-utils.d.ts +79 -0
  98. package/dist_ts/proxies/smart-proxy/utils/route-utils.js +266 -0
  99. package/dist_ts/proxies/smart-proxy/utils/route-validators.d.ts +73 -0
  100. package/dist_ts/proxies/smart-proxy/utils/route-validators.js +264 -0
  101. package/package.json +1 -1
  102. package/readme.md +241 -125
  103. package/readme.plan.md +73 -286
  104. package/ts/00_commitinfo_data.ts +1 -1
  105. package/ts/certificate/index.ts +17 -9
  106. package/ts/certificate/models/certificate-types.ts +37 -16
  107. package/ts/certificate/providers/cert-provisioner.ts +247 -54
  108. package/ts/core/models/index.ts +2 -0
  109. package/ts/core/models/route-context.ts +113 -0
  110. package/ts/core/models/socket-augmentation.ts +33 -0
  111. package/ts/core/utils/event-system.ts +376 -0
  112. package/ts/core/utils/index.ts +7 -0
  113. package/ts/core/utils/route-manager.ts +489 -0
  114. package/ts/core/utils/route-utils.ts +312 -0
  115. package/ts/core/utils/security-utils.ts +309 -0
  116. package/ts/core/utils/shared-security-manager.ts +333 -0
  117. package/ts/core/utils/template-utils.ts +124 -0
  118. package/ts/core/utils/websocket-utils.ts +81 -0
  119. package/ts/forwarding/config/forwarding-types.ts +79 -107
  120. package/ts/forwarding/config/index.ts +4 -2
  121. package/ts/forwarding/handlers/base-handler.ts +4 -2
  122. package/ts/forwarding/index.ts +3 -2
  123. package/ts/http/models/http-types.ts +0 -1
  124. package/ts/http/port80/acme-interfaces.ts +84 -0
  125. package/ts/http/port80/port80-handler.ts +61 -15
  126. package/ts/http/router/index.ts +8 -1
  127. package/ts/http/router/route-router.ts +482 -0
  128. package/ts/index.ts +14 -2
  129. package/ts/proxies/index.ts +12 -3
  130. package/ts/proxies/network-proxy/certificate-manager.ts +114 -10
  131. package/ts/proxies/network-proxy/context-creator.ts +145 -0
  132. package/ts/proxies/network-proxy/function-cache.ts +259 -0
  133. package/ts/proxies/network-proxy/http-request-handler.ts +330 -0
  134. package/ts/proxies/network-proxy/http2-request-handler.ts +255 -0
  135. package/ts/proxies/network-proxy/models/types.ts +312 -1
  136. package/ts/proxies/network-proxy/network-proxy.ts +195 -86
  137. package/ts/proxies/network-proxy/request-handler.ts +698 -246
  138. package/ts/proxies/network-proxy/security-manager.ts +298 -0
  139. package/ts/proxies/network-proxy/websocket-handler.ts +276 -33
  140. package/ts/proxies/smart-proxy/index.ts +2 -12
  141. package/ts/proxies/smart-proxy/models/interfaces.ts +13 -67
  142. package/ts/proxies/smart-proxy/models/route-types.ts +223 -25
  143. package/ts/proxies/smart-proxy/network-proxy-bridge.ts +57 -123
  144. package/ts/proxies/smart-proxy/port-manager.ts +195 -0
  145. package/ts/proxies/smart-proxy/route-connection-handler.ts +191 -225
  146. package/ts/proxies/smart-proxy/route-manager.ts +101 -144
  147. package/ts/proxies/smart-proxy/smart-proxy.ts +206 -377
  148. package/ts/proxies/smart-proxy/timeout-manager.ts +2 -2
  149. package/ts/proxies/smart-proxy/utils/index.ts +40 -0
  150. package/ts/proxies/smart-proxy/utils/route-helpers.ts +621 -0
  151. package/ts/proxies/smart-proxy/utils/route-migration-utils.ts +165 -0
  152. package/ts/proxies/smart-proxy/utils/route-patterns.ts +309 -0
  153. package/ts/proxies/smart-proxy/utils/route-utils.ts +330 -0
  154. package/ts/proxies/smart-proxy/utils/route-validators.ts +288 -0
  155. package/ts/forwarding/config/domain-config.ts +0 -28
  156. package/ts/forwarding/config/domain-manager.ts +0 -283
  157. package/ts/proxies/smart-proxy/connection-handler.ts +0 -1240
  158. package/ts/proxies/smart-proxy/domain-config-manager.ts +0 -441
  159. package/ts/proxies/smart-proxy/port-range-manager.ts +0 -211
  160. package/ts/proxies/smart-proxy/route-helpers.ts +0 -344
@@ -8,6 +8,10 @@ export class RouteManager extends plugins.EventEmitter {
8
8
  super();
9
9
  this.routes = [];
10
10
  this.portMap = new Map();
11
+ /**
12
+ * Memoization cache for expanded port ranges
13
+ */
14
+ this.portRangeCache = new Map();
11
15
  // We no longer support legacy options, always use provided options
12
16
  this.options = options;
13
17
  // Initialize routes from either source
@@ -28,33 +32,76 @@ export class RouteManager extends plugins.EventEmitter {
28
32
  }
29
33
  /**
30
34
  * Rebuild the port mapping for fast lookups
35
+ * Also logs information about the ports being listened on
31
36
  */
32
37
  rebuildPortMap() {
33
38
  this.portMap.clear();
39
+ this.portRangeCache.clear(); // Clear cache when rebuilding
40
+ // Track ports for logging
41
+ const portToRoutesMap = new Map();
34
42
  for (const route of this.routes) {
35
43
  const ports = this.expandPortRange(route.match.ports);
44
+ // Skip if no ports were found
45
+ if (ports.length === 0) {
46
+ console.warn(`Route ${route.name || 'unnamed'} has no valid ports to listen on`);
47
+ continue;
48
+ }
36
49
  for (const port of ports) {
50
+ // Add to portMap for routing
37
51
  if (!this.portMap.has(port)) {
38
52
  this.portMap.set(port, []);
39
53
  }
40
54
  this.portMap.get(port).push(route);
55
+ // Add to tracking for logging
56
+ if (!portToRoutesMap.has(port)) {
57
+ portToRoutesMap.set(port, []);
58
+ }
59
+ portToRoutesMap.get(port).push(route.name || 'unnamed');
60
+ }
61
+ }
62
+ // Log summary of ports and routes
63
+ const totalPorts = this.portMap.size;
64
+ const totalRoutes = this.routes.length;
65
+ console.log(`Route manager configured with ${totalRoutes} routes across ${totalPorts} ports`);
66
+ // Log port details if detailed logging is enabled
67
+ const enableDetailedLogging = this.options.enableDetailedLogging;
68
+ if (enableDetailedLogging) {
69
+ for (const [port, routes] of this.portMap.entries()) {
70
+ console.log(`Port ${port}: ${routes.length} routes (${portToRoutesMap.get(port).join(', ')})`);
41
71
  }
42
72
  }
43
73
  }
44
74
  /**
45
75
  * Expand a port range specification into an array of individual ports
76
+ * Uses caching to improve performance for frequently used port ranges
77
+ *
78
+ * @public - Made public to allow external code to interpret port ranges
46
79
  */
47
80
  expandPortRange(portRange) {
81
+ // For simple number, return immediately
48
82
  if (typeof portRange === 'number') {
49
83
  return [portRange];
50
84
  }
85
+ // Create a cache key for this port range
86
+ const cacheKey = JSON.stringify(portRange);
87
+ // Check if we have a cached result
88
+ if (this.portRangeCache.has(cacheKey)) {
89
+ return this.portRangeCache.get(cacheKey);
90
+ }
91
+ // Process the port range
92
+ let result = [];
51
93
  if (Array.isArray(portRange)) {
52
94
  // Handle array of port objects or numbers
53
- return portRange.flatMap(item => {
95
+ result = portRange.flatMap(item => {
54
96
  if (typeof item === 'number') {
55
97
  return [item];
56
98
  }
57
99
  else if (typeof item === 'object' && 'from' in item && 'to' in item) {
100
+ // Handle port range object - check valid range
101
+ if (item.from > item.to) {
102
+ console.warn(`Invalid port range: from (${item.from}) > to (${item.to})`);
103
+ return [];
104
+ }
58
105
  // Handle port range object
59
106
  const ports = [];
60
107
  for (let p = item.from; p <= item.to; p++) {
@@ -65,12 +112,16 @@ export class RouteManager extends plugins.EventEmitter {
65
112
  return [];
66
113
  });
67
114
  }
68
- return [];
115
+ // Cache the result
116
+ this.portRangeCache.set(cacheKey, result);
117
+ return result;
69
118
  }
70
119
  /**
71
120
  * Get all ports that should be listened on
121
+ * This method automatically infers all required ports from route configurations
72
122
  */
73
123
  getListeningPorts() {
124
+ // Return the unique set of ports from all routes
74
125
  return Array.from(this.portMap.keys());
75
126
  }
76
127
  /**
@@ -135,19 +186,32 @@ export class RouteManager extends plugins.EventEmitter {
135
186
  * Match an IP against a pattern
136
187
  */
137
188
  matchIpPattern(pattern, ip) {
138
- // Handle exact match
139
- if (pattern === ip) {
189
+ // Normalize IPv6-mapped IPv4 addresses
190
+ const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
191
+ const normalizedPattern = pattern.startsWith('::ffff:') ? pattern.substring(7) : pattern;
192
+ // Handle exact match with normalized addresses
193
+ if (pattern === ip || normalizedPattern === normalizedIp ||
194
+ pattern === normalizedIp || normalizedPattern === ip) {
140
195
  return true;
141
196
  }
142
197
  // Handle CIDR notation (e.g., 192.168.1.0/24)
143
198
  if (pattern.includes('/')) {
144
- return this.matchIpCidr(pattern, ip);
199
+ return this.matchIpCidr(pattern, normalizedIp) ||
200
+ (normalizedPattern !== pattern && this.matchIpCidr(normalizedPattern, normalizedIp));
145
201
  }
146
202
  // Handle glob pattern (e.g., 192.168.1.*)
147
203
  if (pattern.includes('*')) {
148
204
  const regexPattern = pattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
149
205
  const regex = new RegExp(`^${regexPattern}$`);
150
- return regex.test(ip);
206
+ if (regex.test(ip) || regex.test(normalizedIp)) {
207
+ return true;
208
+ }
209
+ // If pattern was normalized, also test with normalized pattern
210
+ if (normalizedPattern !== pattern) {
211
+ const normalizedRegexPattern = normalizedPattern.replace(/\./g, '\\.').replace(/\*/g, '.*');
212
+ const normalizedRegex = new RegExp(`^${normalizedRegexPattern}$`);
213
+ return normalizedRegex.test(ip) || normalizedRegex.test(normalizedIp);
214
+ }
151
215
  }
152
216
  return false;
153
217
  }
@@ -160,9 +224,12 @@ export class RouteManager extends plugins.EventEmitter {
160
224
  // This is a simplified implementation
161
225
  const [subnet, bits] = cidr.split('/');
162
226
  const mask = parseInt(bits, 10);
227
+ // Normalize IPv6-mapped IPv4 addresses
228
+ const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
229
+ const normalizedSubnet = subnet.startsWith('::ffff:') ? subnet.substring(7) : subnet;
163
230
  // Convert IP addresses to numeric values
164
- const ipNum = this.ipToNumber(ip);
165
- const subnetNum = this.ipToNumber(subnet);
231
+ const ipNum = this.ipToNumber(normalizedIp);
232
+ const subnetNum = this.ipToNumber(normalizedSubnet);
166
233
  // Calculate subnet mask
167
234
  const maskNum = ~(2 ** (32 - mask) - 1);
168
235
  // Check if IP is in subnet
@@ -177,7 +244,9 @@ export class RouteManager extends plugins.EventEmitter {
177
244
  * Convert an IP address to a numeric value
178
245
  */
179
246
  ipToNumber(ip) {
180
- const parts = ip.split('.').map(part => parseInt(part, 10));
247
+ // Normalize IPv6-mapped IPv4 addresses
248
+ const normalizedIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
249
+ const parts = normalizedIp.split('.').map(part => parseInt(part, 10));
181
250
  return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3];
182
251
  }
183
252
  /**
@@ -230,121 +299,9 @@ export class RouteManager extends plugins.EventEmitter {
230
299
  return regex.test(path);
231
300
  }
232
301
  /**
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)
302
+ * Domain-based configuration methods have been removed
303
+ * as part of the migration to pure route-based configuration
337
304
  */
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
305
  /**
349
306
  * Validate the route configuration and return any warnings
350
307
  */
@@ -480,4 +437,4 @@ export class RouteManager extends plugins.EventEmitter {
480
437
  return match1Points > match2Points;
481
438
  }
482
439
  }
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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"}
440
+ //# 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,26 +1,63 @@
1
1
  import * as plugins from '../../plugins.js';
2
- import type { ISmartProxyOptions, IDomainConfig } from './models/interfaces.js';
2
+ import { RouteManager } from './route-manager.js';
3
+ import type { ISmartProxyOptions } from './models/interfaces.js';
3
4
  import type { IRouteConfig } from './models/route-types.js';
4
5
  /**
5
- * SmartProxy - Unified route-based API
6
+ * SmartProxy - Pure route-based API
7
+ *
8
+ * SmartProxy is a unified proxy system that works with routes to define connection handling behavior.
9
+ * Each route contains matching criteria (ports, domains, etc.) and an action to take (forward, redirect, block).
10
+ *
11
+ * Configuration is provided through a set of routes, with each route defining:
12
+ * - What to match (ports, domains, paths, client IPs)
13
+ * - What to do with matching traffic (forward, redirect, block)
14
+ * - How to handle TLS (passthrough, terminate, terminate-and-reencrypt)
15
+ * - Security settings (IP restrictions, connection limits)
16
+ * - Advanced options (timeout, headers, etc.)
6
17
  */
7
18
  export declare class SmartProxy extends plugins.EventEmitter {
8
- private netServers;
19
+ private portManager;
9
20
  private connectionLogger;
10
21
  private isShuttingDown;
11
22
  private connectionManager;
12
23
  private securityManager;
13
- private domainConfigManager;
14
24
  private tlsManager;
15
25
  private networkProxyBridge;
16
26
  private timeoutManager;
17
- private portRangeManager;
18
- private routeManager;
27
+ routeManager: RouteManager;
19
28
  private routeConnectionHandler;
20
29
  private port80Handler;
21
30
  private certProvisioner?;
22
31
  /**
23
- * Constructor that supports both legacy and route-based configuration
32
+ * Constructor for SmartProxy
33
+ *
34
+ * @param settingsArg Configuration options containing routes and other settings
35
+ * Routes define how traffic is matched and handled, with each route having:
36
+ * - match: criteria for matching traffic (ports, domains, paths, IPs)
37
+ * - action: what to do with matched traffic (forward, redirect, block)
38
+ *
39
+ * Example:
40
+ * ```ts
41
+ * const proxy = new SmartProxy({
42
+ * routes: [
43
+ * {
44
+ * match: {
45
+ * ports: 443,
46
+ * domains: ['example.com', '*.example.com']
47
+ * },
48
+ * action: {
49
+ * type: 'forward',
50
+ * target: { host: '10.0.0.1', port: 8443 },
51
+ * tls: { mode: 'passthrough' }
52
+ * }
53
+ * }
54
+ * ],
55
+ * defaults: {
56
+ * target: { host: 'localhost', port: 8080 },
57
+ * security: { allowedIps: ['*'] }
58
+ * }
59
+ * });
60
+ * ```
24
61
  */
25
62
  constructor(settingsArg: ISmartProxyOptions);
26
63
  /**
@@ -37,28 +74,80 @@ export declare class SmartProxy extends plugins.EventEmitter {
37
74
  start(): Promise<void>;
38
75
  /**
39
76
  * Extract domain configurations from routes for certificate provisioning
77
+ *
78
+ * Note: This method has been removed as we now work directly with routes
40
79
  */
41
- private extractDomainConfigsFromRoutes;
42
80
  /**
43
81
  * Stop the proxy server
44
82
  */
45
83
  stop(): Promise<void>;
46
84
  /**
47
- * Updates the domain configurations for the proxy (legacy support)
85
+ * Updates the domain configurations for the proxy
86
+ *
87
+ * Note: This legacy method has been removed. Use updateRoutes instead.
48
88
  */
49
- updateDomainConfigs(newDomainConfigs: IDomainConfig[]): Promise<void>;
89
+ updateDomainConfigs(): Promise<void>;
50
90
  /**
51
- * Update routes with new configuration (new API)
91
+ * Update routes with new configuration
92
+ *
93
+ * This method replaces the current route configuration with the provided routes.
94
+ * It also provisions certificates for routes that require TLS termination and have
95
+ * `certificate: 'auto'` set in their TLS configuration.
96
+ *
97
+ * @param newRoutes Array of route configurations to use
98
+ *
99
+ * Example:
100
+ * ```ts
101
+ * proxy.updateRoutes([
102
+ * {
103
+ * match: { ports: 443, domains: 'secure.example.com' },
104
+ * action: {
105
+ * type: 'forward',
106
+ * target: { host: '10.0.0.1', port: 8443 },
107
+ * tls: { mode: 'terminate', certificate: 'auto' }
108
+ * }
109
+ * }
110
+ * ]);
111
+ * ```
52
112
  */
53
113
  updateRoutes(newRoutes: IRouteConfig[]): Promise<void>;
54
114
  /**
55
115
  * Request a certificate for a specific domain
116
+ *
117
+ * @param domain The domain to request a certificate for
118
+ * @param routeName Optional route name to associate with the certificate
56
119
  */
57
- requestCertificate(domain: string): Promise<boolean>;
120
+ requestCertificate(domain: string, routeName?: string): Promise<boolean>;
58
121
  /**
59
122
  * Validates if a domain name is valid for certificate issuance
60
123
  */
61
124
  private isValidDomain;
125
+ /**
126
+ * Add a new listening port without changing the route configuration
127
+ *
128
+ * This allows you to add a port listener without updating routes.
129
+ * Useful for preparing to listen on a port before adding routes for it.
130
+ *
131
+ * @param port The port to start listening on
132
+ * @returns Promise that resolves when the port is listening
133
+ */
134
+ addListeningPort(port: number): Promise<void>;
135
+ /**
136
+ * Stop listening on a specific port without changing the route configuration
137
+ *
138
+ * This allows you to stop a port listener without updating routes.
139
+ * Useful for temporary maintenance or port changes.
140
+ *
141
+ * @param port The port to stop listening on
142
+ * @returns Promise that resolves when the port is closed
143
+ */
144
+ removeListeningPort(port: number): Promise<void>;
145
+ /**
146
+ * Get a list of all ports currently being listened on
147
+ *
148
+ * @returns Array of port numbers
149
+ */
150
+ getListeningPorts(): number[];
62
151
  /**
63
152
  * Get statistics about current connections
64
153
  */