Skip to content

Commit 691a4e6

Browse files
authored
Merge pull request #167 from GetStream/feature/uni-125-fix-users-not-knowing-immediately-that-another-user-left-the
Fix waiting for the send queue when leaving the call (to make sure th…
2 parents 05c9201 + d213e8e commit 691a4e6

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,17 +418,17 @@ public async Task StopAsync(string reason = "")
418418

419419
for (int i = 0; i < 60; i++)
420420
{
421-
if (_sfuWebSocket.QueuedMessagesCount > 0)
421+
if (_sfuWebSocket.SendQueueCount > 0)
422422
{
423423
await Task.Delay(5);
424424
}
425425
}
426426

427427
#if STREAM_DEBUG_ENABLED
428-
if (_sfuWebSocket.QueuedMessagesCount > 0)
428+
if (_sfuWebSocket.SendQueueCount > 0)
429429
{
430430
_logs.Error(
431-
$"Waited for 300+ ms for SFU messages to be sent. Remaining: {_sfuWebSocket.QueuedMessagesCount}");
431+
$"Waited for 300+ ms for SFU messages to be sent. Remaining: {_sfuWebSocket.SendQueueCount}");
432432
}
433433
#endif
434434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private void OnConnectionFailed()
298298
private void OnDisconnected()
299299
{
300300
#if STREAM_DEBUG_ENABLED
301-
Logs.Warning($"{LogsPrefix} Websocket Disconnected. Messages left: {WebsocketClient.QueuedMessagesCount}");
301+
Logs.Warning($"{LogsPrefix} Websocket Disconnected. Messages left: {WebsocketClient.ReceiveQueueCount}");
302302
#endif
303303
ConnectionState = ConnectionState.Disconnected;
304304
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ internal class SfuWebSocket : BasePersistentWebSocket
4242
public event Action<ChangePublishOptions> ChangePublishOptions;
4343
public event Action<InboundStateNotification> InboundStateNotification;
4444

45-
public int QueuedMessagesCount => WebsocketClient.QueuedMessagesCount;
45+
public int SendQueueCount => WebsocketClient.SendQueueCount;
4646

4747
public SfuWebSocket(IWebsocketClient websocketClient, IReconnectScheduler reconnectScheduler,
4848
IAuthProvider authProvider,

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ public interface IWebsocketClient : IDisposable
1212
event Action Connected;
1313
event Action Disconnected;
1414
event Action ConnectionFailed;
15-
int QueuedMessagesCount { get; }
15+
16+
int ReceiveQueueCount { get; }
17+
int SendQueueCount { get; }
1618

1719
bool TryDequeueMessage(out byte[] message);
1820

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public class NativeWebSocketWrapper : IWebsocketClient
2020
public event Action Disconnected;
2121
public event Action ConnectionFailed;
2222

23-
public int QueuedMessagesCount => _messages.Count;
23+
public int ReceiveQueueCount => _messages.Count;
24+
public int SendQueueCount => throw new NotImplementedException();
2425

2526
public NativeWebSocketWrapper(ILogs logs, bool isDebugMode)
2627
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public class WebsocketClient : IWebsocketClient
2525

2626
public WebSocketState State => _internalClient?.State ?? WebSocketState.None;
2727

28-
public int QueuedMessagesCount => _receiveQueue.Count;
28+
public int ReceiveQueueCount => _receiveQueue.Count;
29+
public int SendQueueCount => _sendQueue.Count;
2930

3031
/// <param name="isDebugMode">Additional logs will be printed</param>
3132
public WebsocketClient(ILogs logs, Encoding encoding = default, bool isDebugMode = false)

0 commit comments

Comments
 (0)