Add further support for cancellation tokens

Author: sierpinskid

Packages/StreamVideo/Runtime/Core/IStreamVideoClient.cs

@@ -68,6 +68,8 @@ public interface IStreamVideoClient : IStreamVideoClientEventsListener, IDisposa
         /// </summary>
         /// <param name="credentials">Credentials required to connect user: api_key, user_id, and user_token</param>
         Task<IStreamVideoUser> ConnectUserAsync(AuthCredentials credentials);
+        
+        Task<IStreamVideoUser> ConnectUserAsync(AuthCredentials credentials, CancellationToken cancellationToken);
 
         /// <summary>
         /// Disconnect user from Stream server.

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

@@ -22,6 +22,8 @@ internal abstract class BasePersistentWebSocket : IPersistentWebSocket
         public event Action Connected;
         public event Action Disconnected;
 
+        public const int ConnectTimeoutMs = 1000;
+
         public ConnectionState ConnectionState
         {
             get => _connectionState;
@@ -78,7 +80,9 @@ private void TryToReconnect()
             Logs.Info($"{GetType()} TryToReconnect");
 #endif
 
-            ConnectAsync().LogIfFailed();
+            var cts = new CancellationTokenSource();
+            cts.CancelAfter(ConnectTimeoutMs);
+            ConnectAsync(cts.Token).LogIfFailed();
         }
 
         public Task ConnectAsync(CancellationToken cancellationToken = default)

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

@@ -73,7 +73,7 @@ protected override async Task ExecuteConnectAsync(CancellationToken cancellation
             var uri = UriFactory.CreateCoordinatorConnectionUri();
 
             //StreamTodo: Add cancel token support to WS
-            await WebsocketClient.ConnectAsync(uri);
+            await WebsocketClient.ConnectAsync(uri, cancellationToken);
 
 #if STREAM_DEBUG_ENABLED
             Logs.Info("Coordinator connected! Let's send the connect message");

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

@@ -179,7 +179,7 @@ protected override async Task ExecuteConnectAsync(CancellationToken cancellation
 
                 var sfuUri = UriFactory.CreateSfuConnectionUri(_sfuUrl);
 
-                await WebsocketClient.ConnectAsync(sfuUri);
+                await WebsocketClient.ConnectAsync(sfuUri, cancellationToken);
 
                 //StreamTodo: review when is the actual "connected state" - perhaps not the WS connection itself but receiving an appropriate event should set the flag
                 //e.g. are we able to send any data as soon as the connection is established?

Packages/StreamVideo/Runtime/Core/StreamVideoClient.cs

@@ -221,9 +221,12 @@ public void Dispose()
         //StreamTodo: Consider removing this overload and exposing ConnectAsync() DisconnectAsync() only. The config would contain credentials (token or token provider), etc.
         //Similar to Android SDK: https://getstream.io/video/docs/android/guides/client-auth/
 
-        public async Task<IStreamVideoUser> ConnectUserAsync(AuthCredentials credentials)
+        public Task<IStreamVideoUser> ConnectUserAsync(AuthCredentials credentials)
+            => ConnectUserAsync(credentials, CancellationToken.None);
+        
+        public async Task<IStreamVideoUser> ConnectUserAsync(AuthCredentials credentials, CancellationToken cancellationToken)
         {
-            await InternalLowLevelClient.ConnectUserAsync(credentials);
+            await InternalLowLevelClient.ConnectUserAsync(credentials, cancellationToken);
 
 #if STREAM_DEBUG_ENABLED
             _logs.Warning("StreamVideoClient - CONNECTION - Trigger Connected event.");

Packages/StreamVideo/Runtime/Libs/Websockets/IWebsocketClient.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Net.WebSockets;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace StreamVideo.Libs.Websockets
@@ -18,7 +19,7 @@ public interface IWebsocketClient : IDisposable
 
         bool TryDequeueMessage(out byte[] message);
 
-        Task ConnectAsync(Uri serverUri);
+        Task ConnectAsync(Uri serverUri, CancellationToken cancellationToken);
 
         void Update();
 

Packages/StreamVideo/Runtime/Libs/Websockets/NativeWebSocketWrapper.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using NativeWebSocket;
 using StreamVideo.Libs.Utils;
@@ -37,7 +38,7 @@ public bool TryDequeueMessage(out byte[] message)
             return message != null;
         }
 
-        public async Task ConnectAsync(Uri serverUri)
+        public async Task ConnectAsync(Uri serverUri, CancellationToken cancellationToken)
         {
             if (_webSocket != null)
             {

Packages/StreamVideo/Runtime/Libs/Websockets/WebsocketClient.cs

@@ -38,7 +38,7 @@ public WebsocketClient(ILogs logs, Encoding encoding = default, bool isDebugMode
 
         public bool TryDequeueMessage(out byte[] message) => _receiveQueue.TryDequeue(out message);
 
-        public async Task ConnectAsync(Uri serverUri)
+        public async Task ConnectAsync(Uri serverUri, CancellationToken cancellationToken)
         {
             if (IsConnected || IsConnecting)
             {
@@ -52,7 +52,8 @@ public async Task ConnectAsync(Uri serverUri)
             {
                 await TryDisposeResourcesAsync(WebSocketCloseStatus.NormalClosure,
                     "Clean up resources before connecting");
-                _connectionCts = new CancellationTokenSource();
+                cancellationToken.ThrowIfCancellationRequested();
+                _connectionCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
 
                 _internalClient = new ClientWebSocket();
                 _internalClient.Options.SetRequestHeader("User-Agent", "unity-video-sdk-ws-client");