huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WebSocketClient.ConnectAsync throws when the provided CancellationToken is cancelled.

This commit is contained in:
Eric 2017-07-13 17:37:20 +02:00 committed by John Luo
parent b187c1adc4
commit 9b1cbedffc
3 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SampleStartups/FakeServer.cs
View File

@ -22,7 +22,7 @@ namespace SampleStartups
}
}
public static class FakeServerWebHostBuliderExtensions
public static class FakeServerWebHostBuilderExtensions
{
public static IWebHostBuilder UseFakeServer(this IWebHostBuilder builder)
{

21
src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs
View File

@ -87,6 +87,7 @@ namespace Microsoft.AspNetCore.TestHost
{
private readonly IHttpApplication<Context> _application;
private TaskCompletionSource<WebSocket> _clientWebSocketTcs;
private CancellationTokenRegistration _cancellationTokenRegistration;
private WebSocket _serverWebSocket;
public Context Context { get; private set; }
@ -95,6 +96,8 @@ namespace Microsoft.AspNetCore.TestHost
public RequestState(Uri uri, PathString pathBase, CancellationToken cancellationToken, IHttpApplication<Context> application)
{
_clientWebSocketTcs = new TaskCompletionSource<WebSocket>();
_cancellationTokenRegistration = cancellationToken.Register(
() => _clientWebSocketTcs.TrySetCanceled(cancellationToken));
_application = application;
// HttpContext
@ -181,12 +184,20 @@ namespace Microsoft.AspNetCore.TestHost
Task<WebSocket> IHttpWebSocketFeature.AcceptAsync(WebSocketAcceptContext context)
{
Context.HttpContext.Response.StatusCode = 101; // Switching Protocols
var websockets = TestWebSocket.CreatePair(context.SubProtocol);
_clientWebSocketTcs.SetResult(websockets.Item1);
_serverWebSocket = websockets.Item2;
return Task.FromResult<WebSocket>(_serverWebSocket);
if (_clientWebSocketTcs.TrySetResult(websockets.Item1))
{
Context.HttpContext.Response.StatusCode = StatusCodes.Status101SwitchingProtocols;
_serverWebSocket = websockets.Item2;
return Task.FromResult(_serverWebSocket);
}
else
{
Context.HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
websockets.Item1.Dispose();
websockets.Item2.Dispose();
return _clientWebSocketTcs.Task; // Canceled or Faulted - no result
}
}
}
}

50
test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
View File

@ -11,7 +11,6 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.DependencyInjection;
@ -173,7 +172,7 @@ namespace Microsoft.AspNetCore.TestHost
public async Task WebSocketWorks()
{
// Arrange
// This logger will attempt to access information from HttpRequest once the HttpContext is createds
// This logger will attempt to access information from HttpRequest once the HttpContext is created
var logger = new VerifierLogger();
RequestDelegate appDelegate = async ctx =>
{
@ -239,6 +238,53 @@ namespace Microsoft.AspNetCore.TestHost
clientSocket.Dispose();
}
[ConditionalFact]
public async Task WebSocketAcceptThrowsWhenCancelled()
{
// Arrange
// This logger will attempt to access information from HttpRequest once the HttpContext is created
var logger = new VerifierLogger();
RequestDelegate appDelegate = async ctx =>
{
if (ctx.WebSockets.IsWebSocketRequest)
{
var websocket = await ctx.WebSockets.AcceptWebSocketAsync();
var receiveArray = new byte[1024];
while (true)
{
var receiveResult = await websocket.ReceiveAsync(new System.ArraySegment<byte>(receiveArray), CancellationToken.None);
if (receiveResult.MessageType == WebSocketMessageType.Close)
{
await websocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal Closure", CancellationToken.None);
break;
}
else
{
var sendBuffer = new System.ArraySegment<byte>(receiveArray, 0, receiveResult.Count);
await websocket.SendAsync(sendBuffer, receiveResult.MessageType, receiveResult.EndOfMessage, CancellationToken.None);
}
}
}
};
var builder = new WebHostBuilder()
.ConfigureServices(services =>
{
services.AddSingleton<ILogger<IWebHost>>(logger);
})
.Configure(app =>
{
app.Run(appDelegate);
});
var server = new TestServer(builder);
// Act
var client = server.CreateWebSocketClient();
var tokenSource = new CancellationTokenSource();
tokenSource.Cancel();
// Assert
await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await client.ConnectAsync(new System.Uri("http://localhost"), tokenSource.Token));
}
private class VerifierLogger : ILogger<IWebHost>
{