@push.rocks/smartproxy 19.5.16 → 19.5.18
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/core/utils/socket-utils.d.ts +19 -1
- package/dist_ts/core/utils/socket-utils.js +64 -6
- package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +21 -26
- package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +0 -5
- package/dist_ts/proxies/smart-proxy/route-connection-handler.js +85 -132
- package/package.json +1 -1
- package/readme.hints.md +118 -1
- package/ts/core/utils/socket-utils.ts +89 -5
- package/ts/proxies/smart-proxy/http-proxy-bridge.ts +20 -30
- package/ts/proxies/smart-proxy/route-connection-handler.ts +93 -170
|
@@ -34,7 +34,9 @@ export declare function createSocketCleanupHandler(clientSocket: plugins.net.Soc
|
|
|
34
34
|
* @param onBothClosed Callback when both sockets are closed
|
|
35
35
|
* @returns Independent cleanup functions for each socket
|
|
36
36
|
*/
|
|
37
|
-
export declare function createIndependentSocketHandlers(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, onBothClosed: (reason: string) => void
|
|
37
|
+
export declare function createIndependentSocketHandlers(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, onBothClosed: (reason: string) => void, options?: {
|
|
38
|
+
enableHalfOpen?: boolean;
|
|
39
|
+
}): {
|
|
38
40
|
cleanupClient: (reason: string) => Promise<void>;
|
|
39
41
|
cleanupServer: (reason: string) => Promise<void>;
|
|
40
42
|
};
|
|
@@ -46,6 +48,22 @@ export declare function createIndependentSocketHandlers(clientSocket: plugins.ne
|
|
|
46
48
|
* @param errorPrefix Optional prefix for error messages
|
|
47
49
|
*/
|
|
48
50
|
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;
|
|
51
|
+
/**
|
|
52
|
+
* Setup bidirectional data forwarding between two sockets with proper cleanup
|
|
53
|
+
* @param clientSocket The client/incoming socket
|
|
54
|
+
* @param serverSocket The server/outgoing socket
|
|
55
|
+
* @param handlers Object containing optional handlers for data and cleanup
|
|
56
|
+
* @returns Cleanup functions for both sockets
|
|
57
|
+
*/
|
|
58
|
+
export declare function setupBidirectionalForwarding(clientSocket: plugins.net.Socket | plugins.tls.TLSSocket, serverSocket: plugins.net.Socket | plugins.tls.TLSSocket, handlers: {
|
|
59
|
+
onClientData?: (chunk: Buffer) => void;
|
|
60
|
+
onServerData?: (chunk: Buffer) => void;
|
|
61
|
+
onCleanup: (reason: string) => void;
|
|
62
|
+
enableHalfOpen?: boolean;
|
|
63
|
+
}): {
|
|
64
|
+
cleanupClient: (reason: string) => Promise<void>;
|
|
65
|
+
cleanupServer: (reason: string) => Promise<void>;
|
|
66
|
+
};
|
|
49
67
|
/**
|
|
50
68
|
* Pipe two sockets together with proper cleanup on either end
|
|
51
69
|
* @param socket1 First socket
|
|
@@ -79,7 +79,7 @@ export function createSocketCleanupHandler(clientSocket, serverSocket, onCleanup
|
|
|
79
79
|
* @param onBothClosed Callback when both sockets are closed
|
|
80
80
|
* @returns Independent cleanup functions for each socket
|
|
81
81
|
*/
|
|
82
|
-
export function createIndependentSocketHandlers(clientSocket, serverSocket, onBothClosed) {
|
|
82
|
+
export function createIndependentSocketHandlers(clientSocket, serverSocket, onBothClosed, options = {}) {
|
|
83
83
|
let clientClosed = false;
|
|
84
84
|
let serverClosed = false;
|
|
85
85
|
let clientReason = '';
|
|
@@ -94,8 +94,12 @@ export function createIndependentSocketHandlers(clientSocket, serverSocket, onBo
|
|
|
94
94
|
return;
|
|
95
95
|
clientClosed = true;
|
|
96
96
|
clientReason = reason;
|
|
97
|
-
//
|
|
98
|
-
if (!serverClosed &&
|
|
97
|
+
// Default behavior: close both sockets when one closes (required for proxy chains)
|
|
98
|
+
if (!serverClosed && !options.enableHalfOpen) {
|
|
99
|
+
serverSocket.destroy();
|
|
100
|
+
}
|
|
101
|
+
// Half-open support (opt-in only)
|
|
102
|
+
if (!serverClosed && serverSocket.writable && options.enableHalfOpen) {
|
|
99
103
|
// Half-close: stop reading from client, let server finish
|
|
100
104
|
clientSocket.pause();
|
|
101
105
|
clientSocket.unpipe(serverSocket);
|
|
@@ -111,8 +115,12 @@ export function createIndependentSocketHandlers(clientSocket, serverSocket, onBo
|
|
|
111
115
|
return;
|
|
112
116
|
serverClosed = true;
|
|
113
117
|
serverReason = reason;
|
|
114
|
-
//
|
|
115
|
-
if (!clientClosed &&
|
|
118
|
+
// Default behavior: close both sockets when one closes (required for proxy chains)
|
|
119
|
+
if (!clientClosed && !options.enableHalfOpen) {
|
|
120
|
+
clientSocket.destroy();
|
|
121
|
+
}
|
|
122
|
+
// Half-open support (opt-in only)
|
|
123
|
+
if (!clientClosed && clientSocket.writable && options.enableHalfOpen) {
|
|
116
124
|
// Half-close: stop reading from server, let client finish
|
|
117
125
|
serverSocket.pause();
|
|
118
126
|
serverSocket.unpipe(clientSocket);
|
|
@@ -151,6 +159,56 @@ export function setupSocketHandlers(socket, handleClose, handleTimeout, errorPre
|
|
|
151
159
|
}
|
|
152
160
|
});
|
|
153
161
|
}
|
|
162
|
+
/**
|
|
163
|
+
* Setup bidirectional data forwarding between two sockets with proper cleanup
|
|
164
|
+
* @param clientSocket The client/incoming socket
|
|
165
|
+
* @param serverSocket The server/outgoing socket
|
|
166
|
+
* @param handlers Object containing optional handlers for data and cleanup
|
|
167
|
+
* @returns Cleanup functions for both sockets
|
|
168
|
+
*/
|
|
169
|
+
export function setupBidirectionalForwarding(clientSocket, serverSocket, handlers) {
|
|
170
|
+
// Set up cleanup handlers
|
|
171
|
+
const { cleanupClient, cleanupServer } = createIndependentSocketHandlers(clientSocket, serverSocket, handlers.onCleanup, { enableHalfOpen: handlers.enableHalfOpen });
|
|
172
|
+
// Set up error and close handlers
|
|
173
|
+
setupSocketHandlers(clientSocket, cleanupClient, undefined, 'client');
|
|
174
|
+
setupSocketHandlers(serverSocket, cleanupServer, undefined, 'server');
|
|
175
|
+
// Set up data forwarding with backpressure handling
|
|
176
|
+
clientSocket.on('data', (chunk) => {
|
|
177
|
+
if (handlers.onClientData) {
|
|
178
|
+
handlers.onClientData(chunk);
|
|
179
|
+
}
|
|
180
|
+
if (serverSocket.writable) {
|
|
181
|
+
const flushed = serverSocket.write(chunk);
|
|
182
|
+
// Handle backpressure
|
|
183
|
+
if (!flushed) {
|
|
184
|
+
clientSocket.pause();
|
|
185
|
+
serverSocket.once('drain', () => {
|
|
186
|
+
if (!clientSocket.destroyed) {
|
|
187
|
+
clientSocket.resume();
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
serverSocket.on('data', (chunk) => {
|
|
194
|
+
if (handlers.onServerData) {
|
|
195
|
+
handlers.onServerData(chunk);
|
|
196
|
+
}
|
|
197
|
+
if (clientSocket.writable) {
|
|
198
|
+
const flushed = clientSocket.write(chunk);
|
|
199
|
+
// Handle backpressure
|
|
200
|
+
if (!flushed) {
|
|
201
|
+
serverSocket.pause();
|
|
202
|
+
clientSocket.once('drain', () => {
|
|
203
|
+
if (!serverSocket.destroyed) {
|
|
204
|
+
serverSocket.resume();
|
|
205
|
+
}
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
return { cleanupClient, cleanupServer };
|
|
211
|
+
}
|
|
154
212
|
/**
|
|
155
213
|
* Pipe two sockets together with proper cleanup on either end
|
|
156
214
|
* @param socket1 First socket
|
|
@@ -188,4 +246,4 @@ export function createSocketWithErrorHandler(options) {
|
|
|
188
246
|
socket.connect(port, host);
|
|
189
247
|
return socket;
|
|
190
248
|
}
|
|
191
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"socket-utils.js","sourceRoot":"","sources":["../../../ts/core/utils/socket-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../../plugins.js';
|
|
2
2
|
import { HttpProxy } from '../http-proxy/index.js';
|
|
3
|
+
import { setupBidirectionalForwarding } from '../../core/utils/socket-utils.js';
|
|
3
4
|
export class HttpProxyBridge {
|
|
4
5
|
constructor(settings) {
|
|
5
6
|
this.settings = settings;
|
|
@@ -95,31 +96,25 @@ export class HttpProxyBridge {
|
|
|
95
96
|
if (initialChunk) {
|
|
96
97
|
proxySocket.write(initialChunk);
|
|
97
98
|
}
|
|
98
|
-
//
|
|
99
|
-
socket
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
cleanupCallback(reason);
|
|
118
|
-
};
|
|
119
|
-
socket.on('end', () => cleanup('socket_end'));
|
|
120
|
-
socket.on('error', () => cleanup('socket_error'));
|
|
121
|
-
proxySocket.on('end', () => cleanup('proxy_end'));
|
|
122
|
-
proxySocket.on('error', () => cleanup('proxy_error'));
|
|
99
|
+
// Use centralized bidirectional forwarding
|
|
100
|
+
setupBidirectionalForwarding(socket, proxySocket, {
|
|
101
|
+
onClientData: (chunk) => {
|
|
102
|
+
// Update stats if needed
|
|
103
|
+
if (record) {
|
|
104
|
+
record.bytesReceived += chunk.length;
|
|
105
|
+
}
|
|
106
|
+
},
|
|
107
|
+
onServerData: (chunk) => {
|
|
108
|
+
// Update stats if needed
|
|
109
|
+
if (record) {
|
|
110
|
+
record.bytesSent += chunk.length;
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
onCleanup: (reason) => {
|
|
114
|
+
cleanupCallback(reason);
|
|
115
|
+
},
|
|
116
|
+
enableHalfOpen: false // Close both when one closes (required for proxy chains)
|
|
117
|
+
});
|
|
123
118
|
}
|
|
124
119
|
/**
|
|
125
120
|
* Start HttpProxy
|
|
@@ -139,4 +134,4 @@ export class HttpProxyBridge {
|
|
|
139
134
|
}
|
|
140
135
|
}
|
|
141
136
|
}
|
|
142
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1wcm94eS1icmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9wcm94aWVzL3NtYXJ0LXByb3h5L2h0dHAtcHJveHktYnJpZGdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBSWhGLE1BQU0sT0FBTyxlQUFlO0lBRzFCLFlBQW9CLFFBQTRCO1FBQTVCLGFBQVEsR0FBUixRQUFRLENBQW9CO1FBRnhDLGNBQVMsR0FBcUIsSUFBSSxDQUFDO0lBRVEsQ0FBQztJQUVwRDs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxVQUFVO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUMzRixNQUFNLGdCQUFnQixHQUFRO2dCQUM1QixJQUFJLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFjO2dCQUNsQyxvQkFBb0IsRUFBRSxJQUFJO2dCQUMxQixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNO2FBQ2pFLENBQUM7WUFFRixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksU0FBUyxDQUFDLGdCQUFnQixDQUFDLENBQUM7WUFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQ0FBaUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsQ0FBQyxDQUFDO1lBRTVFLDBDQUEwQztZQUMxQyxNQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQztRQUMvRCxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLHFCQUFxQixDQUFDLE1BQXNCO1FBQ3ZELElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUztZQUFFLE9BQU87UUFFNUIscUNBQXFDO1FBQ3JDLE1BQU0sZ0JBQWdCLEdBQUcsTUFBTTthQUM1QixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDZCx1RUFBdUU7WUFDdkUsTUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztnQkFDakQsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSztnQkFDbkIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUV4QixPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FDNUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUMzQyxDQUFDO1FBQ0osQ0FBQyxDQUFDO2FBQ0QsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFFcEQsb0NBQW9DO1FBQ3BDLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQzVELENBQUM7SUFFRDs7T0FFRztJQUNLLHNCQUFzQixDQUFDLEtBQW1CO1FBQ2hELGtEQUFrRDtRQUNsRCxJQUFJLE1BQU0sR0FBRyxHQUFHLENBQUM7UUFDakIsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3hCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZDLE1BQU0sR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLENBQUM7WUFDekMsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQztZQUMvQixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU87WUFDTCxHQUFHLEtBQUssRUFBRyxvQ0FBb0M7WUFDL0MsS0FBSyxFQUFFO2dCQUNMLEdBQUcsS0FBSyxDQUFDLEtBQUs7Z0JBQ2QsT0FBTyxFQUFFLE1BQU0sQ0FBRSw2Q0FBNkM7YUFDL0Q7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsVUFBNkIsRUFBRSxVQUFlO1FBQ3RFLHlDQUF5QztRQUN6QyxPQUFPLENBQ0wsVUFBVSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLElBQUksS0FBSyxXQUFXO1lBQ2pELFVBQVUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxJQUFJLEtBQUsseUJBQXlCLENBQ2hFLElBQUksSUFBSSxDQUFDLFNBQVMsS0FBSyxJQUFJLENBQUM7SUFDL0IsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGtCQUFrQixDQUM3QixZQUFvQixFQUNwQixNQUEwQixFQUMxQixNQUF5QixFQUN6QixZQUFvQixFQUNwQixhQUFxQixFQUNyQixlQUF5QztRQUV6QyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUMvQyxDQUFDO1FBRUQsTUFBTSxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRTdDLE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7WUFDMUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUUsV0FBVyxFQUFFLEdBQUcsRUFBRTtnQkFDbkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLFlBQVksMENBQTBDLENBQUMsQ0FBQztnQkFDeEUsT0FBTyxFQUFFLENBQUM7WUFDWixDQUFDLENBQUMsQ0FBQztZQUVILFdBQVcsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxDQUFDO1FBRUgsZ0NBQWdDO1FBQ2hDLElBQUksWUFBWSxFQUFFLENBQUM7WUFDakIsV0FBVyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNsQyxDQUFDO1FBRUQsMkNBQTJDO1FBQzNDLDRCQUE0QixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUU7WUFDaEQsWUFBWSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7Z0JBQ3RCLHlCQUF5QjtnQkFDekIsSUFBSSxNQUFNLEVBQUUsQ0FBQztvQkFDWCxNQUFNLENBQUMsYUFBYSxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUM7Z0JBQ3ZDLENBQUM7WUFDSCxDQUFDO1lBQ0QsWUFBWSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7Z0JBQ3RCLHlCQUF5QjtnQkFDekIsSUFBSSxNQUFNLEVBQUUsQ0FBQztvQkFDWCxNQUFNLENBQUMsU0FBUyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUM7Z0JBQ25DLENBQUM7WUFDSCxDQUFDO1lBQ0QsU0FBUyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUU7Z0JBQ3BCLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUMxQixDQUFDO1lBQ0QsY0FBYyxFQUFFLEtBQUssQ0FBQyx5REFBeUQ7U0FDaEYsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLEtBQUs7UUFDaEIsSUFBSSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDbkIsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQy9CLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ25CLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQztRQUN4QixDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=
|
|
@@ -43,11 +43,6 @@ export declare class RouteConnectionHandler {
|
|
|
43
43
|
* Handle a socket-handler action for a route
|
|
44
44
|
*/
|
|
45
45
|
private handleSocketHandlerAction;
|
|
46
|
-
/**
|
|
47
|
-
* Setup improved error handling for the outgoing connection
|
|
48
|
-
* @deprecated This method is no longer used - error handling is done in createSocketWithErrorHandler
|
|
49
|
-
*/
|
|
50
|
-
private setupOutgoingErrorHandler;
|
|
51
46
|
/**
|
|
52
47
|
* Sets up a direct connection to the target
|
|
53
48
|
*/
|