Merge pull request #198 from GetStream/bugfix/uni-147-fix-sfu-ws-reconnecting-when-coordinator-looses-connection

Bugfix/uni 147 fix sfu ws reconnecting when coordinator looses connection

Author: sierpinskid

Packages/StreamVideo/Runtime/Core/LowLevelClient/ReconnectScheduler.cs

@@ -10,7 +10,16 @@ internal interface IReconnectScheduler
         event Action ReconnectionScheduled;
 
         void Reset();
+
+        void SetTarget(IReconnectTarget target);
+    }
+
+    internal interface IReconnectTarget
+    {
+        event ConnectionStateChangeHandler ConnectionStateChanged;
+        ConnectionState ConnectionState { get; }
     }
+    
     /// <summary>
     /// Schedules next reconnection time based on the past attempts and network availability
     /// </summary>
@@ -44,29 +53,26 @@ private set
             }
         }
 
-        public ReconnectScheduler(ITimeService timeService, IStreamVideoLowLevelClient lowLevelClient,
-            INetworkMonitor networkMonitor, Func<bool> shouldReconnect)
+        public ReconnectScheduler(ITimeService timeService, INetworkMonitor networkMonitor, Func<bool> shouldReconnect)
         {
             _shouldReconnect = shouldReconnect ?? throw new ArgumentNullException(nameof(shouldReconnect));
-            _client = lowLevelClient ?? throw new ArgumentNullException(nameof(lowLevelClient));
             _timeService = timeService ?? throw new ArgumentNullException(nameof(timeService));
             _networkMonitor = networkMonitor ?? throw new ArgumentNullException(nameof(networkMonitor));
 
             _networkMonitor.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
+        }
 
-            _client.Connected += OnConnected;
-            //_client.Reconnecting += OnReconnecting;
-            _client.ConnectionStateChanged += OnConnectionStateChanged;
+        //StreamTODO: refactor so that each WS instance creates the reconnector internally and injects its instance
+        public void SetTarget(IReconnectTarget target)
+        {
+            UnsubscribeFromTarget();
+            _target = target ?? throw new ArgumentNullException(nameof(target));
+            SubscribeToTarget();
         }
 
         public void Dispose()
         {
-            if (_client != null)
-            {
-                _client.Connected -= OnConnected;
-                //_client.Reconnecting -= OnReconnecting;
-                _client.ConnectionStateChanged -= OnConnectionStateChanged;
-            }
+            UnsubscribeFromTarget();
         }
 
         public void SetReconnectStrategySettings(ReconnectStrategy reconnectStrategy, float? exponentialMinInterval,
@@ -114,14 +120,35 @@ public void Stop()
         }
 
         //StreamTodo: connection info could be split to separate interface
-        private readonly IStreamVideoLowLevelClient _client;
         private readonly ITimeService _timeService;
         private readonly INetworkMonitor _networkMonitor;
 
         private int _reconnectAttempts;
         private bool _isStopped;
         private double? _nextReconnectTime;
         private Func<bool> _shouldReconnect;
+        
+        private IReconnectTarget _target;
+        
+        private void SubscribeToTarget()
+        {
+            if (_target == null)
+            {
+                return;
+            }
+            
+            _target.ConnectionStateChanged += OnConnectionStateChanged;
+        }
+
+        private void UnsubscribeFromTarget()
+        {
+            if (_target == null)
+            {
+                return;
+            }
+            
+            _target.ConnectionStateChanged -= OnConnectionStateChanged;
+        }
 
         private void TryScheduleNextReconnectTime()
         {
@@ -198,8 +225,8 @@ private void OnNetworkAvailabilityChanged(bool isNetworkAvailable)
                 return;
             }
 
-            if (_client.ConnectionState == ConnectionState.Connected ||
-                _client.ConnectionState == ConnectionState.Connecting)
+            if (_target.ConnectionState == ConnectionState.Connected ||
+                _target.ConnectionState == ConnectionState.Connecting)
             {
                 return;
             }

Packages/StreamVideo/Runtime/Core/LowLevelClient/StreamVideoLowLevelClient.cs

@@ -143,8 +143,8 @@ public StreamVideoLowLevelClient(IWebsocketClient coordinatorWebSocket, IWebsock
             }
 
             //StreamTodo: move to factory
-            var coordinatorReconnect = new ReconnectScheduler(_timeService, this, _networkMonitor, shouldReconnect: () => true);
-            var sfuReconnect = new ReconnectScheduler(_timeService, this, _networkMonitor, shouldReconnect: () => RtcSession.ShouldSfuAttemptToReconnect());
+            var coordinatorReconnect = new ReconnectScheduler(_timeService, _networkMonitor, shouldReconnect: () => true);
+            var sfuReconnect = new ReconnectScheduler(_timeService, _networkMonitor, shouldReconnect: () => RtcSession.ShouldSfuAttemptToReconnect());
 
             //StreamTodo: move to factory
             _coordinatorWS = new CoordinatorWebSocket(coordinatorWebSocket, coordinatorReconnect, authProvider: this,

Packages/StreamVideo/Runtime/Core/LowLevelClient/WebSockets/BasePersistentWebSocket.cs

@@ -16,7 +16,7 @@
 
 namespace StreamVideo.Core.LowLevelClient.WebSockets
 {
-    internal abstract class BasePersistentWebSocket : IPersistentWebSocket
+    internal abstract class BasePersistentWebSocket : IPersistentWebSocket, IReconnectTarget
     {
         public event ConnectionStateChangeHandler ConnectionStateChanged;
         public event Action Connected;
@@ -207,6 +207,8 @@ protected BasePersistentWebSocket(IWebsocketClient websocketClient, IReconnectSc
             Logs = logs;
             WebsocketClient = websocketClient ?? throw new ArgumentNullException(nameof(websocketClient));
 
+            _reconnectScheduler.SetTarget(this);
+
             WebsocketClient.ConnectionFailed += OnConnectionFailed;
             WebsocketClient.Disconnected += OnDisconnected;