[release/3.10] 修复系统代理 JVM 参数格式 (#5591)

https://github.com/HMCL-dev/HMCL/pull/5265

Co-authored-by: Xirren <[email protected]>
Co-authored-by: xirren <[email protected]>

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java

@@ -139,7 +139,7 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
                         } else {
                             reject.accept(e.getMessage());
                         }
-                    }).executor(true), i18n("message.downloading"), TaskCancellationAction.NORMAL);
+                    }), i18n("message.downloading"), TaskCancellationAction.NORMAL);
                 } else {
                     // otherwise we still consider the file as modpack zip file
                     // since casually the url may not ends with ".zip"
@@ -156,7 +156,7 @@ public final class ModpackSelectionPage extends VBox implements WizardPage {
                                         } else {
                                             reject.accept(e.getMessage());
                                         }
-                                    }).executor(true),
+                                    }),
                             i18n("message.downloading"),
                             TaskCancellationAction.NORMAL
                     );

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java

@@ -103,7 +103,7 @@ public final class Versions {
                                         i18n("install.failed.downloading.detail", file.getFile().getUrl()) + "\n" + StringUtils.getStackTrace(e),
                                         i18n("download.failed.no_code"), MessageDialogPane.MessageType.ERROR);
                             }
-                        }).executor(true),
+                        }),
                 i18n("message.downloading"),
                 TaskCancellationAction.NORMAL
         );

HMCLCore/src/main/java/org/jackhuang/hmcl/download/MultipleSourceVersionList.java

@@ -20,6 +20,8 @@ package org.jackhuang.hmcl.download;
 import org.jackhuang.hmcl.task.Task;
 
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
@@ -47,25 +49,58 @@ public class MultipleSourceVersionList extends VersionList<RemoteVersion> {
 
     private Task<?> refreshAsync(String gameVersion, int sourceIndex) {
         VersionList<?> versionList = backends[sourceIndex];
-        return versionList.refreshAsync(gameVersion)
-                .thenComposeAsync(() -> {
+        Task<?> refreshTask = versionList.refreshAsync(gameVersion);
+
+        return new Task<Object>() {
+            private Task<?> nextTask = null;
+
+            {
+                setSignificance(TaskSignificance.MODERATE);
+                setName("MultipleSourceVersionList.refreshAsync(" + sourceIndex + ")");
+            }
+
+            @Override
+            public Collection<Task<?>> getDependents() {
+                return List.of(refreshTask);
+            }
+
+            @Override
+            public Collection<? extends Task<?>> getDependencies() {
+                return nextTask != null ? List.of(nextTask) : List.of();
+            }
+
+            @Override
+            public boolean isRelyingOnDependents() {
+                return false;
+            }
+
+            @Override
+            public void execute() throws Exception {
+                if (isDependentsSucceeded()) {
                     lock.writeLock().lock();
                     try {
                         versions.putAll(gameVersion, versionList.getVersions(gameVersion));
-                    } catch (Exception e) {
-                        if (sourceIndex == backends.length - 1) {
-                            LOG.warning("Failed to fetch versions list from all sources", e);
-                            throw e;
-                        } else {
-                            LOG.warning("Failed to fetch versions list and try to fetch from other source", e);
-                            return refreshAsync(gameVersion, sourceIndex + 1);
-                        }
                     } finally {
                         lock.writeLock().unlock();
                     }
 
-                    return null;
-                });
+                    setResult(refreshTask.getResult());
+                } else {
+                    Exception exception = refreshTask.getException();
+                    assert exception != null;
+
+                    if (sourceIndex == backends.length - 1) {
+                        LOG.warning("Failed to fetch versions list from all sources", exception);
+                        setSignificance(TaskSignificance.MINOR);
+                        throw exception;
+                    } else {
+                        LOG.warning("Failed to fetch versions list and try to fetch from other source", exception);
+                        nextTask = refreshAsync(gameVersion, sourceIndex + 1);
+                        nextTask.storeTo(this::setResult);
+                    }
+                }
+            }
+        };
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -172,7 +172,7 @@ public class DefaultLauncher extends Launcher {
 
             Proxy.Type proxyType = options.getProxyType();
             if (proxyType == null) {
-                res.addDefault("-Djava.net.useSystemProxies", "true");
+                res.addDefault("-Djava.net.useSystemProxies=", "true");
             } else {
                 String proxyHost = options.getProxyHost();
                 int proxyPort = options.getProxyPort();

HMCLCore/src/main/java/org/jackhuang/hmcl/task/FetchTask.java

@@ -212,7 +212,7 @@ public abstract class FetchTask<T> extends Task<T> {
                 do {
                     HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(currentURI)
                             .timeout(Duration.ofMillis(NetworkUtils.TIME_OUT))
-                            .header("User-Agent", Holder.USER_AGENT);
+                            .header("User-Agent", NetworkUtils.USER_AGENT);
 
                     headers.forEach(requestBuilder::header);
                     response = Holder.HTTP_CLIENT.send(requestBuilder.build(), BODY_HANDLER);
@@ -518,7 +518,6 @@ public abstract class FetchTask<T> extends Task<T> {
     /// Ensure that [#HTTP_CLIENT] is initialized after ProxyManager has been initialized.
     private static final class Holder {
         private static final HttpClient HTTP_CLIENT;
-        private static final String USER_AGENT = System.getProperty("http.agent", "HMCL");
 
         static {
             if (!initialized) {

HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java

@@ -40,6 +40,8 @@ import static org.jackhuang.hmcl.util.logging.Logger.LOG;
  * @author huangyuhui
  */
 public final class NetworkUtils {
+    public static final String USER_AGENT = System.getProperty("http.agent", "HMCL");
+
     public static final String PARAMETER_SEPARATOR = "&";
     public static final String NAME_VALUE_SEPARATOR = "=";
     public static final int TIME_OUT = 8000;
@@ -168,6 +170,7 @@ public final class NetworkUtils {
         connection.setReadTimeout(TIME_OUT);
         if (connection instanceof HttpURLConnection httpConnection) {
             httpConnection.setRequestProperty("Accept-Language", Locale.getDefault().toLanguageTag());
+            httpConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpConnection.setInstanceFollowRedirects(false);
         }
         return connection;