Skip to content

fix: add try-catch to webSocket onMessage #6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hengyuss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add try-catch to webSocket onMessage #6961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .../main/java/org/apache/shenyu/plugin/sync/data/websocket/client/ShenyuWebsocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,19 +224,23 @@ public void onMessage(final String result) {
if (LOG.isDebugEnabled()) {
LOG.debug("onMessage server[{}] result({})", this.getURI().toString(), result);
}

Map<String, Object> jsonToMap = JsonUtils.jsonToMap(result);
Object eventType = jsonToMap.get(RunningModeConstants.EVENT_TYPE);
if (Objects.equals(DataEventTypeEnum.RUNNING_MODE.name(), eventType)) {
LOG.info("server[{}] handle running mode result({})", this.getURI().toString(), result);
this.runningMode = String.valueOf(jsonToMap.get(RunningModeConstants.RUNNING_MODE));
if (Objects.equals(RunningModeEnum.STANDALONE.name(), runningMode)) {
return;

try {
Map<String, Object> jsonToMap = JsonUtils.jsonToMap(result);
Object eventType = jsonToMap.get(RunningModeConstants.EVENT_TYPE);
if (Objects.equals(DataEventTypeEnum.RUNNING_MODE.name(), eventType)) {
LOG.info("server[{}] handle running mode result({})", this.getURI().toString(), result);
this.runningMode = String.valueOf(jsonToMap.get(RunningModeConstants.RUNNING_MODE));
if (Objects.equals(RunningModeEnum.STANDALONE.name(), runningMode)) {
return;
}
this.masterUrl = String.valueOf(jsonToMap.get(RunningModeConstants.MASTER_URL));
this.isConnectedToMaster = Boolean.TRUE.equals(jsonToMap.get(RunningModeConstants.IS_MASTER));
} else {
handleResult(result);
}
this.masterUrl = String.valueOf(jsonToMap.get(RunningModeConstants.MASTER_URL));
this.isConnectedToMaster = Boolean.TRUE.equals(jsonToMap.get(RunningModeConstants.IS_MASTER));
} else {
handleResult(result);
} catch (RuntimeException ex) {
LOG.warn("Failed to handle websocket message from server[{}], the message will be ignored", this.getURI(), ex);
}
}

Expand Down
26 changes: 26 additions & 0 deletions ...t/java/org/apache/shenyu/plugin/sync/data/websocket/client/ShenyuWebsocketClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,32 @@ public void testOnMessage() {
verify(pluginDataSubscriber).onSubscribe(any());
}

@Test
public void testOnMessageShouldIgnoreMalformedJsonAndHandleNextMessage() {
Assertions.assertDoesNotThrow(() -> shenyuWebsocketClient.onMessage("{invalid json"));

doNothing().when(pluginDataSubscriber).onSubscribe(any());
String json = GsonUtils.getInstance().toJson(websocketData);
shenyuWebsocketClient.onMessage(json);
verify(pluginDataSubscriber).onSubscribe(any());
}

@Test
public void testOnMessageShouldIgnoreUnknownGroupType() {
websocketData.setGroupType("UNKNOWN_GROUP");
String json = GsonUtils.getInstance().toJson(websocketData);

Assertions.assertDoesNotThrow(() -> shenyuWebsocketClient.onMessage(json));
}

@Test
public void testOnMessageShouldIgnoreUnknownEventType() {
websocketData.setEventType("UNKNOWN_EVENT");
String json = GsonUtils.getInstance().toJson(websocketData);

Assertions.assertDoesNotThrow(() -> shenyuWebsocketClient.onMessage(json));
}

@Test
public void testOnClose() {
shenyuWebsocketClient = spy(shenyuWebsocketClient);
Expand Down
Loading