increased the default timeout when using proxy

This commit is contained in:
greenart7c3
2023-05-03 09:00:14 -03:00
parent 20a65a0878
commit 264d6a40b3
2 changed files with 15 additions and 5 deletions
@@ -4,6 +4,7 @@ import com.vitorpamplona.amethyst.model.Account
import okhttp3.OkHttpClient
import java.net.InetSocketAddress
import java.net.Proxy
import java.time.Duration
object HttpClient {
private var proxy: Proxy? = null
@@ -13,7 +14,14 @@ object HttpClient {
}
fun getHttpClient(): OkHttpClient {
return OkHttpClient.Builder().proxy(proxy).build()
val seconds = if (proxy != null) 20L else 10L
val duration = Duration.ofSeconds(seconds)
return OkHttpClient.Builder()
.proxy(proxy)
.readTimeout(duration)
.connectTimeout(duration)
.writeTimeout(duration)
.build()
}
fun getProxy(): Proxy? {
@@ -11,6 +11,7 @@ import okhttp3.Response
import okhttp3.WebSocket
import okhttp3.WebSocketListener
import java.net.Proxy
import java.time.Duration
import java.util.Date
enum class FeedType {
@@ -24,12 +25,13 @@ class Relay(
var activeTypes: Set<FeedType> = FeedType.values().toSet(),
proxy: Proxy?
) {
init {
println("Tor: ${proxy != null} url: $url")
}
val seconds = if (proxy != null) 20L else 10L
val duration = Duration.ofSeconds(seconds)
private val httpClient = OkHttpClient.Builder()
.proxy(proxy)
.readTimeout(duration)
.connectTimeout(duration)
.writeTimeout(duration)
.followRedirects(true)
.followSslRedirects(true)
.build()