Translate template ids on player transfers

Author: ago1024

modules/modlauncher/src/main/java/com/wurmonline/server/intra/ModIntraServerMessage.java

@@ -0,0 +1,132 @@
+package com.wurmonline.server.intra;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.gotti.wurmunlimited.modcomm.intra.BBHelper;
+import org.gotti.wurmunlimited.modcomm.intra.IntraRequest;
+import org.gotti.wurmunlimited.modcomm.intra.ModIntraServer;
+import org.gotti.wurmunlimited.modcomm.intra.ModIntraServerConstants;
+
+import com.wurmonline.communication.SocketConnection;
+import com.wurmonline.server.ServerEntry;
+import com.wurmonline.server.Servers;
+
+/**
+ * ModIntraServer message type
+ * @author ago
+ */
+public final class ModIntraServerMessage extends IntraCommand implements IntraServerProtocol {
+	private static final Logger logger = Logger.getLogger(ModIntraServerMessage.class.getName());
+
+	private final ServerEntry server;
+	private IntraClient client;
+	private boolean done;
+	private boolean sent;
+	private String message;
+	private byte[] data;
+	private IntraRequest handler;
+
+	/**
+	 * Create intra server message
+	 * @param serverEntry Target server
+	 * @param handler Message handler
+	 * @param payload Request payload
+	 */
+	public ModIntraServerMessage(final ServerEntry serverEntry, IntraRequest handler, byte[] payload) {
+		this.done = false;
+		this.sent = false;
+		this.server = serverEntry;
+		this.message = handler.getName();
+		this.data = payload;
+		this.handler = handler;
+	}
+
+	/**
+	 * Called from Server.poll
+	 */
+	public boolean poll() {
+		if (this.server.id == Servers.localServer.id) {
+			return true;
+		}
+		// Client is null, so connect to the target
+		if (this.client == null) {
+			try {
+				this.client = new IntraClient(server.INTRASERVERADDRESS, Integer.parseInt(server.INTRASERVERPORT), this);
+				this.client.login(this.server.INTRASERVERPASSWORD, true);
+				ModIntraServerMessage.logger.log(Level.INFO, "connecting to " + this.server.id);
+			} catch (IOException iox) {
+				this.client.disconnect("Failed.");
+				this.client = null;
+				ModIntraServerMessage.logger.log(Level.INFO, "Failed");
+				this.done = true;
+			}
+		}
+		// Client is not null and we're not done
+		if (this.client != null && !this.done) {
+			// check for timeouts
+			if (System.currentTimeMillis() > this.timeOutAt) {
+				this.done = handler.handleTimeout();
+			}
+			// Main processing loop
+			if (!this.done) {
+				try {
+					// we're logged in but have not sent the message. Send it
+					if (this.client.loggedIn && !this.sent) {
+
+						SocketConnection connection = ModIntraServer.getConnection(this.client);
+
+						final ByteBuffer buf = connection.getBuffer();
+						buf.put(ModIntraServerConstants.CMD_MODCOMM);
+						buf.put(ModIntraServerConstants.PACKET_MESSAGE);
+						BBHelper.putUtf8String(buf, message);
+						buf.put(data);
+						connection.flush();
+
+						this.sent = true;
+						this.timeOutAt = System.currentTimeMillis() + this.timeOutTime;
+					}
+					// poll the connection
+					if (!this.done) {
+						this.client.update();
+					}
+				} catch (IOException iox) {
+					this.done = true;
+				}
+			}
+			// we're done. Disconnect
+			if (this.done && this.client != null) {
+				this.client.disconnect("Done");
+				this.client = null;
+			}
+		}
+		return this.done;
+	}
+
+	public void commandExecuted(final IntraClient aClient) {
+		this.done = true;
+	}
+
+	public void commandFailed(final IntraClient aClient) {
+		this.done = true;
+	}
+
+	public void dataReceived(final IntraClient aClient) {
+		this.done = true;
+	}
+
+	public void reschedule(final IntraClient aClient) {
+		this.done = true;
+	}
+
+	public void remove(final IntraClient aClient) {
+		this.done = true;
+	}
+
+	public void receivingData(final ByteBuffer buffer) {
+		this.done = this.done || handler.handleReply(buffer);
+	}
+
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modcomm/intra/BBHelper.java

@@ -0,0 +1,34 @@
+package org.gotti.wurmunlimited.modcomm.intra;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * ByteBuffer helper
+ */
+public class BBHelper {
+
+	/**
+	 * put an utf-8 string (byte count + bytes)
+	 * @param buffer ByteBuffer
+	 * @param string String
+	 */
+	public static void putUtf8String(ByteBuffer buffer, String string) {
+		byte[] charData = string.getBytes(StandardCharsets.UTF_8);
+		buffer.putInt(charData.length);
+		buffer.put(charData);
+	}
+
+	/**
+	 * read an utf-8 string (byte count + bytes)
+	 * @param buffer Byte buffer
+	 * @return string
+	 */
+	public static String getUtf8String(ByteBuffer buffer) {
+		int lenght = buffer.getInt();
+		byte[] data = new byte[lenght];
+		buffer.get(data);
+		return new String(data, StandardCharsets.UTF_8);
+	}
+
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modcomm/intra/IntraRequest.java

@@ -0,0 +1,29 @@
+package org.gotti.wurmunlimited.modcomm.intra;
+
+import java.nio.ByteBuffer;
+
+/**
+ * ModIntraServer request
+ */
+public interface IntraRequest {
+
+	/**
+	 * @return Unique message name
+	 */
+	String getName();
+
+	/**
+	 * Handle the reply
+	 * @param recvBuffer Receive buffer
+	 * @return true if the request is done
+	 */
+	boolean handleReply(ByteBuffer recvBuffer);
+
+	/**
+	 * Handle a timeout
+	 * @return true to finish the request
+	 */
+	default boolean handleTimeout() {
+		return true;
+	}
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modcomm/intra/IntraRequestHandler.java

@@ -0,0 +1,19 @@
+package org.gotti.wurmunlimited.modcomm.intra;
+
+import java.nio.ByteBuffer;
+
+import com.wurmonline.communication.SocketConnection;
+
+/**
+ * ModIntraServer request handler (receiving end)
+ */
+@FunctionalInterface
+public interface IntraRequestHandler {
+
+	/**
+	 * Handle the request
+	 * @param connection Connection
+	 * @param recvBuffer Receive buffer
+	 */
+	void handleRequest(SocketConnection connection, ByteBuffer recvBuffer);
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modcomm/intra/ModIntraServer.java

@@ -0,0 +1,109 @@
+package org.gotti.wurmunlimited.modcomm.intra;
+
+import java.lang.reflect.Field;
+
+import org.gotti.wurmunlimited.modcomm.intra.playertransfer.ModPlayerTransfer;
+import org.gotti.wurmunlimited.modloader.ReflectionUtil;
+import org.gotti.wurmunlimited.modloader.classhooks.HookException;
+import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
+
+import com.wurmonline.communication.SocketConnection;
+import com.wurmonline.server.intra.IntraClient;
+import com.wurmonline.server.intra.IntraServerConnection;
+
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.expr.ExprEditor;
+import javassist.expr.MethodCall;
+
+/**
+ * Intra server communication.
+ */
+public class ModIntraServer {
+
+	// Reflection fields
+	private static Field intraClientConnection;
+	private static Field intraServerConnectionConn;
+
+	// internal api handler
+	private static ModIntraServerHandler modCommHandler;
+
+	/**
+	 * init
+	 */
+	public static void init() {
+		// create api handler
+		modCommHandler = new ModIntraServerHandler();
+
+		// class hooks
+		final ClassPool classPool = HookManager.getInstance().getClassPool();
+		try {
+			CtClass ctCommunicator = classPool.getCtClass("com.wurmonline.server.intra.IntraServerConnection");
+
+			HookManager.getInstance().addCallback(ctCommunicator, "modcomm", modCommHandler);
+
+			ctCommunicator.getMethod("reallyHandle", "(ILjava/nio/ByteBuffer;)V").instrument(new ExprEditor() {
+				private boolean first = true;
+
+				@Override
+				public void edit(MethodCall m) throws CannotCompileException {
+					if (m.getMethodName().equals("get") && first) {
+						m.replace("$_ = $proceed($$);" + "if ($_ == " + ModIntraServerConstants.CMD_MODCOMM + ") { modcomm.handle(this, $0); return; }");
+						first = false;
+					}
+				}
+			});
+		} catch (NotFoundException | CannotCompileException e) {
+			throw new RuntimeException("Error initializing ModComm", e);
+		}
+
+		// Init player transfers
+		ModPlayerTransfer.init();
+	}
+
+	/**
+	 * Start communications
+	 */
+	public static void serverStarted() {
+		try {
+			intraClientConnection = ReflectionUtil.getField(IntraClient.class, "connection");
+			intraServerConnectionConn = ReflectionUtil.getField(IntraServerConnection.class, "conn");
+
+			ModPlayerTransfer.serverStarted();
+		} catch (NoSuchFieldException e) {
+			throw new HookException(e);
+		}
+	}
+
+	/**
+	 * Helper to retrieve a {@link SocketConnection} from an {@link IntraClient}
+	 * 
+	 * @param client
+	 *            intra client
+	 * @return socket connection
+	 */
+	public static SocketConnection getConnection(IntraClient client) {
+		try {
+			return ReflectionUtil.getPrivateField(client, intraClientConnection);
+		} catch (IllegalArgumentException | IllegalAccessException | ClassCastException e) {
+			throw new HookException(e);
+		}
+	}
+
+	/**
+	 * Helper to retrieve a {@link SocketConnection} from an {@link IntraServerConnection}
+	 * 
+	 * @param connection
+	 *            intra server connection
+	 * @return socket connection
+	 */
+	public static SocketConnection getConnection(IntraServerConnection connection) {
+		try {
+			return ReflectionUtil.getPrivateField(connection, intraServerConnectionConn);
+		} catch (IllegalArgumentException | IllegalAccessException | ClassCastException e) {
+			throw new HookException(e);
+		}
+	}
+}

modules/modlauncher/src/main/java/org/gotti/wurmunlimited/modcomm/intra/ModIntraServerConstants.java

@@ -0,0 +1,13 @@
+package org.gotti.wurmunlimited.modcomm.intra;
+
+public class ModIntraServerConstants {
+	/**
+	 * Command ID for all packets used by this system, should not collide with any packets used by WU (see {@link IntraServerProtocol})})
+	 */
+	public static final byte CMD_MODCOMM = -100;
+
+	/**
+	 * Packet types for the internal protocol
+	 */
+	public static final byte PACKET_MESSAGE = 1;
+}