Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b5f166bc92 | |||
| 94266222fe |
@@ -1,5 +1,12 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2026-02-26 - 25.8.2 - fix(connection)
|
||||||
|
improve connection handling and timeouts
|
||||||
|
|
||||||
|
- Flush logs on process beforeExit and avoid calling process.exit in SIGINT/SIGTERM handlers to preserve host graceful shutdown
|
||||||
|
- Store protocol entries with a createdAt timestamp in ProtocolDetector and remove stale entries older than 30s to prevent leaked state from abandoned handshakes or port scanners
|
||||||
|
- Add backend connect timeout (30s) and idle timeouts (5 minutes) for dynamic forwards; destroy sockets on timeout and emit logs for timeout events
|
||||||
|
|
||||||
## 2026-02-25 - 25.8.1 - fix(allocator)
|
## 2026-02-25 - 25.8.1 - fix(allocator)
|
||||||
switch global allocator from tikv-jemallocator to mimalloc
|
switch global allocator from tikv-jemallocator to mimalloc
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@push.rocks/smartproxy",
|
"name": "@push.rocks/smartproxy",
|
||||||
"version": "25.8.1",
|
"version": "25.8.2",
|
||||||
"private": false,
|
"private": false,
|
||||||
"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.",
|
"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.",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@push.rocks/smartproxy',
|
name: '@push.rocks/smartproxy',
|
||||||
version: '25.8.1',
|
version: '25.8.2',
|
||||||
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.'
|
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.'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -354,17 +354,17 @@ export class LogDeduplicator {
|
|||||||
// Global instance for connection-related log deduplication
|
// Global instance for connection-related log deduplication
|
||||||
export const connectionLogDeduplicator = new LogDeduplicator(5000); // 5 second batches
|
export const connectionLogDeduplicator = new LogDeduplicator(5000); // 5 second batches
|
||||||
|
|
||||||
// Ensure logs are flushed on process exit
|
// Ensure logs are flushed on process exit.
|
||||||
|
// Only use beforeExit — do NOT call process.exit() from SIGINT/SIGTERM handlers
|
||||||
|
// as that kills the host process's graceful shutdown (e.g., dcrouter connection draining).
|
||||||
process.on('beforeExit', () => {
|
process.on('beforeExit', () => {
|
||||||
connectionLogDeduplicator.flushAll();
|
connectionLogDeduplicator.flushAll();
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('SIGINT', () => {
|
process.on('SIGINT', () => {
|
||||||
connectionLogDeduplicator.cleanup();
|
connectionLogDeduplicator.cleanup();
|
||||||
process.exit(0);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
process.on('SIGTERM', () => {
|
process.on('SIGTERM', () => {
|
||||||
connectionLogDeduplicator.cleanup();
|
connectionLogDeduplicator.cleanup();
|
||||||
process.exit(0);
|
|
||||||
});
|
});
|
||||||
@@ -18,8 +18,8 @@ export class ProtocolDetector {
|
|||||||
private fragmentManager: DetectionFragmentManager;
|
private fragmentManager: DetectionFragmentManager;
|
||||||
private tlsDetector: TlsDetector;
|
private tlsDetector: TlsDetector;
|
||||||
private httpDetector: HttpDetector;
|
private httpDetector: HttpDetector;
|
||||||
private connectionProtocols: Map<string, 'tls' | 'http'> = new Map();
|
private connectionProtocols: Map<string, { protocol: 'tls' | 'http'; createdAt: number }> = new Map();
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.fragmentManager = new DetectionFragmentManager();
|
this.fragmentManager = new DetectionFragmentManager();
|
||||||
this.tlsDetector = new TlsDetector();
|
this.tlsDetector = new TlsDetector();
|
||||||
@@ -124,8 +124,9 @@ export class ProtocolDetector {
|
|||||||
const connectionId = DetectionFragmentManager.createConnectionId(context);
|
const connectionId = DetectionFragmentManager.createConnectionId(context);
|
||||||
|
|
||||||
// Check if we already know the protocol for this connection
|
// Check if we already know the protocol for this connection
|
||||||
const knownProtocol = this.connectionProtocols.get(connectionId);
|
const knownEntry = this.connectionProtocols.get(connectionId);
|
||||||
|
const knownProtocol = knownEntry?.protocol;
|
||||||
|
|
||||||
if (knownProtocol === 'http') {
|
if (knownProtocol === 'http') {
|
||||||
const result = this.httpDetector.detectWithContext(buffer, context, options);
|
const result = this.httpDetector.detectWithContext(buffer, context, options);
|
||||||
if (result) {
|
if (result) {
|
||||||
@@ -163,7 +164,7 @@ export class ProtocolDetector {
|
|||||||
if (!knownProtocol) {
|
if (!knownProtocol) {
|
||||||
// First peek to determine protocol type
|
// First peek to determine protocol type
|
||||||
if (this.tlsDetector.canHandle(buffer)) {
|
if (this.tlsDetector.canHandle(buffer)) {
|
||||||
this.connectionProtocols.set(connectionId, 'tls');
|
this.connectionProtocols.set(connectionId, { protocol: 'tls', createdAt: Date.now() });
|
||||||
// Handle TLS with fragment accumulation
|
// Handle TLS with fragment accumulation
|
||||||
const handler = this.fragmentManager.getHandler('tls');
|
const handler = this.fragmentManager.getHandler('tls');
|
||||||
const fragmentResult = handler.addFragment(connectionId, buffer);
|
const fragmentResult = handler.addFragment(connectionId, buffer);
|
||||||
@@ -189,7 +190,7 @@ export class ProtocolDetector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.httpDetector.canHandle(buffer)) {
|
if (this.httpDetector.canHandle(buffer)) {
|
||||||
this.connectionProtocols.set(connectionId, 'http');
|
this.connectionProtocols.set(connectionId, { protocol: 'http', createdAt: Date.now() });
|
||||||
const result = this.httpDetector.detectWithContext(buffer, context, options);
|
const result = this.httpDetector.detectWithContext(buffer, context, options);
|
||||||
if (result) {
|
if (result) {
|
||||||
if (result.isComplete) {
|
if (result.isComplete) {
|
||||||
@@ -221,6 +222,14 @@ export class ProtocolDetector {
|
|||||||
|
|
||||||
private cleanupInstance(): void {
|
private cleanupInstance(): void {
|
||||||
this.fragmentManager.cleanup();
|
this.fragmentManager.cleanup();
|
||||||
|
// Remove stale connectionProtocols entries (abandoned handshakes, port scanners)
|
||||||
|
const maxAge = 30_000; // 30 seconds
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [id, entry] of this.connectionProtocols) {
|
||||||
|
if (now - entry.createdAt > maxAge) {
|
||||||
|
this.connectionProtocols.delete(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -242,8 +251,7 @@ export class ProtocolDetector {
|
|||||||
* @param _maxAge Maximum age in milliseconds (default: 30 seconds)
|
* @param _maxAge Maximum age in milliseconds (default: 30 seconds)
|
||||||
*/
|
*/
|
||||||
static cleanupConnections(_maxAge: number = 30000): void {
|
static cleanupConnections(_maxAge: number = 30000): void {
|
||||||
// Cleanup is now handled internally by the fragment manager
|
this.getInstance().cleanupInstance();
|
||||||
this.getInstance().fragmentManager.cleanup();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -254,11 +254,30 @@ export class SocketHandlerServer {
|
|||||||
|
|
||||||
// Connect to the resolved target
|
// Connect to the resolved target
|
||||||
const backend = plugins.net.connect(port, host, () => {
|
const backend = plugins.net.connect(port, host, () => {
|
||||||
|
// Connection established — set idle timeout on both sides (5 min)
|
||||||
|
socket.setTimeout(300_000);
|
||||||
|
backend.setTimeout(300_000);
|
||||||
|
|
||||||
// Pipe bidirectionally
|
// Pipe bidirectionally
|
||||||
socket.pipe(backend);
|
socket.pipe(backend);
|
||||||
backend.pipe(socket);
|
backend.pipe(socket);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Connect timeout: if backend doesn't connect within 30s, destroy both
|
||||||
|
backend.setTimeout(30_000);
|
||||||
|
|
||||||
|
backend.on('timeout', () => {
|
||||||
|
logger.log('warn', `Dynamic forward timeout to ${host}:${port}`, { component: 'socket-handler-server' });
|
||||||
|
backend.destroy();
|
||||||
|
socket.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
socket.on('timeout', () => {
|
||||||
|
logger.log('debug', `Dynamic forward client idle timeout`, { component: 'socket-handler-server' });
|
||||||
|
socket.destroy();
|
||||||
|
backend.destroy();
|
||||||
|
});
|
||||||
|
|
||||||
backend.on('error', (err) => {
|
backend.on('error', (err) => {
|
||||||
logger.log('error', `Dynamic forward backend error: ${err.message}`, { component: 'socket-handler-server' });
|
logger.log('error', `Dynamic forward backend error: ${err.message}`, { component: 'socket-handler-server' });
|
||||||
socket.destroy();
|
socket.destroy();
|
||||||
|
|||||||
Reference in New Issue
Block a user