@@ -96,6 +96,7 @@ export const pingGatewayAndVerify = async ({
9696 error : err as Error
9797 } ) ;
9898 } ) ;
99+
99100 for ( let attempt = 1 ; attempt <= maxRetries ; attempt += 1 ) {
100101 try {
101102 const stream = quicClient . connection . newStream ( "bidi" ) ;
@@ -108,17 +109,13 @@ export const pingGatewayAndVerify = async ({
108109 const { value, done } = await reader . read ( ) ;
109110
110111 if ( done ) {
111- throw new BadRequestError ( {
112- message : "Gateway closed before receiving PONG"
113- } ) ;
112+ throw new Error ( "Gateway closed before receiving PONG" ) ;
114113 }
115114
116115 const response = Buffer . from ( value ) . toString ( ) ;
117116
118117 if ( response !== "PONG\n" && response !== "PONG" ) {
119- throw new BadRequestError ( {
120- message : `Failed to Ping. Unexpected response: ${ response }
121- } ) ;
118+ throw new Error ( `Failed to Ping. Unexpected response: ${ response } ) ;
122119 }
123120
124121 reader . releaseLock ( ) ;
@@ -146,6 +143,7 @@ interface TProxyServer {
146143 server : net . Server ;
147144 port : number ;
148145 cleanup : ( ) => Promise < void > ;
146+ getProxyError : ( ) => string ;
149147}
150148
151149const setupProxyServer = async ( {
@@ -170,6 +168,7 @@ const setupProxyServer = async ({
170168 error : err as Error
171169 } ) ;
172170 } ) ;
171+ const proxyErrorMsg = [ "" ] ;
173172
174173 return new Promise ( ( resolve , reject ) => {
175174 const server = net . createServer ( ) ;
@@ -185,31 +184,33 @@ const setupProxyServer = async ({
185184 const forwardWriter = stream . writable . getWriter ( ) ;
186185 await forwardWriter . write ( Buffer . from ( `FORWARD-TCP ${ targetHost } ${ targetPort } ) ) ;
187186 forwardWriter . releaseLock ( ) ;
188- /* eslint-disable @typescript-eslint/no-misused-promises */
187+
189188 // Set up bidirectional copy
190- const setupCopy = async ( ) => {
189+ const setupCopy = ( ) => {
191190 // Client to QUIC
192191 // eslint-disable-next-line
193192 ( async ( ) => {
194- try {
195- const writer = stream . writable . getWriter ( ) ;
193+ const writer = stream . writable . getWriter ( ) ;
196194
197- // Create a handler for client data
198- clientConn . on ( "data" , async ( chunk ) => {
199- await writer . write ( chunk ) ;
195+ // Create a handler for client data
196+ clientConn . on ( "data" , ( chunk ) => {
197+ writer . write ( chunk ) . catch ( ( err ) => {
198+ proxyErrorMsg . push ( ( err as Error ) ?. message ) ;
200199 } ) ;
200+ } ) ;
201201
202- // Handle client connection close
203- clientConn . on ( "end" , async ( ) => {
204- await writer . close ( ) ;
202+ // Handle client connection close
203+ clientConn . on ( "end" , ( ) => {
204+ writer . close ( ) . catch ( ( err ) => {
205+ logger . error ( err ) ;
205206 } ) ;
207+ } ) ;
206208
207- clientConn . on ( "error" , async ( err ) => {
208- await writer . abort ( err ) ;
209+ clientConn . on ( "error" , ( clientConnErr ) => {
210+ writer . abort ( clientConnErr ?. message ) . catch ( ( err ) => {
211+ proxyErrorMsg . push ( ( err as Error ) ?. message ) ;
209212 } ) ;
210- } catch ( err ) {
211- clientConn . destroy ( ) ;
212- }
213+ } ) ;
213214 } ) ( ) ;
214215
215216 // QUIC to Client
@@ -238,29 +239,37 @@ const setupProxyServer = async ({
238239 }
239240 }
240241 } catch ( err ) {
242+ proxyErrorMsg . push ( ( err as Error ) ?. message ) ;
241243 clientConn . destroy ( ) ;
242244 }
243245 } ) ( ) ;
244246 } ;
245- await setupCopy ( ) ;
246- //
247+
248+ setupCopy ( ) ;
247249 // Handle connection closure
248- clientConn . on ( "close" , async ( ) => {
249- await stream . destroy ( ) ;
250+ clientConn . on ( "close" , ( ) => {
251+ stream . destroy ( ) . catch ( ( err ) => {
252+ proxyErrorMsg . push ( ( err as Error ) ?. message ) ;
253+ } ) ;
250254 } ) ;
251255
252256 const cleanup = async ( ) => {
253257 clientConn ?. destroy ( ) ;
254258 await stream . destroy ( ) ;
255259 } ;
256260
257- clientConn . on ( "error" , ( err ) => {
258- logger . error ( err , "Client socket error" ) ;
259- void cleanup ( ) ;
260- reject ( err ) ;
261+ clientConn . on ( "error" , ( clientConnErr ) => {
262+ logger . error ( clientConnErr , "Client socket error" ) ;
263+ cleanup ( ) . catch ( ( err ) => {
264+ logger . error ( err , "Client conn cleanup" ) ;
265+ } ) ;
261266 } ) ;
262267
263- clientConn . on ( "end" , cleanup ) ;
268+ clientConn . on ( "end" , ( ) => {
269+ cleanup ( ) . catch ( ( err ) => {
270+ logger . error ( err , "Client conn end" ) ;
271+ } ) ;
272+ } ) ;
264273 } catch ( err ) {
265274 logger . error ( err , "Failed to establish target connection:" ) ;
266275 clientConn . end ( ) ;
@@ -272,12 +281,12 @@ const setupProxyServer = async ({
272281 reject ( err ) ;
273282 } ) ;
274283
275- server . on ( "close" , async ( ) => {
276- await quicClient ?. destroy ( ) ;
284+ server . on ( "close" , ( ) => {
285+ quicClient ?. destroy ( ) . catch ( ( err ) => {
286+ logger . error ( err , "Failed to destroy quic client" ) ;
287+ } ) ;
277288 } ) ;
278289
279- /* eslint-enable */
280-
281290 server . listen ( 0 , ( ) => {
282291 const address = server . address ( ) ;
283292 if ( ! address || typeof address === "string" ) {
@@ -293,7 +302,8 @@ const setupProxyServer = async ({
293302 cleanup : async ( ) => {
294303 server . close ( ) ;
295304 await quicClient ?. destroy ( ) ;
296- }
305+ } ,
306+ getProxyError : ( ) => proxyErrorMsg . join ( "," )
297307 } ) ;
298308 } ) ;
299309 } ) ;
@@ -316,7 +326,7 @@ export const withGatewayProxy = async (
316326 const { relayHost, relayPort, targetHost, targetPort, tlsOptions, identityId, orgId } = options ;
317327
318328 // Setup the proxy server
319- const { port, cleanup } = await setupProxyServer ( {
329+ const { port, cleanup, getProxyError } = await setupProxyServer ( {
320330 targetHost,
321331 targetPort,
322332 relayPort,
@@ -330,8 +340,12 @@ export const withGatewayProxy = async (
330340 // Execute the callback with the allocated port
331341 await callback ( port ) ;
332342 } catch ( err ) {
333- logger . error ( err , "Failed to proxy" ) ;
334- throw new BadRequestError ( { message : ( err as Error ) ?. message } ) ;
343+ const proxyErrorMessage = getProxyError ( ) ;
344+ if ( proxyErrorMessage ) {
345+ logger . error ( new Error ( proxyErrorMessage ) , "Failed to proxy" ) ;
346+ }
347+ logger . error ( err , "Failed to do gateway" ) ;
348+ throw new BadRequestError ( { message : proxyErrorMessage || ( err as Error ) ?. message } ) ;
335349 } finally {
336350 // Ensure cleanup happens regardless of success or failure
337351 await cleanup ( ) ;
0 commit comments