From b3cdf67c4fab0f56cdcf90f03a243ebd715657c6 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 24 Apr 2022 09:33:33 +0100 Subject: [PATCH] Add error logging for failed plugin message parse (#3364) --- .../messaging/LuckPermsMessagingService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java index a49f283ea..a18e8682b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java +++ b/common/src/main/java/me/lucko/luckperms/common/messaging/LuckPermsMessagingService.java @@ -164,11 +164,21 @@ public class LuckPermsMessagingService implements InternalMessagingService, Inco @Override public boolean consumeIncomingMessageAsString(@NonNull String encodedString) { + try { + return consumeIncomingMessageAsString0(encodedString); + } catch (Exception e) { + this.plugin.getLogger().warn("Unable to decode incoming messaging service message: '" + encodedString + "'", e); + return false; + } + } + + private boolean consumeIncomingMessageAsString0(@NonNull String encodedString) { Objects.requireNonNull(encodedString, "encodedString"); - JsonObject decodedObject = GsonProvider.normal().fromJson(encodedString, JsonObject.class).getAsJsonObject(); + JsonObject parsed = Objects.requireNonNull(GsonProvider.normal().fromJson(encodedString, JsonObject.class), "parsed"); + JsonObject json = parsed.getAsJsonObject(); // extract id - JsonElement idElement = decodedObject.get("id"); + JsonElement idElement = json.get("id"); if (idElement == null) { throw new IllegalStateException("Incoming message has no id argument: " + encodedString); } @@ -180,14 +190,14 @@ public class LuckPermsMessagingService implements InternalMessagingService, Inco } // extract type - JsonElement typeElement = decodedObject.get("type"); + JsonElement typeElement = json.get("type"); if (typeElement == null) { throw new IllegalStateException("Incoming message has no type argument: " + encodedString); } String type = typeElement.getAsString(); // extract content - @Nullable JsonElement content = decodedObject.get("content"); + @Nullable JsonElement content = json.get("content"); // decode message Message decoded;