Merge pull request 'Fix HTTP hanging and redirects' (#5) from TheKodeToad/http-fix into mistress

Reviewed-on: #5
Reviewed-by: owlsys <owlsys@noreply.localhost>

build.gradle.kts

@@ -46,7 +46,8 @@ gradlePlugin {
 
 tasks.jar {
     manifest {
-        attributes("Implementation-Version" to version,
+        attributes(
+            "Implementation-Version" to version,
             "Implementation-Date" to Date(),
             "Implementation-Name" to project.name
         )

src/main/kotlin/dev/frogmc/phytotelma/common/CachingHttpClient.kt

@@ -17,6 +17,8 @@ import kotlin.io.path.notExists
 
 object CachingHttpClient {
 
+    private val CLIENT = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build()
+
     fun downloadTo(uri: URI, path: Path, allowOverwrite: Boolean) {
         if (allowOverwrite || path.notExists()) {
             path.createParentDirectories()
@@ -39,14 +41,12 @@ object CachingHttpClient {
     }
 
     fun getUncached(uri: URI): InputStream {
-        HttpClient.newHttpClient().use {
+        return CLIENT.send(
-            return it.send(
+            HttpRequest.newBuilder().uri(uri).header(
-                HttpRequest.newBuilder().uri(uri).header(
+                "User-Agent",
-                    "User-Agent",
+                "FrogMC Phytotelma/" + CachingHttpClient.javaClass.`package`.implementationVersion
-                    "FrogMC Phytotelma/" + CachingHttpClient.javaClass.`package`.implementationVersion
+            ).build(), BodyHandlers.ofInputStream()
-                ).build(), BodyHandlers.ofInputStream()
+        ).body()
-            ).body()
-        }
     }
 
     private fun getCacheFile(uri: URI): Path {