Bump version to 1.5.0 and add crash monitoring for real-time Discord announcements on world crashes

Author: allanf181

build.gradle

@@ -18,7 +18,7 @@ plugins {
 boolean ci = System.getenv("CI") == "true"
 
 group = 'one.armelin'
-version = '1.4.4'
+version = '1.5.0'
 
 def decomp(fileCollection) {
     def jarFile = fileCollection.singleFile

src/main/java/one/armelin/distale/Configuration.java

@@ -175,6 +175,24 @@ Crash message (Not implemented yet)
                 Available placeholders:
                 %crashdescription% | Crash description""")
         public String crashMessage = "**Server crashed:** %crashdescription%";
+
+        @Comment(value = """
+                Hytale -> Discord
+                World crash message
+                Available placeholders:
+                %worldname% | World name
+                %crashdescription% | Crash description""")
+        public String worldCrashMessage = "**World %worldname% crashed:** %crashdescription%";
+
+        @Comment(value = """
+                Hytale -> Discord
+                World crash message
+                Available placeholders:
+                %worldname% | World name
+                %crashdescription% | Crash description
+                %cause% | Potential cause of crash
+                """)
+        public String worldCrashWithCauseMessage = "**World %worldname% crashed:** %crashdescription%\n**Potential cause:** %cause%";
     }
 
     /**

src/main/java/one/armelin/distale/DisTale.java

@@ -1,30 +1,37 @@
 package one.armelin.distale;
 
 import com.hypixel.hytale.logger.HytaleLogger;
+import com.hypixel.hytale.logger.backend.HytaleLoggerBackend;
 import com.hypixel.hytale.protocol.PlayerSkin;
 import com.hypixel.hytale.server.core.command.system.CommandManager;
 import com.hypixel.hytale.server.core.plugin.JavaPlugin;
 import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
 import com.hypixel.hytale.server.core.universe.Universe;
+import com.hypixel.hytale.server.core.universe.world.World;
+import com.hypixel.hytale.server.core.universe.world.WorldConfig;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.exceptions.InvalidTokenException;
 import net.dv8tion.jda.api.requests.GatewayIntent;
+import net.dv8tion.jda.api.utils.MarkdownSanitizer;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import one.armelin.distale.commands.ShrugCommand;
 import one.armelin.distale.listeners.*;
 import one.armelin.distale.listeners.systems.BeforeGatherMemoriesSystem;
 import one.armelin.distale.listeners.systems.PlayerDeathSystem;
+import one.armelin.distale.utils.ObservableCopyOnWriteArrayList;
 
 import java.nio.file.Files;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -53,6 +60,43 @@ public class DisTale extends JavaPlugin {
 
     private static DisTale instance;
 
+    private static final ObservableCopyOnWriteArrayList<LogRecord> logWatcher = new ObservableCopyOnWriteArrayList<>(record -> {
+        if(jda == null || stop || !config.announceCrashes) return;
+        if(record.getLevel() == Level.SEVERE && record.getThrown() != null){
+            if (record.getLoggerName().equals("Hytale")){
+                Pattern pattern = Pattern.compile("Exception in thread Thread\\[#\\d+,([^,]+),[^\\]]*\\](?: potentially caused by (.+))?");
+                Matcher matcher = pattern.matcher(record.getMessage());
+                if (matcher.find()) {
+                    String threadName = matcher.group(1);
+                    String cause = matcher.group(2);
+                    if(threadName.startsWith("WorldThread")){
+                        String worldName = threadName.split(" - ")[1];
+                        Pattern uuidPattern = Pattern.compile("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}");
+                        Matcher uuidMatcher = uuidPattern.matcher(worldName);
+                        if (uuidMatcher.find()) {
+                            World world = universe.getWorld(matcher.group());
+                            if(world != null){
+                                worldName = world.getWorldConfig().getDisplayName() != null ? world.getWorldConfig().getDisplayName() : WorldConfig.formatDisplayName(world.getName());
+                            }
+                        }
+                        String msg;
+                        if(cause != null){
+                            msg = DisTale.config.texts.worldCrashWithCauseMessage
+                                    .replace("%worldname%", worldName)
+                                    .replace("%crashdescription%", MarkdownSanitizer.escape(record.getThrown().getMessage()))
+                                    .replace("%cause%", MarkdownSanitizer.escape(cause));
+                        } else {
+                            msg = DisTale.config.texts.worldCrashMessage
+                                    .replace("%worldname%", worldName)
+                                    .replace("%crashdescription%", MarkdownSanitizer.escape(record.getThrown().getMessage()));
+                        }
+                        textChannel.sendMessage(msg).queue();
+                    }
+                }
+            }
+        }
+    });
+
     public DisTale(JavaPluginInit init) {
         super(init);
         instance = this;
@@ -70,6 +114,8 @@ public DisTale(JavaPluginInit init) {
         }
         config = Configuration.getConfig(getDataDirectory());
 
+        HytaleLoggerBackend.subscribe(logWatcher);
+
         LOGGER.atInfo().log("DisTale initialized successfully!");
     }
 

src/main/java/one/armelin/distale/utils/ObservableCopyOnWriteArrayList.java

@@ -0,0 +1,34 @@
+package one.armelin.distale.utils;
+
+import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
+public class ObservableCopyOnWriteArrayList<E> extends CopyOnWriteArrayList<E> {
+
+    private final Consumer<E> onAdd;
+
+    public ObservableCopyOnWriteArrayList(Consumer<E> onAdd) {
+        this.onAdd = onAdd;
+    }
+
+    @Override
+    public boolean add(E e) {
+        boolean result = super.add(e);
+        onAdd.accept(e);
+        return result;
+    }
+
+    @Override
+    public void add(int index, E e) {
+        super.add(index, e);
+        onAdd.accept(e);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends E> c) {
+        boolean result = super.addAll(c);
+        if (result) c.forEach(onAdd);
+        return result;
+    }
+}

src/main/resources/manifest.json

@@ -1,7 +1,7 @@
 {
     "Group": "armelin1",
     "Name": "DisTale",
-    "Version": "1.4.4",
+    "Version": "1.5.0",
     "Description": "Discord bridge for Hytale servers - Chat integration, announcements, and commands",
     "Authors": [
         {