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

WebSockets transport now creates correct url (#268)

This commit is contained in:
Mikael Mengistu 2017-03-07 11:03:41 -08:00 committed by GitHub
parent 78dfd278c1
commit f374d92712
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Sockets.Client/LongPollingTransport.cs
View File

@ -30,6 +30,10 @@ namespace Microsoft.AspNetCore.Sockets.Client
public Task Running { get; private set; } public Task Running { get; private set; }
public LongPollingTransport(HttpClient httpClient)
: this(httpClient, null)
{ }
public LongPollingTransport(HttpClient httpClient, ILoggerFactory loggerFactory) public LongPollingTransport(HttpClient httpClient, ILoggerFactory loggerFactory)
{ {
_httpClient = httpClient; _httpClient = httpClient;

2
src/Microsoft.AspNetCore.Sockets.Client/WebSocketsTransport.cs
View File

@ -152,6 +152,8 @@ namespace Microsoft.AspNetCore.Sockets.Client
uriBuilder.Scheme = "wss"; uriBuilder.Scheme = "wss";
} }
uriBuilder.Path += "/ws";
await _webSocket.ConnectAsync(uriBuilder.Uri, _cancellationToken); await _webSocket.ConnectAsync(uriBuilder.Uri, _cancellationToken);
} }

20
test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs
View File

@ -54,8 +54,19 @@ namespace Microsoft.AspNetCore.SignalR.Tests
} }
} }
[Fact] public static IEnumerable<object[]> Transports
public async Task ConnectionCanSendAndReceiveMessages() {
get
{
yield return new object[] { new WebSocketsTransport() };
yield return new object[] { new LongPollingTransport(new HttpClient()) };
}
}
[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2, SkipReason = "No WebSockets Client for this platform")]
[MemberData(nameof(Transports))]
public async Task ConnectionCanSendAndReceiveMessages(ITransport transport)
{ {
const string message = "Major Key"; const string message = "Major Key";
var baseUrl = _serverFixture.BaseUrl; var baseUrl = _serverFixture.BaseUrl;
@ -63,7 +74,6 @@ namespace Microsoft.AspNetCore.SignalR.Tests
using (var httpClient = new HttpClient()) using (var httpClient = new HttpClient())
{ {
var transport = new LongPollingTransport(httpClient, loggerFactory);
var connection = new ClientConnection(new Uri(baseUrl + "/echo"), loggerFactory); var connection = new ClientConnection(new Uri(baseUrl + "/echo"), loggerFactory);
try try
{ {
@ -113,10 +123,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests
var baseUrl = _serverFixture.BaseUrl; var baseUrl = _serverFixture.BaseUrl;
var loggerFactory = new LoggerFactory(); var loggerFactory = new LoggerFactory();
var transport = new WebSocketsTransport(); var connection = new ClientConnection(new Uri(baseUrl + "/echo"), loggerFactory);
var connection = new ClientConnection(new Uri(baseUrl + "/echo/ws"), loggerFactory);
try try
{ {
var transport = new WebSocketsTransport();
var receiveTcs = new TaskCompletionSource<byte[]>(); var receiveTcs = new TaskCompletionSource<byte[]>();
connection.Received += (data, messageType) => receiveTcs.SetResult(data); connection.Received += (data, messageType) => receiveTcs.SetResult(data);