Merge pull request #1410 from aarsham/fix-null-check

Address null check error and prevent duplicate events on socket reconnect
zino-hofmann · Apr 8, 2024 · 385c331 · 385c331
2 parents eebac38 + acdaabc
commit 385c331
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/graphql/lib/src/core/fetch_more.dart b/packages/graphql/lib/src/core/fetch_more.dart
@@ -34,11 +34,11 @@ Future<QueryResult<TParsed>> fetchMoreImplementation<TParsed>(
     final data = fetchMoreOptions.updateQuery(
       previousResult.data,
       fetchMoreResult.data,
-    )!;
+    );
 
     fetchMoreResult.data = data;
 
-    if (originalOptions.fetchPolicy != FetchPolicy.noCache) {
+    if (originalOptions.fetchPolicy != FetchPolicy.noCache && data != null) {
       queryManager.attemptCacheWriteFromClient(
         request,
         data,

diff --git a/packages/graphql/lib/src/links/websocket_link/websocket_client.dart b/packages/graphql/lib/src/links/websocket_link/websocket_client.dart
@@ -372,8 +372,8 @@ class SocketClient {
   }
 
   void onConnectionLost([Object? e]) async {
-    var code = socketChannel!.closeCode;
-    var reason = socketChannel!.closeReason;
+    var code = socketChannel?.closeCode;
+    var reason = socketChannel?.closeReason;
 
     await _closeSocketChannel();
     if (e != null) {
@@ -502,6 +502,7 @@ class SocketClient {
             )
           : waitForConnectedStateWithoutTimeout;
 
+      sub?.cancel();
       sub = waitForConnectedState.listen((_) {
         final Stream<GraphQLSocketMessage> dataErrorComplete = _messages.where(
           (GraphQLSocketMessage message) {