Update Healer Man server

src/app/dungeonLeaderboardClient.ts

@@ -1,9 +1,9 @@
 import { requestOnlineJson } from "./onlineAccountClient";
 import type { PlayerSession } from "./types";
-import catalog from "../game/generated/dungeonLeaderboardCatalog.generated.json";
+import { dungeonLeaderboardCatalog as catalog } from "../game/dungeonLeaderboardCatalog";
 import { normalizeDungeonRunProgress, type DungeonClearFilter, type DungeonLeaderboard,
   type DungeonRunPlacement, type DungeonRunRecord } from "../game/dungeonRunTypes";
-import { isLeaderboardFullClear, leaderboardFinalBossIds } from "../game/dungeonLeaderboardRules";
+import { isLeaderboardFullClear, leaderboardFinalBossIds, leaderboardRunBossId } from "../game/dungeonLeaderboardRules";
 
 const STORAGE_KEY = "healer-man:dungeon-runs:v1";
 const listeners = new Set<() => void>();
@@ -27,6 +27,7 @@ function localRuns(): DungeonRunRecord[] {
       const finalBossIds = difficulty ? leaderboardFinalBossIds(difficulty) : [];
       if (!progress || progress.finishedAt === null || progress.durationMs === null || !dungeon
         || !difficulty || !finalBossIds.some((id) => progress.killedBossIds.includes(id))
+        || (difficulty.finalBossIds?.length && finalBossIds.filter((id) => progress.killedBossIds.includes(id)).length !== 1)
         || progress.killedBossIds.some((id) => !difficulty.bossIds.includes(id))) return [];
       return [{ ...value, ...progress, durationMs: progress.durationMs, finishedAt: progress.finishedAt,
         fullClear: isLeaderboardFullClear(difficulty, progress.killedBossIds) }];
@@ -43,9 +44,14 @@ export function saveLocalDungeonRun(record: DungeonRunRecord): void {
 }
 
 export function localDungeonLeaderboard(dungeonId: string, difficultyId: string,
-  filter: DungeonClearFilter, offset = 0, bossDifficulty = 0): DungeonLeaderboard {
+  filter: DungeonClearFilter, offset = 0, bossDifficulty = 0, bossId?: string): DungeonLeaderboard {
+  const difficulty = catalog.dungeons.find((entry) => entry.id === dungeonId)?.difficulties
+    .find((entry) => entry.id === difficultyId);
+  const selectedBossId = difficulty?.finalBossIds?.length
+    ? bossId ?? leaderboardFinalBossIds(difficulty)[0] : null;
   const runs = localRuns().filter((entry) => entry.dungeonId === dungeonId && entry.difficultyId === difficultyId
     && (entry.bossDifficulty ?? 0) === bossDifficulty
+    && (!selectedBossId || entry.killedBossIds.includes(selectedBossId))
     && (filter === "final" || entry.fullClear)).sort((a, b) => a.durationMs - b.durationMs
       || a.finishedAt - b.finishedAt || a.id.localeCompare(b.id));
   return { total: runs.length, entries: runs.slice(offset, offset + DUNGEON_LEADERBOARD_PAGE_SIZE)
@@ -53,19 +59,26 @@ export function localDungeonLeaderboard(dungeonId: string, difficultyId: string,
 }
 
 export function localDungeonRunPlacement(record: DungeonRunRecord): DungeonRunPlacement {
-  const final = localDungeonLeaderboard(record.dungeonId, record.difficultyId, "final", 0, record.bossDifficulty ?? 0);
-  const full = localDungeonLeaderboard(record.dungeonId, record.difficultyId, "full", 0, record.bossDifficulty ?? 0);
+  const difficulty = catalog.dungeons.find((entry) => entry.id === record.dungeonId)?.difficulties
+    .find((entry) => entry.id === record.difficultyId);
+  const bossId = difficulty?.finalBossIds?.length
+    ? leaderboardRunBossId(difficulty, record.killedBossIds) ?? undefined : undefined;
+  const final = localDungeonLeaderboard(record.dungeonId, record.difficultyId, "final", 0, record.bossDifficulty ?? 0, bossId);
+  const full = localDungeonLeaderboard(record.dungeonId, record.difficultyId, "full", 0, record.bossDifficulty ?? 0, bossId);
   const runs = localRuns().filter((entry) => entry.dungeonId === record.dungeonId && entry.difficultyId === record.difficultyId
-    && (entry.bossDifficulty ?? 0) === (record.bossDifficulty ?? 0));
+    && (entry.bossDifficulty ?? 0) === (record.bossDifficulty ?? 0)
+    && (!bossId || entry.killedBossIds.includes(bossId)));
   return { finalRank: 1 + runs.filter((entry) => entry.durationMs < record.durationMs).length,
     finalTotal: final.total, fullTotal: full.total,
     fullRank: record.fullClear ? 1 + runs.filter((entry) => entry.fullClear && entry.durationMs < record.durationMs).length : null };
 }
 
 export async function fetchDungeonLeaderboard(dungeonId: string, difficultyId: string,
-  filter: DungeonClearFilter, offset: number, signal?: AbortSignal, bossDifficulty = 0): Promise<DungeonLeaderboard> {
+  filter: DungeonClearFilter, offset: number, signal?: AbortSignal, bossDifficulty = 0,
+  bossId?: string): Promise<DungeonLeaderboard> {
   const query = new URLSearchParams({ dungeon: dungeonId, difficulty: difficultyId, clear: filter,
     offset: String(offset), limit: String(DUNGEON_LEADERBOARD_PAGE_SIZE), bossDifficulty: String(bossDifficulty) });
+  if (bossId) query.set("boss", bossId);
   return requestOnlineJson(`/api/dungeon-leaderboards?${query}`, { signal });
 }