Browse Source

Set HttpClient timeouts

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 7 months ago
parent
commit
ab2c56f0af
  1. 2
      archive/src/main/kotlin/org/openrs2/archive/cache/nxt/MusicStreamClient.kt
  2. 2
      archive/src/main/kotlin/org/openrs2/archive/jav/JavConfig.kt
  3. 2
      archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyDownloader.kt
  4. 2
      archive/src/main/kotlin/org/openrs2/archive/key/PolarKeyDownloader.kt
  5. 2
      archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt
  6. 2
      archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt
  7. 2
      http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt

2
archive/src/main/kotlin/org/openrs2/archive/cache/nxt/MusicStreamClient.kt vendored

@ -8,6 +8,7 @@ import org.openrs2.http.checkStatusCode @@ -8,6 +8,7 @@ import org.openrs2.http.checkStatusCode
import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.time.Duration
public class MusicStreamClient(
private val client: HttpClient,
@ -19,6 +20,7 @@ public class MusicStreamClient( @@ -19,6 +20,7 @@ public class MusicStreamClient(
val request = HttpRequest.newBuilder(uri)
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, byteBufBodyHandler).await()

2
archive/src/main/kotlin/org/openrs2/archive/jav/JavConfig.kt

@ -9,6 +9,7 @@ import java.net.URI @@ -9,6 +9,7 @@ import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.time.Duration
public data class JavConfig(
public val config: Map<String, String>,
@ -19,6 +20,7 @@ public data class JavConfig( @@ -19,6 +20,7 @@ public data class JavConfig(
public suspend fun download(client: HttpClient, url: String): JavConfig {
val request = HttpRequest.newBuilder(URI(url))
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()

2
archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyDownloader.kt

@ -9,6 +9,7 @@ import java.net.URI @@ -9,6 +9,7 @@ import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.time.Duration
public abstract class JsonKeyDownloader(
private val client: HttpClient,
@ -17,6 +18,7 @@ public abstract class JsonKeyDownloader( @@ -17,6 +18,7 @@ public abstract class JsonKeyDownloader(
override suspend fun download(url: String): Sequence<XteaKey> {
val request = HttpRequest.newBuilder(URI(url))
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()

2
archive/src/main/kotlin/org/openrs2/archive/key/PolarKeyDownloader.kt

@ -10,6 +10,7 @@ import java.net.URI @@ -10,6 +10,7 @@ import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.time.Duration
import javax.inject.Inject
import javax.inject.Singleton
@ -21,6 +22,7 @@ public class PolarKeyDownloader @Inject constructor( @@ -21,6 +22,7 @@ public class PolarKeyDownloader @Inject constructor(
override suspend fun getMissingUrls(seenUrls: Set<String>): Set<String> {
val request = HttpRequest.newBuilder(ENDPOINT)
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()

2
archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt

@ -9,6 +9,7 @@ import java.net.URI @@ -9,6 +9,7 @@ import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.time.Duration
import javax.inject.Inject
import javax.inject.Singleton
@ -25,6 +26,7 @@ public class RuneLiteKeyDownloader @Inject constructor( @@ -25,6 +26,7 @@ public class RuneLiteKeyDownloader @Inject constructor(
private suspend fun getVersion(): String {
val request = HttpRequest.newBuilder(VERSION_ENDPOINT)
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofInputStream()).await()

2
archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt

@ -7,6 +7,7 @@ import java.net.URI @@ -7,6 +7,7 @@ import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
import java.net.http.HttpResponse
import java.time.Duration
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.streams.asSequence
@ -32,6 +33,7 @@ public class RuneStarNameDownloader @Inject constructor( @@ -32,6 +33,7 @@ public class RuneStarNameDownloader @Inject constructor(
private suspend fun readTsv(uri: URI, column: Int): Sequence<String> {
val request = HttpRequest.newBuilder(uri)
.GET()
.timeout(Duration.ofSeconds(30))
.build()
val response = client.sendAsync(request, HttpResponse.BodyHandlers.ofLines()).await()

2
http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt

@ -3,12 +3,14 @@ package org.openrs2.http @@ -3,12 +3,14 @@ package org.openrs2.http
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asExecutor
import java.net.http.HttpClient
import java.time.Duration
import javax.inject.Provider
public class HttpClientProvider : Provider<HttpClient> {
override fun get(): HttpClient {
return HttpClient.newBuilder()
.authenticator(NetrcAuthenticator.read())
.connectTimeout(Duration.ofSeconds(30))
.executor(Dispatchers.IO.asExecutor())
.followRedirects(HttpClient.Redirect.NORMAL)
.build()

Loading…
Cancel
Save