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

Fixed several issues in DefaultWebSocketClient

Browse Source
This commit is contained in:
RogueException
2016-08-17 09:37:17 -03:00
parent 7b130f6528
commit 625f78504c
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Discord.Net/Net/WebSockets/DefaultWebsocketClient.cs
View File

@@ -51,8 +51,19 @@ namespace Discord.Net.WebSockets
public async Task ConnectAsync(string host) public async Task ConnectAsync(string host)
{ {
//Assume locked await _sendLock.WaitAsync(_cancelToken).ConfigureAwait(false);
await DisconnectAsync().ConfigureAwait(false); try
{
await ConnectInternalAsync(host);
}
finally
{
_sendLock.Release();
}
}
private async Task ConnectInternalAsync(string host)
{
await DisconnectInternalAsync().ConfigureAwait(false);
_cancelTokenSource = new CancellationTokenSource(); _cancelTokenSource = new CancellationTokenSource();
_cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token; _cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token;
@@ -69,19 +80,30 @@ namespace Discord.Net.WebSockets
await _client.ConnectAsync(new Uri(host), _cancelToken).ConfigureAwait(false); await _client.ConnectAsync(new Uri(host), _cancelToken).ConfigureAwait(false);
_task = RunAsync(_cancelToken); _task = RunAsync(_cancelToken);
} }
public async Task DisconnectAsync() public async Task DisconnectAsync()
{ {
//Assume locked await _sendLock.WaitAsync(_cancelToken).ConfigureAwait(false);
try
{
await DisconnectInternalAsync();
}
finally
{
_sendLock.Release();
}
}
private async Task DisconnectInternalAsync()
{
try { _cancelTokenSource.Cancel(false); } catch { } try { _cancelTokenSource.Cancel(false); } catch { }
await (_task ?? Task.CompletedTask).ConfigureAwait(false);
if (_client != null && _client.State == WebSocketState.Open) if (_client != null && _client.State == WebSocketState.Open)
{ {
var task = _client?.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None); _client.Dispose();
if (task != null) _client = null;
await task.ConfigureAwait(false);
} }
await (_task ?? Task.CompletedTask).ConfigureAwait(false);
} }
public void SetHeader(string key, string value) public void SetHeader(string key, string value)
@@ -99,7 +121,8 @@ namespace Discord.Net.WebSockets
await _sendLock.WaitAsync(_cancelToken).ConfigureAwait(false); await _sendLock.WaitAsync(_cancelToken).ConfigureAwait(false);
try try
{ {
//TODO: If connection is temporarily down, retry? if (_client == null) return;
int frameCount = (int)Math.Ceiling((double)count / SendChunkSize); int frameCount = (int)Math.Ceiling((double)count / SendChunkSize);
for (int i = 0; i < frameCount; i++, index += SendChunkSize) for (int i = 0; i < frameCount; i++, index += SendChunkSize)
@@ -112,16 +135,9 @@ namespace Discord.Net.WebSockets
else else
frameSize = SendChunkSize; frameSize = SendChunkSize;
try
{
var type = isText ? WebSocketMessageType.Text : WebSocketMessageType.Binary; var type = isText ? WebSocketMessageType.Text : WebSocketMessageType.Binary;
await _client.SendAsync(new ArraySegment<byte>(data, index, count), type, isLast, _cancelToken).ConfigureAwait(false); await _client.SendAsync(new ArraySegment<byte>(data, index, count), type, isLast, _cancelToken).ConfigureAwait(false);
} }
catch (Win32Exception ex) when (ex.HResult == HR_TIMEOUT)
{
return;
}
}
} }
finally finally
{ {