CringeStudios/ShareServer
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update protocol

Browse Source
This commit is contained in:
MrLetsplay 2023-12-04 21:37:48 +01:00
parent e41b0cfe8a
commit 8fa23d9dff
Signed by: mr
SSH Key Fingerprint: SHA256:92jBH80vpXyaZHjaIl47pjRq+Yt7XGTArqQg1V7hSqg
2 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/mrletsplay/shareserver/SessionUser.java
View File

@ -1,3 +1,3 @@
package me.mrletsplay.shareserver; package me.mrletsplay.shareserver;
public record SessionUser(Session session, int siteID) {} public record SessionUser(Session session, String username, int siteID) {}

57
src/main/java/me/mrletsplay/shareserver/ShareWSServer.java
View File

@ -5,8 +5,8 @@ import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Objects;
import org.java_websocket.WebSocket; import org.java_websocket.WebSocket;
import org.java_websocket.framing.CloseFrame; import org.java_websocket.framing.CloseFrame;
@ -14,7 +14,7 @@ import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer; import org.java_websocket.server.WebSocketServer;
import me.mrletsplay.shareclientcore.connection.RemoteConnection; import me.mrletsplay.shareclientcore.connection.RemoteConnection;
import me.mrletsplay.shareclientcore.connection.message.ChangeMessage; import me.mrletsplay.shareclientcore.connection.message.AddressableMessage;
import me.mrletsplay.shareclientcore.connection.message.ClientHelloMessage; import me.mrletsplay.shareclientcore.connection.message.ClientHelloMessage;
import me.mrletsplay.shareclientcore.connection.message.Message; import me.mrletsplay.shareclientcore.connection.message.Message;
import me.mrletsplay.shareclientcore.connection.message.PeerJoinMessage; import me.mrletsplay.shareclientcore.connection.message.PeerJoinMessage;
@ -66,18 +66,43 @@ public class ShareWSServer extends WebSocketServer {
if(m instanceof ClientHelloMessage hello) { if(m instanceof ClientHelloMessage hello) {
Session session = ShareServer.getOrCreateSession(hello.sessionID()); Session session = ShareServer.getOrCreateSession(hello.sessionID());
int siteID = session.getNewSiteID(); int siteID = session.getNewSiteID();
conn.setAttachment(new SessionUser(session, siteID)); conn.setAttachment(new SessionUser(session, hello.username(), siteID));
send(conn, new ServerHelloMessage(RemoteConnection.PROTOCOL_VERSION, siteID)); send(conn, new ServerHelloMessage(RemoteConnection.PROTOCOL_VERSION, siteID));
getPeers(session).forEach(peer -> send(peer, new PeerJoinMessage(hello.username(), siteID))); getPeers(session).forEach(peer -> {
if(peer != conn) {
SessionUser user = peer.getAttachment();
send(conn, new PeerJoinMessage(user.username(), user.siteID()));
}
send(peer, new PeerJoinMessage(hello.username(), siteID));
});
}else { }else {
conn.close(CloseFrame.POLICY_VALIDATION, "First message must be CLIENT_HELLO"); conn.close(CloseFrame.POLICY_VALIDATION, "First message must be CLIENT_HELLO");
} }
return; return;
} }
Session session = conn.getAttachment(); SessionUser user = conn.getAttachment();
if(m instanceof ChangeMessage change) { Session session = user.session();
getPeers(session).forEach(peer -> send(peer, m)); switch(m.getType()) {
case CHANGE -> getPeers(session).forEach(peer -> send(peer, m));
case REQUEST_FULL_SYNC, REQUEST_CHECKSUM -> {
AddressableMessage msg = (AddressableMessage) m;
if(msg.siteID() != user.siteID()) {
conn.close(CloseFrame.POLICY_VALIDATION, "Invalid site id");
return;
}
send(getHost(getPeers(session)), m);
}
case FULL_SYNC, CHECKSUM -> {
AddressableMessage msg = (AddressableMessage) m;
WebSocket peer = getPeer(getPeers(session), msg.siteID());
if(peer != null) send(peer, m);
}
default -> {
conn.close(CloseFrame.POLICY_VALIDATION, "Invalid message received");
}
} }
// System.out.println("Got a message"); // System.out.println("Got a message");
@ -88,10 +113,26 @@ public class ShareWSServer extends WebSocketServer {
private List<WebSocket> getPeers(Session session) { private List<WebSocket> getPeers(Session session) {
return getConnections().stream() return getConnections().stream()
.filter(c -> Objects.equals(c.getAttachment(), session)) .filter(c -> {
SessionUser user = c.getAttachment();
if(user == null) return false;
return user.session().equals(session);
})
.toList(); .toList();
} }
private WebSocket getHost(List<WebSocket> peers) {
return peers.stream()
.min(Comparator.comparing(p -> p.<SessionUser>getAttachment().siteID()))
.orElse(null);
}
private WebSocket getPeer(List<WebSocket> peers, int siteID) {
return peers.stream()
.filter(p -> p.<SessionUser>getAttachment().siteID() == siteID)
.findFirst().orElse(null);
}
@Override @Override
public void onError(WebSocket conn, Exception ex) { public void onError(WebSocket conn, Exception ex) {