From da4c568cbab8b6d0df79e7092cc10dcb826c4ea6 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 15 Mar 2022 13:50:52 +0100
Subject: [PATCH] fix(llc): make ws reconnection more robust

---
 packages/stream_chat/lib/src/client/client.dart | 1 +
 packages/stream_chat/lib/src/ws/websocket.dart  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index c3605ac5..00b0433b 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -374,6 +374,7 @@ class StreamChatClient {
       final event = await _ws.connect(user);
       return user.merge(event.me);
     } catch (e, stk) {
+      _wsConnectionStatus = ConnectionStatus.disconnected;
       logger.severe('error connecting ws', e, stk);
       rethrow;
     }
diff --git a/packages/stream_chat/lib/src/ws/websocket.dart b/packages/stream_chat/lib/src/ws/websocket.dart
index 82c7d7c1..20d54879 100644
--- a/packages/stream_chat/lib/src/ws/websocket.dart
+++ b/packages/stream_chat/lib/src/ws/websocket.dart
@@ -190,8 +190,12 @@ class WebSocket with TimerHelper {
     _connectionStatus = ConnectionStatus.connecting;
     connectionCompleter = Completer<Event>();
 
-    final uri = await _buildUri();
-    _initWebSocketChannel(uri);
+    try {
+      final uri = await _buildUri();
+      _initWebSocketChannel(uri);
+    } catch (e, stk) {
+      _onConnectionError(e, stk);
+    }
 
     return connectionCompleter!.future;
   }