stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 19:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tournament now returns result to clients

Browse Source
This commit is contained in:
Bas de Jong
2026-01-10 02:44:04 +01:00
parent 75963a891b
commit aca0b2dcc0
4 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/org/toop/framework/networking/connection/events/NetworkEvents.java
View File

@@ -65,6 +65,9 @@ public class NetworkEvents extends EventsBase {
public record GameResultResponse(long clientId, String condition)
implements GenericEvent {}
public record TournamentResultResponse(long clientId, String gameType, String[] names, Integer[] scores)
implements GenericEvent {}
/** Indicates that a game move has been processed or received. */
public record GameMoveResponse(long clientId, String player, String move, String details)
implements GenericEvent {}
@@ -219,4 +222,5 @@ public class NetworkEvents extends EventsBase {
/** Response to a {@link ChangeAddress} event, carrying the success result. */
public record ChangeAddressResponse(boolean successful, long identifier)
implements ResponseToUniqueEvent {}
}

32
framework/src/main/java/org/toop/framework/networking/connection/handlers/NetworkingGameClientHandler.java
View File

@@ -3,6 +3,7 @@ package org.toop.framework.networking.connection.handlers;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import java.util.Arrays;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -94,6 +95,9 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
case "HELP":
helpHandler(recSrvRemoved);
return;
case "RESULTS":
resultsHandler(recSrvRemoved);
return;
default:
// return
}
@@ -103,6 +107,34 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
}
}
private static String extract(String input, String key) {
Pattern p = Pattern.compile(
key + "\\s*:\\s*(\\[[^]]*]|\"[^\"]*\")",
Pattern.CASE_INSENSITIVE
);
Matcher m = p.matcher(input);
return m.find() ? m.group(1) : null;
}
private void resultsHandler(String rec) {
IO.println(rec);
String gameTypeRaw = extract(rec, "GAMETYPE");
String usersRaw = extract(rec, "USERS");
String scoresRaw = extract(rec, "SCORES");
String[] users = Arrays.stream(usersRaw.substring(1, usersRaw.length() - 1).split(","))
.map(s -> s.trim().replace("\"", ""))
.toArray(String[]::new);
Integer[] scores = Arrays.stream(scoresRaw.substring(1, scoresRaw.length() - 1).split(","))
.map(String::trim)
.map(Integer::parseInt)
.toArray(Integer[]::new);
eventBus.post(new NetworkEvents.TournamentResultResponse(this.connectionId, gameTypeRaw, users, scores));
}
private void gameMoveHandler(String rec) {
String[] msg =
Pattern.compile(

2
framework/src/main/java/org/toop/framework/networking/server/Server.java
View File

@@ -292,7 +292,7 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
String scores = gson.toJson(s);
String msg = String.format(
"SVR RESULTS {GAMETYPE: \"%s\", USERS: %s, SCORES: %s}",
"SVR RESULTS {GAMETYPE: \"%s\", USERS: %s, SCORES: %s, TOURNAMENT: 1}",
gameType,
users,
scores