Merge pull request #4 from superlistapp/fix/dev-11330-investigate-why-mac-app-opens-two-websocket-connections-in

[DEV-11330] Double-check whether connection is possible after _buildMountPoint

Author: kpsroka

lib/src/socket.dart

@@ -170,10 +170,19 @@ class PhoenixSocket {
   /// Whether the underlying socket is connected of not.
   bool get isConnected => _ws != null && _socketState == SocketState.connected;
 
+  bool get _isConnectingOrConnected =>
+      _ws != null &&
+      (_socketState == SocketState.connected ||
+          _socketState == SocketState.connecting);
+
+  void _checkNotDisposed() {
+    if (_disposed) {
+      throw StateError('PhoenixSocket cannot connect after being disposed.');
+    }
+  }
+
   void _connect(Completer<PhoenixSocket?> completer) async {
-    if (_ws != null &&
-        (_socketState == SocketState.connected ||
-            _socketState == SocketState.connecting)) {
+    if (_isConnectingOrConnected) {
       _logger.warning(
           'Calling connect() on already connected or connecting socket.');
       completer.complete(this);
@@ -182,12 +191,20 @@ class PhoenixSocket {
 
     _shouldReconnect = true;
 
-    if (_disposed) {
-      throw StateError('PhoenixSocket cannot connect after being disposed.');
-    }
+    _checkNotDisposed();
 
     _mountPoint = await _buildMountPoint(_endpoint, _options);
 
+    // Double-check in case something changed during the async call above.
+    if (_isConnectingOrConnected) {
+      _logger.warning(
+          'Calling connect() on already connected or connecting socket.');
+      completer.complete(this);
+      return;
+    }
+
+    _checkNotDisposed();
+
     // workaround to check the existing bearer token
     final token = _mountPoint.queryParameters["token"];
 

test/mocks.dart

@@ -11,6 +11,7 @@ export 'mocks.mocks.dart';
     MockSpec<PhoenixSocket>(),
     MockSpec<WebSocketChannel>(),
     MockSpec<WebSocketSink>(),
+    MockSpec<PhoenixSocketOptions>(),
   ],
 )
 class MockTest extends Mock {