From 0b2faa3e6dc473cc9707bd2f8367c6d28a9564e2 Mon Sep 17 00:00:00 2001 From: James Munson Date: Mon, 1 Jul 2019 17:54:11 -0700 Subject: [PATCH 1/5] Fix for people lagging when loading a new region if they have a firewall/bad internet --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 1 + 1 file changed, 1 insertion(+) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 7d256096b6..a707d4300d 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -119,6 +119,7 @@ public class RuneLiteAPI RLP_CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) + .connectTimeout(2655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override From 483f2937b50b0b4c08c6043b247b2102f54fdb74 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Tue, 2 Jul 2019 09:14:24 +0100 Subject: [PATCH 2/5] added timeout to RL Client added timeout to RL Client --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 1 + 1 file changed, 1 insertion(+) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index a707d4300d..5d1bf894c8 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -103,6 +103,7 @@ public class RuneLiteAPI CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) + .connectTimeout(2655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override From 4a77249440d20704dacbbda3c47179492fdcb949 Mon Sep 17 00:00:00 2001 From: James Munson Date: Tue, 2 Jul 2019 01:46:35 -0700 Subject: [PATCH 3/5] Update --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 1 + 1 file changed, 1 insertion(+) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index a707d4300d..0fe9357f62 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -103,6 +103,7 @@ public class RuneLiteAPI CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) + .connectTimeout(5655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override From 09419c2f812d665f4c34acebff47b5378e572dd5 Mon Sep 17 00:00:00 2001 From: James Munson Date: Tue, 2 Jul 2019 03:01:15 -0700 Subject: [PATCH 4/5] Updated okhttp3 from 3.7.0 okhttp3 4.0.0 Updated timeout stuff --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 0fe9357f62..65dbb7b17b 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -104,6 +104,8 @@ public class RuneLiteAPI CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) .connectTimeout(5655, TimeUnit.MILLISECONDS) + .writeTimeout(5655, TimeUnit.MILLISECONDS) + .connectTimeout(5655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override @@ -120,6 +122,8 @@ public class RuneLiteAPI RLP_CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) + .connectTimeout(5655, TimeUnit.MILLISECONDS) + .writeTimeout(5655, TimeUnit.MILLISECONDS) .connectTimeout(2655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { diff --git a/pom.xml b/pom.xml index 6a41755b67..6a3fe52405 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 1.10.19 1.5.4 3.0.6 - 3.7.0 + 4.0.0 0.7 3.0.2 From 6518102e31ab19a5ea65050816d050d1ae0e5bca Mon Sep 17 00:00:00 2001 From: James Munson Date: Tue, 2 Jul 2019 03:06:02 -0700 Subject: [PATCH 5/5] Update --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 65dbb7b17b..de2b1d469c 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -105,7 +105,6 @@ public class RuneLiteAPI .pingInterval(30, TimeUnit.SECONDS) .connectTimeout(5655, TimeUnit.MILLISECONDS) .writeTimeout(5655, TimeUnit.MILLISECONDS) - .connectTimeout(5655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor() { @Override @@ -122,7 +121,6 @@ public class RuneLiteAPI RLP_CLIENT = new OkHttpClient.Builder() .pingInterval(30, TimeUnit.SECONDS) - .connectTimeout(5655, TimeUnit.MILLISECONDS) .writeTimeout(5655, TimeUnit.MILLISECONDS) .connectTimeout(2655, TimeUnit.MILLISECONDS) .addNetworkInterceptor(new Interceptor()