(probably) fix EOFException is thrown on proxy-side

api/src/main/java/net/azisaba/azipluginmessaging/api/protocol/handler/ProxyboundEncryptionPacket.java

@@ -10,13 +10,17 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInputStream;
+import java.io.IOException;
 
 public class ProxyboundEncryptionPacket implements ProxyMessageHandler<EncryptionMessage> {
     @Override
-    public @NotNull EncryptionMessage read(@NotNull ServerConnection server, @NotNull DataInputStream in) {
+    public @NotNull EncryptionMessage read(@NotNull ServerConnection server, @NotNull DataInputStream in) throws IOException {
         try {
             return EncryptionMessage.read(in);
         } catch (Exception e) {
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
             throw new RuntimeException(e);
         }
     }

api/src/main/java/net/azisaba/azipluginmessaging/api/protocol/handler/ServerboundEncryptionPacket.java

@@ -8,13 +8,17 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInputStream;
+import java.io.IOException;
 
 public class ServerboundEncryptionPacket implements ServerMessageHandler<EncryptionMessage> {
     @Override
-    public @NotNull EncryptionMessage read(@NotNull DataInputStream in) {
+    public @NotNull EncryptionMessage read(@NotNull DataInputStream in) throws IOException {
         try {
             return EncryptionMessage.read(in);
         } catch (Exception e) {
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
             throw new RuntimeException(e);
         }
     }

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "net.azisaba.azipluginmessaging"
-version = "2.0.2"
+version = "2.0.3"
 
 repositories {
     mavenCentral()

spigot/src/main/java/net/azisaba/azipluginmessaging/spigot/SpigotPlugin.java

@@ -52,8 +52,7 @@ public static PacketSender getAnyPacketSender() {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
-        // do inside the separate thread to avoid blocking main thread
-        new Thread(() -> {
+        Bukkit.getScheduler().runTaskLaterAsynchronously(this, () -> {
             KeyPair keyPair;
             try {
                 // generate keypair
@@ -76,6 +75,6 @@ public void onPlayerJoin(PlayerJoinEvent e) {
 
             // send our public key
             Protocol.P_ENCRYPTION.sendPacket(player, new EncryptionMessage(player.challenge, keyPair.getPublic()));
-        }, "AziPluginMessaging-" + e.getPlayer().getName()).start();
+        }, 20L);
     }
 }

spigot/src/main/java/net/azisaba/azipluginmessaging/spigot/entity/PlayerImpl.java

@@ -77,6 +77,9 @@ public void setKeyPair(@NotNull KeyPair keyPair) {
     @Override
     public void setEncrypted(boolean encrypted) {
         this.encrypted = encrypted;
+
+        // clear challenge, so any new encryption requests will be denied.
+        this.challenge = null;
     }
 
     @Override

velocity/src/main/java/net/azisaba/azipluginmessaging/velocity/server/ServerConnectionImpl.java

@@ -106,9 +106,11 @@ public void setRemotePublicKey(@NotNull PublicKey publicKey) {
         this.publicKey = publicKey;
     }
 
-    @NotNull
     @Override
     public String toString() {
-        return "ServerConnectionImpl{handle=" + handle + '}';
+        return "ServerConnectionImpl{" +
+                "handle=" + handle +
+                ", encrypted=" + encrypted +
+                '}';
     }
 }