Fix WebSocket not work problem.

aaasoft · aaasoft · commit 50cddbb2dcff · 2022-05-20T19:00:02.000+08:00
diff --git a/Quick.Protocol.WebSocket.Client/WebSocketClientStream.cs b/Quick.Protocol.WebSocket.Client/WebSocketClientStream.cs
@@ -49,11 +49,27 @@ public override int Read(byte[] buffer, int offset, int count)
             return result.Count;
         }
 
+        public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            var result = await client.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), CancellationToken.None);
+            return result.Count;
+        }
+
         public override void Write(byte[] buffer, int offset, int count)
         {
             if (closeReason != null)
                 throw new IOException(closeReason);
-            client.SendAsync(new ArraySegment<byte>(buffer, offset, count), System.Net.WebSockets.WebSocketMessageType.Binary, true, CancellationToken.None);
+
+            client.SendAsync(
+                new ArraySegment<byte>(buffer, offset, count),
+                System.Net.WebSockets.WebSocketMessageType.Binary,
+                true,
+                CancellationToken.None).Wait();
+        }
+
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return client.SendAsync(new ArraySegment<byte>(buffer, offset, count), System.Net.WebSockets.WebSocketMessageType.Binary, true, CancellationToken.None);
         }
 
         protected override void Dispose(bool disposing)
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QuickProtocolMiddlewareExtensions.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QuickProtocolMiddlewareExtensions.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
+using Quick.Protocol;
 using Quick.Protocol.WebSocket.Server.AspNetCore;
 using System;
 using System.Collections.Generic;
@@ -28,14 +29,15 @@ public static IApplicationBuilder UseQuickProtocol(this IApplicationBuilder app,
                     }
                     else
                     {
+                        var qpLibVersion = typeof(QpChannel).Assembly.GetName().Version;
                         var message = $@"
 <html>
     <head>
         <title>Quick.Protocol</title>
     </head>
     <body>
-        <p>Welcome to use <b>Quick.Protocol</b>.</p>
-        <p>Source Code:<a href=""http://github.com/aaasoft/Quick.Protocol"">http://github.com/aaasoft/Quick.Protocol</a></p>
+        <p>Welcome to use <b>Quick.Protocol {qpLibVersion.ToString(3)}</b></p>
+        <p>Source Code:<a href=""https://github.com/QuickProtocol/"">https://github.com/QuickProtocol/</a></p>
         <p>ServerProgram:{string.Join(" | ", options.InstructionSet.Select(t => $"{t.Name}({t.Id})"))}</p>
         <p>InstructionSet:{DateTime.Now}</p>
         <p>MaxPackageSize:{options.MaxPackageSize}</p>
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/WebSocketServerStream.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/WebSocketServerStream.cs
@@ -12,7 +12,7 @@ internal class WebSocketServerStream : Stream
     {
         private System.Net.WebSockets.WebSocket webSocket;
         private CancellationToken cancellationToken;
-        
+
         public WebSocketServerStream(System.Net.WebSockets.WebSocket webSocket, CancellationToken cancellationToken)
         {
             this.webSocket = webSocket;
@@ -37,6 +37,11 @@ public override int Read(byte[] buffer, int offset, int count)
             return result.Count;
         }
 
+        public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            var result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken);
+            return result.Count;
+        }
 
         public override void Write(byte[] buffer, int offset, int count)
         {
@@ -48,6 +53,16 @@ public override void Write(byte[] buffer, int offset, int count)
                 .Wait();
         }
 
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return webSocket.SendAsync(
+                new ArraySegment<byte>(buffer, offset, count),
+                System.Net.WebSockets.WebSocketMessageType.Binary,
+                true,
+                cancellationToken);
+        }
+
+
         protected override void Dispose(bool disposing)
         {
             webSocket.Dispose();

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ internal class WebSocketServerStream : Stream`
`12`	`12`	`{`
`13`	`13`	`private System.Net.WebSockets.WebSocket webSocket;`
`14`	`14`	`private CancellationToken cancellationToken;`
`15`		`-`
	`15`	`+`
`16`	`16`	`public WebSocketServerStream(System.Net.WebSockets.WebSocket webSocket, CancellationToken cancellationToken)`
`17`	`17`	`{`
`18`	`18`	`this.webSocket = webSocket;`
`@@ -37,6 +37,11 @@ public override int Read(byte[] buffer, int offset, int count)`
`37`	`37`	`return result.Count;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)`
	`41`	`+ {`
	`42`	`+ var result = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, offset, count), cancellationToken);`
	`43`	`+ return result.Count;`
	`44`	`+ }`
`40`	`45`
`41`	`46`	`public override void Write(byte[] buffer, int offset, int count)`
`42`	`47`	`{`
`@@ -48,6 +53,16 @@ public override void Write(byte[] buffer, int offset, int count)`
`48`	`53`	`.Wait();`
`49`	`54`	`}`
`50`	`55`
	`56`	`+ public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)`
	`57`	`+ {`
	`58`	`+ return webSocket.SendAsync(`
	`59`	`+ new ArraySegment<byte>(buffer, offset, count),`
	`60`	`+ System.Net.WebSockets.WebSocketMessageType.Binary,`
	`61`	`+ true,`
	`62`	`+ cancellationToken);`
	`63`	`+ }`
	`64`	`+`
	`65`	`+`
`51`	`66`	`protected override void Dispose(bool disposing)`
`52`	`67`	`{`
`53`	`68`	`webSocket.Dispose();`