@push.rocks/smartproxy 19.6.1 → 19.6.2
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.
|
@@ -420,14 +420,18 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
420
420
|
// Check for half-zombie: one socket destroyed
|
|
421
421
|
if (incomingDestroyed || outgoingDestroyed) {
|
|
422
422
|
const age = now - record.incomingStartTime;
|
|
423
|
-
//
|
|
424
|
-
|
|
423
|
+
// Use longer grace period for encrypted connections (5 minutes vs 30 seconds)
|
|
424
|
+
const gracePeriod = record.isTLS ? 300000 : 30000;
|
|
425
|
+
// Also ensure connection is old enough to avoid premature cleanup
|
|
426
|
+
if (age > gracePeriod && age > 10000) {
|
|
425
427
|
logger.log('warn', `Half-zombie connection detected: ${connectionId} - ${incomingDestroyed ? 'incoming' : 'outgoing'} destroyed`, {
|
|
426
428
|
connectionId,
|
|
427
429
|
remoteIP: record.remoteIP,
|
|
428
430
|
age: plugins.prettyMs(age),
|
|
429
431
|
incomingDestroyed,
|
|
430
432
|
outgoingDestroyed,
|
|
433
|
+
isTLS: record.isTLS,
|
|
434
|
+
gracePeriod: plugins.prettyMs(gracePeriod),
|
|
431
435
|
component: 'connection-manager'
|
|
432
436
|
});
|
|
433
437
|
// Clean up
|
|
@@ -437,8 +441,10 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
437
441
|
// Check for stuck connections: no data sent back to client
|
|
438
442
|
if (!record.connectionClosed && record.outgoing && record.bytesReceived > 0 && record.bytesSent === 0) {
|
|
439
443
|
const age = now - record.incomingStartTime;
|
|
440
|
-
//
|
|
441
|
-
|
|
444
|
+
// Use longer grace period for encrypted connections (5 minutes vs 60 seconds)
|
|
445
|
+
const stuckThreshold = record.isTLS ? 300000 : 60000;
|
|
446
|
+
// If connection is older than threshold and no data sent back, likely stuck
|
|
447
|
+
if (age > stuckThreshold) {
|
|
442
448
|
logger.log('warn', `Stuck connection detected: ${connectionId} - received ${record.bytesReceived} bytes but sent 0 bytes`, {
|
|
443
449
|
connectionId,
|
|
444
450
|
remoteIP: record.remoteIP,
|
|
@@ -446,6 +452,8 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
446
452
|
bytesReceived: record.bytesReceived,
|
|
447
453
|
targetHost: record.targetHost,
|
|
448
454
|
targetPort: record.targetPort,
|
|
455
|
+
isTLS: record.isTLS,
|
|
456
|
+
threshold: plugins.prettyMs(stuckThreshold),
|
|
449
457
|
component: 'connection-manager'
|
|
450
458
|
});
|
|
451
459
|
// Set termination reason and increment stats
|
|
@@ -603,4 +611,4 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
603
611
|
setImmediate(processBatch);
|
|
604
612
|
}
|
|
605
613
|
}
|
|
606
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/connection-manager.ts"],"names":[],"mappings":"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"}
|
|
614
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/connection-manager.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.6.
|
|
3
|
+
"version": "19.6.2",
|
|
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",
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
# WebSocket Keep-Alive Configuration Guide
|
|
2
|
+
|
|
3
|
+
## Quick Fix for SNI Passthrough WebSocket Disconnections
|
|
4
|
+
|
|
5
|
+
If your WebSocket connections are disconnecting every 30 seconds in SNI passthrough mode, here's the immediate solution:
|
|
6
|
+
|
|
7
|
+
### Option 1: Extended Keep-Alive Treatment (Recommended)
|
|
8
|
+
|
|
9
|
+
```typescript
|
|
10
|
+
const proxy = new SmartProxy({
|
|
11
|
+
// Extend timeout for keep-alive connections
|
|
12
|
+
keepAliveTreatment: 'extended',
|
|
13
|
+
keepAliveInactivityMultiplier: 10, // 10x the base timeout
|
|
14
|
+
inactivityTimeout: 14400000, // 4 hours base (40 hours with multiplier)
|
|
15
|
+
|
|
16
|
+
routes: [
|
|
17
|
+
{
|
|
18
|
+
name: 'websocket-passthrough',
|
|
19
|
+
match: {
|
|
20
|
+
ports: 443,
|
|
21
|
+
domains: ['ws.example.com', 'wss.example.com']
|
|
22
|
+
},
|
|
23
|
+
action: {
|
|
24
|
+
type: 'forward',
|
|
25
|
+
target: { host: 'backend', port: 443 },
|
|
26
|
+
tls: { mode: 'passthrough' }
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
]
|
|
30
|
+
});
|
|
31
|
+
```
|
|
32
|
+
|
|
33
|
+
### Option 2: Immortal Connections (Never Timeout)
|
|
34
|
+
|
|
35
|
+
```typescript
|
|
36
|
+
const proxy = new SmartProxy({
|
|
37
|
+
// Never timeout keep-alive connections
|
|
38
|
+
keepAliveTreatment: 'immortal',
|
|
39
|
+
|
|
40
|
+
routes: [
|
|
41
|
+
// ... same as above
|
|
42
|
+
]
|
|
43
|
+
});
|
|
44
|
+
```
|
|
45
|
+
|
|
46
|
+
### Option 3: Per-Route Security Settings
|
|
47
|
+
|
|
48
|
+
```typescript
|
|
49
|
+
const proxy = new SmartProxy({
|
|
50
|
+
routes: [
|
|
51
|
+
{
|
|
52
|
+
name: 'websocket-passthrough',
|
|
53
|
+
match: {
|
|
54
|
+
ports: 443,
|
|
55
|
+
domains: ['ws.example.com']
|
|
56
|
+
},
|
|
57
|
+
action: {
|
|
58
|
+
type: 'forward',
|
|
59
|
+
target: { host: 'backend', port: 443 },
|
|
60
|
+
tls: { mode: 'passthrough' }
|
|
61
|
+
},
|
|
62
|
+
security: {
|
|
63
|
+
// Disable connection limits for this route
|
|
64
|
+
maxConnections: 0, // 0 = unlimited
|
|
65
|
+
maxConnectionsPerIP: 0 // 0 = unlimited
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
]
|
|
69
|
+
});
|
|
70
|
+
```
|
|
71
|
+
|
|
72
|
+
## Understanding the Issue
|
|
73
|
+
|
|
74
|
+
### Why Connections Drop at 30 Seconds
|
|
75
|
+
|
|
76
|
+
1. **WebSocket Heartbeat**: The HTTP proxy's WebSocket handler sends ping frames every 30 seconds
|
|
77
|
+
2. **SNI Passthrough**: In passthrough mode, traffic is encrypted end-to-end
|
|
78
|
+
3. **Can't Inject Pings**: The proxy can't inject ping frames into encrypted traffic
|
|
79
|
+
4. **No Pong Response**: Client doesn't respond to pings that were never sent
|
|
80
|
+
5. **Connection Terminated**: After 30 seconds, connection is marked inactive and closed
|
|
81
|
+
|
|
82
|
+
### Why Grace Periods Were Too Short
|
|
83
|
+
|
|
84
|
+
- Half-zombie detection: 30 seconds (now 5 minutes for TLS)
|
|
85
|
+
- Stuck connection detection: 60 seconds (now 5 minutes for TLS)
|
|
86
|
+
- These were too aggressive for encrypted long-lived connections
|
|
87
|
+
|
|
88
|
+
## Long-Term Solution
|
|
89
|
+
|
|
90
|
+
The fix involves:
|
|
91
|
+
|
|
92
|
+
1. **Detecting SNI Passthrough**: Skip WebSocket heartbeat for passthrough connections
|
|
93
|
+
2. **Longer Grace Periods**: 5-minute grace for encrypted connections
|
|
94
|
+
3. **TCP Keep-Alive**: Rely on OS-level TCP keep-alive instead
|
|
95
|
+
4. **Route-Aware Timeouts**: Different timeout strategies per route type
|
|
96
|
+
|
|
97
|
+
## TCP Keep-Alive Configuration
|
|
98
|
+
|
|
99
|
+
For best results, also configure TCP keep-alive at the OS level:
|
|
100
|
+
|
|
101
|
+
### Linux
|
|
102
|
+
```bash
|
|
103
|
+
# /etc/sysctl.conf
|
|
104
|
+
net.ipv4.tcp_keepalive_time = 600 # Start probes after 10 minutes
|
|
105
|
+
net.ipv4.tcp_keepalive_intvl = 60 # Probe every minute
|
|
106
|
+
net.ipv4.tcp_keepalive_probes = 9 # Drop after 9 failed probes
|
|
107
|
+
```
|
|
108
|
+
|
|
109
|
+
### Node.js Socket Options
|
|
110
|
+
The proxy already enables TCP keep-alive on sockets:
|
|
111
|
+
- Keep-alive is enabled by default
|
|
112
|
+
- Initial delay can be configured via `keepAliveInitialDelay`
|
|
113
|
+
|
|
114
|
+
## Monitoring
|
|
115
|
+
|
|
116
|
+
Check your connections:
|
|
117
|
+
|
|
118
|
+
```typescript
|
|
119
|
+
const stats = proxy.getStats();
|
|
120
|
+
console.log('Active connections:', stats.getActiveConnections());
|
|
121
|
+
console.log('Connections by route:', stats.getConnectionsByRoute());
|
|
122
|
+
|
|
123
|
+
// Monitor long-lived connections
|
|
124
|
+
setInterval(() => {
|
|
125
|
+
const connections = proxy.connectionManager.getConnections();
|
|
126
|
+
for (const [id, conn] of connections) {
|
|
127
|
+
const age = Date.now() - conn.incomingStartTime;
|
|
128
|
+
if (age > 300000) { // 5+ minutes
|
|
129
|
+
console.log(`Long-lived connection: ${id}, age: ${age}ms, route: ${conn.routeName}`);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}, 60000);
|
|
133
|
+
```
|
|
134
|
+
|
|
135
|
+
## Summary
|
|
136
|
+
|
|
137
|
+
- **Immediate Fix**: Use `keepAliveTreatment: 'extended'` or `'immortal'`
|
|
138
|
+
- **Applied Fix**: Increased grace periods for TLS connections to 5 minutes
|
|
139
|
+
- **Best Practice**: Use SNI passthrough for WebSocket when you need end-to-end encryption
|
|
140
|
+
- **Alternative**: Use TLS termination if you need application-level WebSocket features
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
# WebSocket Keep-Alive Fix for SNI Passthrough
|
|
2
|
+
|
|
3
|
+
## Problem
|
|
4
|
+
|
|
5
|
+
WebSocket connections in SNI passthrough mode are being disconnected every 30 seconds due to:
|
|
6
|
+
|
|
7
|
+
1. **WebSocket Heartbeat**: The HTTP proxy's WebSocket handler performs heartbeat checks every 30 seconds using ping/pong frames. In SNI passthrough mode, these frames can't be injected into the encrypted stream, causing connections to be marked as inactive and terminated.
|
|
8
|
+
|
|
9
|
+
2. **Half-Zombie Detection**: The connection manager's aggressive cleanup gives only 30 seconds grace period for connections where one socket is destroyed.
|
|
10
|
+
|
|
11
|
+
## Solution
|
|
12
|
+
|
|
13
|
+
For SNI passthrough connections:
|
|
14
|
+
1. Disable WebSocket-specific heartbeat checking (they're handled as raw TCP)
|
|
15
|
+
2. Rely on TCP keepalive settings instead
|
|
16
|
+
3. Increase grace period for encrypted connections
|
|
17
|
+
|
|
18
|
+
## Current Settings
|
|
19
|
+
|
|
20
|
+
- Default inactivity timeout: 4 hours (14400000 ms)
|
|
21
|
+
- Keep-alive multiplier for extended mode: 6x (24 hours)
|
|
22
|
+
- WebSocket heartbeat interval: 30 seconds (problem!)
|
|
23
|
+
- Half-zombie grace period: 30 seconds (too aggressive)
|
|
24
|
+
|
|
25
|
+
## Recommended Configuration
|
|
26
|
+
|
|
27
|
+
```typescript
|
|
28
|
+
const proxy = new SmartProxy({
|
|
29
|
+
// Increase grace period for connection cleanup
|
|
30
|
+
inactivityTimeout: 14400000, // 4 hours default
|
|
31
|
+
keepAliveTreatment: 'extended', // or 'immortal' for no timeout
|
|
32
|
+
keepAliveInactivityMultiplier: 10, // 40 hours for keepalive connections
|
|
33
|
+
|
|
34
|
+
// For routes with WebSocket over SNI passthrough
|
|
35
|
+
routes: [
|
|
36
|
+
{
|
|
37
|
+
name: 'websocket-passthrough',
|
|
38
|
+
match: { ports: 443, domains: 'ws.example.com' },
|
|
39
|
+
action: {
|
|
40
|
+
type: 'forward',
|
|
41
|
+
target: { host: 'backend', port: 443 },
|
|
42
|
+
tls: { mode: 'passthrough' },
|
|
43
|
+
// No WebSocket-specific config needed for passthrough
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
});
|
|
48
|
+
```
|
|
49
|
+
|
|
50
|
+
## Temporary Workaround
|
|
51
|
+
|
|
52
|
+
Until a fix is implemented, you can:
|
|
53
|
+
|
|
54
|
+
1. Use `keepAliveTreatment: 'immortal'` to disable timeout-based cleanup
|
|
55
|
+
2. Increase the half-zombie grace period
|
|
56
|
+
3. Use TCP keepalive at the OS level
|
|
57
|
+
|
|
58
|
+
## Proper Fix Implementation
|
|
59
|
+
|
|
60
|
+
1. Detect when a connection is SNI passthrough
|
|
61
|
+
2. Skip WebSocket heartbeat for passthrough connections
|
|
62
|
+
3. Increase grace period for encrypted connections
|
|
63
|
+
4. Rely on TCP keepalive instead of application-level ping/pong
|
|
@@ -488,14 +488,19 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
488
488
|
// Check for half-zombie: one socket destroyed
|
|
489
489
|
if (incomingDestroyed || outgoingDestroyed) {
|
|
490
490
|
const age = now - record.incomingStartTime;
|
|
491
|
-
//
|
|
492
|
-
|
|
491
|
+
// Use longer grace period for encrypted connections (5 minutes vs 30 seconds)
|
|
492
|
+
const gracePeriod = record.isTLS ? 300000 : 30000;
|
|
493
|
+
|
|
494
|
+
// Also ensure connection is old enough to avoid premature cleanup
|
|
495
|
+
if (age > gracePeriod && age > 10000) {
|
|
493
496
|
logger.log('warn', `Half-zombie connection detected: ${connectionId} - ${incomingDestroyed ? 'incoming' : 'outgoing'} destroyed`, {
|
|
494
497
|
connectionId,
|
|
495
498
|
remoteIP: record.remoteIP,
|
|
496
499
|
age: plugins.prettyMs(age),
|
|
497
500
|
incomingDestroyed,
|
|
498
501
|
outgoingDestroyed,
|
|
502
|
+
isTLS: record.isTLS,
|
|
503
|
+
gracePeriod: plugins.prettyMs(gracePeriod),
|
|
499
504
|
component: 'connection-manager'
|
|
500
505
|
});
|
|
501
506
|
|
|
@@ -507,8 +512,11 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
507
512
|
// Check for stuck connections: no data sent back to client
|
|
508
513
|
if (!record.connectionClosed && record.outgoing && record.bytesReceived > 0 && record.bytesSent === 0) {
|
|
509
514
|
const age = now - record.incomingStartTime;
|
|
510
|
-
//
|
|
511
|
-
|
|
515
|
+
// Use longer grace period for encrypted connections (5 minutes vs 60 seconds)
|
|
516
|
+
const stuckThreshold = record.isTLS ? 300000 : 60000;
|
|
517
|
+
|
|
518
|
+
// If connection is older than threshold and no data sent back, likely stuck
|
|
519
|
+
if (age > stuckThreshold) {
|
|
512
520
|
logger.log('warn', `Stuck connection detected: ${connectionId} - received ${record.bytesReceived} bytes but sent 0 bytes`, {
|
|
513
521
|
connectionId,
|
|
514
522
|
remoteIP: record.remoteIP,
|
|
@@ -516,6 +524,8 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
516
524
|
bytesReceived: record.bytesReceived,
|
|
517
525
|
targetHost: record.targetHost,
|
|
518
526
|
targetPort: record.targetPort,
|
|
527
|
+
isTLS: record.isTLS,
|
|
528
|
+
threshold: plugins.prettyMs(stuckThreshold),
|
|
519
529
|
component: 'connection-manager'
|
|
520
530
|
});
|
|
521
531
|
|