@push.rocks/smartproxy 19.3.7 → 19.3.9
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 +1 -1
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +16 -3
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +44 -32
- package/package.json +1 -1
- package/readme.hints.md +42 -1
- package/readme.md +18 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +15 -2
- package/ts/proxies/smart-proxy/route-connection-handler.ts +63 -41
- package/readme.plan.md +0 -179
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '19.3.
|
|
6
|
+
version: '19.3.9',
|
|
7
7
|
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.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFQQUFxUDtDQUNuUSxDQUFBIn0=
|
|
@@ -51,11 +51,24 @@ export class HttpProxyBridge {
|
|
|
51
51
|
*/
|
|
52
52
|
routeToHttpProxyConfig(route) {
|
|
53
53
|
// Convert route to HttpProxy domain config format
|
|
54
|
+
let domain = '*';
|
|
55
|
+
if (route.match.domains) {
|
|
56
|
+
if (Array.isArray(route.match.domains)) {
|
|
57
|
+
domain = route.match.domains[0] || '*';
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
domain = route.match.domains;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
54
63
|
return {
|
|
55
|
-
domain
|
|
64
|
+
domain,
|
|
56
65
|
target: route.action.target,
|
|
57
66
|
tls: route.action.tls,
|
|
58
|
-
security: route.action.security
|
|
67
|
+
security: route.action.security,
|
|
68
|
+
match: {
|
|
69
|
+
...route.match,
|
|
70
|
+
domains: domain // Ensure domains is always set for HttpProxy
|
|
71
|
+
}
|
|
59
72
|
};
|
|
60
73
|
}
|
|
61
74
|
/**
|
|
@@ -118,4 +131,4 @@ export class HttpProxyBridge {
|
|
|
118
131
|
}
|
|
119
132
|
}
|
|
120
133
|
}
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1wcm94eS1icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L2h0dHAtcHJveHktYnJpZGdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBSW5ELE1BQU0sT0FBTyxlQUFlO0lBRzFCLFlBQW9CLFFBQTRCO1FBQTVCLGFBQVEsR0FBUixRQUFRLENBQW9CO1FBRnhDLGNBQVMsR0FBcUIsSUFBSSxDQUFDO0lBRVEsQ0FBQztJQUVwRDs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUMzRixNQUFNLGdCQUFnQixHQUFRO2dCQUM1QixJQUFJLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFjO2dCQUNsQyxvQkFBb0IsRUFBRSxJQUFJO2dCQUMxQixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNO2FBQ2pFLENBQUM7WUFFRixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksU0FBUyxDQUFDLGdCQUFnQixDQUFDLENBQUM7WUFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO1lBRTVFLDBDQUEwQztZQUMxQyxNQUFNLElBQUksQ0FBQyxxQkFB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
|
|
@@ -410,40 +410,52 @@ export class RouteConnectionHandler {
|
|
|
410
410
|
}
|
|
411
411
|
}
|
|
412
412
|
else {
|
|
413
|
-
// No TLS settings -
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
targetHost = Array.isArray(hostResult)
|
|
423
|
-
? hostResult[Math.floor(Math.random() * hostResult.length)]
|
|
424
|
-
: hostResult;
|
|
425
|
-
}
|
|
426
|
-
else {
|
|
427
|
-
// For static host value
|
|
428
|
-
targetHost = Array.isArray(action.target.host)
|
|
429
|
-
? action.target.host[Math.floor(Math.random() * action.target.host.length)]
|
|
430
|
-
: action.target.host;
|
|
431
|
-
}
|
|
432
|
-
// Determine port - either function-based, static, or preserve incoming port
|
|
433
|
-
let targetPort;
|
|
434
|
-
if (typeof action.target.port === 'function') {
|
|
435
|
-
targetPort = action.target.port(routeContext);
|
|
436
|
-
}
|
|
437
|
-
else if (action.target.port === 'preserve') {
|
|
438
|
-
targetPort = record.localPort;
|
|
413
|
+
// No TLS settings - check if this port should use HttpProxy
|
|
414
|
+
const isHttpProxyPort = this.settings.useHttpProxy?.includes(record.localPort);
|
|
415
|
+
if (isHttpProxyPort && this.httpProxyBridge.getHttpProxy()) {
|
|
416
|
+
// Forward non-TLS connections to HttpProxy if configured
|
|
417
|
+
if (this.settings.enableDetailedLogging) {
|
|
418
|
+
console.log(`[${connectionId}] Using HttpProxy for non-TLS connection on port ${record.localPort}`);
|
|
419
|
+
}
|
|
420
|
+
this.httpProxyBridge.forwardToHttpProxy(connectionId, socket, record, initialChunk, this.settings.httpProxyPort || 8443, (reason) => this.connectionManager.initiateCleanupOnce(record, reason));
|
|
421
|
+
return;
|
|
439
422
|
}
|
|
440
423
|
else {
|
|
441
|
-
|
|
424
|
+
// Basic forwarding
|
|
425
|
+
if (this.settings.enableDetailedLogging) {
|
|
426
|
+
console.log(`[${connectionId}] Using basic forwarding to ${action.target.host}:${action.target.port}`);
|
|
427
|
+
}
|
|
428
|
+
// Get the appropriate host value
|
|
429
|
+
let targetHost;
|
|
430
|
+
if (typeof action.target.host === 'function') {
|
|
431
|
+
// For function-based host, use the same routeContext created earlier
|
|
432
|
+
const hostResult = action.target.host(routeContext);
|
|
433
|
+
targetHost = Array.isArray(hostResult)
|
|
434
|
+
? hostResult[Math.floor(Math.random() * hostResult.length)]
|
|
435
|
+
: hostResult;
|
|
436
|
+
}
|
|
437
|
+
else {
|
|
438
|
+
// For static host value
|
|
439
|
+
targetHost = Array.isArray(action.target.host)
|
|
440
|
+
? action.target.host[Math.floor(Math.random() * action.target.host.length)]
|
|
441
|
+
: action.target.host;
|
|
442
|
+
}
|
|
443
|
+
// Determine port - either function-based, static, or preserve incoming port
|
|
444
|
+
let targetPort;
|
|
445
|
+
if (typeof action.target.port === 'function') {
|
|
446
|
+
targetPort = action.target.port(routeContext);
|
|
447
|
+
}
|
|
448
|
+
else if (action.target.port === 'preserve') {
|
|
449
|
+
targetPort = record.localPort;
|
|
450
|
+
}
|
|
451
|
+
else {
|
|
452
|
+
targetPort = action.target.port;
|
|
453
|
+
}
|
|
454
|
+
// Update the connection record and context with resolved values
|
|
455
|
+
record.targetHost = targetHost;
|
|
456
|
+
record.targetPort = targetPort;
|
|
457
|
+
return this.setupDirectConnection(socket, record, record.lockedDomain, initialChunk, undefined, targetHost, targetPort);
|
|
442
458
|
}
|
|
443
|
-
// Update the connection record and context with resolved values
|
|
444
|
-
record.targetHost = targetHost;
|
|
445
|
-
record.targetPort = targetPort;
|
|
446
|
-
return this.setupDirectConnection(socket, record, record.lockedDomain, initialChunk, undefined, targetHost, targetPort);
|
|
447
459
|
}
|
|
448
460
|
}
|
|
449
461
|
/**
|
|
@@ -704,4 +716,4 @@ export class RouteConnectionHandler {
|
|
|
704
716
|
});
|
|
705
717
|
}
|
|
706
718
|
}
|
|
707
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-connection-handler.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/route-connection-handler.ts"],"names":[],"mappings":"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"}
|
|
719
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-connection-handler.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/route-connection-handler.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": "19.3.
|
|
3
|
+
"version": "19.3.9",
|
|
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",
|
package/readme.hints.md
CHANGED
|
@@ -91,4 +91,45 @@ const proxy = new SmartProxy({
|
|
|
91
91
|
- Update `plugins.ts` when adding new dependencies.
|
|
92
92
|
- Maintain test coverage for new routing or proxy features.
|
|
93
93
|
- Keep `ts/` and `dist_ts/` in sync after refactors.
|
|
94
|
-
- Consider implementing top-level ACME config support for backward compatibility
|
|
94
|
+
- Consider implementing top-level ACME config support for backward compatibility
|
|
95
|
+
|
|
96
|
+
## HTTP-01 ACME Challenge Fix (v19.3.8)
|
|
97
|
+
|
|
98
|
+
### Issue
|
|
99
|
+
Non-TLS connections on ports configured in `useHttpProxy` were not being forwarded to HttpProxy. This caused ACME HTTP-01 challenges to fail when the ACME port (usually 80) was included in `useHttpProxy`.
|
|
100
|
+
|
|
101
|
+
### Root Cause
|
|
102
|
+
In the `RouteConnectionHandler.handleForwardAction` method, only connections with TLS settings (mode: 'terminate' or 'terminate-and-reencrypt') were being forwarded to HttpProxy. Non-TLS connections were always handled as direct connections, even when the port was configured for HttpProxy.
|
|
103
|
+
|
|
104
|
+
### Solution
|
|
105
|
+
Added a check for non-TLS connections on ports listed in `useHttpProxy`:
|
|
106
|
+
```typescript
|
|
107
|
+
// No TLS settings - check if this port should use HttpProxy
|
|
108
|
+
const isHttpProxyPort = this.settings.useHttpProxy?.includes(record.localPort);
|
|
109
|
+
|
|
110
|
+
if (isHttpProxyPort && this.httpProxyBridge.getHttpProxy()) {
|
|
111
|
+
// Forward non-TLS connections to HttpProxy if configured
|
|
112
|
+
this.httpProxyBridge.forwardToHttpProxy(/*...*/);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
```
|
|
116
|
+
|
|
117
|
+
### Test Coverage
|
|
118
|
+
- `test/test.http-fix-unit.ts` - Unit tests verifying the fix
|
|
119
|
+
- Tests confirm that non-TLS connections on HttpProxy ports are properly forwarded
|
|
120
|
+
- Tests verify that non-HttpProxy ports still use direct connections
|
|
121
|
+
|
|
122
|
+
### Configuration Example
|
|
123
|
+
```typescript
|
|
124
|
+
const proxy = new SmartProxy({
|
|
125
|
+
useHttpProxy: [80], // Enable HttpProxy for port 80
|
|
126
|
+
httpProxyPort: 8443,
|
|
127
|
+
acme: {
|
|
128
|
+
email: 'ssl@example.com',
|
|
129
|
+
port: 80
|
|
130
|
+
},
|
|
131
|
+
routes: [
|
|
132
|
+
// Your routes here
|
|
133
|
+
]
|
|
134
|
+
});
|
|
135
|
+
```
|
package/readme.md
CHANGED
|
@@ -1412,6 +1412,8 @@ createRedirectRoute({
|
|
|
1412
1412
|
- `routes` (IRouteConfig[], required) - Array of route configurations
|
|
1413
1413
|
- `defaults` (object) - Default settings for all routes
|
|
1414
1414
|
- `acme` (IAcmeOptions) - ACME certificate options
|
|
1415
|
+
- `useHttpProxy` (number[], optional) - Array of ports to forward to HttpProxy (e.g. `[80, 443]`)
|
|
1416
|
+
- `httpProxyPort` (number, default 8443) - Port where HttpProxy listens for forwarded connections
|
|
1415
1417
|
- Connection timeouts: `initialDataTimeout`, `socketTimeout`, `inactivityTimeout`, etc.
|
|
1416
1418
|
- Socket opts: `noDelay`, `keepAlive`, `enableKeepAliveProbes`
|
|
1417
1419
|
- `certProvisionFunction` (callback) - Custom certificate provisioning
|
|
@@ -1478,6 +1480,22 @@ HttpProxy now supports full route-based configuration including:
|
|
|
1478
1480
|
- Use higher priority for block routes to ensure they take precedence
|
|
1479
1481
|
- Enable `enableDetailedLogging` or `enableTlsDebugLogging` for debugging
|
|
1480
1482
|
|
|
1483
|
+
### ACME HTTP-01 Challenges
|
|
1484
|
+
- If ACME HTTP-01 challenges fail on port 80, ensure port 80 is included in `useHttpProxy`
|
|
1485
|
+
- Since v19.3.8, non-TLS connections on ports listed in `useHttpProxy` are properly forwarded to HttpProxy
|
|
1486
|
+
- Example configuration for ACME on port 80:
|
|
1487
|
+
```typescript
|
|
1488
|
+
const proxy = new SmartProxy({
|
|
1489
|
+
useHttpProxy: [80], // Ensure port 80 is forwarded to HttpProxy
|
|
1490
|
+
httpProxyPort: 8443,
|
|
1491
|
+
acme: {
|
|
1492
|
+
email: 'ssl@example.com',
|
|
1493
|
+
port: 80
|
|
1494
|
+
},
|
|
1495
|
+
routes: [/* your routes */]
|
|
1496
|
+
});
|
|
1497
|
+
```
|
|
1498
|
+
|
|
1481
1499
|
### NFTables Integration
|
|
1482
1500
|
- Ensure NFTables is installed: `apt install nftables` or `yum install nftables`
|
|
1483
1501
|
- Verify root/sudo permissions for NFTables operations
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '19.3.
|
|
6
|
+
version: '19.3.9',
|
|
7
7
|
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.'
|
|
8
8
|
}
|
|
@@ -63,11 +63,24 @@ export class HttpProxyBridge {
|
|
|
63
63
|
*/
|
|
64
64
|
private routeToHttpProxyConfig(route: IRouteConfig): any {
|
|
65
65
|
// Convert route to HttpProxy domain config format
|
|
66
|
+
let domain = '*';
|
|
67
|
+
if (route.match.domains) {
|
|
68
|
+
if (Array.isArray(route.match.domains)) {
|
|
69
|
+
domain = route.match.domains[0] || '*';
|
|
70
|
+
} else {
|
|
71
|
+
domain = route.match.domains;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
66
75
|
return {
|
|
67
|
-
domain
|
|
76
|
+
domain,
|
|
68
77
|
target: route.action.target,
|
|
69
78
|
tls: route.action.tls,
|
|
70
|
-
security: route.action.security
|
|
79
|
+
security: route.action.security,
|
|
80
|
+
match: {
|
|
81
|
+
...route.match,
|
|
82
|
+
domains: domain // Ensure domains is always set for HttpProxy
|
|
83
|
+
}
|
|
71
84
|
};
|
|
72
85
|
}
|
|
73
86
|
|
|
@@ -552,52 +552,74 @@ export class RouteConnectionHandler {
|
|
|
552
552
|
}
|
|
553
553
|
}
|
|
554
554
|
} else {
|
|
555
|
-
// No TLS settings -
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
555
|
+
// No TLS settings - check if this port should use HttpProxy
|
|
556
|
+
const isHttpProxyPort = this.settings.useHttpProxy?.includes(record.localPort);
|
|
557
|
+
|
|
558
|
+
if (isHttpProxyPort && this.httpProxyBridge.getHttpProxy()) {
|
|
559
|
+
// Forward non-TLS connections to HttpProxy if configured
|
|
560
|
+
if (this.settings.enableDetailedLogging) {
|
|
561
|
+
console.log(
|
|
562
|
+
`[${connectionId}] Using HttpProxy for non-TLS connection on port ${record.localPort}`
|
|
563
|
+
);
|
|
564
|
+
}
|
|
565
|
+
|
|
566
|
+
this.httpProxyBridge.forwardToHttpProxy(
|
|
567
|
+
connectionId,
|
|
568
|
+
socket,
|
|
569
|
+
record,
|
|
570
|
+
initialChunk,
|
|
571
|
+
this.settings.httpProxyPort || 8443,
|
|
572
|
+
(reason) => this.connectionManager.initiateCleanupOnce(record, reason)
|
|
559
573
|
);
|
|
560
|
-
|
|
574
|
+
return;
|
|
575
|
+
} else {
|
|
576
|
+
// Basic forwarding
|
|
577
|
+
if (this.settings.enableDetailedLogging) {
|
|
578
|
+
console.log(
|
|
579
|
+
`[${connectionId}] Using basic forwarding to ${action.target.host}:${action.target.port}`
|
|
580
|
+
);
|
|
581
|
+
}
|
|
561
582
|
|
|
562
|
-
|
|
563
|
-
|
|
583
|
+
// Get the appropriate host value
|
|
584
|
+
let targetHost: string;
|
|
585
|
+
|
|
586
|
+
if (typeof action.target.host === 'function') {
|
|
587
|
+
// For function-based host, use the same routeContext created earlier
|
|
588
|
+
const hostResult = action.target.host(routeContext);
|
|
589
|
+
targetHost = Array.isArray(hostResult)
|
|
590
|
+
? hostResult[Math.floor(Math.random() * hostResult.length)]
|
|
591
|
+
: hostResult;
|
|
592
|
+
} else {
|
|
593
|
+
// For static host value
|
|
594
|
+
targetHost = Array.isArray(action.target.host)
|
|
595
|
+
? action.target.host[Math.floor(Math.random() * action.target.host.length)]
|
|
596
|
+
: action.target.host;
|
|
597
|
+
}
|
|
564
598
|
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
? action.target.host[Math.floor(Math.random() * action.target.host.length)]
|
|
575
|
-
: action.target.host;
|
|
576
|
-
}
|
|
599
|
+
// Determine port - either function-based, static, or preserve incoming port
|
|
600
|
+
let targetPort: number;
|
|
601
|
+
if (typeof action.target.port === 'function') {
|
|
602
|
+
targetPort = action.target.port(routeContext);
|
|
603
|
+
} else if (action.target.port === 'preserve') {
|
|
604
|
+
targetPort = record.localPort;
|
|
605
|
+
} else {
|
|
606
|
+
targetPort = action.target.port;
|
|
607
|
+
}
|
|
577
608
|
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
targetPort = action.target.port(routeContext);
|
|
582
|
-
} else if (action.target.port === 'preserve') {
|
|
583
|
-
targetPort = record.localPort;
|
|
584
|
-
} else {
|
|
585
|
-
targetPort = action.target.port;
|
|
586
|
-
}
|
|
609
|
+
// Update the connection record and context with resolved values
|
|
610
|
+
record.targetHost = targetHost;
|
|
611
|
+
record.targetPort = targetPort;
|
|
587
612
|
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
targetHost,
|
|
599
|
-
targetPort
|
|
600
|
-
);
|
|
613
|
+
return this.setupDirectConnection(
|
|
614
|
+
socket,
|
|
615
|
+
record,
|
|
616
|
+
record.lockedDomain,
|
|
617
|
+
initialChunk,
|
|
618
|
+
undefined,
|
|
619
|
+
targetHost,
|
|
620
|
+
targetPort
|
|
621
|
+
);
|
|
622
|
+
}
|
|
601
623
|
}
|
|
602
624
|
}
|
|
603
625
|
|
package/readme.plan.md
DELETED
|
@@ -1,179 +0,0 @@
|
|
|
1
|
-
# SmartProxy v19.4.0 - Completed Refactoring
|
|
2
|
-
|
|
3
|
-
## Overview
|
|
4
|
-
|
|
5
|
-
SmartProxy has been successfully refactored with clearer separation of concerns between HTTP/HTTPS traffic handling and low-level connection routing. Version 19.4.0 introduces global ACME configuration and enhanced route management.
|
|
6
|
-
|
|
7
|
-
## Current Architecture (v19.4.0)
|
|
8
|
-
|
|
9
|
-
### HttpProxy (formerly NetworkProxy)
|
|
10
|
-
**Purpose**: Handle all HTTP/HTTPS traffic with TLS termination
|
|
11
|
-
|
|
12
|
-
**Current Responsibilities**:
|
|
13
|
-
- TLS termination for HTTPS
|
|
14
|
-
- HTTP/1.1 and HTTP/2 protocol handling
|
|
15
|
-
- HTTP request/response parsing
|
|
16
|
-
- HTTP to HTTPS redirects
|
|
17
|
-
- ACME challenge handling
|
|
18
|
-
- Static route handlers
|
|
19
|
-
- WebSocket protocol upgrades
|
|
20
|
-
- Connection pooling for backend servers
|
|
21
|
-
- Certificate management integration
|
|
22
|
-
|
|
23
|
-
### SmartProxy
|
|
24
|
-
**Purpose**: Central API for all proxy needs with route-based configuration
|
|
25
|
-
|
|
26
|
-
**Current Responsibilities**:
|
|
27
|
-
- Port management (listen on multiple ports)
|
|
28
|
-
- Route-based connection routing
|
|
29
|
-
- TLS passthrough (SNI-based routing)
|
|
30
|
-
- NFTables integration
|
|
31
|
-
- Certificate management via SmartCertManager
|
|
32
|
-
- Raw TCP proxying
|
|
33
|
-
- Connection lifecycle management
|
|
34
|
-
- Global ACME configuration (v19+)
|
|
35
|
-
|
|
36
|
-
## Completed Implementation
|
|
37
|
-
|
|
38
|
-
### Phase 1: Rename and Reorganize ✅
|
|
39
|
-
- NetworkProxy renamed to HttpProxy
|
|
40
|
-
- Directory structure reorganized
|
|
41
|
-
- All imports and references updated
|
|
42
|
-
|
|
43
|
-
### Phase 2: Certificate Management ✅
|
|
44
|
-
- Unified certificate management in SmartCertManager
|
|
45
|
-
- Global ACME configuration support (v19+)
|
|
46
|
-
- Route-level certificate overrides
|
|
47
|
-
- Automatic renewal system
|
|
48
|
-
- Renamed `network-proxy.ts` to `http-proxy.ts`
|
|
49
|
-
- Updated `NetworkProxy` class to `HttpProxy` class
|
|
50
|
-
- Updated all type definitions and interfaces
|
|
51
|
-
|
|
52
|
-
3. **Update exports**
|
|
53
|
-
- Updated exports in `ts/index.ts`
|
|
54
|
-
- Fixed imports across the codebase
|
|
55
|
-
|
|
56
|
-
### Phase 2: Extract HTTP Logic from SmartProxy ✅
|
|
57
|
-
|
|
58
|
-
1. **Create HTTP handler modules in HttpProxy**
|
|
59
|
-
- Created handlers directory with:
|
|
60
|
-
- `redirect-handler.ts` - HTTP redirect logic
|
|
61
|
-
- `static-handler.ts` - Static/ACME route handling
|
|
62
|
-
- `index.ts` - Module exports
|
|
63
|
-
|
|
64
|
-
2. **Move HTTP parsing from RouteConnectionHandler**
|
|
65
|
-
- Updated `handleRedirectAction` to delegate to `RedirectHandler`
|
|
66
|
-
- Updated `handleStaticAction` to delegate to `StaticHandler`
|
|
67
|
-
- Removed duplicated HTTP parsing logic
|
|
68
|
-
|
|
69
|
-
3. **Clean up references and naming**
|
|
70
|
-
- Updated all NetworkProxy references to HttpProxy
|
|
71
|
-
- Renamed config properties: `useNetworkProxy` → `useHttpProxy`
|
|
72
|
-
- Renamed config properties: `networkProxyPort` → `httpProxyPort`
|
|
73
|
-
- Fixed HttpProxyBridge methods and references
|
|
74
|
-
|
|
75
|
-
### Phase 3: Simplify SmartProxy
|
|
76
|
-
|
|
77
|
-
1. **Update RouteConnectionHandler**
|
|
78
|
-
- Remove embedded HTTP parsing
|
|
79
|
-
- Delegate HTTP routes to HttpProxy
|
|
80
|
-
- Focus on connection routing only
|
|
81
|
-
|
|
82
|
-
2. **Simplified route handling**
|
|
83
|
-
```typescript
|
|
84
|
-
// Simplified handleRedirectAction
|
|
85
|
-
private handleRedirectAction(socket, record, route) {
|
|
86
|
-
// Delegate to HttpProxy
|
|
87
|
-
this.httpProxy.handleRedirect(socket, route);
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
// Simplified handleStaticAction
|
|
91
|
-
private handleStaticAction(socket, record, route) {
|
|
92
|
-
// Delegate to HttpProxy
|
|
93
|
-
this.httpProxy.handleStatic(socket, route);
|
|
94
|
-
}
|
|
95
|
-
```
|
|
96
|
-
|
|
97
|
-
3. **Update NetworkProxyBridge**
|
|
98
|
-
- Rename to HttpProxyBridge
|
|
99
|
-
- Update integration points
|
|
100
|
-
|
|
101
|
-
### Phase 4: Consolidate HTTP Utilities ✅
|
|
102
|
-
|
|
103
|
-
1. **Move HTTP types to http-proxy**
|
|
104
|
-
- Created consolidated `http-types.ts` in `ts/proxies/http-proxy/models/`
|
|
105
|
-
- Includes HTTP status codes, error classes, and interfaces
|
|
106
|
-
- Added helper functions like `getStatusText()`
|
|
107
|
-
|
|
108
|
-
2. **Clean up ts/http directory**
|
|
109
|
-
- Kept only router functionality
|
|
110
|
-
- Replaced local HTTP types with re-exports from HttpProxy
|
|
111
|
-
- Updated imports throughout the codebase to use consolidated types
|
|
112
|
-
|
|
113
|
-
### Phase 5: Update Tests and Documentation ✅
|
|
114
|
-
|
|
115
|
-
1. **Update test files**
|
|
116
|
-
- Renamed NetworkProxy references to HttpProxy
|
|
117
|
-
- Renamed test files to match new naming
|
|
118
|
-
- Updated imports and references throughout tests
|
|
119
|
-
- Fixed certificate manager method names
|
|
120
|
-
|
|
121
|
-
2. **Update documentation**
|
|
122
|
-
- Updated README to reflect HttpProxy naming
|
|
123
|
-
- Updated architecture descriptions
|
|
124
|
-
- Updated usage examples
|
|
125
|
-
- Fixed all API documentation references
|
|
126
|
-
|
|
127
|
-
## Migration Steps
|
|
128
|
-
|
|
129
|
-
1. Create feature branch: `refactor/http-proxy-consolidation`
|
|
130
|
-
2. Phase 1: Rename NetworkProxy (1 day)
|
|
131
|
-
3. Phase 2: Extract HTTP logic (2 days)
|
|
132
|
-
4. Phase 3: Simplify SmartProxy (1 day)
|
|
133
|
-
5. Phase 4: Consolidate utilities (1 day)
|
|
134
|
-
6. Phase 5: Update tests/docs (1 day)
|
|
135
|
-
7. Integration testing (1 day)
|
|
136
|
-
8. Code review and merge
|
|
137
|
-
|
|
138
|
-
## Benefits
|
|
139
|
-
|
|
140
|
-
1. **Clear Separation**: HTTP/HTTPS handling is clearly separated from TCP routing
|
|
141
|
-
2. **Better Naming**: HttpProxy clearly indicates its purpose
|
|
142
|
-
3. **No Duplication**: HTTP parsing logic exists in one place
|
|
143
|
-
4. **Maintainability**: Easier to modify HTTP handling without affecting routing
|
|
144
|
-
5. **Testability**: Each component has a single responsibility
|
|
145
|
-
6. **Performance**: Optimized paths for different traffic types
|
|
146
|
-
|
|
147
|
-
## Future Enhancements
|
|
148
|
-
|
|
149
|
-
After this refactoring, we can more easily add:
|
|
150
|
-
|
|
151
|
-
1. HTTP/3 (QUIC) support in HttpProxy
|
|
152
|
-
2. Advanced HTTP features (compression, caching)
|
|
153
|
-
3. HTTP middleware system
|
|
154
|
-
4. Protocol-specific optimizations
|
|
155
|
-
5. Better HTTP/2 multiplexing
|
|
156
|
-
|
|
157
|
-
## Breaking Changes from v18 to v19
|
|
158
|
-
|
|
159
|
-
1. `NetworkProxy` class renamed to `HttpProxy`
|
|
160
|
-
2. Import paths change from `network-proxy` to `http-proxy`
|
|
161
|
-
3. Global ACME configuration now available at the top level
|
|
162
|
-
4. Certificate management unified under SmartCertManager
|
|
163
|
-
|
|
164
|
-
## Future Enhancements
|
|
165
|
-
|
|
166
|
-
1. HTTP/3 (QUIC) support in HttpProxy
|
|
167
|
-
2. Advanced HTTP features (compression, caching)
|
|
168
|
-
3. HTTP middleware system
|
|
169
|
-
4. Protocol-specific optimizations
|
|
170
|
-
5. Better HTTP/2 multiplexing
|
|
171
|
-
6. Enhanced monitoring and metrics
|
|
172
|
-
|
|
173
|
-
## Key Features in v19.4.0
|
|
174
|
-
|
|
175
|
-
1. **Global ACME Configuration**: Default settings for all routes with `certificate: 'auto'`
|
|
176
|
-
2. **Enhanced Route Management**: Better separation between routing and certificate management
|
|
177
|
-
3. **Improved Test Coverage**: Fixed test exports and port bindings
|
|
178
|
-
4. **Better Error Messages**: Clear guidance for ACME configuration issues
|
|
179
|
-
5. **Non-Privileged Port Support**: Examples for development environments
|