Enhance score calculations, improve display, and update dependencies

README.md

@@ -93,7 +93,7 @@ mvn -U clean compile exec:java
 ### 4) Call an Endpoint
 
 ```shell
-curl "http://localhost:8721/bo?u=12345678&n=20" --output best_of_20.png
+curl "http://localhost:8721/bp?u=12345678&n=20" --output best_of_20.png
 ```
 
 ## Endpoints
@@ -169,16 +169,17 @@ persisting it. After osuRenderer uploads the completed MP4, `/status` returns th
 QQ `qqFile` identifier to SeiraCore. Deploy both service hops behind TLS because
 the render request can contain a bearer credential.
 
-| Method | Path                                    | Purpose                                | Params / POST Body                                | Response    |
-|--------|-----------------------------------------|----------------------------------------|---------------------------------------------------|-------------|
-| GET    | `/replays/status`                       | Replay renderer overview               | none                                              | JSON        |
-| POST   | `/cache/control`                        | Control cache across oStella and workers | `{"operation":"QUERY","type":"BEATMAPSET","id":12345}` | JSON |
-| POST   | `/replays/renders/score/{scoreId}`      | Queue single replay render             | path `scoreId`                                    | `202` JSON  |
-| POST   | `/replays/renders/showcase/scores`      | Queue multi-score showcase render      | POST Body `{"ids":[score ids]}`                   | `202` JSON  |
-| POST   | `/replays/renders/showcase/{beatmapId}` | Queue multi-score showcase render      | path `beatmapId` + POST Body `{"ids":[user ids]}` | `202` JSON  |
-| GET    | `/replays/{jobId}/status`               | Get render job state                   | path `{jobId}`                                    | JSON        |
-| GET    | `/replays/{jobId}/video`                | Download rendered video                | path `{jobId}`                                    | `video/mp4` |
-| DELETE | `/replays/{jobId}/video`                | Remove rendered video and job metadata | path `{jobId}`                                    | text        |
+| Method | Path                                    | Purpose                                  | Params / POST Body                                     | Response    |
+|--------|-----------------------------------------|------------------------------------------|--------------------------------------------------------|-------------|
+| GET    | `/replays/status`                       | Replay renderer overview                 | none                                                   | JSON        |
+| POST   | `/cache/control`                        | Control cache across oStella and workers | `{"operation":"QUERY","type":"BEATMAPSET","id":12345}` | JSON        |
+| POST   | `/replays/renders/score/{scoreId}`      | Queue single replay render               | path `scoreId`                                         | `202` JSON  |
+| POST   | `/replays/renders/showcase/scores`      | Queue multi-score showcase render        | POST Body `{"ids":[score ids]}`                        | `202` JSON  |
+| POST   | `/replays/renders/showcase/{beatmapId}` | Queue multi-score showcase render        | path `beatmapId` + POST Body `{"ids":[user ids]}`      | `202` JSON  |
+| GET    | `/replays/{jobId}/status`               | Get render job state                     | path `{jobId}`                                         | JSON        |
+| POST   | `/replays/{jobId}/cancel`               | Cancel a queued or active render job     | path `{jobId}`                                         | JSON        |
+| GET    | `/replays/{jobId}/video`                | Download rendered video                  | path `{jobId}`                                         | `video/mp4` |
+| DELETE | `/replays/{jobId}/video`                | Remove rendered video and job metadata   | path `{jobId}`                                         | text        |
 
 ### Miscellaneous
 
@@ -252,12 +253,12 @@ You can also look up the score of a beatmap, or the beatmap index of a beatmapse
 #### Looking up beatmaps, beatmapset, or scores by a user and index (e.g., best-of-N):
 
 - `of` = score type
-- `i` = index (for `bo` `rs` `rp`, which score index to return)
+- `i` = index (for `bp` `rs` `rp`, which score index to return)
 - `u` = user ID
 
 ##### Score Types for `of` parameter:
 
-- `bo` - best scores
+- `bp` - best scores
 - `rs` - recent scores
 - `rp` - recent **passed** scores
 - `mp` - current multiplayer playlist item
@@ -267,7 +268,7 @@ You can also look up the score of a beatmap, or the beatmap index of a beatmapse
 - `/beatmaps/lookup?m=12345678` - Look up beatmap by map ID
 - `/beatmaps/lookup?ms=12345678&i=0` - Look up the first beatmap of a beatmapset
 - `/beatmaps/lookup?s=12345678` - Look up the beatmap of a score
-- `/beatmaps/lookup?of=bo&i=0&u=12345678` - Look up the beatmap of a user's best score #1
+- `/beatmaps/lookup?of=bp&i=0&u=12345678` - Look up the beatmap of a user's best score #1
 - `/beatmapsets/lookup?ms=12345678` - Look up beatmapset by mapset ID
 - `/beatmapsets/lookup?m=12345678` - Look up the beatmapset of a beatmap
 - `/beatmapsets/lookup?of=mp` - Look up the beatmapset of the current multiplayer playlist item

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.BotSeira</groupId>
     <artifactId>oStella</artifactId>
-    <version>1.11.5</version>
+    <version>1.12.0</version>
 
     <properties>
         <maven.compiler.source>25</maven.compiler.source>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.github.BotSeira</groupId>
             <artifactId>osuParser</artifactId>
-            <version>v1.5.2</version>
+            <version>v1.5.6</version>
         </dependency>
 
         <!-- Source: https://mvnrepository.com/artifact/org.tukaani/xz -->

src/main/java/xyz/zcraft/ostella/data/MultiplayerResultData.java

@@ -2,10 +2,12 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 public record MultiplayerResultData(long roomId, String roomName, long playlistItemId, String playedAt,
                                     String client, String scoringType, String teamType,
                                     long totalScore, long averageScore, double teamLeadPercent, String winningTeam,
+                                    SeriesScore seriesScore,
                                     BeatmapInfo beatmap, UserInfo queuedBy, List<PlayerResult> players,
                                     List<TeamResult> teams, List<PlayerResult> unassignedPlayers) {
     public MultiplayerResultData(
@@ -20,6 +22,7 @@ public MultiplayerResultData(
             long averageScore,
             double teamLeadPercent,
             String winningTeam,
+            SeriesScore seriesScore,
             BeatmapInfo beatmap,
             UserInfo queuedBy,
             List<PlayerResult> players,
@@ -37,6 +40,7 @@ public MultiplayerResultData(
         this.averageScore = averageScore;
         this.teamLeadPercent = teamLeadPercent;
         this.winningTeam = winningTeam;
+        this.seriesScore = seriesScore == null ? SeriesScore.empty() : seriesScore;
         this.beatmap = beatmap;
         this.queuedBy = queuedBy;
         this.players = List.copyOf(players);
@@ -45,22 +49,61 @@ public MultiplayerResultData(
     }
 
     public boolean isTeamVs() {
-        return teams.size() == 2;
+        return teams.size() == 2 && !isTeamDuel();
     }
 
     public boolean isDuel() {
-        return !isTeamVs() && players.size() == 2;
+        return isTeamDuel() || (teams.isEmpty() && players.size() == 2);
     }
 
     public List<PlayerResult> duelPlayers() {
         if (!isDuel()) {
             return players;
         }
         return players.stream()
-                .sorted(Comparator.comparingLong(PlayerResult::userId))
+                .sorted(Comparator
+                        .comparingInt((PlayerResult player) -> teamOrder(player.team()))
+                        .thenComparingLong(PlayerResult::userId))
                 .toList();
     }
 
+    public List<VersusScore> versusScores() {
+        if (teams.size() == 2) {
+            return teams.stream()
+                    .map(team -> new VersusScore(
+                            team.key(),
+                            team.name(),
+                            "red".equals(team.key()) ? seriesScore.redWins() : seriesScore.blueWins()
+                    ))
+                    .toList();
+        }
+        if (!isDuel()) {
+            return List.of();
+        }
+        return duelPlayers().stream()
+                .map(player -> new VersusScore(
+                        null,
+                        player.username(),
+                        seriesScore.playerWins().getOrDefault(player.userId(), 0)
+                ))
+                .toList();
+    }
+
+    private static int teamOrder(String team) {
+        return switch (team == null ? "" : team) {
+            case "red" -> 0;
+            case "blue" -> 1;
+            default -> 2;
+        };
+    }
+
+    private boolean isTeamDuel() {
+        return players.size() == 2
+                && teams.size() == 2
+                && teams.get(0).players().size() == 1
+                && teams.get(1).players().size() == 1;
+    }
+
     public record BeatmapInfo(long id, String title, String titleUnicode, String artist, String creator,
                               String difficultyName,
                               Double difficultyRating, Double bpm, Long totalLength, String ruleset, String coverUrl) {
@@ -81,4 +124,17 @@ public record TeamResult(String key, String name, long totalScore, List<PlayerRe
             players = List.copyOf(players);
         }
     }
+
+    public record SeriesScore(Map<Long, Integer> playerWins, int redWins, int blueWins) {
+        public SeriesScore {
+            playerWins = playerWins == null ? Map.of() : Map.copyOf(playerWins);
+        }
+
+        public static SeriesScore empty() {
+            return new SeriesScore(Map.of(), 0, 0);
+        }
+    }
+
+    public record VersusScore(String key, String name, int wins) {
+    }
 }