From 979143be35d4c6c4690f46878d9e7916e74acbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Gourdeau?= Date: Fri, 18 Jul 2025 22:50:02 -0400 Subject: [PATCH 1/2] Update AbstractRemote.ts add optional chaining to stream close method --- packages/common/src/client/sync/stream/AbstractRemote.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/client/sync/stream/AbstractRemote.ts b/packages/common/src/client/sync/stream/AbstractRemote.ts index f0de66d00..3ce53bd22 100644 --- a/packages/common/src/client/sync/stream/AbstractRemote.ts +++ b/packages/common/src/client/sync/stream/AbstractRemote.ts @@ -310,7 +310,7 @@ export abstract class AbstractRemote { clearTimeout(keepAliveTimeout); keepAliveTimeout = setTimeout(() => { this.logger.error(`No data received on WebSocket in ${SOCKET_TIMEOUT_MS}ms, closing connection.`); - stream.close(); + stream?.close(); }, SOCKET_TIMEOUT_MS); }; resetTimeout(); From 286e0c05296ba195d3674616c56e4cf92e223fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Gourdeau?= Date: Mon, 21 Jul 2025 23:23:18 -0400 Subject: [PATCH 2/2] Update AbstractRemote.ts remove the resetTimeout call which starts the timeout process before connector.connect() has been called --- packages/common/src/client/sync/stream/AbstractRemote.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/common/src/client/sync/stream/AbstractRemote.ts b/packages/common/src/client/sync/stream/AbstractRemote.ts index 3ce53bd22..7d67dad3f 100644 --- a/packages/common/src/client/sync/stream/AbstractRemote.ts +++ b/packages/common/src/client/sync/stream/AbstractRemote.ts @@ -313,7 +313,6 @@ export abstract class AbstractRemote { stream?.close(); }, SOCKET_TIMEOUT_MS); }; - resetTimeout(); const url = this.options.socketUrlTransformer(request.url); const connector = new RSocketConnector({