@push.rocks/smartproxy 19.5.17 → 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 +17 -14
- package/dist_ts/core/utils/socket-utils.js +61 -37
- 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/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +21 -26
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +21 -53
- package/package.json +1 -1
- package/readme.hints.md +80 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/core/utils/socket-utils.ts +85 -45
- package/ts/forwarding/handlers/https-terminate-to-http-handler.ts +47 -33
- package/ts/forwarding/handlers/https-terminate-to-https-handler.ts +55 -35
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +20 -30
- package/ts/proxies/smart-proxy/route-connection-handler.ts +20 -64
|
@@ -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
|
|
@@ -34,7 +25,9 @@ export declare function createSocketCleanupHandler(clientSocket: plugins.net.Soc
|
|
|
34
25
|
* @param onBothClosed Callback when both sockets are closed
|
|
35
26
|
* @returns Independent cleanup functions for each socket
|
|
36
27
|
*/
|
|
37
|
-
export declare function createIndependentSocketHandlers(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, onBothClosed: (reason: string) => void
|
|
28
|
+
export declare function createIndependentSocketHandlers(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, onBothClosed: (reason: string) => void, options?: {
|
|
29
|
+
enableHalfOpen?: boolean;
|
|
30
|
+
}): {
|
|
38
31
|
cleanupClient: (reason: string) => Promise<void>;
|
|
39
32
|
cleanupServer: (reason: string) => Promise<void>;
|
|
40
33
|
};
|
|
@@ -47,11 +40,21 @@ export declare function createIndependentSocketHandlers(clientSocket: plugins.ne
|
|
|
47
40
|
*/
|
|
48
41
|
export declare function setupSocketHandlers(socket: plugins.net.Socket | plugins.tls.TLSSocket, handleClose: (reason: string) => void, handleTimeout?: (socket: plugins.net.Socket | plugins.tls.TLSSocket) => void, errorPrefix?: string): void;
|
|
49
42
|
/**
|
|
50
|
-
*
|
|
51
|
-
* @param
|
|
52
|
-
* @param
|
|
43
|
+
* Setup bidirectional data forwarding between two sockets with proper cleanup
|
|
44
|
+
* @param clientSocket The client/incoming socket
|
|
45
|
+
* @param serverSocket The server/outgoing socket
|
|
46
|
+
* @param handlers Object containing optional handlers for data and cleanup
|
|
47
|
+
* @returns Cleanup functions for both sockets
|
|
53
48
|
*/
|
|
54
|
-
export declare function
|
|
49
|
+
export declare function setupBidirectionalForwarding(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, handlers: {
|
|
50
|
+
onClientData?: (chunk: Buffer) => void;
|
|
51
|
+
onServerData?: (chunk: Buffer) => void;
|
|
52
|
+
onCleanup: (reason: string) => void;
|
|
53
|
+
enableHalfOpen?: boolean;
|
|
54
|
+
}): {
|
|
55
|
+
cleanupClient: (reason: string) => Promise<void>;
|
|
56
|
+
cleanupServer: (reason: string) => Promise<void>;
|
|
57
|
+
};
|
|
55
58
|
/**
|
|
56
59
|
* Create a socket with immediate error handling to prevent crashes
|
|
57
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
|
|
@@ -79,7 +54,7 @@ export function createSocketCleanupHandler(clientSocket, serverSocket, onCleanup
|
|
|
79
54
|
* @param onBothClosed Callback when both sockets are closed
|
|
80
55
|
* @returns Independent cleanup functions for each socket
|
|
81
56
|
*/
|
|
82
|
-
export function createIndependentSocketHandlers(clientSocket, serverSocket, onBothClosed) {
|
|
57
|
+
export function createIndependentSocketHandlers(clientSocket, serverSocket, onBothClosed, options = {}) {
|
|
83
58
|
let clientClosed = false;
|
|
84
59
|
let serverClosed = false;
|
|
85
60
|
let clientReason = '';
|
|
@@ -94,8 +69,12 @@ export function createIndependentSocketHandlers(clientSocket, serverSocket, onBo
|
|
|
94
69
|
return;
|
|
95
70
|
clientClosed = true;
|
|
96
71
|
clientReason = reason;
|
|
97
|
-
//
|
|
98
|
-
if (!serverClosed &&
|
|
72
|
+
// Default behavior: close both sockets when one closes (required for proxy chains)
|
|
73
|
+
if (!serverClosed && !options.enableHalfOpen) {
|
|
74
|
+
serverSocket.destroy();
|
|
75
|
+
}
|
|
76
|
+
// Half-open support (opt-in only)
|
|
77
|
+
if (!serverClosed && serverSocket.writable && options.enableHalfOpen) {
|
|
99
78
|
// Half-close: stop reading from client, let server finish
|
|
100
79
|
clientSocket.pause();
|
|
101
80
|
clientSocket.unpipe(serverSocket);
|
|
@@ -111,8 +90,12 @@ export function createIndependentSocketHandlers(clientSocket, serverSocket, onBo
|
|
|
111
90
|
return;
|
|
112
91
|
serverClosed = true;
|
|
113
92
|
serverReason = reason;
|
|
114
|
-
//
|
|
115
|
-
if (!clientClosed &&
|
|
93
|
+
// Default behavior: close both sockets when one closes (required for proxy chains)
|
|
94
|
+
if (!clientClosed && !options.enableHalfOpen) {
|
|
95
|
+
clientSocket.destroy();
|
|
96
|
+
}
|
|
97
|
+
// Half-open support (opt-in only)
|
|
98
|
+
if (!clientClosed && clientSocket.writable && options.enableHalfOpen) {
|
|
116
99
|
// Half-close: stop reading from server, let client finish
|
|
117
100
|
serverSocket.pause();
|
|
118
101
|
serverSocket.unpipe(clientSocket);
|
|
@@ -152,13 +135,54 @@ export function setupSocketHandlers(socket, handleClose, handleTimeout, errorPre
|
|
|
152
135
|
});
|
|
153
136
|
}
|
|
154
137
|
/**
|
|
155
|
-
*
|
|
156
|
-
* @param
|
|
157
|
-
* @param
|
|
138
|
+
* Setup bidirectional data forwarding between two sockets with proper cleanup
|
|
139
|
+
* @param clientSocket The client/incoming socket
|
|
140
|
+
* @param serverSocket The server/outgoing socket
|
|
141
|
+
* @param handlers Object containing optional handlers for data and cleanup
|
|
142
|
+
* @returns Cleanup functions for both sockets
|
|
158
143
|
*/
|
|
159
|
-
export function
|
|
160
|
-
|
|
161
|
-
|
|
144
|
+
export function setupBidirectionalForwarding(clientSocket, serverSocket, handlers) {
|
|
145
|
+
// Set up cleanup handlers
|
|
146
|
+
const { cleanupClient, cleanupServer } = createIndependentSocketHandlers(clientSocket, serverSocket, handlers.onCleanup, { enableHalfOpen: handlers.enableHalfOpen });
|
|
147
|
+
// Set up error and close handlers
|
|
148
|
+
setupSocketHandlers(clientSocket, cleanupClient, undefined, 'client');
|
|
149
|
+
setupSocketHandlers(serverSocket, cleanupServer, undefined, 'server');
|
|
150
|
+
// Set up data forwarding with backpressure handling
|
|
151
|
+
clientSocket.on('data', (chunk) => {
|
|
152
|
+
if (handlers.onClientData) {
|
|
153
|
+
handlers.onClientData(chunk);
|
|
154
|
+
}
|
|
155
|
+
if (serverSocket.writable) {
|
|
156
|
+
const flushed = serverSocket.write(chunk);
|
|
157
|
+
// Handle backpressure
|
|
158
|
+
if (!flushed) {
|
|
159
|
+
clientSocket.pause();
|
|
160
|
+
serverSocket.once('drain', () => {
|
|
161
|
+
if (!clientSocket.destroyed) {
|
|
162
|
+
clientSocket.resume();
|
|
163
|
+
}
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
serverSocket.on('data', (chunk) => {
|
|
169
|
+
if (handlers.onServerData) {
|
|
170
|
+
handlers.onServerData(chunk);
|
|
171
|
+
}
|
|
172
|
+
if (clientSocket.writable) {
|
|
173
|
+
const flushed = clientSocket.write(chunk);
|
|
174
|
+
// Handle backpressure
|
|
175
|
+
if (!flushed) {
|
|
176
|
+
serverSocket.pause();
|
|
177
|
+
clientSocket.once('drain', () => {
|
|
178
|
+
if (!serverSocket.destroyed) {
|
|
179
|
+
serverSocket.resume();
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
});
|
|
185
|
+
return { cleanupClient, cleanupServer };
|
|
162
186
|
}
|
|
163
187
|
/**
|
|
164
188
|
* Create a socket with immediate error handling to prevent crashes
|
|
@@ -188,4 +212,4 @@ export function createSocketWithErrorHandler(options) {
|
|
|
188
212
|
socket.connect(port, host);
|
|
189
213
|
return socket;
|
|
190
214
|
}
|
|
191
|
-
//# 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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"}
|