From 34ec627457e91a2e836e563dd81ce5610726266b Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Thu, 25 Nov 2021 20:14:11 +0000 Subject: [PATCH] Use HttpClient for VersionChecker (#8148) --- .../minecraftforge/fml/VersionChecker.java | 73 +++++++++++-------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java b/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java index e2f3bef674..adc9abbb4c 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java @@ -19,7 +19,6 @@ package net.minecraftforge.fml; -import com.google.common.io.ByteStreams; import com.google.gson.Gson; import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLLoader; @@ -28,19 +27,26 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.maven.artifact.versioning.ComparableVersion; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; -import java.net.HttpURLConnection; +import java.io.InputStreamReader; +import java.net.URISyntaxException; import java.net.URL; -import java.net.URLConnection; -import java.nio.charset.StandardCharsets; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; +import java.util.zip.GZIPInputStream; import static net.minecraftforge.fml.VersionChecker.Status.*; @@ -48,6 +54,7 @@ public class VersionChecker { private static final Logger LOGGER = LogManager.getLogger(); private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20); + private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15); public enum Status { @@ -107,6 +114,8 @@ public class VersionChecker { new Thread("Forge Version Check") { + private HttpClient client; + @Override public void run() { @@ -116,46 +125,52 @@ public class VersionChecker return; } + client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build(); gatherMods().forEach(this::process); } /** - * Opens stream for given URL while following redirects + * Returns the response body as a String for the given URL while following redirects */ - private InputStream openUrlStream(URL url) throws IOException - { + private String openUrlString(URL url) throws IOException, URISyntaxException, InterruptedException { URL currentUrl = url; for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++) { - URLConnection c = currentUrl.openConnection(); - if (c instanceof HttpURLConnection) + var request = HttpRequest.newBuilder() + .uri(currentUrl.toURI()) + .timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)) + .setHeader("Accept-Encoding", "gzip") + .GET() + .build(); + + final HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofInputStream()); + + int responseCode = response.statusCode(); + if (responseCode >= 300 && responseCode <= 399) { - HttpURLConnection huc = (HttpURLConnection) c; - huc.setInstanceFollowRedirects(false); - int responseCode = huc.getResponseCode(); - if (responseCode >= 300 && responseCode <= 399) - { - try - { - String loc = huc.getHeaderField("Location"); - currentUrl = new URL(currentUrl, loc); - continue; - } - finally - { - huc.disconnect(); - } - } + String newLocation = response.headers().firstValue("Location") + .orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url)); + currentUrl = new URL(currentUrl, newLocation); + continue; } - return c.getInputStream(); + final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip"); + + final String bodyStr; + try (InputStream inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body()) + { + try (var bufferedReader = new BufferedReader(new InputStreamReader(inStream))) + { + bodyStr = bufferedReader.lines().collect(Collectors.joining("\n")); + } + } + return bodyStr; } throw new IOException("Too many redirects while trying to fetch " + url); } private void process(IModInfo mod) { -// HttpClient.newBuilder().build(); Status status = PENDING; ComparableVersion target = null; Map changes = null; @@ -166,9 +181,7 @@ public class VersionChecker URL url = mod.getUpdateURL().get(); LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString()); - InputStream con = openUrlStream(url); - String data = new String(ByteStreams.toByteArray(con), StandardCharsets.UTF_8); - con.close(); + String data = openUrlString(url); LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);