implemented relay connection interface

src/main/java/net/lax1dude/eaglercraft/RelayQuery.java

@@ -11,16 +11,16 @@ public interface RelayQuery {
 		}
 	}
 
-	public boolean isQueryOpen();
+	boolean isQueryOpen();
-	public boolean isQueryFailed();
+	boolean isQueryFailed();
-	public RateLimit isQueryRateLimit();
+	RateLimit isQueryRateLimit();
-	public void close();
+	void close();
 	
-	public int getVersion();
+	int getVersion();
-	public String getComment();
+	String getComment();
-	public String getBrand();
+	String getBrand();
-	public long getPing();
+	long getPing();
 
-	public VersionMismatch getCompatible();
+	VersionMismatch getCompatible();
 
 }

src/main/java/net/lax1dude/eaglercraft/RelayServerSocket.java

@@ -0,0 +1,21 @@
+package net.lax1dude.eaglercraft;
+
+import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit;
+import net.lax1dude.eaglercraft.sp.relay.pkt.IPacket;
+
+public interface RelayServerSocket {
+
+	boolean isOpen();
+	boolean isClosed();
+	void close();
+	
+	boolean isFailed();
+	Throwable getException();
+	
+	void writePacket(IPacket pkt);
+	
+	IPacket readPacket();
+	
+	RateLimit getRatelimitHistory();
+	
+}

src/main/java/net/lax1dude/eaglercraft/RelayWorldsQuery.java

@@ -2,16 +2,19 @@ package net.lax1dude.eaglercraft;
 
 import java.util.List;
 
+import net.lax1dude.eaglercraft.RelayQuery.VersionMismatch;
 import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit;
 import net.lax1dude.eaglercraft.sp.relay.pkt.IPacket07LocalWorlds.LocalWorld;
 
 public interface RelayWorldsQuery {
 
-	public boolean isQueryOpen();
+	boolean isQueryOpen();
-	public boolean isQueryFailed();
+	boolean isQueryFailed();
-	public RateLimit isQueryRateLimit();
+	RateLimit isQueryRateLimit();
-	public void close();
+	void close();
 	
-	public List<LocalWorld> getWorlds();
+	List<LocalWorld> getWorlds();
+	
+	VersionMismatch getCompatible();
 	
 }

src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java

@@ -93,9 +93,11 @@ import net.lax1dude.eaglercraft.IntegratedServer;
 import net.lax1dude.eaglercraft.LocalStorageManager;
 import net.lax1dude.eaglercraft.PKT;
 import net.lax1dude.eaglercraft.RelayQuery;
+import net.lax1dude.eaglercraft.RelayServerSocket;
 import net.lax1dude.eaglercraft.RelayWorldsQuery;
 import net.lax1dude.eaglercraft.ServerQuery;
 import net.lax1dude.eaglercraft.Voice;
+import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit;
 import net.lax1dude.eaglercraft.adapter.teavm.EaglercraftLANClient;
 import net.lax1dude.eaglercraft.adapter.teavm.EaglercraftLANServer;
 import net.lax1dude.eaglercraft.adapter.teavm.EaglercraftVoiceClient;
@@ -2984,6 +2986,7 @@ public class EaglerAdapterImpl2 {
 				connectionOpenedAt = 0l;
 				sock = null;
 				open = false;
+				failed = true;
 				return;
 			}
 			sock = s;
@@ -3245,6 +3248,7 @@ public class EaglerAdapterImpl2 {
 			}catch(Throwable t) {
 				sock = null;
 				open = false;
+				failed = true;
 				return;
 			}
 			sock = s;
@@ -3383,6 +3387,11 @@ public class EaglerAdapterImpl2 {
 			return worlds;
 		}
 
+		@Override
+		public RelayQuery.VersionMismatch getCompatible() {
+			return versError;
+		}
+		
 	}
 	
 	private static class RelayWorldsQueryRatelimitDummy implements RelayWorldsQuery {
@@ -3417,6 +3426,10 @@ public class EaglerAdapterImpl2 {
 			return new ArrayList(0);
 		}
 
+		@Override
+		public RelayQuery.VersionMismatch getCompatible() {
+			return RelayQuery.VersionMismatch.COMPATIBLE;
+		}
 	}
 	
 	public static final RelayWorldsQuery openRelayWorldsQuery(String addr) {
@@ -3435,6 +3448,214 @@ public class EaglerAdapterImpl2 {
 		return new RelayWorldsQueryImpl(addr);
 	}
 	
+	private static class RelayServerSocketImpl implements RelayServerSocket {
+		
+		private final WebSocket sock;
+		private final String uri;
+
+		private boolean open;
+		private boolean closed;
+		private boolean failed;
+		
+		private boolean hasRecievedAnyData;
+
+		private final List<Throwable> exceptions = new LinkedList();
+		private final List<IPacket> packets = new LinkedList();
+		
+		private RelayServerSocketImpl(String uri) {
+			this.uri = uri;
+			WebSocket s = null;
+			try {
+				s = WebSocket.create(uri);
+				s.setBinaryType("arraybuffer");
+				open = false;
+				closed = false;
+				failed = false;
+			}catch(Throwable t) {
+				exceptions.add(t);
+				sock = null;
+				open = false;
+				closed = true;
+				failed = true;
+				return;
+			}
+			sock = s;
+			sock.onOpen(new EventListener<MessageEvent>() {
+				@Override
+				public void handleEvent(MessageEvent evt) {
+					open = true;
+				}
+			});
+			sock.onMessage(new EventListener<MessageEvent>() {
+				@Override
+				public void handleEvent(MessageEvent evt) {
+					if(evt.getData() != null && !isString(evt.getData())) {
+						hasRecievedAnyData = true;
+						Uint8Array buf = Uint8Array.create(evt.getDataAsArray());
+						byte[] arr = new byte[buf.getLength()];
+						for(int i = 0; i < arr.length; ++i) {
+							arr[i] = (byte)buf.get(i);
+						}
+						try {
+							packets.add(IPacket.readPacket(new DataInputStream(new ByteArrayInputStream(arr))));
+						} catch (IOException e) {
+							exceptions.add(e);
+							System.err.println("Relay Socket Error: " + e.toString());
+							e.printStackTrace();
+							open = false;
+							failed = true;
+							closed = true;
+							sock.close();
+						}
+					}
+				}
+			});
+			sock.onClose(new EventListener<CloseEvent>() {
+				@Override
+				public void handleEvent(CloseEvent evt) {
+					if(!hasRecievedAnyData) {
+						failed = true;
+					}
+					open = false;
+					closed = true;
+				}
+			});
+		}
+
+		@Override
+		public boolean isOpen() {
+			return open;
+		}
+
+		@Override
+		public boolean isClosed() {
+			return closed;
+		}
+
+		@Override
+		public void close() {
+			if(open && sock != null) {
+				sock.close();
+			}
+			open = false;
+			closed = true;
+		}
+
+		@Override
+		public boolean isFailed() {
+			return failed;
+		}
+
+		@Override
+		public Throwable getException() {
+			if(exceptions.size() > 0) {
+				return exceptions.remove(0);
+			}else {
+				return null;
+			}
+		}
+
+		@Override
+		public void writePacket(IPacket pkt) {
+			try {
+				nativeBinarySend(sock, convertToArrayBuffer(IPacket.writePacket(pkt)));
+			} catch (Throwable e) {
+				System.err.println("Relay connection error: " + e.toString());
+				e.printStackTrace();
+				exceptions.add(e);
+				failed = true;
+				open = false;
+				closed = true;
+				sock.close();
+			}
+		}
+
+		@Override
+		public IPacket readPacket() {
+			if(packets.size() > 0) {
+				return packets.remove(0);
+			}else {
+				return null;
+			}
+		}
+		
+		@Override
+		public RateLimit getRatelimitHistory() {
+			if(relayQueryBlocked.containsKey(uri)) {
+				return RateLimit.LOCKED;
+			}
+			if(relayQueryLimited.containsKey(uri)) {
+				return RateLimit.BLOCKED;
+			}
+			return RateLimit.NONE;
+		}
+		
+	}
+	
+	private static class RelayServerSocketRatelimitDummy implements RelayServerSocket {
+		
+		private final RateLimit limit;
+		
+		private RelayServerSocketRatelimitDummy(RateLimit limit) {
+			this.limit = limit;
+		}
+		
+		@Override
+		public boolean isOpen() {
+			return false;
+		}
+
+		@Override
+		public boolean isClosed() {
+			return true;
+		}
+
+		@Override
+		public void close() {
+		}
+
+		@Override
+		public boolean isFailed() {
+			return true;
+		}
+
+		@Override
+		public Throwable getException() {
+			return null;
+		}
+
+		@Override
+		public void writePacket(IPacket pkt) {
+		}
+
+		@Override
+		public IPacket readPacket() {
+			return null;
+		}
+		
+		@Override
+		public RateLimit getRatelimitHistory() {
+			return limit;
+		}
+		
+	}
+	
+	public static final RelayServerSocket openRelayConnection(String addr) {
+		long millis = System.currentTimeMillis();
+		
+		Long l = relayQueryBlocked.get(addr);
+		if(l != null && millis - l.longValue() < 60000l) {
+			return new RelayServerSocketRatelimitDummy(RateLimit.LOCKED);
+		}
+		
+		l = relayQueryLimited.get(addr);
+		if(l != null && millis - l.longValue() < 10000l) {
+			return new RelayServerSocketRatelimitDummy(RateLimit.BLOCKED);
+		}
+		
+		return new RelayServerSocketImpl(addr);
+	}
+
 	private static EaglercraftLANClient rtcLANClient = null;
 	
 	@JSBody(params = { }, script = "return window.startLANClient();")