Refactor web socket usage

Frameworks/MQTTnet.NetFramework/Implementations/MqttTcpChannel.cs

@@ -12,6 +12,10 @@ namespace MQTTnet.Implementations
 {
     public sealed class MqttTcpChannel : IMqttCommunicationChannel, IDisposable
     {
+        // ReSharper disable once MemberCanBePrivate.Global
+        // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Global
+        public static int BufferSize { get; set; } = 4096 * 20; // Can be changed for fine tuning by library user.
+
         private Socket _socket;
         private SslStream _sslStream;
 
@@ -34,9 +38,9 @@ namespace MQTTnet.Implementations
             CreateStreams(socket, sslStream);
         }
 
-        public Stream RawStream { get; private set; }
         public Stream SendStream { get; private set; }
         public Stream ReceiveStream { get; private set; }
+        public Stream RawReceiveStream { get; private set; }
 
         public async Task ConnectAsync(MqttClientOptions options)
         {
@@ -67,8 +71,8 @@ namespace MQTTnet.Implementations
 
         public void Dispose()
         {
-            RawStream?.Dispose();
-            RawStream = null;
+            RawReceiveStream?.Dispose();
+            RawReceiveStream = null;
 
             ReceiveStream?.Dispose();
             ReceiveStream = null;
@@ -85,12 +89,12 @@ namespace MQTTnet.Implementations
 
         private void CreateStreams(Socket socket, Stream sslStream)
         {
-            RawStream = sslStream ?? new NetworkStream(socket);
+            RawReceiveStream = sslStream ?? new NetworkStream(socket);
 
             //cannot use this as default buffering prevents from receiving the first connect message
             //need two streams otherwise read and write have to be synchronized
-            SendStream = new BufferedStream(RawStream, BufferConstants.Size);
-            ReceiveStream = new BufferedStream(RawStream, BufferConstants.Size);
+            SendStream = new BufferedStream(RawReceiveStream, BufferSize);
+            ReceiveStream = new BufferedStream(RawReceiveStream, BufferSize);
         }
 
         private static X509CertificateCollection LoadCertificates(MqttClientOptions options)

Frameworks/MQTTnet.NetFramework/Implementations/MqttWebSocketChannel.cs

@@ -12,20 +12,32 @@ namespace MQTTnet.Implementations
     {
         private ClientWebSocket _webSocket;
 
-        public Stream RawStream { get; private set; }
-        public Stream SendStream => RawStream;
-        public Stream ReceiveStream => RawStream;
+        public Stream RawReceiveStream { get; private set; }
+        public Stream SendStream => RawReceiveStream;
+        public Stream ReceiveStream => RawReceiveStream;
 
         public async Task ConnectAsync(MqttClientOptions options)
         {
+            var uri = options.Server;
+            if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase))
+            {
+                uri = "ws://" + uri;
+            }
+
+            if (options.Port.HasValue)
+            {
+                uri += ":" + options.Port;
+            }
+            
             _webSocket = new ClientWebSocket();
-            await _webSocket.ConnectAsync(new Uri(options.Server), CancellationToken.None).ConfigureAwait(false);
-            RawStream = new WebSocketStream(_webSocket);
+            _webSocket.Options.KeepAliveInterval = options.KeepAlivePeriod;
+            await _webSocket.ConnectAsync(new Uri(uri), CancellationToken.None).ConfigureAwait(false);
+            RawReceiveStream = new WebSocketStream(_webSocket);
         }
 
         public async Task DisconnectAsync()
         {
-            RawStream = null;
+            RawReceiveStream = null;
 
             if (_webSocket == null)
             {