Switch to virtual threads

Gaming32 · May 10, 2024 · 509b2a4 · 509b2a4
1 parent c23daaa
commit 509b2a4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/IOFunction.java b/src/main/java/io/github/gaming32/worldhost/IOFunction.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+// TODO: Remove when 1.18.2 is minimum
 @FunctionalInterface
 public interface IOFunction<T, R> {
     R apply(T t) throws IOException;

diff --git a/src/main/java/io/github/gaming32/worldhost/ProxyClient.java b/src/main/java/io/github/gaming32/worldhost/ProxyClient.java
@@ -9,7 +9,8 @@
 import java.util.Arrays;
 import java.util.function.Supplier;
 
-public class ProxyClient extends Thread {
+public final class ProxyClient {
+    private final Thread thread;
     private final Socket socket;
     private final InetAddress remoteAddress;
     private final long connectionId;
@@ -23,7 +24,7 @@ public ProxyClient(
         long connectionId,
         Supplier<ProxyPassthrough> proxy
     ) throws IOException {
-        super("ProxyClient for " + connectionId);
+        thread = Thread.ofVirtual().name("ProxyClient for " + connectionId).unstarted(this::run);
         socket = new Socket(InetAddress.getLoopbackAddress(), port);
         this.remoteAddress = remoteAddress;
         this.connectionId = connectionId;
@@ -33,8 +34,7 @@ public ProxyClient(
         }
     }
 
-    @Override
-    public void run() {
+    private void run() {
         WorldHost.LOGGER.info("Starting proxy client from {}", remoteAddress);
         try {
             final var is = socket.getInputStream();
@@ -58,6 +58,10 @@ public void run() {
         WorldHost.LOGGER.info("Proxy client connection for {} closed", remoteAddress);
     }
 
+    public void start() {
+        thread.start();
+    }
+
     public void close() {
         if (closed) return;
         closed = true;

diff --git a/src/main/java/io/github/gaming32/worldhost/WorldHost.java b/src/main/java/io/github/gaming32/worldhost/WorldHost.java
@@ -455,6 +455,7 @@ public static String getName(GameProfile profile) {
     }
 
     // From Apache Commons Lang StringUtils 3.10+
+    // TODO: Remove when 1.18.2 is minimum
     public static <T extends CharSequence> T getIfBlank(final T str, final Supplier<T> defaultSupplier) {
         return StringUtils.isBlank(str) ? defaultSupplier == null ? null : defaultSupplier.get() : str;
     }

diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/ProtocolClient.java b/src/main/java/io/github/gaming32/worldhost/protocol/ProtocolClient.java
@@ -47,7 +47,7 @@ public final class ProtocolClient implements AutoCloseable, ProxyPassthrough {
     public ProtocolClient(String host, boolean successToast, boolean failureToast) {
         this.originalHost = host;
         final HostAndPort target = HostAndPort.fromString(host).withDefaultPort(9646);
-        final Thread connectionThread = new Thread(() -> {
+        Thread.ofVirtual().name("WH-ConnectionThread").start(() -> {
             Socket socket = null;
             try {
                 socket = new Socket(target.getHost(), target.getPort());
@@ -91,7 +91,7 @@ public ProtocolClient(String host, boolean successToast, boolean failureToast) {
             }
             final Socket fSocket = socket;
 
-            final Thread sendThread = new Thread(() -> {
+            final Thread sendThread = Thread.ofVirtual().name("WH-SendThread").start(() -> {
                 try {
                     final DataOutputStream dos = new DataOutputStream(fSocket.getOutputStream());
                     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -111,9 +111,9 @@ public ProtocolClient(String host, boolean successToast, boolean failureToast) {
                     WorldHost.LOGGER.error("Critical error in WH send thread", e);
                 }
                 close();
-            }, "WH-SendThread");
+            });
 
-            final Thread recvThread = new Thread(() -> {
+            Thread.ofVirtual().name("WH-RecvThread").start(() -> {
                 try {
                     final DataInputStream dis = new DataInputStream(fSocket.getInputStream());
                     while (!closed) {
@@ -151,10 +151,7 @@ public ProtocolClient(String host, boolean successToast, boolean failureToast) {
                     }
                 }
                 close();
-            }, "WH-RecvThread");
-
-            sendThread.start();
-            recvThread.start();
+            });
 
             try {
                 sendThread.join();
@@ -174,9 +171,7 @@ public ProtocolClient(String host, boolean successToast, boolean failureToast) {
                         .show();
                 }
             }
-        }, "WH-ConnectionThread");
-        connectionThread.setDaemon(true);
-        connectionThread.start();
+        });
     }
 
     public String getOriginalHost() {

diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java b/src/main/java/io/github/gaming32/worldhost/protocol/proxy/ProxyProtocolClient.java
@@ -23,7 +23,7 @@ public class ProxyProtocolClient implements AutoCloseable, ProxyPassthrough {
     public ProxyProtocolClient(String host, int port, long connectionId, String baseAddr, int mcPort) {
         this.baseAddr = baseAddr;
         this.mcPort = mcPort;
-        final Thread connectionThread = new Thread(() -> {
+        Thread.ofVirtual().name("WHEP-ConnectThread").start(() -> {
             Socket socket = null;
             try {
                 socket = new Socket(host, port);
@@ -52,7 +52,7 @@ public ProxyProtocolClient(String host, int port, long connectionId, String base
             }
             final Socket fSocket = socket;
 
-            final Thread sendThread = new Thread(() -> {
+            final Thread sendThread = Thread.ofVirtual().name("WHEP-SendThread").start(() -> {
                 try {
                     final DataOutputStream dos = new DataOutputStream(fSocket.getOutputStream());
                     while (!closed) {
@@ -69,9 +69,9 @@ public ProxyProtocolClient(String host, int port, long connectionId, String base
                     WorldHost.LOGGER.error("Critical error in WHEP send thread", e);
                 }
                 closed = true;
-            }, "WHEP-SendThread");
+            });
 
-            final Thread recvThread = new Thread(() -> {
+            Thread.ofVirtual().name("WHEP-RecvThread").start(() -> {
                 try {
                     final DataInputStream dis = new DataInputStream(fSocket.getInputStream());
                     while (!closed) {
@@ -91,10 +91,7 @@ public ProxyProtocolClient(String host, int port, long connectionId, String base
                     }
                 }
                 closed = true;
-            }, "WHEP-RecvThread");
-
-            sendThread.start();
-            recvThread.start();
+            });
 
             try {
                 sendThread.join();
@@ -107,9 +104,7 @@ public ProxyProtocolClient(String host, int port, long connectionId, String base
             } catch (IOException e) {
                 WorldHost.LOGGER.error("Failed to close WHEP socket.", e);
             }
-        }, "WHEP-ConnectThread");
-        connectionThread.setDaemon(true);
-        connectionThread.start();
+        });
     }
 
     private void enqueue(ProxyMessage message) {

diff --git a/version.gradle.kts b/version.gradle.kts
@@ -435,4 +435,7 @@ tasks.withType<RemapJarTask> {
         }
     }
     from("$rootDir/LICENSE")
+    mixinRemap {
+        disableRefmap()
+    }
 }