Log exceptions and fix maven api url

neoforged · Feb 2, 2025 · ec64b61 · ec64b61
1 parent 18071f3
commit ec64b61
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/net/neoforged/waifu/GameVersionIndexService.java b/src/main/java/net/neoforged/waifu/GameVersionIndexService.java
@@ -8,6 +8,7 @@
 import net.neoforged.waifu.util.Counter;
 import net.neoforged.waifu.util.NeoForgeJarProvider;
 import net.neoforged.waifu.util.ProgressMonitor;
+import net.neoforged.waifu.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +22,8 @@
 
 public class GameVersionIndexService implements Runnable {
     private static final Logger LOGGER = LoggerFactory.getLogger(GameVersionIndexService.class);
-    public static final ExecutorService VIRTUAL_THREAD_EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
+    public static final ExecutorService VIRTUAL_THREAD_EXECUTOR = Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
+            .name("indexing-service-", 0).uncaughtExceptionHandler(Utils.LOG_EXCEPTIONS).factory());
     public static final int CONCURRENCY = 100;
 
     private volatile boolean isRunning, pendingReRun;
@@ -109,7 +111,8 @@ public void runWithExceptions() {
 
                 var downloadCounter = listener.startDownload();
 
-                try (var exec = Executors.newFixedThreadPool(10, Thread.ofVirtual().name("mod-downloader-" + platform.getName() + "-" + version + "-", 0).factory())) {
+                try (var exec = Executors.newFixedThreadPool(10, Thread.ofVirtual().name("mod-downloader-" + platform.getName() + "-" + version + "-", 0)
+                        .uncaughtExceptionHandler(Utils.LOG_EXCEPTIONS).factory())) {
                     indexer.downloadAndConsiderConcurrently(files, exec, downloadCounter);
                 }
 

diff --git a/src/main/java/net/neoforged/waifu/Main.java b/src/main/java/net/neoforged/waifu/Main.java
@@ -8,6 +8,7 @@
 import net.neoforged.waifu.platform.ModPlatform;
 import net.neoforged.waifu.platform.impl.cf.CurseForgePlatform;
 import net.neoforged.waifu.platform.impl.mr.ModrinthPlatform;
+import net.neoforged.waifu.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,7 +23,7 @@ public class Main {
     public static final Path PLATFORM_CACHE = Main.CACHE.resolve("platform");
     public static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
     public static final ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(
-            3, Thread.ofPlatform().name("indexer-").factory()
+            3, Thread.ofPlatform().name("indexer-").uncaughtExceptionHandler(Utils.LOG_EXCEPTIONS).factory()
     );
     public static final DataSanitizer SANITIZER = DataSanitizer.of(
             DataSanitizer.REMOVE_OWN_DIRECT_REFERENCES, DataSanitizer.REMOVE_PRIVATE_MEMBERS

diff --git a/src/main/java/net/neoforged/waifu/discord/DiscordBot.java b/src/main/java/net/neoforged/waifu/discord/DiscordBot.java
@@ -117,7 +117,8 @@ protected void execute(SlashCommandEvent event) {
 
                 var indexer = new ModIndexer<>(Main.PLATFORM_CACHE, Main.createDatabase(event.optString("version")));
                 var counter = new Counter<>(new AtomicInteger(), new PlatformModFile[5]);
-                try (var exec = Executors.newFixedThreadPool(10, Thread.ofVirtual().name("mod-downloader-manual-", 0).factory())) {
+                try (var exec = Executors.newFixedThreadPool(10, Thread.ofVirtual().name("mod-downloader-manual-", 0)
+                        .uncaughtExceptionHandler(Utils.LOG_EXCEPTIONS).factory())) {
                     indexer.downloadAndConsiderConcurrently(files, exec, counter);
                 }
 

diff --git a/src/main/java/net/neoforged/waifu/util/NeoForgeJarProvider.java b/src/main/java/net/neoforged/waifu/util/NeoForgeJarProvider.java
@@ -26,7 +26,7 @@
 
 public class NeoForgeJarProvider {
     private static final URI NFRT_JAR = URI.create("https://maven.neoforged.net/releases/net/neoforged/neoform-runtime/1.0.19/neoform-runtime-1.0.19-all.jar");
-    private static final String LATEST_VERSION_URL = "https://maven.neoforged.net/api/maven/latest/version/releases/net%2Fneoforged%2Fneoforge?filter=%s&type=json";
+    private static final String LATEST_VERSION_URL = "https://maven.neoforged.net/api/maven/latest/version/releases/net/neoforged/neoforge?filter=%s&type=json";
     private static final String DOWNLOAD_URL = "https://maven.neoforged.net/releases/net/neoforged/neoforge/${version}/neoforge-${version}-${type}.jar";
 
     public static String getLatestVersion(String mcVersion) {

diff --git a/src/main/java/net/neoforged/waifu/util/Utils.java b/src/main/java/net/neoforged/waifu/util/Utils.java
@@ -4,6 +4,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializer;
+import net.neoforged.waifu.Main;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -18,6 +19,7 @@
 import java.util.zip.ZipInputStream;
 
 public class Utils {
+    public static final Thread.UncaughtExceptionHandler LOG_EXCEPTIONS = (t, e) -> Main.LOGGER.error("Thread {} threw uncaught exception: ", t, e);
     public static final Gson GSON = new GsonBuilder()
             .registerTypeAdapter(Instant.class, (JsonDeserializer<Instant>) (json, typeOfT, context) -> Instant.parse(json.getAsString()))
             .create();