使用 WebURL for Java 解析 URI (#6084)

Glavo · web-flow · commit 58032354070f · 2026-05-12T21:43:19.000+08:00
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
@@ -62,6 +62,7 @@
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.setting.StyleSheets;
 import org.jackhuang.hmcl.task.CacheFileTask;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -1166,12 +1167,10 @@ public static Image loadImage(Path path,
         }
     }
 
-    public static Image loadImage(String url) throws Exception {
-        URI uri = NetworkUtils.toURI(url);
-
-        URLConnection connection = NetworkUtils.createConnection(uri);
-        if (connection instanceof HttpURLConnection)
-            connection = NetworkUtils.resolveConnection((HttpURLConnection) connection);
+    public static Image loadImage(WebURL url) throws Exception {
+        URLConnection connection = NetworkUtils.createConnection(url);
+        if (connection instanceof HttpURLConnection httpConnection)
+            connection = NetworkUtils.resolveConnection(httpConnection);
 
         try (BufferedInputStream input = new BufferedInputStream(connection.getInputStream())) {
             String contentType = Objects.requireNonNull(connection.getContentType(), "");
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java
@@ -20,8 +20,8 @@
 import com.jfoenix.validation.base.ValidatorBase;
 import javafx.beans.NamedArg;
 import javafx.scene.control.TextInputControl;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.NetworkUtils;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -54,12 +54,7 @@ private void evalTextInputField() {
         if (StringUtils.isBlank(textField.getText()))
             hasErrors.set(!nullable);
         else {
-            try {
-                NetworkUtils.toURI(textField.getText());
-                hasErrors.set(false);
-            } catch (IllegalArgumentException e) {
-                hasErrors.set(true);
-            }
+            hasErrors.set(WebURL.tryParseBrowserInput(textField.getText()) == null);
         }
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java
@@ -34,6 +34,7 @@
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
@@ -205,7 +206,7 @@ private Background getBackground() {
                 String backgroundImageUrl = config().getBackgroundImageUrl();
                 if (backgroundImageUrl != null) {
                     try {
-                        image = FXUtils.loadImage(backgroundImageUrl);
+                        image = FXUtils.loadImage(WebURL.parseBrowserInput(backgroundImageUrl));
                     } catch (Exception e) {
                         LOG.warning("Couldn't load background image", e);
                     }
diff --git a/HMCL/src/main/resources/assets/about/deps.json b/HMCL/src/main/resources/assets/about/deps.json
@@ -98,5 +98,10 @@
     "title": "TomlJ",
     "subtitle": "Licensed under the Apache 2.0 License.",
     "externalLink": "https://github.com/tomlj/tomlj"
+  },
+  {
+    "title": "WebURL for Java",
+    "subtitle": "Licensed under the Apache 2.0 License.",
+    "externalLink": "https://github.com/Glavo/weburl-java"
   }
 ]
diff --git a/HMCLCore/build.gradle.kts b/HMCLCore/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     api(libs.jna)
     api(libs.pci.ids)
     api(libs.hello.nbt)
+    api(libs.weburl)
 
     compileOnlyApi(libs.jetbrains.annotations)
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorServer.java
@@ -24,12 +24,11 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.util.io.HttpRequest;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -58,13 +57,17 @@ public class AuthlibInjectorServer implements Observable {
     public static AuthlibInjectorServer locateServer(String url) throws IOException {
         try {
             url = NetworkUtils.addHttpsIfMissing(url);
-            HttpURLConnection conn = NetworkUtils.createHttpConnection(url);
+
+            WebURL webURL = WebURL.parseBrowserInput(url);
+            url = webURL.toString();
+
+            HttpURLConnection conn = NetworkUtils.createHttpConnection(webURL);
             conn = NetworkUtils.resolveConnection(conn);
 
             String ali = conn.getHeaderField("x-authlib-injector-api-location");
             if (ali != null) {
-                URI absoluteAli = conn.getURL().toURI().resolve(NetworkUtils.toURI(ali));
-                if (!urlEqualsIgnoreSlash(url, absoluteAli.toString())) {
+                WebURL absoluteAli = WebURL.parse(ali, WebURL.of(conn.getURL()));
+                if (!urlEqualsIgnoreSlash(webURL.toString(), absoluteAli.toString())) {
                     conn.disconnect();
                     url = absoluteAli.toString();
                     conn = NetworkUtils.resolveConnection(NetworkUtils.createHttpConnection(absoluteAli));
@@ -81,7 +84,7 @@ public static AuthlibInjectorServer locateServer(String url) throws IOException
             } finally {
                 conn.disconnect();
             }
-        } catch (IllegalArgumentException | URISyntaxException e) {
+        } catch (IllegalArgumentException e) {
             throw new IOException(e);
         }
     }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java
@@ -17,16 +17,14 @@
  */
 package org.jackhuang.hmcl.util.io;
 
+import org.glavo.url.WebURL;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
 import java.net.*;
-import java.net.http.HttpClient;
-import java.net.http.HttpHeaders;
-import java.net.http.HttpResponse;
 import java.nio.charset.Charset;
 import java.util.*;
 import java.util.Map.Entry;
@@ -162,10 +160,10 @@ public static URI dropQuery(URI u) {
         }
     }
 
-    public static URLConnection createConnection(URI uri) throws IOException {
+    public static URLConnection createConnection(WebURL url) throws IOException {
         URLConnection connection;
         try {
-            connection = uri.toURL().openConnection();
+            connection = url.toURL().openConnection();
         } catch (IllegalArgumentException | MalformedURLException e) {
             throw new IOException(e);
         }
@@ -179,8 +177,16 @@ public static URLConnection createConnection(URI uri) throws IOException {
         return connection;
     }
 
+    public static URLConnection createConnection(URI uri) throws IOException {
+        return createConnection(WebURL.of(uri));
+    }
+
+    public static HttpURLConnection createHttpConnection(WebURL url) throws IOException {
+        return (HttpURLConnection) createConnection(url);
+    }
+
     public static HttpURLConnection createHttpConnection(String url) throws IOException {
-        return (HttpURLConnection) createConnection(toURI(url));
+        return (HttpURLConnection) createConnection(WebURL.parse(url));
     }
 
     public static HttpURLConnection createHttpConnection(URI url) throws IOException {
@@ -436,24 +442,7 @@ public static String decodeURL(String toDecode) {
 
     /// @throws IllegalArgumentException if the string is not a valid URI
     public static @NotNull URI toURI(@NotNull String uri) {
-        try {
-            return new URI(encodeLocation(uri));
-        } catch (URISyntaxException e) {
-            // Possibly an Internationalized Domain Name (IDN)
-            return URI.create(uri);
-        }
-    }
-
-    public static @NotNull URI toURI(@NotNull URL url) {
-        return toURI(url.toExternalForm());
-    }
-
-    public static @NotNull HttpResponse.ResponseInfo getResponseInfo(@NotNull HttpResponse<?> response) {
-        record ResponseInfoImpl(int statusCode, HttpHeaders headers, HttpClient.Version version)
-                implements HttpResponse.ResponseInfo {
-        }
-
-        return new ResponseInfoImpl(response.statusCode(), response.headers(), response.version());
+        return WebURL.toURI(uri);
     }
 
     public static @Nullable URI toURIOrNull(String uri) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,6 +23,7 @@ monet-fx = "0.4.0"
 terracotta = "0.4.2"
 nayuki-qrcodegen = "1.8.0"
 jwebp = "0.2.0"
+weburl = "0.2.0"
 
 # testing
 junit = "6.0.1"
@@ -58,6 +59,7 @@ lwjgl-unsafe-agent = { module = "org.glavo:lwjgl-unsafe-agent", version.ref = "l
 monet-fx = { module = "org.glavo:MonetFX", version.ref = "monet-fx" }
 nayuki-qrcodegen = { module = "io.nayuki:qrcodegen", version.ref = "nayuki-qrcodegen" }
 jwebp = { module = "org.glavo:webp", version.ref = "jwebp" }
+weburl = { module = "org.glavo:weburl", version.ref = "weburl" }
 
 # testing
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }

Original file line number	Diff line number	Diff line change
`@@ -98,5 +98,10 @@`
`98`	`98`	`"title": "TomlJ",`
`99`	`99`	`"subtitle": "Licensed under the Apache 2.0 License.",`
`100`	`100`	`"externalLink": "https://github.com/tomlj/tomlj"`
	`101`	`+ },`
	`102`	`+ {`
	`103`	`+ "title": "WebURL for Java",`
	`104`	`+ "subtitle": "Licensed under the Apache 2.0 License.",`
	`105`	`+ "externalLink": "https://github.com/Glavo/weburl-java"`
`101`	`106`	`}`
`102`	`107`	`]`