github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't throw if websocket close was requested

Browse Source
This commit is contained in:
RogueException
2017-01-28 20:54:58 -04:00
parent a266d072db
commit 35c10a1006
2 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Discord.Net.DebugTools/UnstableWebSocketClient.cs
View File

@@ -28,7 +28,7 @@ namespace Discord.Net.Providers.UnstableWebSocket
private Task _task;
private CancellationTokenSource _cancelTokenSource;
private CancellationToken _cancelToken, _parentToken;
private bool _isDisposed;
private bool _isDisposed, _isDisconnecting;
public UnstableWebSocketClient()
{
@@ -101,22 +101,44 @@ namespace Discord.Net.Providers.UnstableWebSocket
{
try { _cancelTokenSource.Cancel(false); } catch { }
if (!isDisposing)
await (_task ?? Task.Delay(0)).ConfigureAwait(false);
if (_client != null && _client.State == WebSocketState.Open)
_isDisconnecting = true;
try
{
await (_task ?? Task.Delay(0)).ConfigureAwait(false);
_task = null;
}
finally { _isDisconnecting = false; }
if (_client != null)
{
var token = new CancellationToken();
if (!isDisposing)
{
try { await _client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", token); }
try { await _client.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", new CancellationToken()); }
catch { }
}
try { _client.Dispose(); }
catch { }
_client = null;
}
}
private async Task OnClosed(Exception ex)
{
if (_isDisconnecting)
return; //Ignore, this disconnect was requested.
System.Diagnostics.Debug.WriteLine("OnClosed - " + ex.Message);
await _lock.WaitAsync().ConfigureAwait(false);
try
{
await DisconnectInternalAsync(false);
}
finally
{
_lock.Release();
}
await Closed(ex);
}
public void SetHeader(string key, string value)
{
@@ -173,10 +195,7 @@ namespace Discord.Net.Providers.UnstableWebSocket
int resultCount;
if (socketResult.MessageType == WebSocketMessageType.Close)
{
var _ = Closed(new WebSocketClosedException((int)socketResult.CloseStatus, socketResult.CloseStatusDescription));
return;
}
throw new WebSocketClosedException((int)socketResult.CloseStatus, socketResult.CloseStatusDescription);
if (!socketResult.EndOfMessage)
{
@@ -219,13 +238,13 @@ namespace Discord.Net.Providers.UnstableWebSocket
}
catch (Win32Exception ex) when (ex.HResult == HR_TIMEOUT)
{
var _ = Closed(new Exception("Connection timed out.", ex));
var _ = OnClosed(new Exception("Connection timed out.", ex));
}
catch (OperationCanceledException) { }
catch (Exception ex)
{
//This cannot be awaited otherwise we'll deadlock when DiscordApiClient waits for this task to complete.
var _ = Closed(ex);
var _ = OnClosed(ex);
}
}