fix reconnect test.

livekit · Dec 18, 2023 · 242919a · 242919a
1 parent 121a95d
commit 242919a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 23 deletions.
diff --git a/lib/src/core/signal_client.dart b/lib/src/core/signal_client.dart
@@ -43,6 +43,7 @@ class SignalClient extends Disposable with EventsEmittable<SignalEvent> {
   ConnectionState get connectionState => _connectionState;
 
   final WebSocketUtility _ws;
+  WebSocketUtility get ws => _ws;
 
   final _queue = Queue<lk_rtc.SignalRequest>();
   Duration? _pingTimeoutDuration;

diff --git a/lib/src/support/websocket_utility.dart b/lib/src/support/websocket_utility.dart
@@ -14,9 +14,12 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
+
 import 'package:connectivity_plus/connectivity_plus.dart';
 
 import '../logger.dart';
+import 'platform.dart';
 import 'websocket.dart';
 
 enum SocketStatus {
@@ -75,23 +78,25 @@ class WebSocketUtility {
     _socketStatus = SocketStatus.kSocketStatusNone;
     onSocketStatusChange?.call(_socketStatus);
 
-    if (_connectivitySubscription != null) {
-      await _connectivitySubscription?.cancel();
-      _connectivitySubscription = null;
-    }
+    if (!lkPlatformIsTest()) {
+      if (_connectivitySubscription != null) {
+        await _connectivitySubscription?.cancel();
+        _connectivitySubscription = null;
+      }
 
-    _connectivity = await Connectivity().checkConnectivity();
-    _connectivitySubscription =
-        Connectivity().onConnectivityChanged.listen((result) {
-      logger.fine('network changed ${result.name}, reconnecting...');
-      if ((result != ConnectivityResult.none && _connectivity != result) &&
-          !_isClosed) {
-        if (_socketStatus != SocketStatus.kSocketStatusNone) {
-          reconnect();
+      _connectivity = await Connectivity().checkConnectivity();
+      _connectivitySubscription =
+          Connectivity().onConnectivityChanged.listen((result) {
+        logger.fine('network changed ${result.name}, reconnecting...');
+        if ((result != ConnectivityResult.none && _connectivity != result) &&
+            !_isClosed) {
+          if (_socketStatus != SocketStatus.kSocketStatusNone) {
+            reconnect();
+          }
         }
-      }
-      _connectivity = result;
-    });
+        _connectivity = result;
+      });
+    }
   }
 
   void setReconnSid(String sid) {
@@ -182,8 +187,10 @@ class WebSocketUtility {
     }
     _reconnectTimes = 0;
     _isClosed = true;
-    _connectivitySubscription?.cancel();
-    _connectivitySubscription = null;
+    if (!lkPlatformIsTest()) {
+      _connectivitySubscription?.cancel();
+      _connectivitySubscription = null;
+    }
     _cleanUp();
   }
 
@@ -196,10 +203,15 @@ class WebSocketUtility {
   }
 
   Future<bool> reconnect() async {
+    if (lkPlatformIsTest()) {
+      _reconnectUrl = Uri.tryParse('ws://example.com');
+    }
+
     if (_reconnectUrl == null) {
       logger.warning('WebSocket reconnect failed, no reconnect url');
       return false;
     }
+
     if (_reconnectTimes < _reconnectCount) {
       if (_socketStatus != SocketStatus.kSocketStatusReconnecting) {
         _changeSocketStatus(SocketStatus.kSocketStatusReconnecting);

diff --git a/test/core/signal_client_test.dart b/test/core/signal_client_test.dart
@@ -54,21 +54,24 @@ void main() {
       );
     });
     test('reconnect', () async {
+      await client.connect(
+        exampleUri,
+        token,
+        connectOptions: connectOptions,
+        roomOptions: roomOptions,
+      );
       expect(
           client.events.streamCtrl.stream,
           emitsInOrder(<Matcher>[
+            predicate<SignalConnectionStateUpdatedEvent>(
+                (event) => event.newState == ConnectionState.disconnected),
             predicate<SignalConnectionStateUpdatedEvent>(
                 (event) => event.newState == ConnectionState.reconnecting),
             predicate<SignalConnectionStateUpdatedEvent>((event) =>
                 event.newState == ConnectionState.connected &&
                 event.didReconnect == true),
           ]));
-      await client.connect(
-        exampleUri,
-        token,
-        connectOptions: connectOptions,
-        roomOptions: roomOptions,
-      );
+      await client.closeSocket();
     });
   });