Use org.json for json parsing.

Author: vLuckyyy

buildSrc/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     gradlePluginPortal()
 }
 

eternalcode-commons-updater-example/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     `commons-java-17`
+    `commons-repositories`
 }
 
 dependencies {

eternalcode-commons-updater-example/src/main/java/com/eternalcode/commons/updater/example/ExampleChecker.java

@@ -7,9 +7,9 @@ public class ExampleChecker {
     private static final String OLD_ETERNALCOMBAT_VERSION = "1.3.3";
 
     public static void main(String[] args) {
-        ExampleUpdateService service = new ExampleUpdateService();
+        ExampleUpdateService updateService = new ExampleUpdateService();
 
-        UpdateResult modrinthResult = service.checkModrinth("EternalCombat", OLD_ETERNALCOMBAT_VERSION);
+        UpdateResult modrinthResult = updateService.checkModrinth("EternalCombat", OLD_ETERNALCOMBAT_VERSION);
         System.out.println("Modrinth update available: " + modrinthResult.isUpdateAvailable());
         if (modrinthResult.isUpdateAvailable()) {
             System.out.println("Latest: " + modrinthResult.latestVersion());

eternalcode-commons-updater/build.gradle.kts

@@ -2,9 +2,9 @@ plugins {
     `commons-java-17`
     `commons-publish`
     `commons-repositories`
-    `commons-java-unit-test`
 }
 
-tasks.test {
-    useJUnitPlatform()
+dependencies {
+    api("org.json:json:20240303")
+    api(project(":eternalcode-commons-shared"))
 }

eternalcode-commons-updater/src/main/java/com/eternalcode/commons/updater/impl/ModrinthUpdateChecker.java

@@ -1,5 +1,6 @@
 package com.eternalcode.commons.updater.impl;
 
+import com.eternalcode.commons.Lazy;
 import com.eternalcode.commons.updater.UpdateChecker;
 import com.eternalcode.commons.updater.UpdateResult;
 import com.eternalcode.commons.updater.Version;
@@ -8,7 +9,9 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
-import java.util.Optional;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public final class ModrinthUpdateChecker implements UpdateChecker {
 
@@ -17,11 +20,7 @@ public final class ModrinthUpdateChecker implements UpdateChecker {
     private static final String USER_AGENT = "UpdateChecker/1.0";
     private static final Duration TIMEOUT = Duration.ofSeconds(10);
 
-    private final HttpClient client;
-
-    public ModrinthUpdateChecker() {
-        this.client = HttpClient.newBuilder().connectTimeout(TIMEOUT).build();
-    }
+    private final Lazy<HttpClient> client = new Lazy<>(() -> HttpClient.newBuilder().connectTimeout(TIMEOUT).build());
 
     @Override
     public UpdateResult check(String projectId, Version currentVersion) {
@@ -35,7 +34,7 @@ public UpdateResult check(String projectId, Version currentVersion) {
             HttpRequest request =
                 HttpRequest.newBuilder().uri(URI.create(url)).header("User-Agent", USER_AGENT).timeout(TIMEOUT).build();
 
-            HttpResponse<String> response = this.client.send(request, HttpResponse.BodyHandlers.ofString());
+            HttpResponse<String> response = this.client.get().send(request, HttpResponse.BodyHandlers.ofString());
 
             if (response.statusCode() != 200) {
                 return createEmptyResult(currentVersion);
@@ -46,47 +45,48 @@ public UpdateResult check(String projectId, Version currentVersion) {
                 return createEmptyResult(currentVersion);
             }
 
-            Optional<String> versionNumber = extractJsonValue(json, "version_number");
-            Optional<String> downloadUrl = extractJsonValue(json, "url");
-
-            if (versionNumber.isEmpty()) {
-                return createEmptyResult(currentVersion);
-            }
-
-            String releaseUrl = MODRINTH_BASE_URL + "/" + projectId + "/version/" + versionNumber.get();
-            Version latestVersion = new Version(versionNumber.get());
-
-            return new UpdateResult(currentVersion, latestVersion, downloadUrl.orElse(null), releaseUrl);
+            return parseVersionResponse(json, currentVersion, projectId);
         }
         catch (Exception exception) {
             throw new RuntimeException("Failed to check Modrinth updates for project: " + projectId, exception);
         }
     }
 
-    private UpdateResult createEmptyResult(Version currentVersion) {
-        return new UpdateResult(currentVersion, currentVersion, null, null);
-    }
+    private UpdateResult parseVersionResponse(String json, Version currentVersion, String projectId) {
+        try {
+            JSONArray versions = new JSONArray(json);
 
-    private Optional<String> extractJsonValue(String json, String key) {
-        if (json == null || key == null) {
-            return Optional.empty();
-        }
+            if (versions.isEmpty()) {
+                return createEmptyResult(currentVersion);
+            }
 
-        String pattern = "\"" + key + "\":\"";
-        int start = json.indexOf(pattern);
+            JSONObject latestVersionObj = versions.getJSONObject(0);
 
-        if (start == -1) {
-            return Optional.empty();
-        }
+            String versionNumber = latestVersionObj.optString("version_number", null);
+            if (versionNumber == null || versionNumber.trim().isEmpty()) {
+                return createEmptyResult(currentVersion);
+            }
 
-        start += pattern.length();
-        int end = json.indexOf("\"", start);
+            String downloadUrl = null;
+            if (latestVersionObj.has("files")) {
+                JSONArray files = latestVersionObj.getJSONArray("files");
+                if (!files.isEmpty()) {
+                    JSONObject firstFile = files.getJSONObject(0);
+                    downloadUrl = firstFile.optString("url", null);
+                }
+            }
 
-        if (end == -1) {
-            return Optional.empty();
+            String releaseUrl = MODRINTH_BASE_URL + "/" + projectId + "/version/" + versionNumber;
+            Version latestVersion = new Version(versionNumber);
+
+            return new UpdateResult(currentVersion, latestVersion, downloadUrl, releaseUrl);
+        }
+        catch (JSONException exception) {
+            return createEmptyResult(currentVersion);
         }
+    }
 
-        String value = json.substring(start, end);
-        return value.isEmpty() ? Optional.empty() : Optional.of(value);
+    private UpdateResult createEmptyResult(Version currentVersion) {
+        return new UpdateResult(currentVersion, currentVersion, null, null);
     }
 }