Download Utils 0.4 - Remove Dependency on Log Utils (#16)

Author: Jonathing

download-utils/build.gradle

@@ -7,6 +7,7 @@ plugins {
     alias libs.plugins.gradleutils
     alias libs.plugins.gitversion
     alias libs.plugins.changelog
+    alias libs.plugins.multi.release
 }
 
 gradleutils.displayName = 'Download Utils'
@@ -23,33 +24,26 @@ java {
 
 dependencies {
     compileOnly libs.nulls
-
-    implementation projects.logUtils
 }
 
-final java11 = configurations.detachedConfiguration(
-    dependencies.create(projects.downloadUtils.java11) {
-        transitive = false
-    }
-)
-
 tasks.named('jar', Jar) {
-    dependsOn java11.buildDependencies
-
     manifest {
         attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.utils.download',
-            'Multi-Release'        : 'true'
+            'Automatic-Module-Name': 'net.minecraftforge.utils.download'
         ])
 
         gradleutils.manifestDefaults(it, 'net/minecraftforge/util/download/')
     }
 
-    into('META-INF/versions/11') {
-        from(provider { zipTree(java11.singleFile) }) {
-            exclude 'META-INF/**'
-        }
-    }
+    archiveClassifier = 'java8'
+}
+
+multiRelease.register {
+    add(JavaLanguageVersion.of(11), projects.downloadUtils.downloadUtilsJ11)
+}
+
+tasks.named('multiReleaseJar', Jar) {
+    archiveClassifier = ''
 }
 
 license {
@@ -68,7 +62,7 @@ publishing {
     }
 
     publications.register('mavenJava', MavenPublication).configure {
-        from components.java
+        from multiRelease.component
 
         changelog.publish(it)
         gradleutils.promote(it)

download-utils/java11/build.gradle …ad-utils/download-utils-j11/build.gradledownload-utils/java11/build.gradle renamed to download-utils/download-utils-j11/build.gradle download-utils/java11/build.gradle renamed to download-utils/download-utils-j11/build.gradle

@@ -10,8 +10,6 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(11)
 
 dependencies {
     compileOnly libs.nulls
-
-    implementation projects.logUtils
 }
 
 license {

download-utils/download-utils-j11/src/main/java/net/minecraftforge/util/download/DownloadUtilsImpl.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.util.download;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.ArrayList;
+
+final class DownloadUtilsImpl {
+    private DownloadUtilsImpl() { }
+
+    private static final Duration TIMEOUT = Duration.ofSeconds(5);
+    private static final int MAX_REDIRECTS = 3;
+
+    private static final HttpClient CLIENT = HttpClient
+        .newBuilder()
+        .connectTimeout(TIMEOUT)
+        .followRedirects(HttpClient.Redirect.NEVER)
+        .build();
+
+    private static final HttpRequest.Builder REQUEST_BUILDER = HttpRequest
+        .newBuilder()
+        .timeout(TIMEOUT)
+        .header("User-Agent", "MinecraftForge-Utils")
+        .header("Accept", "application/json");
+
+    static InputStream connect(String address) throws IOException, InterruptedException {
+        URI uri;
+        try {
+            uri = new URI(address);
+        } catch (URISyntaxException e) {
+            throw new IOException(e);
+        }
+
+        // if not http, then try a URLConnection. we might be trying to make a file or jar connection.
+        // see jdk.internal.net.http.HttpRequestBuilderImpl#checkUri
+        var scheme = uri.getScheme();
+        if (scheme == null || !(scheme.equalsIgnoreCase("https") || scheme.equalsIgnoreCase("http"))) {
+            return uri.toURL().openStream();
+        }
+
+        var redirections = new ArrayList<String>();
+        HttpResponse<InputStream> con;
+        for (int redirects = 0; ; redirects++) {
+            con = CLIENT.send(
+                REQUEST_BUILDER.uri(uri).build(),
+                info -> HttpResponse.BodySubscribers.ofInputStream()
+            );
+
+            int res = con.statusCode();
+            if (res == HttpURLConnection.HTTP_MOVED_PERM || res == HttpURLConnection.HTTP_MOVED_TEMP) {
+                var header = con.headers().firstValue("Location");
+                if (header.isEmpty())
+                    throw new IOException(String.format(
+                        "No location header found in redirect response: %s -- previous redirections: [%s]",
+                        uri, String.join(", ", redirections)
+                    ));
+
+                var location = header.get();
+                redirections.add(location);
+
+                if (redirects == MAX_REDIRECTS - 1) {
+                    throw new IOException(String.format(
+                        "Too many redirects: %s -- redirections: [%s]",
+                        address, String.join(", ", redirections)
+                    ));
+                } else {
+                    uri = uri.resolve(location);
+                }
+            } else if (res == HttpURLConnection.HTTP_NOT_FOUND) {
+                throw new FileNotFoundException("Returned 404: " + address);
+            } else {
+                break;
+            }
+        }
+
+        return con.body();
+    }
+
+    static byte[] readInputStream(InputStream stream) throws IOException {
+        return stream.readAllBytes();
+    }
+}