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

Merge branch 'rel/1.0.0-alpha2' into dev

This commit is contained in:
moozzyk 2017-09-25 08:17:27 -07:00
parent 65cd41dbf5 0267695656
commit c0713c9916
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs
View File

@ -77,20 +77,27 @@ namespace Microsoft.AspNetCore.SignalR
var protocolReaderWriter = connectionContext.ProtocolReaderWriter;
async Task WriteToTransport()
{
while (await output.In.WaitToReadAsync())
try
{
while (output.In.TryRead(out var hubMessage))
while (await output.In.WaitToReadAsync())
{
var buffer = protocolReaderWriter.WriteMessage(hubMessage);
while (await connection.Transport.Out.WaitToWriteAsync())
while (output.In.TryRead(out var hubMessage))
{
if (connection.Transport.Out.TryWrite(buffer))
var buffer = protocolReaderWriter.WriteMessage(hubMessage);
while (await connection.Transport.Out.WaitToWriteAsync())
{
break;
if (connection.Transport.Out.TryWrite(buffer))
{
break;
}
}
}
}
}
catch (Exception ex)
{
connectionContext.Abort(ex);
}
}
var writingOutputTask = WriteToTransport();
@ -245,7 +252,7 @@ namespace Microsoft.AspNetCore.SignalR
private async Task DispatchMessagesAsync(HubConnectionContext connection)
{
// Since we dispatch multiple hub invocations in parallel, we need a way to communicate failure back to the main processing loop.
// Since we dispatch multiple hub invocations in parallel, we need a way to communicate failure back to the main processing loop.
// This is done by aborting the connection.
try

34
test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTests.cs
View File

@ -4,11 +4,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks.Channels;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.SignalR.Internal.Protocol;
using Microsoft.AspNetCore.SignalR.Tests.Common;
@ -21,7 +23,6 @@ using MsgPack.Serialization;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Xunit;
using Microsoft.AspNetCore.Hosting;
namespace Microsoft.AspNetCore.SignalR.Tests
{
@ -1149,6 +1150,32 @@ namespace Microsoft.AspNetCore.SignalR.Tests
}
}
[Fact]
public async Task ConnectionClosedIfWritingToTransportFails()
{
// MessagePack does not support serializing objects or private types (including anonymous types)
// and throws. In this test we make sure that this exception closes the connection and bubbles up.
var serviceProvider = CreateServiceProvider();
var endPoint = serviceProvider.GetService<HubEndPoint<MethodHub>>();
using (var client = new TestClient(false, new MessagePackHubProtocol()))
{
var transportFeature = new Mock<IConnectionTransportFeature>();
transportFeature.SetupGet(f => f.TransportCapabilities).Returns(TransferMode.Binary);
client.Connection.Features.Set(transportFeature.Object);
var endPointLifetime = endPoint.OnConnectedAsync(client.Connection);
await client.Connected.OrTimeout();
await client.SendInvocationAsync(nameof(MethodHub.SendAnonymousObject)).OrTimeout();
await Assert.ThrowsAsync<SerializationException>(() => endPointLifetime.OrTimeout());
}
}
private static void AssertHubMessage(HubMessage expected, HubMessage actual)
{
// We aren't testing InvocationIds here
@ -1567,6 +1594,11 @@ namespace Microsoft.AspNetCore.SignalR.Tests
return $"{b}, {i}, {c}, {s}";
}
public Task SendAnonymousObject()
{
return Clients.Client(Context.ConnectionId).InvokeAsync("Send", new { });
}
public override Task OnDisconnectedAsync(Exception e)
{
return Task.CompletedTask;