Added alternate keepalive

2023-03-31 01:53:50 +03:00
parent 757de4f65f
commit 602212daff
5 changed files with 80 additions and 9 deletions
--- a/patches/server/0009-Purpur-Network-Alternate-Keepalive.patch
+++ b/patches/server/0009-Purpur-Network-Alternate-Keepalive.patch
@@ -0,0 +1,71 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
+Date: Fri, 31 Mar 2023 01:52:44 +0300
+Subject: [PATCH] Purpur Network Alternate Keepalive
+
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+index 94a033e835915dc84c0dd4a84d218c0283aa03fe..e88e9197e99ac68fd58d48e7722eb6254ee75388 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+@@ -203,8 +203,10 @@ public class KaiijuConfig {
+     }
+     
+     public static boolean sendNullEntityPackets = true;
+    public static boolean alternateKeepAlive = false;
+ 
+     private static void networkSettings() {
+         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
+        alternateKeepAlive = getBoolean("network.alternate-keepalive", sendNullEntityPackets);
+     }
+ }
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 96203bd4d7af425236db220b746a9dcba38bfd08..40af4162787e03af9842d661835de806c71e6204 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+     private long keepAliveTime = Util.getMillis();
+     private boolean keepAlivePending;
+     private long keepAliveChallenge;
+    private it.unimi.dsi.fastutil.longs.LongList keepAlives = new it.unimi.dsi.fastutil.longs.LongArrayList(); // Kaiiju
+     // CraftBukkit start - multithreaded fields
+     private final AtomicInteger chatSpamTickCount = new AtomicInteger();
+     private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
+@@ -352,6 +353,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+         long currentTime = Util.getMillis();
+         long elapsedTime = currentTime - this.keepAliveTime;
+ 
+        // Kaiiju start
+        if (dev.kaiijumc.kaiiju.KaiijuConfig.alternateKeepAlive) {
+            if (elapsedTime >= 1000L) { // 1 second
+                if (!processedDisconnect && keepAlives.size() * 1000L >= KEEPALIVE_LIMIT) {
+                    LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName());
+                    disconnect(Component.translatable("disconnect.timeout"), org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT);
+                } else {
+                    keepAliveTime = currentTime; // hijack this field for 1 second intervals
+                    keepAlives.add(currentTime); // currentTime is ID
+                    send(new ClientboundKeepAlivePacket(currentTime));
+                }
+            }
+        } else
+        // Kaiiju end
+         if (this.keepAlivePending) {
+             if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
+                 ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
+@@ -3517,6 +3532,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ 
+     @Override
+     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
+        // Kaiiju start
+        if (dev.kaiijumc.kaiiju.KaiijuConfig.alternateKeepAlive) {
+            long id = packet.getId();
+            if (keepAlives.size() > 0 && keepAlives.contains(id)) {
+                int ping = (int) (Util.getMillis() - id);
+                player.latency = (player.latency * 3 + ping) / 4;
+                keepAlives.clear(); // we got a valid response, lets roll with it and forget the rest
+            }
+        } else
+        // Kaiiju end
+         //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
+         if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
+             int i = (int) (Util.getMillis() - this.keepAliveTime);
--- a/patches/server/0010-Kaiiju-Lithium-Configuration.patch
+++ b/patches/server/0010-Kaiiju-Lithium-Configuration.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Kaiiju Lithium Configuration


 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 94a033e835915dc84c0dd4a84d218c0283aa03fe..a94ec0d098394a5bd662268fe17e92e343c4619c 100644
+index e88e9197e99ac68fd58d48e7722eb6254ee75388..4c9200e51ffc24b354d83822b78526d853ad4ddc 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -207,4 +207,9 @@ public class KaiijuConfig {
-     private static void networkSettings() {
+@@ -209,4 +209,9 @@ public class KaiijuConfig {
         sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
+         alternateKeepAlive = getBoolean("network.alternate-keepalive", sendNullEntityPackets);
     }
 +
 +    public static boolean lithiumEnable = true;
--- a/patches/server/0011-Lithium-Math-FastUtil.patch
+++ b/patches/server/0011-Lithium-Math-FastUtil.patch
@@ -7,10 +7,10 @@ Author: JellySquid
 Licence: LGPL-3.0

 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index a94ec0d098394a5bd662268fe17e92e343c4619c..df9a3bb3b955705ced8a431aff4683b12eae34c1 100644
+index 4c9200e51ffc24b354d83822b78526d853ad4ddc..48bf2e11a4d869aeef4ce7169636ff625555f7e1 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -209,7 +209,9 @@ public class KaiijuConfig {
+@@ -211,7 +211,9 @@ public class KaiijuConfig {
     }
 
     public static boolean lithiumEnable = true;
--- a/patches/server/0012-Lithium-Math-SineLut.patch
+++ b/patches/server/0012-Lithium-Math-SineLut.patch
@@ -7,10 +7,10 @@ Author: JellySquid
 Licence: LGPL-3.0

 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index df9a3bb3b955705ced8a431aff4683b12eae34c1..4bd05b06f4410f8d425ac1f79b37a7fc45b433f4 100644
+index 48bf2e11a4d869aeef4ce7169636ff625555f7e1..46389c9cbc00ffa0303886cd6cba7df94777e0f1 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -210,8 +210,10 @@ public class KaiijuConfig {
+@@ -212,8 +212,10 @@ public class KaiijuConfig {
 
     public static boolean lithiumEnable = true;
     public static boolean lithiumMathFastUtil = true;
--- a/patches/server/0013-Lithium-Entity-FastRetrieval.patch
+++ b/patches/server/0013-Lithium-Entity-FastRetrieval.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lithium Entity FastRetrieval


 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 4bd05b06f4410f8d425ac1f79b37a7fc45b433f4..57ff32c4eac364362ff2e7dc4e8b02156ee30756 100644
+index 46389c9cbc00ffa0303886cd6cba7df94777e0f1..8392dd45c0cfd13f3a1d4f3aeedb23b699eed8f9 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -211,9 +211,11 @@ public class KaiijuConfig {
+@@ -213,9 +213,11 @@ public class KaiijuConfig {
     public static boolean lithiumEnable = true;
     public static boolean lithiumMathFastUtil = true;
     public static boolean lithiumMathSineLut = true;