@push.rocks/smartproxy 19.5.18 → 19.5.19
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 +2 -2
- package/dist_ts/core/utils/socket-utils.d.ts +0 -15
- package/dist_ts/core/utils/socket-utils.js +1 -35
- package/dist_ts/forwarding/handlers/https-terminate-to-http-handler.js +47 -32
- package/dist_ts/forwarding/handlers/https-terminate-to-https-handler.js +51 -32
- package/package.json +1 -1
- package/readme.hints.md +22 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/core/utils/socket-utils.ts +0 -44
- package/ts/forwarding/handlers/https-terminate-to-http-handler.ts +47 -33
- package/ts/forwarding/handlers/https-terminate-to-https-handler.ts +55 -35
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartproxy',
|
|
6
|
-
version: '19.5.
|
|
6
|
+
version: '19.5.19',
|
|
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
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHFQQUFxUDtDQUNuUSxDQUFBIn0=
|
|
@@ -18,15 +18,6 @@ export interface SafeSocketOptions {
|
|
|
18
18
|
* @param options Cleanup options
|
|
19
19
|
*/
|
|
20
20
|
export declare function cleanupSocket(socket: plugins.net.Socket | plugins.tls.TLSSocket | null, socketName?: string, options?: CleanupOptions): Promise<void>;
|
|
21
|
-
/**
|
|
22
|
-
* Create a cleanup handler for paired sockets (client and server)
|
|
23
|
-
* @param clientSocket The client socket
|
|
24
|
-
* @param serverSocket The server socket (optional)
|
|
25
|
-
* @param onCleanup Optional callback when cleanup is done
|
|
26
|
-
* @returns A cleanup function that can be called multiple times safely
|
|
27
|
-
* @deprecated Use createIndependentSocketHandlers for better half-open support
|
|
28
|
-
*/
|
|
29
|
-
export declare function createSocketCleanupHandler(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket?: plugins.net.Socket | plugins.tls.TLSSocket | null, onCleanup?: (reason: string) => void): (reason: string) => void;
|
|
30
21
|
/**
|
|
31
22
|
* Create independent cleanup handlers for paired sockets that support half-open connections
|
|
32
23
|
* @param clientSocket The client socket
|
|
@@ -64,12 +55,6 @@ export declare function setupBidirectionalForwarding(clientSocket: plugins.net.S
|
|
|
64
55
|
cleanupClient: (reason: string) => Promise<void>;
|
|
65
56
|
cleanupServer: (reason: string) => Promise<void>;
|
|
66
57
|
};
|
|
67
|
-
/**
|
|
68
|
-
* Pipe two sockets together with proper cleanup on either end
|
|
69
|
-
* @param socket1 First socket
|
|
70
|
-
* @param socket2 Second socket
|
|
71
|
-
*/
|
|
72
|
-
export declare function pipeSockets(socket1: plugins.net.Socket | plugins.tls.TLSSocket, socket2: plugins.net.Socket | plugins.tls.TLSSocket): void;
|
|
73
58
|
/**
|
|
74
59
|
* Create a socket with immediate error handling to prevent crashes
|
|
75
60
|
* @param options Socket creation options
|
|
@@ -47,31 +47,6 @@ export function cleanupSocket(socket, socketName, options = {}) {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
/**
|
|
51
|
-
* Create a cleanup handler for paired sockets (client and server)
|
|
52
|
-
* @param clientSocket The client socket
|
|
53
|
-
* @param serverSocket The server socket (optional)
|
|
54
|
-
* @param onCleanup Optional callback when cleanup is done
|
|
55
|
-
* @returns A cleanup function that can be called multiple times safely
|
|
56
|
-
* @deprecated Use createIndependentSocketHandlers for better half-open support
|
|
57
|
-
*/
|
|
58
|
-
export function createSocketCleanupHandler(clientSocket, serverSocket, onCleanup) {
|
|
59
|
-
let cleanedUp = false;
|
|
60
|
-
return (reason) => {
|
|
61
|
-
if (cleanedUp)
|
|
62
|
-
return;
|
|
63
|
-
cleanedUp = true;
|
|
64
|
-
// Cleanup both sockets (old behavior - too aggressive)
|
|
65
|
-
cleanupSocket(clientSocket, 'client', { immediate: true });
|
|
66
|
-
if (serverSocket) {
|
|
67
|
-
cleanupSocket(serverSocket, 'server', { immediate: true });
|
|
68
|
-
}
|
|
69
|
-
// Call cleanup callback if provided
|
|
70
|
-
if (onCleanup) {
|
|
71
|
-
onCleanup(reason);
|
|
72
|
-
}
|
|
73
|
-
};
|
|
74
|
-
}
|
|
75
50
|
/**
|
|
76
51
|
* Create independent cleanup handlers for paired sockets that support half-open connections
|
|
77
52
|
* @param clientSocket The client socket
|
|
@@ -209,15 +184,6 @@ export function setupBidirectionalForwarding(clientSocket, serverSocket, handler
|
|
|
209
184
|
});
|
|
210
185
|
return { cleanupClient, cleanupServer };
|
|
211
186
|
}
|
|
212
|
-
/**
|
|
213
|
-
* Pipe two sockets together with proper cleanup on either end
|
|
214
|
-
* @param socket1 First socket
|
|
215
|
-
* @param socket2 Second socket
|
|
216
|
-
*/
|
|
217
|
-
export function pipeSockets(socket1, socket2) {
|
|
218
|
-
socket1.pipe(socket2);
|
|
219
|
-
socket2.pipe(socket1);
|
|
220
|
-
}
|
|
221
187
|
/**
|
|
222
188
|
* Create a socket with immediate error handling to prevent crashes
|
|
223
189
|
* @param options Socket creation options
|
|
@@ -246,4 +212,4 @@ export function createSocketWithErrorHandler(options) {
|
|
|
246
212
|
socket.connect(port, host);
|
|
247
213
|
return socket;
|
|
248
214
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LXV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvY29yZS91dGlscy9zb2NrZXQtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQWdCNUM7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsYUFBYSxDQUMzQixNQUF5RCxFQUN6RCxVQUFtQixFQUNuQixVQUEwQixFQUFFO0lBRTVCLElBQUksQ0FBQyxNQUFNLElBQUksTUFBTSxDQUFDLFNBQVM7UUFBRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUUxRCxPQUFPLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDbkMsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFO1lBQ25CLElBQUksQ0FBQztnQkFDSCw2QkFBNkI7Z0JBQzdCLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO2dCQUU1QixtQ0FBbUM7Z0JBQ25DLElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUM7b0JBQ3RCLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDbkIsQ0FBQztZQUNILENBQUM7WUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO2dCQUNiLE9BQU8sQ0FBQyxLQUFLLENBQUMsMkJBQTJCLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxVQUFVLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLEdBQUcsRUFBRSxDQUFDLENBQUM7WUFDM0YsQ0FBQztZQUNELE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQyxDQUFDO1FBRUYsSUFBSSxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDdEIsbUNBQW1DO1lBQ25DLE1BQU0sQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNoQixPQUFPLEVBQUUsQ0FBQztRQUNaLENBQUM7YUFBTSxJQUFJLE9BQU8sQ0FBQyxVQUFVLElBQUksTUFBTSxD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
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { ForwardingHandler } from './base-handler.js';
|
|
3
3
|
import { ForwardingHandlerEvents } from '../config/forwarding-types.js';
|
|
4
|
-
import {
|
|
4
|
+
import { setupSocketHandlers, createSocketWithErrorHandler, setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
|
|
5
5
|
/**
|
|
6
6
|
* Handler for HTTPS termination with HTTP backend
|
|
7
7
|
*/
|
|
@@ -89,17 +89,27 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
89
89
|
let backendSocket = null;
|
|
90
90
|
let dataBuffer = Buffer.alloc(0);
|
|
91
91
|
let connectionEstablished = false;
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
92
|
+
let forwardingSetup = false;
|
|
93
|
+
// Set up initial error handling for TLS socket
|
|
94
|
+
const tlsCleanupHandler = (reason) => {
|
|
95
|
+
if (!forwardingSetup) {
|
|
96
|
+
// If forwarding not set up yet, emit disconnected and cleanup
|
|
97
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
98
|
+
remoteAddress,
|
|
99
|
+
reason
|
|
100
|
+
});
|
|
101
|
+
dataBuffer = Buffer.alloc(0);
|
|
102
|
+
connectionEstablished = false;
|
|
103
|
+
if (!tlsSocket.destroyed) {
|
|
104
|
+
tlsSocket.destroy();
|
|
105
|
+
}
|
|
106
|
+
if (backendSocket && !backendSocket.destroyed) {
|
|
107
|
+
backendSocket.destroy();
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
// If forwarding is setup, setupBidirectionalForwarding will handle cleanup
|
|
111
|
+
};
|
|
112
|
+
setupSocketHandlers(tlsSocket, tlsCleanupHandler, undefined, 'tls');
|
|
103
113
|
// Set timeout
|
|
104
114
|
const timeout = this.getTimeout();
|
|
105
115
|
tlsSocket.setTimeout(timeout);
|
|
@@ -108,7 +118,7 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
108
118
|
remoteAddress,
|
|
109
119
|
error: 'TLS connection timeout'
|
|
110
120
|
});
|
|
111
|
-
|
|
121
|
+
tlsCleanupHandler('timeout');
|
|
112
122
|
});
|
|
113
123
|
// Handle TLS data
|
|
114
124
|
tlsSocket.on('data', (data) => {
|
|
@@ -149,27 +159,32 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
149
159
|
backendSocket.write(dataBuffer);
|
|
150
160
|
dataBuffer = Buffer.alloc(0);
|
|
151
161
|
}
|
|
152
|
-
//
|
|
153
|
-
|
|
154
|
-
|
|
162
|
+
// Now set up bidirectional forwarding with proper cleanup
|
|
163
|
+
forwardingSetup = true;
|
|
164
|
+
setupBidirectionalForwarding(tlsSocket, backendSocket, {
|
|
165
|
+
onCleanup: (reason) => {
|
|
166
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
167
|
+
remoteAddress,
|
|
168
|
+
reason
|
|
169
|
+
});
|
|
170
|
+
dataBuffer = Buffer.alloc(0);
|
|
171
|
+
connectionEstablished = false;
|
|
172
|
+
forwardingSetup = false;
|
|
173
|
+
},
|
|
174
|
+
enableHalfOpen: false // Close both when one closes
|
|
175
|
+
});
|
|
155
176
|
}
|
|
156
177
|
});
|
|
157
|
-
//
|
|
158
|
-
const newHandleClose = createSocketCleanupHandler(tlsSocket, backendSocket, (reason) => {
|
|
159
|
-
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
160
|
-
remoteAddress,
|
|
161
|
-
reason
|
|
162
|
-
});
|
|
163
|
-
dataBuffer = Buffer.alloc(0);
|
|
164
|
-
connectionEstablished = false;
|
|
165
|
-
});
|
|
166
|
-
// Set up handlers for backend socket
|
|
167
|
-
setupSocketHandlers(backendSocket, newHandleClose, undefined, 'backend');
|
|
178
|
+
// Additional error logging for backend socket
|
|
168
179
|
backendSocket.on('error', (error) => {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
180
|
+
if (!connectionEstablished) {
|
|
181
|
+
// Connection failed during setup
|
|
182
|
+
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
183
|
+
remoteAddress,
|
|
184
|
+
error: `Target connection error: ${error.message}`
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
// If connected, setupBidirectionalForwarding handles cleanup
|
|
173
188
|
});
|
|
174
189
|
}
|
|
175
190
|
});
|
|
@@ -258,4 +273,4 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
258
273
|
}
|
|
259
274
|
}
|
|
260
275
|
}
|
|
261
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"https-terminate-to-http-handler.js","sourceRoot":"","sources":["../../../ts/forwarding/handlers/https-terminate-to-http-handler.ts"],"names":[],"mappings":"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"}
|
|
276
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"https-terminate-to-http-handler.js","sourceRoot":"","sources":["../../../ts/forwarding/handlers/https-terminate-to-http-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { ForwardingHandler } from './base-handler.js';
|
|
3
3
|
import { ForwardingHandlerEvents } from '../config/forwarding-types.js';
|
|
4
|
-
import {
|
|
4
|
+
import { setupSocketHandlers, createSocketWithErrorHandler, setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
|
|
5
5
|
/**
|
|
6
6
|
* Handler for HTTPS termination with HTTPS backend
|
|
7
7
|
*/
|
|
@@ -85,15 +85,23 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
85
85
|
});
|
|
86
86
|
// Variable to track backend socket
|
|
87
87
|
let backendSocket = null;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
88
|
+
let isConnectedToBackend = false;
|
|
89
|
+
// Set up initial error handling for TLS socket
|
|
90
|
+
const tlsCleanupHandler = (reason) => {
|
|
91
|
+
if (!isConnectedToBackend) {
|
|
92
|
+
// If backend not connected yet, just emit disconnected event
|
|
93
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
94
|
+
remoteAddress,
|
|
95
|
+
reason
|
|
96
|
+
});
|
|
97
|
+
// Cleanup TLS socket if needed
|
|
98
|
+
if (!tlsSocket.destroyed) {
|
|
99
|
+
tlsSocket.destroy();
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
// If connected to backend, setupBidirectionalForwarding will handle cleanup
|
|
103
|
+
};
|
|
104
|
+
setupSocketHandlers(tlsSocket, tlsCleanupHandler, undefined, 'tls');
|
|
97
105
|
// Set timeout
|
|
98
106
|
const timeout = this.getTimeout();
|
|
99
107
|
tlsSocket.setTimeout(timeout);
|
|
@@ -102,7 +110,7 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
102
110
|
remoteAddress,
|
|
103
111
|
error: 'TLS connection timeout'
|
|
104
112
|
});
|
|
105
|
-
|
|
113
|
+
tlsCleanupHandler('timeout');
|
|
106
114
|
});
|
|
107
115
|
// Get the target from configuration
|
|
108
116
|
const target = this.getTargetFromConfig();
|
|
@@ -114,38 +122,49 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
114
122
|
// In a real implementation, we would configure TLS options
|
|
115
123
|
rejectUnauthorized: false // For testing only, never use in production
|
|
116
124
|
}, () => {
|
|
125
|
+
isConnectedToBackend = true;
|
|
117
126
|
this.emit(ForwardingHandlerEvents.DATA_FORWARDED, {
|
|
118
127
|
direction: 'outbound',
|
|
119
128
|
target: `${target.host}:${target.port}`,
|
|
120
129
|
tls: true
|
|
121
130
|
});
|
|
122
|
-
// Set up bidirectional
|
|
123
|
-
tlsSocket
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
+
// Set up bidirectional forwarding with proper cleanup
|
|
132
|
+
setupBidirectionalForwarding(tlsSocket, backendSocket, {
|
|
133
|
+
onCleanup: (reason) => {
|
|
134
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
135
|
+
remoteAddress,
|
|
136
|
+
reason
|
|
137
|
+
});
|
|
138
|
+
},
|
|
139
|
+
enableHalfOpen: false // Close both when one closes
|
|
140
|
+
});
|
|
141
|
+
// Set timeout for backend socket
|
|
142
|
+
backendSocket.setTimeout(timeout);
|
|
143
|
+
backendSocket.on('timeout', () => {
|
|
144
|
+
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
145
|
+
remoteAddress,
|
|
146
|
+
error: 'Backend connection timeout'
|
|
147
|
+
});
|
|
148
|
+
// Let setupBidirectionalForwarding handle the cleanup
|
|
131
149
|
});
|
|
132
150
|
});
|
|
133
|
-
//
|
|
134
|
-
setupSocketHandlers(backendSocket, newHandleClose, undefined, 'backend');
|
|
151
|
+
// Handle backend connection errors
|
|
135
152
|
backendSocket.on('error', (error) => {
|
|
136
153
|
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
137
154
|
remoteAddress,
|
|
138
155
|
error: `Backend connection error: ${error.message}`
|
|
139
156
|
});
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
157
|
+
if (!isConnectedToBackend) {
|
|
158
|
+
// Connection failed, clean up TLS socket
|
|
159
|
+
if (!tlsSocket.destroyed) {
|
|
160
|
+
tlsSocket.destroy();
|
|
161
|
+
}
|
|
162
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
163
|
+
remoteAddress,
|
|
164
|
+
reason: `backend_connection_failed: ${error.message}`
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
// If connected, let setupBidirectionalForwarding handle cleanup
|
|
149
168
|
});
|
|
150
169
|
};
|
|
151
170
|
// Wait for the TLS handshake to complete before connecting to backend
|
|
@@ -239,4 +258,4 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
239
258
|
}
|
|
240
259
|
}
|
|
241
260
|
}
|
|
242
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
261
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"https-terminate-to-https-handler.js","sourceRoot":"","sources":["../../../ts/forwarding/handlers/https-terminate-to-https-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.5.
|
|
3
|
+
"version": "19.5.19",
|
|
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
|
@@ -640,4 +640,25 @@ export function setupBidirectionalForwarding(
|
|
|
640
640
|
- **Neutral**: Half-open connections still available when needed (opt-in)
|
|
641
641
|
|
|
642
642
|
### Migration Notes
|
|
643
|
-
No configuration changes needed. The fix applies to all proxy chains automatically.
|
|
643
|
+
No configuration changes needed. The fix applies to all proxy chains automatically.
|
|
644
|
+
|
|
645
|
+
## Socket Cleanup Handler Deprecation (v19.5.15+)
|
|
646
|
+
|
|
647
|
+
### Issue
|
|
648
|
+
The deprecated `createSocketCleanupHandler()` function was still being used in forwarding handlers, despite being marked as deprecated.
|
|
649
|
+
|
|
650
|
+
### Solution
|
|
651
|
+
Updated all forwarding handlers to use the new centralized socket utilities:
|
|
652
|
+
1. **Replaced `createSocketCleanupHandler()`** with `setupBidirectionalForwarding()` in:
|
|
653
|
+
- `https-terminate-to-https-handler.ts`
|
|
654
|
+
- `https-terminate-to-http-handler.ts`
|
|
655
|
+
2. **Removed deprecated function** from `socket-utils.ts`
|
|
656
|
+
|
|
657
|
+
### Benefits
|
|
658
|
+
- Consistent socket handling across all handlers
|
|
659
|
+
- Proper cleanup in proxy chains (no half-open connections by default)
|
|
660
|
+
- Better backpressure handling with the centralized implementation
|
|
661
|
+
- Reduced code duplication
|
|
662
|
+
|
|
663
|
+
### Migration Notes
|
|
664
|
+
No user-facing changes. All forwarding handlers now use the same robust socket handling as the main SmartProxy connection handler.
|
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.5.
|
|
6
|
+
version: '19.5.19',
|
|
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
|
}
|
|
@@ -67,37 +67,6 @@ export function cleanupSocket(
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
/**
|
|
71
|
-
* Create a cleanup handler for paired sockets (client and server)
|
|
72
|
-
* @param clientSocket The client socket
|
|
73
|
-
* @param serverSocket The server socket (optional)
|
|
74
|
-
* @param onCleanup Optional callback when cleanup is done
|
|
75
|
-
* @returns A cleanup function that can be called multiple times safely
|
|
76
|
-
* @deprecated Use createIndependentSocketHandlers for better half-open support
|
|
77
|
-
*/
|
|
78
|
-
export function createSocketCleanupHandler(
|
|
79
|
-
clientSocket: plugins.net.Socket | plugins.tls.TLSSocket,
|
|
80
|
-
serverSocket?: plugins.net.Socket | plugins.tls.TLSSocket | null,
|
|
81
|
-
onCleanup?: (reason: string) => void
|
|
82
|
-
): (reason: string) => void {
|
|
83
|
-
let cleanedUp = false;
|
|
84
|
-
|
|
85
|
-
return (reason: string) => {
|
|
86
|
-
if (cleanedUp) return;
|
|
87
|
-
cleanedUp = true;
|
|
88
|
-
|
|
89
|
-
// Cleanup both sockets (old behavior - too aggressive)
|
|
90
|
-
cleanupSocket(clientSocket, 'client', { immediate: true });
|
|
91
|
-
if (serverSocket) {
|
|
92
|
-
cleanupSocket(serverSocket, 'server', { immediate: true });
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
// Call cleanup callback if provided
|
|
96
|
-
if (onCleanup) {
|
|
97
|
-
onCleanup(reason);
|
|
98
|
-
}
|
|
99
|
-
};
|
|
100
|
-
}
|
|
101
70
|
|
|
102
71
|
/**
|
|
103
72
|
* Create independent cleanup handlers for paired sockets that support half-open connections
|
|
@@ -278,19 +247,6 @@ export function setupBidirectionalForwarding(
|
|
|
278
247
|
return { cleanupClient, cleanupServer };
|
|
279
248
|
}
|
|
280
249
|
|
|
281
|
-
/**
|
|
282
|
-
* Pipe two sockets together with proper cleanup on either end
|
|
283
|
-
* @param socket1 First socket
|
|
284
|
-
* @param socket2 Second socket
|
|
285
|
-
*/
|
|
286
|
-
export function pipeSockets(
|
|
287
|
-
socket1: plugins.net.Socket | plugins.tls.TLSSocket,
|
|
288
|
-
socket2: plugins.net.Socket | plugins.tls.TLSSocket
|
|
289
|
-
): void {
|
|
290
|
-
socket1.pipe(socket2);
|
|
291
|
-
socket2.pipe(socket1);
|
|
292
|
-
}
|
|
293
|
-
|
|
294
250
|
/**
|
|
295
251
|
* Create a socket with immediate error handling to prevent crashes
|
|
296
252
|
* @param options Socket creation options
|
|
@@ -2,7 +2,7 @@ import * as plugins from '../../plugins.js';
|
|
|
2
2
|
import { ForwardingHandler } from './base-handler.js';
|
|
3
3
|
import type { IForwardConfig } from '../config/forwarding-types.js';
|
|
4
4
|
import { ForwardingHandlerEvents } from '../config/forwarding-types.js';
|
|
5
|
-
import {
|
|
5
|
+
import { setupSocketHandlers, createSocketWithErrorHandler, setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Handler for HTTPS termination with HTTP backend
|
|
@@ -100,19 +100,30 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
100
100
|
let backendSocket: plugins.net.Socket | null = null;
|
|
101
101
|
let dataBuffer = Buffer.alloc(0);
|
|
102
102
|
let connectionEstablished = false;
|
|
103
|
+
let forwardingSetup = false;
|
|
103
104
|
|
|
104
|
-
//
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
105
|
+
// Set up initial error handling for TLS socket
|
|
106
|
+
const tlsCleanupHandler = (reason: string) => {
|
|
107
|
+
if (!forwardingSetup) {
|
|
108
|
+
// If forwarding not set up yet, emit disconnected and cleanup
|
|
109
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
110
|
+
remoteAddress,
|
|
111
|
+
reason
|
|
112
|
+
});
|
|
113
|
+
dataBuffer = Buffer.alloc(0);
|
|
114
|
+
connectionEstablished = false;
|
|
115
|
+
|
|
116
|
+
if (!tlsSocket.destroyed) {
|
|
117
|
+
tlsSocket.destroy();
|
|
118
|
+
}
|
|
119
|
+
if (backendSocket && !backendSocket.destroyed) {
|
|
120
|
+
backendSocket.destroy();
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
// If forwarding is setup, setupBidirectionalForwarding will handle cleanup
|
|
124
|
+
};
|
|
113
125
|
|
|
114
|
-
|
|
115
|
-
setupSocketHandlers(tlsSocket, handleClose, undefined, 'tls');
|
|
126
|
+
setupSocketHandlers(tlsSocket, tlsCleanupHandler, undefined, 'tls');
|
|
116
127
|
|
|
117
128
|
// Set timeout
|
|
118
129
|
const timeout = this.getTimeout();
|
|
@@ -123,7 +134,7 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
123
134
|
remoteAddress,
|
|
124
135
|
error: 'TLS connection timeout'
|
|
125
136
|
});
|
|
126
|
-
|
|
137
|
+
tlsCleanupHandler('timeout');
|
|
127
138
|
});
|
|
128
139
|
|
|
129
140
|
// Handle TLS data
|
|
@@ -172,30 +183,33 @@ export class HttpsTerminateToHttpHandler extends ForwardingHandler {
|
|
|
172
183
|
dataBuffer = Buffer.alloc(0);
|
|
173
184
|
}
|
|
174
185
|
|
|
175
|
-
//
|
|
176
|
-
|
|
177
|
-
|
|
186
|
+
// Now set up bidirectional forwarding with proper cleanup
|
|
187
|
+
forwardingSetup = true;
|
|
188
|
+
setupBidirectionalForwarding(tlsSocket, backendSocket!, {
|
|
189
|
+
onCleanup: (reason) => {
|
|
190
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
191
|
+
remoteAddress,
|
|
192
|
+
reason
|
|
193
|
+
});
|
|
194
|
+
dataBuffer = Buffer.alloc(0);
|
|
195
|
+
connectionEstablished = false;
|
|
196
|
+
forwardingSetup = false;
|
|
197
|
+
},
|
|
198
|
+
enableHalfOpen: false // Close both when one closes
|
|
199
|
+
});
|
|
178
200
|
}
|
|
179
201
|
});
|
|
180
202
|
|
|
181
|
-
//
|
|
182
|
-
const newHandleClose = createSocketCleanupHandler(tlsSocket, backendSocket, (reason) => {
|
|
183
|
-
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
184
|
-
remoteAddress,
|
|
185
|
-
reason
|
|
186
|
-
});
|
|
187
|
-
dataBuffer = Buffer.alloc(0);
|
|
188
|
-
connectionEstablished = false;
|
|
189
|
-
});
|
|
190
|
-
|
|
191
|
-
// Set up handlers for backend socket
|
|
192
|
-
setupSocketHandlers(backendSocket, newHandleClose, undefined, 'backend');
|
|
193
|
-
|
|
203
|
+
// Additional error logging for backend socket
|
|
194
204
|
backendSocket.on('error', (error) => {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
205
|
+
if (!connectionEstablished) {
|
|
206
|
+
// Connection failed during setup
|
|
207
|
+
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
208
|
+
remoteAddress,
|
|
209
|
+
error: `Target connection error: ${error.message}`
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
// If connected, setupBidirectionalForwarding handles cleanup
|
|
199
213
|
});
|
|
200
214
|
}
|
|
201
215
|
});
|
|
@@ -2,7 +2,7 @@ import * as plugins from '../../plugins.js';
|
|
|
2
2
|
import { ForwardingHandler } from './base-handler.js';
|
|
3
3
|
import type { IForwardConfig } from '../config/forwarding-types.js';
|
|
4
4
|
import { ForwardingHandlerEvents } from '../config/forwarding-types.js';
|
|
5
|
-
import {
|
|
5
|
+
import { setupSocketHandlers, createSocketWithErrorHandler, setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* Handler for HTTPS termination with HTTPS backend
|
|
@@ -96,17 +96,26 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
96
96
|
|
|
97
97
|
// Variable to track backend socket
|
|
98
98
|
let backendSocket: plugins.tls.TLSSocket | null = null;
|
|
99
|
+
let isConnectedToBackend = false;
|
|
99
100
|
|
|
100
|
-
//
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
101
|
+
// Set up initial error handling for TLS socket
|
|
102
|
+
const tlsCleanupHandler = (reason: string) => {
|
|
103
|
+
if (!isConnectedToBackend) {
|
|
104
|
+
// If backend not connected yet, just emit disconnected event
|
|
105
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
106
|
+
remoteAddress,
|
|
107
|
+
reason
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
// Cleanup TLS socket if needed
|
|
111
|
+
if (!tlsSocket.destroyed) {
|
|
112
|
+
tlsSocket.destroy();
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// If connected to backend, setupBidirectionalForwarding will handle cleanup
|
|
116
|
+
};
|
|
107
117
|
|
|
108
|
-
|
|
109
|
-
setupSocketHandlers(tlsSocket, handleClose, undefined, 'tls');
|
|
118
|
+
setupSocketHandlers(tlsSocket, tlsCleanupHandler, undefined, 'tls');
|
|
110
119
|
|
|
111
120
|
// Set timeout
|
|
112
121
|
const timeout = this.getTimeout();
|
|
@@ -117,7 +126,7 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
117
126
|
remoteAddress,
|
|
118
127
|
error: 'TLS connection timeout'
|
|
119
128
|
});
|
|
120
|
-
|
|
129
|
+
tlsCleanupHandler('timeout');
|
|
121
130
|
});
|
|
122
131
|
|
|
123
132
|
// Get the target from configuration
|
|
@@ -131,44 +140,55 @@ export class HttpsTerminateToHttpsHandler extends ForwardingHandler {
|
|
|
131
140
|
// In a real implementation, we would configure TLS options
|
|
132
141
|
rejectUnauthorized: false // For testing only, never use in production
|
|
133
142
|
}, () => {
|
|
143
|
+
isConnectedToBackend = true;
|
|
144
|
+
|
|
134
145
|
this.emit(ForwardingHandlerEvents.DATA_FORWARDED, {
|
|
135
146
|
direction: 'outbound',
|
|
136
147
|
target: `${target.host}:${target.port}`,
|
|
137
148
|
tls: true
|
|
138
149
|
});
|
|
139
150
|
|
|
140
|
-
// Set up bidirectional
|
|
141
|
-
tlsSocket
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
151
|
+
// Set up bidirectional forwarding with proper cleanup
|
|
152
|
+
setupBidirectionalForwarding(tlsSocket, backendSocket!, {
|
|
153
|
+
onCleanup: (reason) => {
|
|
154
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
155
|
+
remoteAddress,
|
|
156
|
+
reason
|
|
157
|
+
});
|
|
158
|
+
},
|
|
159
|
+
enableHalfOpen: false // Close both when one closes
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
// Set timeout for backend socket
|
|
163
|
+
backendSocket!.setTimeout(timeout);
|
|
164
|
+
|
|
165
|
+
backendSocket!.on('timeout', () => {
|
|
166
|
+
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
167
|
+
remoteAddress,
|
|
168
|
+
error: 'Backend connection timeout'
|
|
169
|
+
});
|
|
170
|
+
// Let setupBidirectionalForwarding handle the cleanup
|
|
150
171
|
});
|
|
151
172
|
});
|
|
152
173
|
|
|
153
|
-
//
|
|
154
|
-
setupSocketHandlers(backendSocket, newHandleClose, undefined, 'backend');
|
|
155
|
-
|
|
174
|
+
// Handle backend connection errors
|
|
156
175
|
backendSocket.on('error', (error) => {
|
|
157
176
|
this.emit(ForwardingHandlerEvents.ERROR, {
|
|
158
177
|
remoteAddress,
|
|
159
178
|
error: `Backend connection error: ${error.message}`
|
|
160
179
|
});
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
180
|
+
|
|
181
|
+
if (!isConnectedToBackend) {
|
|
182
|
+
// Connection failed, clean up TLS socket
|
|
183
|
+
if (!tlsSocket.destroyed) {
|
|
184
|
+
tlsSocket.destroy();
|
|
185
|
+
}
|
|
186
|
+
this.emit(ForwardingHandlerEvents.DISCONNECTED, {
|
|
187
|
+
remoteAddress,
|
|
188
|
+
reason: `backend_connection_failed: ${error.message}`
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
// If connected, let setupBidirectionalForwarding handle cleanup
|
|
172
192
|
});
|
|
173
193
|
};
|
|
174
194
|
|