Optimized exception handling and awaits.

This commit is contained in:
Christian Kratky
2017-09-15 15:58:48 +02:00
parent 76105de4c7
commit eda8bff10b
6 changed files with 70 additions and 71 deletions
@@ -1,6 +1,5 @@
using MQTTnet.Core.Channel;
using MQTTnet.Core.Client;
using MQTTnet.Core.Exceptions;
using System;
using System.IO;
using System.Net.WebSockets;
@@ -11,7 +10,7 @@ namespace MQTTnet.Implementations
{
public sealed class MqttWebSocketChannel : IMqttCommunicationChannel, IDisposable
{
private ClientWebSocket _webSocket = new ClientWebSocket();
private ClientWebSocket _webSocket;
public Stream RawStream { get; private set; }
public Stream SendStream => RawStream;
@@ -19,25 +18,15 @@ namespace MQTTnet.Implementations
public async Task ConnectAsync(MqttClientOptions options)
{
_webSocket = null;
try
{
_webSocket = new ClientWebSocket();
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None);
RawStream = new WebSocketStream(_webSocket);
}
catch (WebSocketException exception)
{
throw new MqttCommunicationException(exception);
}
_webSocket = new ClientWebSocket();
await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None);
RawStream = new WebSocketStream(_webSocket);
}
public Task DisconnectAsync()
{
RawStream = null;
return _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
return _webSocket?.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
}
public void Dispose()