ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #7673 from deathbeam/try-catch-ws-message

Browse Source 
Prevent WSMessage deserialization failure from closing websocket
This commit is contained in:
Tomas Slusny
2019-02-03 11:27:48 +00:00
committed by GitHub
parent 04f076a6b8 e4828a597c
commit 0b7672d12d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/ws/WSClient.java
View File

@@ -25,6 +25,7 @@
package net.runelite.client.ws; package net.runelite.client.ws;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
@@ -154,7 +155,18 @@ public class WSClient extends WebSocketListener implements AutoCloseable
@Override @Override
public void onMessage(WebSocket webSocket, String text) public void onMessage(WebSocket webSocket, String text)
{ {
final WebsocketMessage message = gson.fromJson(text, WebsocketMessage.class); final WebsocketMessage message;
try
{
message = gson.fromJson(text, WebsocketMessage.class);
}
catch (JsonParseException e)
{
log.debug("Failed to deserialize message", e);
return;
}
if (message.isParty() && !(message instanceof PartyMessage)) if (message.isParty() && !(message instanceof PartyMessage))
{ {
// spoofed message? // spoofed message?