Some improvement of ws client #131

Author: chronoxor

examples/WsChatClient/Program.cs

@@ -28,6 +28,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

examples/WssChatClient/Program.cs

@@ -30,6 +30,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WsEchoClient/Program.cs

@@ -25,6 +25,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WsMulticastClient/Program.cs

@@ -24,6 +24,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsReceived(byte[] buffer, long offset, long size)

performance/WssEchoClient/Program.cs

@@ -27,6 +27,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsConnected(HttpResponse response)

performance/WssMulticastClient/Program.cs

@@ -26,6 +26,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
 
         public override void OnWsReceived(byte[] buffer, long offset, long size)

source/NetCoreServer/NetCoreServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.0.15.0</Version>
+    <Version>5.0.16.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019-2021 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>

source/NetCoreServer/WsClient.cs

@@ -320,14 +320,11 @@ protected override void OnConnected()
             // Fill the WebSocket upgrade HTTP request
             OnWsConnecting(Request);
 
-            // Set empty body of the WebSocket upgrade HTTP request
-            Request.SetBody();
-
             // Send the WebSocket upgrade HTTP request
             if (_syncConnect)
-                Send(Request.Cache.Data);
+                SendRequest(Request);
             else
-                SendAsync(Request.Cache.Data);
+                SendRequestAsync(Request);
         }
 
         protected override void OnDisconnecting()

source/NetCoreServer/WssClient.cs

@@ -323,14 +323,11 @@ protected override void OnHandshaked()
             // Fill the WebSocket upgrade HTTP request
             OnWsConnecting(Request);
 
-            // Set empty body of the WebSocket upgrade HTTP request
-            Request.SetBody();
-
             // Send the WebSocket upgrade HTTP request
             if (_syncConnect)
-                Send(Request.Cache.Data);
+                SendRequest(Request);
             else
-                SendAsync(Request.Cache.Data);
+                SendRequestAsync(Request);
         }
 
         protected override void OnDisconnecting()

tests/WsTests.cs

@@ -29,6 +29,7 @@ public override void OnWsConnecting(HttpRequest request)
             request.SetHeader("Sec-WebSocket-Key", Convert.ToBase64String(WsNonce));
             request.SetHeader("Sec-WebSocket-Protocol", "chat, superchat");
             request.SetHeader("Sec-WebSocket-Version", "13");
+            request.SetBody();
         }
         public override void OnWsConnected(HttpResponse response) { IsWsConnected = true; Connected = true; }
         public override void OnWsDisconnected() { IsWsConnected = false; Disconnected = true; }