@push.rocks/smartproxy 19.5.25 → 19.5.26
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.
|
@@ -116,10 +116,10 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
116
116
|
* Start the inactivity check timer
|
|
117
117
|
*/
|
|
118
118
|
startInactivityCheckTimer() {
|
|
119
|
-
// Check every
|
|
119
|
+
// Check more frequently (every 10 seconds) to catch zombies and stuck connections faster
|
|
120
120
|
this.setInterval(() => {
|
|
121
121
|
this.performOptimizedInactivityCheck();
|
|
122
|
-
},
|
|
122
|
+
}, 10000);
|
|
123
123
|
// Note: LifecycleComponent's setInterval already calls unref()
|
|
124
124
|
}
|
|
125
125
|
/**
|
|
@@ -163,6 +163,12 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
163
163
|
* Queue a connection for cleanup
|
|
164
164
|
*/
|
|
165
165
|
queueCleanup(connectionId) {
|
|
166
|
+
// Check if connection is already being processed
|
|
167
|
+
const record = this.connectionRecords.get(connectionId);
|
|
168
|
+
if (!record || record.connectionClosed) {
|
|
169
|
+
// Already cleaned up or doesn't exist, skip
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
166
172
|
this.cleanupQueue.add(connectionId);
|
|
167
173
|
// Process immediately if queue is getting large
|
|
168
174
|
if (this.cleanupQueue.size >= this.cleanupBatchSize) {
|
|
@@ -184,8 +190,9 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
184
190
|
this.cleanupTimer = null;
|
|
185
191
|
}
|
|
186
192
|
const toCleanup = Array.from(this.cleanupQueue).slice(0, this.cleanupBatchSize);
|
|
187
|
-
|
|
193
|
+
// Remove only the items we're processing, not the entire queue!
|
|
188
194
|
for (const connectionId of toCleanup) {
|
|
195
|
+
this.cleanupQueue.delete(connectionId);
|
|
189
196
|
const record = this.connectionRecords.get(connectionId);
|
|
190
197
|
if (record) {
|
|
191
198
|
this.cleanupConnection(record, record.incomingTerminationReason || 'normal');
|
|
@@ -392,6 +399,66 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
392
399
|
connectionsToCheck.push(connectionId);
|
|
393
400
|
}
|
|
394
401
|
}
|
|
402
|
+
// Also check ALL connections for zombie state (destroyed sockets but not cleaned up)
|
|
403
|
+
// This is critical for proxy chains where sockets can be destroyed without events
|
|
404
|
+
for (const [connectionId, record] of this.connectionRecords) {
|
|
405
|
+
if (!record.connectionClosed) {
|
|
406
|
+
const incomingDestroyed = record.incoming?.destroyed || false;
|
|
407
|
+
const outgoingDestroyed = record.outgoing?.destroyed || false;
|
|
408
|
+
// Check for zombie connections: both sockets destroyed but connection not cleaned up
|
|
409
|
+
if (incomingDestroyed && outgoingDestroyed) {
|
|
410
|
+
logger.log('warn', `Zombie connection detected: ${connectionId} - both sockets destroyed but not cleaned up`, {
|
|
411
|
+
connectionId,
|
|
412
|
+
remoteIP: record.remoteIP,
|
|
413
|
+
age: plugins.prettyMs(now - record.incomingStartTime),
|
|
414
|
+
component: 'connection-manager'
|
|
415
|
+
});
|
|
416
|
+
// Clean up immediately
|
|
417
|
+
this.cleanupConnection(record, 'zombie_cleanup');
|
|
418
|
+
continue;
|
|
419
|
+
}
|
|
420
|
+
// Check for half-zombie: one socket destroyed
|
|
421
|
+
if (incomingDestroyed || outgoingDestroyed) {
|
|
422
|
+
const age = now - record.incomingStartTime;
|
|
423
|
+
// Give it 30 seconds grace period for normal cleanup
|
|
424
|
+
if (age > 30000) {
|
|
425
|
+
logger.log('warn', `Half-zombie connection detected: ${connectionId} - ${incomingDestroyed ? 'incoming' : 'outgoing'} destroyed`, {
|
|
426
|
+
connectionId,
|
|
427
|
+
remoteIP: record.remoteIP,
|
|
428
|
+
age: plugins.prettyMs(age),
|
|
429
|
+
incomingDestroyed,
|
|
430
|
+
outgoingDestroyed,
|
|
431
|
+
component: 'connection-manager'
|
|
432
|
+
});
|
|
433
|
+
// Clean up
|
|
434
|
+
this.cleanupConnection(record, 'half_zombie_cleanup');
|
|
435
|
+
}
|
|
436
|
+
}
|
|
437
|
+
// Check for stuck connections: no data sent back to client
|
|
438
|
+
if (!record.connectionClosed && record.outgoing && record.bytesReceived > 0 && record.bytesSent === 0) {
|
|
439
|
+
const age = now - record.incomingStartTime;
|
|
440
|
+
// If connection is older than 60 seconds and no data sent back, likely stuck
|
|
441
|
+
if (age > 60000) {
|
|
442
|
+
logger.log('warn', `Stuck connection detected: ${connectionId} - received ${record.bytesReceived} bytes but sent 0 bytes`, {
|
|
443
|
+
connectionId,
|
|
444
|
+
remoteIP: record.remoteIP,
|
|
445
|
+
age: plugins.prettyMs(age),
|
|
446
|
+
bytesReceived: record.bytesReceived,
|
|
447
|
+
targetHost: record.targetHost,
|
|
448
|
+
targetPort: record.targetPort,
|
|
449
|
+
component: 'connection-manager'
|
|
450
|
+
});
|
|
451
|
+
// Set termination reason and increment stats
|
|
452
|
+
if (record.incomingTerminationReason == null) {
|
|
453
|
+
record.incomingTerminationReason = 'stuck_no_response';
|
|
454
|
+
this.incrementTerminationStat('incoming', 'stuck_no_response');
|
|
455
|
+
}
|
|
456
|
+
// Clean up
|
|
457
|
+
this.cleanupConnection(record, 'stuck_no_response');
|
|
458
|
+
}
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
}
|
|
395
462
|
// Process only connections that need checking
|
|
396
463
|
for (const connectionId of connectionsToCheck) {
|
|
397
464
|
const record = this.connectionRecords.get(connectionId);
|
|
@@ -536,4 +603,4 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
536
603
|
setImmediate(processBatch);
|
|
537
604
|
}
|
|
538
605
|
}
|
|
539
|
-
//# 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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"}
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartproxy",
|
|
3
|
-
"version": "19.5.
|
|
3
|
+
"version": "19.5.26",
|
|
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.connections.md
CHANGED
|
@@ -673,4 +673,52 @@ if (!record.connectionClosed && record.outgoing && record.bytesReceived > 0 && r
|
|
|
673
673
|
- Connection is older than 60 seconds
|
|
674
674
|
- Both sockets are still alive (not destroyed)
|
|
675
675
|
|
|
676
|
-
This complements the zombie detection by handling cases where sockets remain technically alive but the connection is effectively dead.
|
|
676
|
+
This complements the zombie detection by handling cases where sockets remain technically alive but the connection is effectively dead.
|
|
677
|
+
|
|
678
|
+
## 🚨 CRITICAL FIX: Cleanup Queue Bug (January 2025)
|
|
679
|
+
|
|
680
|
+
### Critical Bug Found
|
|
681
|
+
The cleanup queue had a severe bug that caused connection accumulation when more than 100 connections needed cleanup:
|
|
682
|
+
|
|
683
|
+
```typescript
|
|
684
|
+
// BUG: This cleared the ENTIRE queue after processing only the first batch!
|
|
685
|
+
const toCleanup = Array.from(this.cleanupQueue).slice(0, this.cleanupBatchSize);
|
|
686
|
+
this.cleanupQueue.clear(); // ❌ This discarded all connections beyond the first 100!
|
|
687
|
+
```
|
|
688
|
+
|
|
689
|
+
### Fix Implemented
|
|
690
|
+
```typescript
|
|
691
|
+
// Now only removes the connections being processed
|
|
692
|
+
const toCleanup = Array.from(this.cleanupQueue).slice(0, this.cleanupBatchSize);
|
|
693
|
+
for (const connectionId of toCleanup) {
|
|
694
|
+
this.cleanupQueue.delete(connectionId); // ✅ Only remove what we process
|
|
695
|
+
const record = this.connectionRecords.get(connectionId);
|
|
696
|
+
if (record) {
|
|
697
|
+
this.cleanupConnection(record, record.incomingTerminationReason || 'normal');
|
|
698
|
+
}
|
|
699
|
+
}
|
|
700
|
+
```
|
|
701
|
+
|
|
702
|
+
### Impact
|
|
703
|
+
- **Before**: If 150 connections needed cleanup, only the first 100 would be processed and the remaining 50 would accumulate forever
|
|
704
|
+
- **After**: All connections are properly cleaned up in batches
|
|
705
|
+
|
|
706
|
+
### Additional Improvements
|
|
707
|
+
|
|
708
|
+
1. **Faster Inactivity Checks**: Reduced from 30s to 10s intervals
|
|
709
|
+
- Zombies and stuck connections are detected 3x faster
|
|
710
|
+
- Reduces the window for accumulation
|
|
711
|
+
|
|
712
|
+
2. **Duplicate Prevention**: Added check in queueCleanup to prevent processing already-closed connections
|
|
713
|
+
- Prevents unnecessary work
|
|
714
|
+
- Ensures connections are only cleaned up once
|
|
715
|
+
|
|
716
|
+
### Summary of All Fixes
|
|
717
|
+
|
|
718
|
+
1. **Connection Timeout** (already documented) - Prevents accumulation when backends are unreachable
|
|
719
|
+
2. **Zombie Detection** - Cleans up connections with destroyed sockets
|
|
720
|
+
3. **Stuck Connection Detection** - Cleans up connections to hanging backends
|
|
721
|
+
4. **Cleanup Queue Bug** - Ensures ALL connections get cleaned up, not just the first 100
|
|
722
|
+
5. **Faster Detection** - Reduced check interval from 30s to 10s
|
|
723
|
+
|
|
724
|
+
These fixes combined should prevent connection accumulation in all known scenarios.
|
|
@@ -140,10 +140,10 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
140
140
|
* Start the inactivity check timer
|
|
141
141
|
*/
|
|
142
142
|
private startInactivityCheckTimer(): void {
|
|
143
|
-
// Check every
|
|
143
|
+
// Check more frequently (every 10 seconds) to catch zombies and stuck connections faster
|
|
144
144
|
this.setInterval(() => {
|
|
145
145
|
this.performOptimizedInactivityCheck();
|
|
146
|
-
},
|
|
146
|
+
}, 10000);
|
|
147
147
|
// Note: LifecycleComponent's setInterval already calls unref()
|
|
148
148
|
}
|
|
149
149
|
|
|
@@ -194,6 +194,13 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
194
194
|
* Queue a connection for cleanup
|
|
195
195
|
*/
|
|
196
196
|
private queueCleanup(connectionId: string): void {
|
|
197
|
+
// Check if connection is already being processed
|
|
198
|
+
const record = this.connectionRecords.get(connectionId);
|
|
199
|
+
if (!record || record.connectionClosed) {
|
|
200
|
+
// Already cleaned up or doesn't exist, skip
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
|
|
197
204
|
this.cleanupQueue.add(connectionId);
|
|
198
205
|
|
|
199
206
|
// Process immediately if queue is getting large
|
|
@@ -217,9 +224,10 @@ export class ConnectionManager extends LifecycleComponent {
|
|
|
217
224
|
}
|
|
218
225
|
|
|
219
226
|
const toCleanup = Array.from(this.cleanupQueue).slice(0, this.cleanupBatchSize);
|
|
220
|
-
this.cleanupQueue.clear();
|
|
221
227
|
|
|
228
|
+
// Remove only the items we're processing, not the entire queue!
|
|
222
229
|
for (const connectionId of toCleanup) {
|
|
230
|
+
this.cleanupQueue.delete(connectionId);
|
|
223
231
|
const record = this.connectionRecords.get(connectionId);
|
|
224
232
|
if (record) {
|
|
225
233
|
this.cleanupConnection(record, record.incomingTerminationReason || 'normal');
|