Skip to content

Fix attempting to connect while the underlying WS is already connecti… #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sierpinskid wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix attempting to connect while the underlying WS is already connecti… #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Assets/Samples/Stream Video & Audio Chat SDK/0.8.20.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Packages/StreamVideo/Runtime/Core/LowLevelClient/WebSockets/BasePersistentWebSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ private void TryToReconnect()
return;
}

// StreamTODO: revise this. The wrapper state should be perfectly in sync with the inner WebSocket
// Most likely this class should fully rely on WS state and not maintain it's own state
// This check should be handled already by the ConnectionState.IsValidToConnect() above
if (WebsocketClient != null && (WebsocketClient.IsConnecting || WebsocketClient.IsConnected))
{
return;
}

#if STREAM_DEBUG_ENABLED
Logs.Info($"{GetType()} TryToReconnect");
#endif
Expand Down
2 changes: 2 additions & 0 deletions Packages/StreamVideo/Runtime/Libs/Websockets/IWebsocketClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public interface IWebsocketClient : IDisposable

int ReceiveQueueCount { get; }
int SendQueueCount { get; }
bool IsConnected { get; }
bool IsConnecting { get; }

bool TryDequeueMessage(out byte[] message);

Expand Down
3 changes: 2 additions & 1 deletion Packages/StreamVideo/Runtime/Libs/Websockets/NativeWebSocketWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Net.WebSockets;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using NativeWebSocket;
Expand All @@ -23,6 +22,8 @@ public class NativeWebSocketWrapper : IWebsocketClient

public int ReceiveQueueCount => _messages.Count;
public int SendQueueCount => throw new NotImplementedException();
public bool IsConnected => _webSocket.State == WebSocketState.Open;
public bool IsConnecting => _webSocket.State == WebSocketState.Connecting;

public NativeWebSocketWrapper(ILogs logs, bool isDebugMode)
{
Expand Down
Loading