frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Fix HTTP hanging and redirects' (#5) from TheKodeToad/http-fix into mistress
Some checks failed
Publish to snapshot maven / build (push) Failing after 31s
Details

Browse source 
Reviewed-on: #5
Reviewed-by: owlsys <owlsys@noreply.localhost>
This commit is contained in:
TheKodeToad 2024-09-07 05:58:49 -04:00
parent 274c59f979 022d170c0a
commit 18143913b8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle.kts
View file

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

6
src/main/kotlin/dev/frogmc/phytotelma/common/CachingHttpClient.kt
View file

@ -17,6 +17,8 @@ import kotlin.io.path.notExists
object CachingHttpClient { object CachingHttpClient {
private val CLIENT = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build()
fun downloadTo(uri: URI, path: Path, allowOverwrite: Boolean) { fun downloadTo(uri: URI, path: Path, allowOverwrite: Boolean) {
if (allowOverwrite || path.notExists()) { if (allowOverwrite || path.notExists()) {
path.createParentDirectories() path.createParentDirectories()
@ -39,15 +41,13 @@ object CachingHttpClient {
} }
fun getUncached(uri: URI): InputStream { 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 { private fun getCacheFile(uri: URI): Path {
val path = PhytotelmaPlugin.globalCacheDir.resolve("httpCache") val path = PhytotelmaPlugin.globalCacheDir.resolve("httpCache")