@push.rocks/smartproxy 21.1.3 → 21.1.5

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 (38) hide show
  1. package/changelog.md +23 -0
  2. package/dist_ts/00_commitinfo_data.js +2 -2
  3. package/dist_ts/core/models/socket-augmentation.d.ts +3 -0
  4. package/dist_ts/core/models/socket-augmentation.js +1 -1
  5. package/dist_ts/core/utils/socket-tracker.d.ts +16 -0
  6. package/dist_ts/core/utils/socket-tracker.js +49 -0
  7. package/dist_ts/detection/detectors/http-detector.js +14 -2
  8. package/dist_ts/detection/protocol-detector.js +2 -1
  9. package/dist_ts/proxies/http-proxy/http-proxy.d.ts +5 -1
  10. package/dist_ts/proxies/http-proxy/http-proxy.js +63 -39
  11. package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +5 -0
  12. package/dist_ts/proxies/smart-proxy/certificate-manager.js +20 -6
  13. package/dist_ts/proxies/smart-proxy/index.d.ts +1 -0
  14. package/dist_ts/proxies/smart-proxy/index.js +2 -1
  15. package/dist_ts/proxies/smart-proxy/metrics-collector.d.ts +4 -0
  16. package/dist_ts/proxies/smart-proxy/metrics-collector.js +52 -7
  17. package/dist_ts/proxies/smart-proxy/route-orchestrator.d.ts +56 -0
  18. package/dist_ts/proxies/smart-proxy/route-orchestrator.js +204 -0
  19. package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +1 -11
  20. package/dist_ts/proxies/smart-proxy/smart-proxy.js +48 -237
  21. package/dist_ts/proxies/smart-proxy/utils/route-helpers.js +42 -7
  22. package/dist_ts/proxies/smart-proxy/utils/route-validator.d.ts +58 -0
  23. package/dist_ts/proxies/smart-proxy/utils/route-validator.js +405 -0
  24. package/package.json +3 -2
  25. package/readme.md +321 -828
  26. package/ts/00_commitinfo_data.ts +1 -1
  27. package/ts/core/models/socket-augmentation.ts +5 -0
  28. package/ts/core/utils/socket-tracker.ts +63 -0
  29. package/ts/detection/detectors/http-detector.ts +14 -1
  30. package/ts/detection/protocol-detector.ts +1 -0
  31. package/ts/proxies/http-proxy/http-proxy.ts +73 -48
  32. package/ts/proxies/smart-proxy/certificate-manager.ts +21 -5
  33. package/ts/proxies/smart-proxy/index.ts +1 -0
  34. package/ts/proxies/smart-proxy/metrics-collector.ts +58 -6
  35. package/ts/proxies/smart-proxy/route-orchestrator.ts +297 -0
  36. package/ts/proxies/smart-proxy/smart-proxy.ts +66 -270
  37. package/ts/proxies/smart-proxy/utils/route-helpers.ts +45 -6
  38. package/ts/proxies/smart-proxy/utils/route-validator.ts +453 -0
@@ -0,0 +1,405 @@
1
+ import { logger } from '../../../core/utils/logger.js';
2
+ /**
3
+ * Validates route configurations for correctness and safety
4
+ */
5
+ export class RouteValidator {
6
+ static { this.VALID_TLS_MODES = ['terminate', 'passthrough', 'terminate-and-reencrypt']; }
7
+ static { this.VALID_ACTION_TYPES = ['forward', 'socket-handler']; }
8
+ static { this.VALID_PROTOCOLS = ['tcp', 'http', 'https', 'ws', 'wss']; }
9
+ static { this.MAX_PORTS = 100; }
10
+ static { this.MAX_DOMAINS = 1000; }
11
+ static { this.MAX_HEADER_SIZE = 8192; }
12
+ /**
13
+ * Validate a single route configuration
14
+ */
15
+ static validateRoute(route) {
16
+ const errors = [];
17
+ // Validate route has a name
18
+ if (!route.name || typeof route.name !== 'string') {
19
+ errors.push('Route must have a valid name');
20
+ }
21
+ // Validate match criteria
22
+ if (!route.match) {
23
+ errors.push('Route must have match criteria');
24
+ }
25
+ else {
26
+ // Validate ports
27
+ if (route.match.ports) {
28
+ const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
29
+ if (ports.length > this.MAX_PORTS) {
30
+ errors.push(`Too many ports specified (max ${this.MAX_PORTS})`);
31
+ }
32
+ for (const port of ports) {
33
+ if (typeof port === 'number') {
34
+ if (!this.isValidPort(port)) {
35
+ errors.push(`Invalid port: ${port}. Must be between 1 and 65535`);
36
+ }
37
+ }
38
+ else if (typeof port === 'object' && 'from' in port && 'to' in port) {
39
+ if (!this.isValidPort(port.from)) {
40
+ errors.push(`Invalid port range start: ${port.from}. Must be between 1 and 65535`);
41
+ }
42
+ if (!this.isValidPort(port.to)) {
43
+ errors.push(`Invalid port range end: ${port.to}. Must be between 1 and 65535`);
44
+ }
45
+ if (port.from > port.to) {
46
+ errors.push(`Invalid port range: ${port.from}-${port.to} (start > end)`);
47
+ }
48
+ }
49
+ else {
50
+ errors.push(`Invalid port configuration: ${JSON.stringify(port)}`);
51
+ }
52
+ }
53
+ }
54
+ // Validate domains
55
+ if (route.match.domains) {
56
+ const domains = Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains];
57
+ if (domains.length > this.MAX_DOMAINS) {
58
+ errors.push(`Too many domains specified (max ${this.MAX_DOMAINS})`);
59
+ }
60
+ for (const domain of domains) {
61
+ if (!this.isValidDomain(domain)) {
62
+ errors.push(`Invalid domain pattern: ${domain}`);
63
+ }
64
+ }
65
+ }
66
+ // Validate paths
67
+ if (route.match.path) {
68
+ const paths = Array.isArray(route.match.path) ? route.match.path : [route.match.path];
69
+ for (const path of paths) {
70
+ if (!this.isValidPath(path)) {
71
+ errors.push(`Invalid path pattern: ${path}`);
72
+ }
73
+ }
74
+ }
75
+ // Validate client IPs
76
+ if (route.match.clientIp) {
77
+ const ips = Array.isArray(route.match.clientIp) ? route.match.clientIp : [route.match.clientIp];
78
+ for (const ip of ips) {
79
+ if (!this.isValidIPPattern(ip)) {
80
+ errors.push(`Invalid IP pattern: ${ip}`);
81
+ }
82
+ }
83
+ }
84
+ // Validate headers
85
+ if (route.match.headers) {
86
+ for (const [key, value] of Object.entries(route.match.headers)) {
87
+ if (key.length > 256) {
88
+ errors.push(`Header name too long: ${key}`);
89
+ }
90
+ const headerValue = String(value);
91
+ if (headerValue.length > this.MAX_HEADER_SIZE) {
92
+ errors.push(`Header value too long for ${key} (max ${this.MAX_HEADER_SIZE} bytes)`);
93
+ }
94
+ if (!/^[\x20-\x7E]+$/.test(key)) {
95
+ errors.push(`Invalid header name: ${key} (must be printable ASCII)`);
96
+ }
97
+ }
98
+ }
99
+ // Protocol validation removed - not part of IRouteMatch interface
100
+ }
101
+ // Validate action
102
+ if (!route.action) {
103
+ errors.push('Route must have an action');
104
+ }
105
+ else {
106
+ // Validate action type
107
+ if (!route.action.type || !this.VALID_ACTION_TYPES.includes(route.action.type)) {
108
+ errors.push(`Invalid action type: ${route.action.type}. Must be one of: ${this.VALID_ACTION_TYPES.join(', ')}`);
109
+ }
110
+ // Validate socket-handler
111
+ if (route.action.type === 'socket-handler') {
112
+ if (typeof route.action.socketHandler !== 'function') {
113
+ errors.push('socket-handler action requires a socketHandler function');
114
+ }
115
+ }
116
+ // Validate forward target
117
+ if (route.action.type === 'forward') {
118
+ if (!route.action.targets || route.action.targets.length === 0) {
119
+ errors.push('Forward action must have at least one target');
120
+ }
121
+ else {
122
+ for (const target of route.action.targets) {
123
+ if (!target.host) {
124
+ errors.push('Target must have a host');
125
+ }
126
+ else if (typeof target.host !== 'string' && !Array.isArray(target.host) && typeof target.host !== 'function') {
127
+ errors.push('Target host must be a string, array of strings, or function');
128
+ }
129
+ if (target.port) {
130
+ if (typeof target.port === 'number' && !this.isValidPort(target.port)) {
131
+ errors.push(`Invalid target port: ${target.port}`);
132
+ }
133
+ else if (target.port !== 'preserve' && typeof target.port !== 'function' && typeof target.port !== 'number') {
134
+ errors.push(`Invalid target port configuration: ${target.port}`);
135
+ }
136
+ }
137
+ }
138
+ }
139
+ }
140
+ // Validate TLS settings
141
+ if (route.action.tls) {
142
+ if (route.action.tls.mode && !this.VALID_TLS_MODES.includes(route.action.tls.mode)) {
143
+ errors.push(`Invalid TLS mode: ${route.action.tls.mode}. Must be one of: ${this.VALID_TLS_MODES.join(', ')}`);
144
+ }
145
+ if (route.action.tls.certificate) {
146
+ if (route.action.tls.certificate !== 'auto' && typeof route.action.tls.certificate !== 'object') {
147
+ errors.push('TLS certificate must be "auto" or a certificate configuration object');
148
+ }
149
+ }
150
+ if (route.action.tls.versions) {
151
+ for (const version of route.action.tls.versions) {
152
+ if (!['TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3'].includes(version)) {
153
+ errors.push(`Invalid TLS version: ${version}`);
154
+ }
155
+ }
156
+ }
157
+ }
158
+ }
159
+ // Validate security settings
160
+ if (route.security) {
161
+ // Validate IP allow/block lists
162
+ if (route.security.ipAllowList) {
163
+ const allowList = Array.isArray(route.security.ipAllowList) ? route.security.ipAllowList : [route.security.ipAllowList];
164
+ for (const ip of allowList) {
165
+ if (!this.isValidIPPattern(ip)) {
166
+ errors.push(`Invalid IP pattern in allow list: ${ip}`);
167
+ }
168
+ }
169
+ }
170
+ if (route.security.ipBlockList) {
171
+ const blockList = Array.isArray(route.security.ipBlockList) ? route.security.ipBlockList : [route.security.ipBlockList];
172
+ for (const ip of blockList) {
173
+ if (!this.isValidIPPattern(ip)) {
174
+ errors.push(`Invalid IP pattern in block list: ${ip}`);
175
+ }
176
+ }
177
+ }
178
+ // Validate rate limits
179
+ if (route.security.rateLimit) {
180
+ if (route.security.rateLimit.maxRequests && route.security.rateLimit.maxRequests < 0) {
181
+ errors.push('Rate limit maxRequests must be positive');
182
+ }
183
+ if (route.security.rateLimit.window && route.security.rateLimit.window < 0) {
184
+ errors.push('Rate limit window must be positive');
185
+ }
186
+ }
187
+ // Validate connection limits
188
+ if (route.security.maxConnections && route.security.maxConnections < 0) {
189
+ errors.push('Max connections must be positive');
190
+ }
191
+ }
192
+ // Validate priority
193
+ if (route.priority !== undefined && (route.priority < 0 || route.priority > 10000)) {
194
+ errors.push('Priority must be between 0 and 10000');
195
+ }
196
+ return {
197
+ valid: errors.length === 0,
198
+ errors
199
+ };
200
+ }
201
+ /**
202
+ * Validate multiple route configurations
203
+ */
204
+ static validateRoutes(routes) {
205
+ const errorMap = new Map();
206
+ let valid = true;
207
+ // Check for duplicate route names
208
+ const routeNames = new Set();
209
+ for (const route of routes) {
210
+ if (route.name && routeNames.has(route.name)) {
211
+ const existingErrors = errorMap.get(route.name) || [];
212
+ existingErrors.push('Duplicate route name');
213
+ errorMap.set(route.name, existingErrors);
214
+ valid = false;
215
+ }
216
+ routeNames.add(route.name);
217
+ }
218
+ // Validate each route
219
+ for (const route of routes) {
220
+ const result = this.validateRoute(route);
221
+ if (!result.valid) {
222
+ errorMap.set(route.name || 'unnamed', result.errors);
223
+ valid = false;
224
+ }
225
+ }
226
+ // Check for conflicting routes
227
+ const conflicts = this.findRouteConflicts(routes);
228
+ if (conflicts.length > 0) {
229
+ for (const conflict of conflicts) {
230
+ const existingErrors = errorMap.get(conflict.route) || [];
231
+ existingErrors.push(conflict.message);
232
+ errorMap.set(conflict.route, existingErrors);
233
+ }
234
+ valid = false;
235
+ }
236
+ return { valid, errors: errorMap };
237
+ }
238
+ /**
239
+ * Find potential conflicts between routes
240
+ */
241
+ static findRouteConflicts(routes) {
242
+ const conflicts = [];
243
+ // Group routes by port
244
+ const portMap = new Map();
245
+ for (const route of routes) {
246
+ if (route.match?.ports) {
247
+ const ports = Array.isArray(route.match.ports) ? route.match.ports : [route.match.ports];
248
+ // Expand port ranges to individual ports
249
+ const expandedPorts = [];
250
+ for (const port of ports) {
251
+ if (typeof port === 'number') {
252
+ expandedPorts.push(port);
253
+ }
254
+ else if (typeof port === 'object' && 'from' in port && 'to' in port) {
255
+ for (let p = port.from; p <= port.to; p++) {
256
+ expandedPorts.push(p);
257
+ }
258
+ }
259
+ }
260
+ for (const port of expandedPorts) {
261
+ const routesOnPort = portMap.get(port) || [];
262
+ routesOnPort.push(route);
263
+ portMap.set(port, routesOnPort);
264
+ }
265
+ }
266
+ }
267
+ // Check for conflicting catch-all routes on the same port
268
+ for (const [port, routesOnPort] of portMap) {
269
+ const catchAllRoutes = routesOnPort.filter(r => !r.match.domains ||
270
+ (Array.isArray(r.match.domains) && r.match.domains.includes('*')) ||
271
+ r.match.domains === '*');
272
+ if (catchAllRoutes.length > 1) {
273
+ for (const route of catchAllRoutes) {
274
+ conflicts.push({
275
+ route: route.name,
276
+ message: `Multiple catch-all routes on port ${port}`
277
+ });
278
+ }
279
+ }
280
+ }
281
+ return conflicts;
282
+ }
283
+ /**
284
+ * Validate port number
285
+ */
286
+ static isValidPort(port) {
287
+ return Number.isInteger(port) && port >= 1 && port <= 65535;
288
+ }
289
+ /**
290
+ * Validate domain pattern
291
+ */
292
+ static isValidDomain(domain) {
293
+ if (!domain || typeof domain !== 'string')
294
+ return false;
295
+ if (domain === '*')
296
+ return true;
297
+ // Basic domain pattern validation
298
+ const domainPattern = /^(\*\.)?([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
299
+ return domainPattern.test(domain) || domain === 'localhost';
300
+ }
301
+ /**
302
+ * Validate path pattern
303
+ */
304
+ static isValidPath(path) {
305
+ if (!path || typeof path !== 'string')
306
+ return false;
307
+ if (!path.startsWith('/'))
308
+ return false;
309
+ // Check for invalid characters
310
+ if (!/^[a-zA-Z0-9/_*:{}.-]+$/.test(path))
311
+ return false;
312
+ // Validate parameter syntax
313
+ const paramPattern = /\{[a-zA-Z_][a-zA-Z0-9_]*\}/g;
314
+ const params = path.match(paramPattern) || [];
315
+ for (const param of params) {
316
+ if (param.length > 32)
317
+ return false;
318
+ }
319
+ return true;
320
+ }
321
+ /**
322
+ * Validate IP pattern
323
+ */
324
+ static isValidIPPattern(ip) {
325
+ if (!ip || typeof ip !== 'string')
326
+ return false;
327
+ if (ip === '*')
328
+ return true;
329
+ // Check for CIDR notation
330
+ if (ip.includes('/')) {
331
+ const [addr, prefix] = ip.split('/');
332
+ const prefixNum = parseInt(prefix, 10);
333
+ if (addr.includes(':')) {
334
+ // IPv6 CIDR
335
+ return this.isValidIPv6(addr) && prefixNum >= 0 && prefixNum <= 128;
336
+ }
337
+ else {
338
+ // IPv4 CIDR
339
+ return this.isValidIPv4(addr) && prefixNum >= 0 && prefixNum <= 32;
340
+ }
341
+ }
342
+ // Check for range
343
+ if (ip.includes('-')) {
344
+ const [start, end] = ip.split('-');
345
+ return (this.isValidIPv4(start) && this.isValidIPv4(end)) ||
346
+ (this.isValidIPv6(start) && this.isValidIPv6(end));
347
+ }
348
+ // Check for wildcards in IPv4
349
+ if (ip.includes('*') && !ip.includes(':')) {
350
+ const parts = ip.split('.');
351
+ if (parts.length !== 4)
352
+ return false;
353
+ for (const part of parts) {
354
+ if (part !== '*' && !/^\d{1,3}$/.test(part))
355
+ return false;
356
+ if (part !== '*' && parseInt(part, 10) > 255)
357
+ return false;
358
+ }
359
+ return true;
360
+ }
361
+ // Regular IP address
362
+ return this.isValidIPv4(ip) || this.isValidIPv6(ip);
363
+ }
364
+ /**
365
+ * Validate IPv4 address
366
+ */
367
+ static isValidIPv4(ip) {
368
+ const parts = ip.split('.');
369
+ if (parts.length !== 4)
370
+ return false;
371
+ for (const part of parts) {
372
+ const num = parseInt(part, 10);
373
+ if (isNaN(num) || num < 0 || num > 255)
374
+ return false;
375
+ }
376
+ return true;
377
+ }
378
+ /**
379
+ * Validate IPv6 address
380
+ */
381
+ static isValidIPv6(ip) {
382
+ // Simple IPv6 validation
383
+ const ipv6Pattern = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|::[0-9a-fA-F]{0,4}(:[0-9a-fA-F]{1,4}){0,6}|::1|::)$/;
384
+ return ipv6Pattern.test(ip);
385
+ }
386
+ /**
387
+ * Log validation errors
388
+ */
389
+ static logValidationErrors(errors) {
390
+ for (const [routeName, routeErrors] of errors) {
391
+ logger.log('error', `Route validation failed for ${routeName}:`, {
392
+ route: routeName,
393
+ errors: routeErrors,
394
+ component: 'route-validator'
395
+ });
396
+ for (const error of routeErrors) {
397
+ logger.log('error', ` - ${error}`, {
398
+ route: routeName,
399
+ component: 'route-validator'
400
+ });
401
+ }
402
+ }
403
+ }
404
+ }
405
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-validator.js","sourceRoot":"","sources":["../../../../ts/proxies/smart-proxy/utils/route-validator.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": "21.1.3",
3
+ "version": "21.1.5",
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",
@@ -13,7 +13,8 @@
13
13
  "@git.zone/tsrun": "^1.2.44",
14
14
  "@git.zone/tstest": "^2.3.1",
15
15
  "@types/node": "^22.15.29",
16
- "typescript": "^5.8.3"
16
+ "typescript": "^5.8.3",
17
+ "why-is-node-running": "^3.2.2"
17
18
  },
18
19
  "dependencies": {
19
20
  "@push.rocks/lik": "^6.2.2",