diff --git a/src/main/java/dev/slimevr/protocol/DataFeedHandler.java b/src/main/java/dev/slimevr/protocol/DataFeedHandler.java index 78446b8f1..58476be56 100644 --- a/src/main/java/dev/slimevr/protocol/DataFeedHandler.java +++ b/src/main/java/dev/slimevr/protocol/DataFeedHandler.java @@ -68,7 +68,7 @@ public class DataFeedHandler extends ProtocolHandler { long currTime = System.currentTimeMillis(); this.api.getAPIServers().forEach((server) -> { - server.getAPIConnections().values().forEach((conn) -> { + server.getAPIConnections().forEach((conn) -> { FlatBufferBuilder fbb = null; int configsCount = conn.getContext().getDataFeedConfigList().size(); diff --git a/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java b/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java index 774167dde..b14136f73 100644 --- a/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java +++ b/src/main/java/dev/slimevr/protocol/ProtocolAPIServer.java @@ -1,8 +1,8 @@ package dev.slimevr.protocol; -import java.util.Map; +import java.util.stream.Stream; public interface ProtocolAPIServer { - Map getAPIConnections(); + Stream getAPIConnections(); } diff --git a/src/main/java/dev/slimevr/protocol/RPCHandler.java b/src/main/java/dev/slimevr/protocol/RPCHandler.java index e63399e75..520e3e850 100644 --- a/src/main/java/dev/slimevr/protocol/RPCHandler.java +++ b/src/main/java/dev/slimevr/protocol/RPCHandler.java @@ -260,8 +260,6 @@ public class RPCHandler extends ProtocolHandler implements Ser this.api.getAPIServers().forEach((server) -> { server.getAPIConnections() - .values() - .stream() .filter(conn -> conn.getContext().useSerial()) .forEach((conn) -> { FlatBufferBuilder fbb = new FlatBufferBuilder(32); @@ -281,8 +279,6 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onSerialDisconnected() { this.api.getAPIServers().forEach((server) -> { server.getAPIConnections() - .values() - .stream() .filter(conn -> conn.getContext().useSerial()) .forEach((conn) -> { FlatBufferBuilder fbb = new FlatBufferBuilder(32); @@ -302,8 +298,6 @@ public class RPCHandler extends ProtocolHandler implements Ser public void onSerialLog(String str) { this.api.getAPIServers().forEach((server) -> { server.getAPIConnections() - .values() - .stream() .filter(conn -> conn.getContext().useSerial()) .forEach((conn) -> { FlatBufferBuilder fbb = new FlatBufferBuilder(32); diff --git a/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java b/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java index 6f11cae0a..ee32ee0ff 100644 --- a/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java +++ b/src/main/java/dev/slimevr/websocketapi/WebsocketAPI.java @@ -13,60 +13,59 @@ import org.java_websocket.server.WebSocketServer; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import java.util.stream.Stream; public class WebsocketAPI extends WebSocketServer implements ProtocolAPIServer { - + public final VRServer server; public final ProtocolAPI protocolAPI; - private final Map websocketConnections = new HashMap<>(); - + public WebsocketAPI(VRServer server, ProtocolAPI protocolAPI) { super(new InetSocketAddress(21110), Collections.singletonList(new Draft_6455())); this.server = server; this.protocolAPI = protocolAPI; - + this.protocolAPI.registerAPIServer(this); } - + @Override public void onOpen(WebSocket conn, ClientHandshake handshake) { LogManager.log.info("[WebSocketAPI] New connection from: " + conn.getRemoteSocketAddress().getAddress().getHostAddress()); - - this.websocketConnections.put(conn.hashCode(), new WebsocketConnection(conn)); + conn.setAttachment(new WebsocketConnection(conn)); } - + @Override public void onClose(WebSocket conn, int code, String reason, boolean remote) { LogManager.log.info("[WebSocketAPI] Disconnected: " + conn.getRemoteSocketAddress().getAddress().getHostAddress() + ", (" + code + ") " + reason + ". Remote: " + remote); - this.websocketConnections.remove(conn.hashCode()); } - + @Override public void onMessage(WebSocket conn, String message) { } - + @Override public void onMessage(WebSocket conn, ByteBuffer message) { - GenericConnection connection = this.websocketConnections.get(conn.hashCode()); - if (connection != null) + var connection = conn. getAttachment(); + if(connection != null) this.protocolAPI.onMessage(connection, message); } - + @Override public void onError(WebSocket conn, Exception ex) { ex.printStackTrace(); } - + @Override public void onStart() { LogManager.log.info("[WebSocketAPI] Web Socket API started on port " + getPort()); setConnectionLostTimeout(0); } - + @Override - public Map getAPIConnections() { - return this.websocketConnections; + public Stream getAPIConnections() { + return this.getConnections().stream().map(conn -> { + var c = conn. getAttachment(); + return (GenericConnection) c; + }).filter(c -> c != null); } }