Switch to Bun and websockets

.github/workflows/build-server.yml

@@ -13,17 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ["lts/*", "latest"]
+        version: ["1.2.15", "latest"]
     steps:
       - uses: actions/checkout@v3
-      - name: Use latest Node.js LTS
-        uses: actions/setup-node@v3
+      - name: Setup bun.sh
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: ${{ matrix.version }}
-          # cache: "yarn"
-      - run: yarn
+          bun-version: ${{ matrix.version }}
+      - run: bun install
         working-directory: ./server
-      - run: yarn build
-        working-directory: ./server
-      - run: yarn test
+      - run: bun test
         working-directory: ./server

README.md

@@ -46,11 +46,10 @@ You can control who has access to a Sync Server by editing its `allowed-users.tx
 <summary>System Install</summary>
 <br />
 
-- install recent nodejs (~17)
+- install [Bun](https://bun.sh/)
 - clone code, `cd server`
-- `npm install`
-- `npm run build` -- this has to be run after every time the code is edited
-- `npm run start`
+- `bun install`
+- `bun start`
 - to stop, press Ctrl+C twice
 </details>
 

mod/common/build.gradle

@@ -20,6 +20,9 @@ dependencies {
 	modCompileOnly("maven.modrinth:journeymap:5JbcGXLn")
 	// https://modrinth.com/mod/xaeros-minimap/version/23.6.2_Fabric_1.18.2 (23.6.2 fabric)
 	modCompileOnly("maven.modrinth:xaeros-minimap:Jwydpps9")
+
+	// https://github.com/TooTallNate/Java-WebSocket
+	compileOnly("org.java-websocket:Java-WebSocket:1.6.0")
 }
 
 tasks {

mod/common/src/main/java/gjum/minecraft/mapsync/common/CatchupLogic.java

@@ -32,7 +32,7 @@ public void addCatchupChunks(List<CatchupChunk> catchupChunks) {
 		if (catchupChunks.isEmpty()) return;
 		var catchupDim = catchupChunks.get(0).dimension();
 		if (!dimensionState.dimension.equals(catchupDim)) {
-			logger.warn("Catchup chunks from wrong dimension " + catchupDim + ", expected " + dimensionState.dimension);
+			LOGGER.warn("Catchup chunks from wrong dimension " + catchupDim + ", expected " + dimensionState.dimension);
 			return;
 		}
 		synchronized (this.catchupChunks) {

mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java

@@ -4,21 +4,23 @@
 import gjum.minecraft.mapsync.common.config.ModConfig;
 import gjum.minecraft.mapsync.common.config.ServerConfig;
 import gjum.minecraft.mapsync.common.data.*;
+import gjum.minecraft.mapsync.common.net.SyncAddress;
 import gjum.minecraft.mapsync.common.net.SyncClient;
 import gjum.minecraft.mapsync.common.net.packet.*;
+import java.util.stream.Collectors;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static gjum.minecraft.mapsync.common.Cartography.chunkTileFromLevel;
 
@@ -27,7 +29,7 @@ public abstract class MapSyncMod {
 
 	private static final Minecraft mc = Minecraft.getInstance();
 
-	public static final Logger logger = LogManager.getLogger(MapSyncMod.class);
+	public static final Logger LOGGER = LogManager.getLogger(MapSyncMod.class);
 
 	private static MapSyncMod INSTANCE;
 
@@ -123,30 +125,41 @@ public void handleRespawn(ClientboundRespawnPacket packet) {
 		if (syncServerAddresses.isEmpty()) return shutDownSyncClients();
 
 		// will be filled with clients that are still wanted (address) and are still connected
-		var existingClients = new HashMap<String, SyncClient>();
+		var existingClients = new HashMap<SyncAddress, SyncClient>();
 
-		for (SyncClient client : syncClients) {
-			if (client.isShutDown) continue;
+		for (final SyncClient client : this.syncClients) {
+			if (client.isShutDown) {
+				continue;
+			}
 			// avoid reconnecting to same sync server, to keep shared state (expensive to resync)
-			if (!client.gameAddress.equals(serverConfig.gameAddress)) {
-				debugLog("Disconnecting sync client; different game server");
+			if (!StringUtils.equals(client.gameAddress, serverConfig.gameAddress)) {
+				LOGGER.warn("Disconnecting sync client; different game server");
 				client.shutDown();
-			} else if (!syncServerAddresses.contains(client.address)) {
-				debugLog("Disconnecting sync client; different sync address");
+			}
+			else if (!syncServerAddresses.contains(client.syncAddress.toString())) {
+				LOGGER.warn("Disconnecting sync client; different sync address");
 				client.shutDown();
-			} else {
-				existingClients.put(client.address, client);
+			}
+			else {
+				existingClients.put(client.syncAddress, client);
 			}
 		}
 
-		syncClients = syncServerAddresses.stream().map(address -> {
-			var client = existingClients.get(address);
-			if (client == null) client = new SyncClient(address, serverConfig.gameAddress);
-			client.autoReconnect = true;
-			return client;
-		}).collect(Collectors.toList());
-
-		return syncClients;
+		this.syncClients = syncServerAddresses.stream()
+			.map(SyncAddress::of)
+			.filter(Objects::nonNull)
+			.distinct()
+			.map((address) -> {
+				SyncClient client = existingClients.get(address);
+				if (client == null) {
+					client = new SyncClient(address, serverConfig.gameAddress);
+				}
+				client.autoReconnect = true;
+				return client;
+			})
+			.collect(Collectors.toCollection(ArrayList::new));
+
+		return this.syncClients;
 	}
 
 	public List<SyncClient> shutDownSyncClients() {
@@ -214,11 +227,6 @@ public void handleMcChunkPartialChange(int cx, int cz) {
 		// TODO update ChunkTile in a second or so; remember dimension in case it changes til then
 	}
 
-	public void handleSyncServerEncryptionSuccess() {
-		debugLog("tcp encrypted");
-		// TODO tell server our current dimension
-	}
-
 	public void handleRegionTimestamps(ClientboundRegionTimestampsPacket packet, SyncClient client) {
 		DimensionState dimension = getDimensionState();
 		if (dimension == null) return;
@@ -258,7 +266,7 @@ public void handleSharedChunk(ChunkTile chunkTile) {
 	public void handleCatchupData(ClientboundChunkTimestampsResponsePacket packet) {
 		var dimensionState = getDimensionState();
 		if (dimensionState == null) return;
-		debugLog("received catchup: " + packet.chunks.size() + " " + packet.chunks.get(0).syncClient.address);
+		debugLog("received catchup: " + packet.chunks.size() + " " + packet.chunks.get(0).syncClient.syncAddress);
 		dimensionState.addCatchupChunks(packet.chunks);
 	}
 
@@ -269,9 +277,9 @@ public void requestCatchupData(List<CatchupChunk> chunks) {
 		}
 
 		debugLog("requesting more catchup: " + chunks.size());
-		var byServer = new HashMap<String, List<CatchupChunk>>();
+		var byServer = new HashMap<SyncAddress, List<CatchupChunk>>();
 		for (CatchupChunk chunk : chunks) {
-			var list = byServer.computeIfAbsent(chunk.syncClient.address, (a) -> new ArrayList<>());
+			var list = byServer.computeIfAbsent(chunk.syncClient.syncAddress, (a) -> new ArrayList<>());
 			list.add(chunk);
 		}
 		for (List<CatchupChunk> chunksForServer : byServer.values()) {
@@ -283,7 +291,7 @@ public void requestCatchupData(List<CatchupChunk> chunks) {
 	public static void debugLog(String msg) {
 		// we could also make use of slf4j's debug() but I don't know how to reconfigure that at runtime based on globalConfig
 		if (modConfig.isShowDebugLog()) {
-			logger.info(msg);
+			LOGGER.info(msg);
 		}
 	}
 }

mod/common/src/main/java/gjum/minecraft/mapsync/common/ModGui.java

@@ -2,15 +2,17 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import gjum.minecraft.mapsync.common.config.ServerConfig;
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.TextComponent;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
-
 import static gjum.minecraft.mapsync.common.MapSyncMod.getMod;
 
 public class ModGui extends Screen {
@@ -78,8 +80,12 @@ protected void init() {
 	public void connectClicked(Button btn) {
 		try {
 			if (syncServerAddressField == null) return;
-			var addresses = List.of(syncServerAddressField.getValue().split("[^-_.:A-Za-z0-9]+"));
-			serverConfig.setSyncServerAddresses(addresses);
+			serverConfig.setSyncServerAddresses(
+				Stream.of(StringUtils.split(syncServerAddressField.getValue(), ","))
+					.map(String::trim)
+					.filter(StringUtils::isNotEmpty)
+					.collect(Collectors.toCollection(ArrayList::new))
+			);
 			getMod().shutDownSyncClients();
 			getMod().getSyncClients();
 			btn.active = false;
@@ -117,7 +123,7 @@ public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
 			for (var client : syncClients) {
 				int statusColor;
 				String statusText;
-				if (client.isEncrypted()) {
+				if (client.isEstablished()) {
 					numConnected++;
 					statusColor = 0x008800;
 					statusText = "Connected";
@@ -128,7 +134,7 @@ public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
 					statusColor = 0xffffff;
 					statusText = "Connecting...";
 				}
-				statusText = client.address + "  " + statusText;
+				statusText = client.syncAddress + "  " + statusText;
 				drawString(poseStack, font, statusText, left, msgY, statusColor);
 				msgY += 10;
 			}

mod/common/src/main/java/gjum/minecraft/mapsync/common/net/Packet.java

@@ -81,4 +81,13 @@ static void writeResourceKey(
 				resourceKey.location().toString()
 		);
 	}
+
+	static void assertNoRemainder(
+		final @NotNull ByteBuf in
+	) {
+		final int remainder = in.readableBytes();
+		if (remainder > 0) {
+			throw new IllegalStateException("Found [" + remainder + "] remaining bytes!");
+		}
+	}
 }