Buf fix:When stop QpWebSocketServer Channels didn't clear.

Author: aaasoft

Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServer.cs

@@ -17,13 +17,11 @@ private class WebSocketContext
         {
             public string ConnectionInfo { get; set; }
             public System.Net.WebSockets.WebSocket WebSocket { get; set; }
-            public CancellationTokenSource Cts { get; set; }
 
             public WebSocketContext(string connectionInfo, System.Net.WebSockets.WebSocket webSocket, CancellationTokenSource cts)
             {
                 ConnectionInfo = connectionInfo;
                 WebSocket = webSocket;
-                Cts = cts;
             }
         }
 
@@ -86,7 +84,7 @@ protected override async Task InnerAcceptAsync(CancellationToken token)
                 {
                     if (LogUtils.LogConnection)
                         LogUtils.Log("[Connection]{0} connected.", context.ConnectionInfo);
-                    OnNewChannelConnected(new WebSocketServerStream(context.WebSocket, context.Cts), context.ConnectionInfo, token);
+                    OnNewChannelConnected(new WebSocketServerStream(context.WebSocket, token), context.ConnectionInfo, token);
                 }
                 catch (Exception ex)
                 {

Quick.Protocol.WebSocket.Server.AspNetCore/Quick.Protocol.WebSocket.Server.AspNetCore.csproj

@@ -5,7 +5,7 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>
-		<Version>2.1.8</Version>
+		<Version>2.1.9</Version>
 		<Authors>scbeta</Authors>
 		<Company />
 		<Product>Quick.Protocol</Product>

Quick.Protocol.WebSocket.Server.AspNetCore/WebSocketServerStream.cs

@@ -11,14 +11,14 @@ namespace Quick.Protocol.WebSocket.Server.AspNetCore
     internal class WebSocketServerStream : Stream
     {
         private System.Net.WebSockets.WebSocket webSocket;
-        private CancellationTokenSource cts = null;
+        private CancellationToken cancellationToken;
         private const int ReadSize = 1024 * 4;
         private byte[] readBuffer = new byte[ReadSize];
 
-        public WebSocketServerStream(System.Net.WebSockets.WebSocket webSocket, CancellationTokenSource cts)
+        public WebSocketServerStream(System.Net.WebSockets.WebSocket webSocket, CancellationToken cancellationToken)
         {
             this.webSocket = webSocket;
-            this.cts = cts;
+            this.cancellationToken = cancellationToken;
         }
 
         public override bool CanSeek => throw new NotImplementedException();
@@ -35,39 +35,23 @@ public override void Flush() { }
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            try
-            {
-                var result = webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), cts.Token).Result;
-                return result.Count;
-            }
-            catch
-            {
-                cts.Cancel();
-                return 0;
-            }
+            var result = webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken).Result;
+            return result.Count;
         }
 
 
         public override void Write(byte[] buffer, int offset, int count)
         {
-            try
-            {
-                webSocket.SendAsync(
-                    new ArraySegment<byte>(buffer, offset, count),
-                    System.Net.WebSockets.WebSocketMessageType.Binary,
-                    true,
-                    cts.Token)
-                    .Wait();
-            }
-            catch
-            {
-                cts.Cancel();
-            }
+            webSocket.SendAsync(
+                new ArraySegment<byte>(buffer, offset, count),
+                System.Net.WebSockets.WebSocketMessageType.Binary,
+                true,
+                cancellationToken)
+                .Wait();
         }
 
         protected override void Dispose(bool disposing)
         {
-            cts.Cancel();
             webSocket.Dispose();
             base.Dispose(disposing);
         }