avoid hitting the ready completer twice

dart-lang · Nov 22, 2023 · 9c985ce · 9c985ce
1 parent 054af53
commit 9c985ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/html.dart b/lib/html.dart
@@ -102,7 +102,9 @@ class HtmlWebSocketChannel extends StreamChannelMixin
       // Unfortunately, the underlying WebSocket API doesn't expose any
       // specific information about the error itself.
       final error = WebSocketChannelException('WebSocket connection failed.');
-      _readyCompleter.completeError(error);
+      if (!_readyCompleter.isCompleted) {
+        _readyCompleter.completeError(error);
+      }
       _controller.local.sink.addError(error);
       _controller.local.sink.close();
     });

diff --git a/test/html_test.dart b/test/html_test.dart
@@ -89,7 +89,14 @@ void main() {
     webSocket.close();
 
     final channel = HtmlWebSocketChannel(webSocket);
-    expect(channel.ready, throwsA(isA<WebSocketChannelException>()));
+    await expectLater(
+      channel.ready,
+      throwsA(
+        isA<WebSocketChannelException>()
+            .having((p0) => p0.message, 'message', 'WebSocket state error: 2')
+            .having((p0) => p0.inner, 'inner', isNull),
+      ),
+    );
   });
 
   test('.connect defaults to binary lists', () async {