Fix a race when close() called before remote class event delivered (dart-archive/web_socket_channel#348)

Author: brianquinlan

pkgs/web_socket_channel/lib/adapter_web_socket_channel.dart

@@ -79,15 +79,13 @@ class AdapterWebSocketChannel extends StreamChannelMixin
     }
 
     webSocketFuture.then((webSocket) {
-      var remoteClosed = false;
       webSocket.events.listen((event) {
         switch (event) {
           case TextDataReceived(text: final text):
             _controller.local.sink.add(text);
           case BinaryDataReceived(data: final data):
             _controller.local.sink.add(data);
           case CloseReceived(code: final code, reason: final reason):
-            remoteClosed = true;
             _closeCode = code;
             _closeReason = reason;
             _controller.local.sink.close();
@@ -105,13 +103,15 @@ class AdapterWebSocketChannel extends StreamChannelMixin
             default:
               throw UnsupportedError('Cannot send ${obj.runtimeType}');
           }
-        } on WebSocketConnectionClosed catch (_) {
+        } on WebSocketConnectionClosed {
           // There is nowhere to surface this error; `_controller.local.sink`
           // has already been closed.
         }
-      }, onDone: () {
-        if (!remoteClosed) {
-          webSocket.close(_localCloseCode, _localCloseReason);
+      }, onDone: () async {
+        try {
+          await webSocket.close(_localCloseCode, _localCloseReason);
+        } on WebSocketConnectionClosed {
+          // It is not an error to close an already-closed `WebSocketChannel`.
         }
       });
       _protocol = webSocket.protocol;

pkgs/web_socket_channel/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   crypto: ^3.0.0
   stream_channel: ^2.1.0
   web: ^0.5.0
-  web_socket: ^0.1.1
+  web_socket: ^0.1.3
 
 dev_dependencies:
   dart_flutter_team_lints: ^2.0.0