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

Merge pull request #2816 from dotnet-maestro-bot/merge/release/2.2-to-master 

[automated] Merge branch 'release/2.2' => 'master'
This commit is contained in:
Mikael Mengistu 2018-08-15 16:04:07 -07:00 committed by GitHub
parent 5780e4e200 431627958c
commit 8d282dad83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 163 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CloseMessage.java Normal file
View File

@ -0,0 +1,24 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
package com.microsoft.aspnet.signalr;
public class CloseMessage extends HubMessage {
String error;
@Override
public HubMessageType getMessageType() {
return HubMessageType.CLOSE;
}
public CloseMessage() {
}
public CloseMessage(String error) {
this.error = error;
}
public String getError() {
return this.error;
}
}

32
clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java
View File

@ -71,17 +71,21 @@ public class HubConnection {
logger.log(LogLevel.Warning, "Failed to find handler for %s method", invocationMessage.target);
}
break;
case CLOSE:
logger.log(LogLevel.Information, "Close message received from server.");
CloseMessage closeMessage = (CloseMessage)message;
stop(closeMessage.getError());
break;
case PING:
// We don't need to do anything in the case of a ping message.
break;
case STREAM_INVOCATION:
case STREAM_ITEM:
case CLOSE:
case CANCEL_INVOCATION:
case COMPLETION:
logger.log(LogLevel.Error, "This client does not support %s messages", message.getMessageType());
throw new UnsupportedOperationException(String.format("The message type %s is not supported yet.", message.getMessageType()));
case PING:
// We don't need to do anything in the case of a ping message.
break;
}
}
};
@ -142,17 +146,29 @@ public class HubConnection {
String handshake = HandshakeProtocol.createHandshakeRequestMessage(new HandshakeRequestMessage(protocol.getName(), protocol.getVersion()));
transport.send(handshake);
connectionState = HubConnectionState.CONNECTED;
logger.log(LogLevel.Information, "HubConnected started");
logger.log(LogLevel.Information, "HubConnected started.");
}
/**
* Stops a connection to the server.
*/
public void stop(){
logger.log(LogLevel.Debug, "Stopping HubConnection");
private void stop(String errorMessage) {
if(errorMessage != null){
logger.log(LogLevel.Error , "HubConnection disconnected with an error %s.", errorMessage);
} else {
logger.log(LogLevel.Debug, "Stopping HubConnection.");
}
transport.stop();
connectionState = HubConnectionState.DISCONNECTED;
logger.log(LogLevel.Information, "HubConnection stopped");
logger.log(LogLevel.Information, "HubConnection stopped.");
}
/**
* Stops a connection to the server.
*/
public void stop() {
stop(null);
}
/**

9
clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java
View File

@ -62,7 +62,14 @@ public class JsonHubProtocol implements HubProtocol {
hubMessages.add(new PingMessage());
break;
case CLOSE:
//Don't care yet;
CloseMessage closeMessage;
if (jsonMessage.has("error")){
String error = jsonMessage.get("error").getAsString();
closeMessage = new CloseMessage(error);
} else {
closeMessage = new CloseMessage();
}
hubMessages.add(closeMessage);
break;
}
}

2
clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Transport.java
View File

@ -4,7 +4,7 @@
package com.microsoft.aspnet.signalr;
public interface Transport {
void start() throws InterruptedException;
void start() throws Exception;
void send(String message) throws Exception;
void setOnReceive(OnReceiveCallBack callback);
void onReceive(String message) throws Exception;

10
clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java
View File

@ -39,10 +39,14 @@ public class WebSocketTransport implements Transport {
}
@Override
public void start() throws InterruptedException {
logger.log(LogLevel.Debug, "Starting Websocket connection");
public void start() throws Exception {
logger.log(LogLevel.Debug, "Starting Websocket connection.");
webSocketClient = createWebSocket();
webSocketClient.connectBlocking();
if (!webSocketClient.connectBlocking()) {
String errorMessage = "There was an error starting the Websockets transport.";
logger.log(LogLevel.Debug, errorMessage);
throw new Exception(errorMessage);
}
logger.log(LogLevel.Information, "WebSocket transport connected to: %s", webSocketClient.getURI());
}

15
clients/java/signalr/src/test/java/HubConnectionTest.java
View File

@ -22,6 +22,21 @@ public class HubConnectionTest {
assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
}
@Test
public void HubConnectionClosesAfterCloseMessage() throws Exception {
MockTransport mockTransport = new MockTransport();
HubConnection hubConnection = new HubConnection("http://example.com", mockTransport);
hubConnection.start();
mockTransport.receiveMessage("{}" + RECORD_SEPARATOR);
assertEquals(HubConnectionState.CONNECTED, hubConnection.getConnectionState());
mockTransport.receiveMessage("{\"type\":7,\"error\": \"There was an error\"}" + RECORD_SEPARATOR);
assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState());
}
@Test
public void RegisteringMultipleHandlersAndBothGetTriggered() throws Exception {
AtomicReference<Double> value = new AtomicReference<>(0.0);

32
clients/java/signalr/src/test/java/JsonHubProtocolTest.java
View File

@ -45,6 +45,38 @@ public class JsonHubProtocolTest {
assertEquals(HubMessageType.PING, messages[0].getMessageType());
}
@Test
public void ParseCloseMessage() {
String stringifiedMessage = "{\"type\":7}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
//We know it's only one message
assertEquals(1, messages.length);
assertEquals(HubMessageType.CLOSE, messages[0].getMessageType());
//We can safely cast here because we know that it's a close message.
CloseMessage closeMessage = (CloseMessage) messages[0];
assertEquals(null, closeMessage.getError());
}
@Test
public void ParseCloseMessageWithError() {
String stringifiedMessage = "{\"type\":7,\"error\": \"There was an error\"}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
//We know it's only one message
assertEquals(1, messages.length);
assertEquals(HubMessageType.CLOSE, messages[0].getMessageType());
//We can safely cast here because we know that it's a close message.
CloseMessage closeMessage = (CloseMessage) messages[0];
assertEquals("There was an error", closeMessage.getError());
}
@Test
public void ParseSingleMessage() {
String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";

38
clients/java/signalr/src/test/java/WebSocketTransportTest.java
View File

@ -2,38 +2,22 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
import com.microsoft.aspnet.signalr.NullLogger;
import com.microsoft.aspnet.signalr.Transport;
import com.microsoft.aspnet.signalr.WebSocketTransport;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collection;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.rules.ExpectedException;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
public class WebSocketTransportTest {
private String url;
private String expectedUrl;
public WebSocketTransportTest(String url, String expectedProtocol){
this.url = url;
this.expectedUrl = expectedProtocol;
}
@Parameterized.Parameters
public static Collection protocols(){
return Arrays.asList(new String[][] {
{"http://example.com", "ws://example.com"},
{"https://example.com", "wss://example.com"},
{"ws://example.com", "ws://example.com"},
{"wss://example.com", "wss://example.com"}});
}
@Rule
public ExpectedException expectedEx = ExpectedException.none();
@Test
public void checkWebsocketUrlProtocol() throws URISyntaxException {
WebSocketTransport webSocketTransport = new WebSocketTransport(this.url, new NullLogger());
assertEquals(this.expectedUrl, webSocketTransport.getUrl().toString());
public void WebsocketThrowsIfItCantConnect() throws Exception {
expectedEx.expect(Exception.class);
expectedEx.expectMessage("There was an error starting the Websockets transport");
Transport transport = new WebSocketTransport("www.notarealurl12345.fake", new NullLogger());
transport.start();
}
}
}

41
clients/java/signalr/src/test/java/WebSocketTransportUrlFormatTest.java Normal file
View File

@ -0,0 +1,41 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
import com.microsoft.aspnet.signalr.NullLogger;
import com.microsoft.aspnet.signalr.WebSocketTransport;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collection;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
public class WebSocketTransportUrlFormatTest {
private String url;
private String expectedUrl;
public WebSocketTransportUrlFormatTest(String url, String expectedProtocol) {
this.url = url;
this.expectedUrl = expectedProtocol;
}
@Parameterized.Parameters
public static Collection protocols() {
return Arrays.asList(new String[][]{
{"http://example.com", "ws://example.com"},
{"https://example.com", "wss://example.com"},
{"ws://example.com", "ws://example.com"},
{"wss://example.com", "wss://example.com"}});
}
@Test
public void checkWebsocketUrlProtocol() throws URISyntaxException {
WebSocketTransport webSocketTransport = new WebSocketTransport(this.url, new NullLogger());
assertEquals(this.expectedUrl, webSocketTransport.getUrl().toString());
}
}