Allow current-region takeover of empty draining locks

Reviewed-on: #11

.gitignore

@@ -39,3 +39,8 @@ yarn-error.log*
 .DS_Store
 .idea/
 .vscode/
+
+source-bestiary/
+source-drops/
+site/server-status.json
+site/server-status.json.tmp

backend/app.py

@@ -712,23 +712,32 @@ def newserv_account_lock_acquire():
                         "lock": lock_row_payload(row),
                     })
 
-                if row["holder_source"] != source:
-                    return jsonify({
-                        "ok": False,
-                        "message": f"$C6Account is already active\\non {row['holder_source']}.",
-                        "holder_source": row["holder_source"],
-                        "state": row["state"],
-                        "lock": lock_row_payload(row),
-                    })
-
                 sessions = row["sessions"] or {}
                 if isinstance(sessions, str):
                     sessions = json.loads(sessions)
+
+                if row["holder_source"] != source:
+                    target_region_current = False
+                    if row["state"] == "draining" and not sessions and source_region:
+                        _all_current, sync = account_sync_current_on_all_regions(account_id)
+                        region_status = (sync.get("regions") or {}).get(source_region) or {}
+                        target_region_current = region_status.get("status") == "current"
+
+                    if not target_region_current:
+                        return jsonify({
+                            "ok": False,
+                            "message": f"$C6Account is already active\\non {row['holder_source']}.",
+                            "holder_source": row["holder_source"],
+                            "state": row["state"],
+                            "lock": lock_row_payload(row),
+                        })
+
                 sessions[session_nonce] = session_info
 
                 cur.execute("""
                     UPDATE account_session_locks
-                    SET state = 'active',
+                    SET holder_source = %s,
+                        state = 'active',
                         source_region = %s,
                         source_ship = %s,
                         account_store = %s,
@@ -739,6 +748,7 @@ def newserv_account_lock_acquire():
                     RETURNING account_id, holder_source, source_region, source_ship,
                               account_store, state, sessions, created_at, updated_at, expires_at
                 """, (
+                    source,
                     source_region,
                     source_ship,
                     account_store,
@@ -780,7 +790,7 @@ def newserv_account_lock_heartbeat():
                 SET updated_at = now(),
                     expires_at = %s
                 WHERE holder_source = %s
-                  AND state IN ('active', 'draining')
+                  AND state = 'active'
             """, (expires_at, source))
             refreshed = cur.rowcount
 
@@ -1939,3 +1949,117 @@ def hardcore_leaderboard_points_combined():
     return jsonify(rows[:100])
 
 # --- end Hardcore stats aggregator -------------------------------------------
+
+
+@app.get("/server-status")
+@app.get("/api/server-status")
+def public_server_status():
+    import json
+    import os
+    import urllib.parse
+    import urllib.request
+
+    prometheus_url = os.environ.get("PROMETHEUS_URL", "http://5.0.0.20:9090").rstrip("/")
+
+    def prom_value(query):
+        url = prometheus_url + "/api/v1/query?" + urllib.parse.urlencode({"query": query})
+        try:
+            with urllib.request.urlopen(url, timeout=2.5) as resp:
+                data = json.loads(resp.read().decode("utf-8"))
+        except Exception:
+            return 0
+
+        if data.get("status") != "success":
+            return 0
+
+        total = 0.0
+        for result in data.get("data", {}).get("result", []):
+            value = result.get("value", [None, "0"])[1]
+            try:
+                total += float(value)
+            except (TypeError, ValueError):
+                pass
+
+        return int(total)
+
+    def q(metric, labels):
+        label_text = ",".join(f'{k}="{v}"' for k, v in labels.items())
+        return f'sum({metric}{{{label_text}}}) or vector(0)'
+
+    def newserv(region, service, ship, version):
+        return prom_value(q("pso_newserv_clients_connected", {
+            "region": region,
+            "service": service,
+            "ship": ship,
+            "version": version,
+        }))
+
+    def adhoc(region, game):
+        return prom_value(q("psppeeps_adhoc_connected_clients_by_product", {
+            "region": region,
+            "service": f"{region}-psppeeps-adhoc",
+            "ship": "psp",
+            "game": game,
+        }))
+
+    us = {
+        "alis_v2": newserv("us", "us-newserv-live", "live", "v2"),
+        "alis_v3": newserv("us", "us-newserv-live", "live", "v3"),
+        "alis_bb": newserv("us", "us-newserv-live", "live", "v4"),
+        "abion_hcbb": newserv("us", "us-newserv-hardcore", "hardcore", "v4"),
+        "adhoc_psp1": adhoc("us", "psp1"),
+        "adhoc_psp2i": adhoc("us", "psp2i"),
+    }
+
+    eu = {
+        "palma_v2": newserv("eu", "eu-newserv-live", "live", "v2"),
+        "palma_v3": newserv("eu", "eu-newserv-live", "live", "v3"),
+        "palma_bb": newserv("eu", "eu-newserv-live", "live", "v4"),
+        "aiedo_hcbb": newserv("eu", "eu-newserv-hardcore", "hardcore", "v4"),
+        "adhoc_psp1": adhoc("eu", "psp1"),
+        "adhoc_psp2i": adhoc("eu", "psp2i"),
+    }
+
+    us_total = sum(us.values())
+    eu_total = sum(eu.values())
+
+    return jsonify({
+        "servers": [
+            {
+                "label": "US Server",
+                "players": us_total,
+                "ships": [
+                    {"label": "Alis", "rows": [
+                        {"label": "V2", "players": us["alis_v2"]},
+                        {"label": "V3", "players": us["alis_v3"]},
+                        {"label": "BB", "players": us["alis_bb"]},
+                    ]},
+                    {"label": "Abion", "rows": [
+                        {"label": "HC/BB", "players": us["abion_hcbb"]},
+                    ]},
+                    {"label": "AdHoc-US", "rows": [
+                        {"label": "PSP1", "players": us["adhoc_psp1"]},
+                        {"label": "PSP2i", "players": us["adhoc_psp2i"]},
+                    ]},
+                ],
+            },
+            {
+                "label": "EU Server",
+                "players": eu_total,
+                "ships": [
+                    {"label": "Palma", "rows": [
+                        {"label": "V2", "players": eu["palma_v2"]},
+                        {"label": "V3", "players": eu["palma_v3"]},
+                        {"label": "BB", "players": eu["palma_bb"]},
+                    ]},
+                    {"label": "Aiedo", "rows": [
+                        {"label": "HC/BB", "players": eu["aiedo_hcbb"]},
+                    ]},
+                    {"label": "AdHoc-EU", "rows": [
+                        {"label": "PSP1", "players": eu["adhoc_psp1"]},
+                        {"label": "PSP2i", "players": eu["adhoc_psp2i"]},
+                    ]},
+                ],
+            },
+        ],
+    })

scripts/import-newserv-bestiary-tables.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+import json
+from pathlib import Path
+
+SOURCE = Path("source-bestiary/local-newserv/system/tables/battle-params.json")
+OUT = Path("site/generated/bestiary/bb")
+
+DIFFICULTY_ORDER = {
+    "Normal": 0,
+    "Hard": 1,
+    "Very Hard": 2,
+    "Ultimate": 3,
+}
+
+def label_episode(table_name):
+    ep, mode = table_name.split("-", 1)
+    return ep.replace("Episode", "Episode "), mode
+
+def enemy_label(value):
+    return str(value).replace("_", " ").title()
+
+def main():
+    data = json.loads(SOURCE.read_text())
+    OUT.mkdir(parents=True, exist_ok=True)
+
+    rows = []
+
+    for table_name, difficulties in data.items():
+        episode, mode = label_episode(table_name)
+
+        for difficulty, entries in difficulties.items():
+            for entry in entries:
+                stats = entry.get("Stats", {})
+                resist = entry.get("ResistData", {})
+                enemies = stats.get("Enemies") or []
+
+                for enemy in enemies:
+                    rows.append({
+                        "version": "bb",
+                        "episode": episode,
+                        "mode": mode,
+                        "difficulty": difficulty,
+                        "enemy": enemy_label(enemy),
+                        "enemy_key": enemy,
+                        "bp_index": entry.get("BPIndex"),
+                        "hp": stats.get("HP", 0),
+                        "atp": stats.get("ATP", 0),
+                        "dfp": stats.get("DFP", 0),
+                        "mst": stats.get("MST", 0),
+                        "ata": stats.get("ATA", 0),
+                        "evp": stats.get("EVP", 0),
+                        "lck": stats.get("LCK", 0),
+                        "esp": stats.get("ESP", 0),
+                        "exp": stats.get("EXP", 0),
+                        "meseta": stats.get("Meseta", 0),
+                        "efr": resist.get("EFR", 0),
+                        "eic": resist.get("EIC", 0),
+                        "eth": resist.get("ETH", 0),
+                        "elt": resist.get("ELT", 0),
+                        "edk": resist.get("EDK", 0),
+                    })
+
+    rows.sort(key=lambda row: (
+        row["episode"],
+        row["mode"],
+        DIFFICULTY_ORDER.get(row["difficulty"], 999),
+        row["enemy"],
+        row["bp_index"] if row["bp_index"] is not None else 9999,
+    ))
+
+    (OUT / "bb.json").write_text(json.dumps(rows, indent=2, sort_keys=True) + "\n")
+    (OUT / "index.json").write_text(json.dumps({
+        "mode": "bestiary",
+        "label": "BB",
+        "tables": [{
+            "version": "bb",
+            "label": "BB",
+            "path": "bb.json",
+            "rows": len(rows),
+        }],
+    }, indent=2, sort_keys=True) + "\n")
+
+    print(f"bb: {len(rows)} rows -> {OUT / 'bb.json'}")
+    print(f"index -> {OUT / 'index.json'}")
+
+if __name__ == "__main__":
+    main()

scripts/write-server-status-json.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python3
+import json
+import os
+import urllib.parse
+import urllib.request
+from datetime import datetime, timezone
+from pathlib import Path
+
+PROMETHEUS_URL = os.environ.get("PROMETHEUS_URL", "http://5.0.0.20:9090").rstrip("/")
+SOURCE_URL = os.environ.get("SERVER_STATUS_SOURCE_URL", "").strip()
+OUTPUT_PATH = Path(os.environ.get("SERVER_STATUS_JSON", "site/server-status.json"))
+TIMEOUT_SECONDS = float(os.environ.get("PROMETHEUS_TIMEOUT_SECONDS", "5"))
+
+def write_data(data):
+    if not isinstance(data.get("servers"), list):
+        raise SystemExit("server status JSON missing servers array")
+
+    data["generated_at"] = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
+
+    OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
+    tmp_path = OUTPUT_PATH.with_name(OUTPUT_PATH.name + ".tmp")
+    tmp_path.write_text(json.dumps(data, separators=(",", ":")) + "\n")
+    os.replace(tmp_path, OUTPUT_PATH)
+    print(f"wrote {OUTPUT_PATH}")
+
+def prom_value(query):
+    url = PROMETHEUS_URL + "/api/v1/query?" + urllib.parse.urlencode({"query": query})
+    with urllib.request.urlopen(url, timeout=TIMEOUT_SECONDS) as response:
+        body = json.loads(response.read().decode("utf-8"))
+
+    result = body.get("data", {}).get("result", [])
+    if not result:
+        return 0
+    return int(float(result[0]["value"][1]))
+
+def q(metric, labels):
+    label_text = ",".join(f'{key}="{value}"' for key, value in labels.items())
+    return f"sum({metric}{{{label_text}}}) or vector(0)"
+
+def newserv(region, service, ship, version):
+    return prom_value(q("pso_newserv_clients_connected", {
+        "region": region,
+        "service": service,
+        "ship": ship,
+        "version": version,
+    }))
+
+def adhoc(region, game):
+    return prom_value(q("psppeeps_adhoc_connected_clients_by_product", {
+        "region": region,
+        "service": f"{region}-psppeeps-adhoc",
+        "ship": "psp",
+        "game": game,
+    }))
+
+def row(label, players):
+    return {"label": label, "players": int(players)}
+
+def main():
+    if SOURCE_URL:
+        with urllib.request.urlopen(SOURCE_URL, timeout=TIMEOUT_SECONDS) as response:
+            write_data(json.loads(response.read().decode("utf-8")))
+        return
+
+    us_alis_v2 = newserv("us", "us-newserv-live", "live", "v2")
+    us_alis_v3 = newserv("us", "us-newserv-live", "live", "v3")
+    us_alis_bb = newserv("us", "us-newserv-live", "live", "v4")
+    us_abion_hcbb = newserv("us", "us-newserv-hardcore", "hardcore", "v4")
+    us_adhoc_psp1 = adhoc("us", "psp1")
+    us_adhoc_psp2i = adhoc("us", "psp2i")
+
+    eu_palma_v2 = newserv("eu", "eu-newserv-live", "live", "v2")
+    eu_palma_v3 = newserv("eu", "eu-newserv-live", "live", "v3")
+    eu_palma_bb = newserv("eu", "eu-newserv-live", "live", "v4")
+    eu_aiedo_hcbb = newserv("eu", "eu-newserv-hardcore", "hardcore", "v4")
+    eu_adhoc_psp1 = adhoc("eu", "psp1")
+    eu_adhoc_psp2i = adhoc("eu", "psp2i")
+
+    write_data({
+        "servers": [
+            {
+                "label": "US Server",
+                "players": us_alis_v2 + us_alis_v3 + us_alis_bb + us_abion_hcbb + us_adhoc_psp1 + us_adhoc_psp2i,
+                "ships": [
+                    {"label": "Alis", "rows": [row("V2", us_alis_v2), row("V3", us_alis_v3), row("BB", us_alis_bb)]},
+                    {"label": "Abion", "rows": [row("HC/BB", us_abion_hcbb)]},
+                    {"label": "AdHoc-US", "rows": [row("PSP1", us_adhoc_psp1), row("PSP2i", us_adhoc_psp2i)]},
+                ],
+            },
+            {
+                "label": "EU Server",
+                "players": eu_palma_v2 + eu_palma_v3 + eu_palma_bb + eu_aiedo_hcbb + eu_adhoc_psp1 + eu_adhoc_psp2i,
+                "ships": [
+                    {"label": "Palma", "rows": [row("V2", eu_palma_v2), row("V3", eu_palma_v3), row("BB", eu_palma_bb)]},
+                    {"label": "Aiedo", "rows": [row("HC/BB", eu_aiedo_hcbb)]},
+                    {"label": "AdHoc-EU", "rows": [row("PSP1", eu_adhoc_psp1), row("PSP2i", eu_adhoc_psp2i)]},
+                ],
+            },
+        ],
+    })
+
+if __name__ == "__main__":
+    main()

site/bestiary-tables.js

@@ -0,0 +1,389 @@
+(() => {
+  "use strict";
+
+  const qs = (sel) => document.querySelector(sel);
+
+  const DIFFICULTY_ORDER = {
+    Normal: 0,
+    Hard: 1,
+    "Very Hard": 2,
+    Ultimate: 3,
+  };
+
+  const NUMERIC_COLUMNS = new Set([
+    "hp", "atp", "dfp", "mst", "ata", "evp", "lck", "esp", "exp",
+    "efr", "eic", "eth", "elt", "edk",
+  ]);
+
+  const BP_TIERS = {
+    0: { hp: 1.00, atp: 1.00, exp: 1.00 },
+    1: { hp: 1.10, atp: 1.01, exp: 1.10 },
+    2: { hp: 1.15, atp: 1.02, exp: 1.15 },
+    3: { hp: 1.20, atp: 1.03, exp: 1.20 },
+    4: { hp: 1.30, atp: 1.04, exp: 1.30 },
+    5: { hp: 1.40, atp: 1.05, exp: 1.40 },
+    6: { hp: 1.50, atp: 1.06, exp: 1.50 },
+    7: { hp: 1.75, atp: 1.07, exp: 1.75 },
+    8: { hp: 2.00, atp: 1.08, exp: 2.00 },
+    9: { hp: 2.50, atp: 1.09, exp: 2.50 },
+    10: { hp: 3.00, atp: 1.10, exp: 3.00 },
+    11: { hp: 4.00, atp: 1.10, exp: 3.00 },
+  };
+
+  const COLUMN_GROUPS = {
+    stats: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["hp", "HP"],
+      ["atp", "ATP"],
+      ["dfp", "DFP"],
+      ["ata", "ATA"],
+      ["evp", "EVP"],
+      ["lck", "LCK"],
+      ["exp", "EXP"],
+    ],
+    resists: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["efr", "EFR"],
+      ["eic", "EIC"],
+      ["eth", "ETH"],
+      ["elt", "ELT"],
+      ["edk", "EDK"],
+      ["esp", "ESP"],
+    ],
+    all: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["hp", "HP"],
+      ["atp", "ATP"],
+      ["dfp", "DFP"],
+      ["mst", "MST"],
+      ["ata", "ATA"],
+      ["evp", "EVP"],
+      ["lck", "LCK"],
+      ["esp", "ESP"],
+      ["exp", "EXP"],
+      ["efr", "EFR"],
+      ["eic", "EIC"],
+      ["eth", "ETH"],
+      ["elt", "ELT"],
+      ["edk", "EDK"],
+    ],
+  };
+
+  function currentColumns() {
+    const view = qs("#bestiary-view")?.value || "stats";
+    return COLUMN_GROUPS[view] || COLUMN_GROUPS.stats;
+  }
+
+  const state = {
+    rows: [],
+    index: null,
+    table: null,
+    page: 1,
+    pageSize: 100,
+    sort: {
+      key: "enemy",
+      dir: "asc",
+    },
+    filters: {
+      mode: "",
+      episode: "",
+      difficulty: "",
+      search: "",
+    },
+  };
+
+  function esc(value) {
+    return String(value ?? "")
+      .replaceAll("&", "&")
+      .replaceAll("<", "&lt;")
+      .replaceAll(">", "&gt;")
+      .replaceAll('"', "&quot;")
+      .replaceAll("'", "&#039;");
+  }
+
+  async function fetchJson(path) {
+    const res = await fetch(path, { cache: "no-store" });
+    if (!res.ok) throw new Error(`${path}: HTTP ${res.status}`);
+    return res.json();
+  }
+
+  function setStatus(message, kind = "") {
+    const box = qs("#bestiary-placeholder");
+    if (!box) return;
+    box.innerHTML = `<div class="drops-status ${kind ? `drops-status--${kind}` : ""}">${esc(message)}</div>`;
+  }
+
+  function uniqueSorted(rows, key) {
+    return [...new Set(rows.map((row) => row[key]).filter(Boolean))]
+      .sort((a, b) => String(a).localeCompare(String(b), undefined, { numeric: true }));
+  }
+
+  function fillSelect(select, values, allLabel) {
+    if (!select) return;
+    const previous = select.value;
+    select.innerHTML = `<option value="">${esc(allLabel)}</option>`;
+    for (const value of values) {
+      const opt = document.createElement("option");
+      opt.value = value;
+      opt.textContent = value;
+      select.appendChild(opt);
+    }
+    if ([...select.options].some((opt) => opt.value === previous)) {
+      select.value = previous;
+    }
+  }
+
+  function orderedDifficulties(rows) {
+    const present = new Set(rows.map((row) => row.difficulty).filter(Boolean));
+    return Object.keys(DIFFICULTY_ORDER).filter((value) => present.has(value));
+  }
+
+  function bpTier() {
+    const select = qs("#bestiary-tier");
+    const raw = String(select?.value || "");
+    const label = String(select?.selectedOptions?.[0]?.textContent || "");
+    const match = raw.match(/(\d+)$/) || label.match(/(\d+)/);
+    const tier = match ? Number(match[1]) : 0;
+    return BP_TIERS[tier] || BP_TIERS[0];
+  }
+
+  function xpBonusMultiplier() {
+    return Number(qs("#bestiary-xp-bonus")?.value || 1);
+  }
+
+  function displayValue(row, key) {
+    const value = row[key];
+
+    if (key === "exp" && row.difficulty !== "Ultimate") {
+      return Math.round(Number(value || 0) * xpBonusMultiplier());
+    }
+
+    if (row.difficulty !== "Ultimate") {
+      return value ?? "";
+    }
+
+    const tier = bpTier();
+
+    if (key === "hp") {
+      return Math.round(Number(value || 0) * tier.hp);
+    }
+
+    if (key === "atp") {
+      return Math.round(Number(value || 0) * tier.atp);
+    }
+
+    if (key === "exp" && tier.exp !== null) {
+      return Math.round(Number(value || 0) * tier.exp * xpBonusMultiplier());
+    }
+
+    return value ?? "";
+  }
+
+  function hasAnyBestiaryValue(row) {
+    const keys = ["hp", "atp", "dfp", "mst", "ata", "evp", "lck", "esp", "exp", "efr", "eic", "eth", "elt", "edk"];
+    return keys.some((key) => Number(row[key] || 0) !== 0);
+  }
+
+  function visibleRows() {
+    const search = state.filters.search.trim().toLowerCase();
+
+    return state.rows.filter((row) => {
+      if (!hasAnyBestiaryValue(row)) return false;
+      if (state.filters.mode && row.mode !== state.filters.mode) return false;
+      if (state.filters.episode && row.episode !== state.filters.episode) return false;
+      if (state.filters.difficulty && row.difficulty !== state.filters.difficulty) return false;
+
+      if (search) {
+        const haystack = [row.enemy, row.enemy_key, row.mode, row.episode, row.difficulty]
+          .join(" ")
+          .toLowerCase();
+        if (!haystack.includes(search)) return false;
+      }
+
+      return true;
+    });
+  }
+
+  function sortValue(row, key) {
+    if (key === "difficulty") return DIFFICULTY_ORDER[row.difficulty] ?? 999;
+    if (NUMERIC_COLUMNS.has(key)) return Number(displayValue(row, key) || 0);
+    return row[key] || "";
+  }
+
+  function sortedRows(rows) {
+    const { key, dir } = state.sort;
+    const factor = dir === "desc" ? -1 : 1;
+
+    return [...rows].sort((a, b) => {
+      const av = sortValue(a, key);
+      const bv = sortValue(b, key);
+
+      if (typeof av === "number" && typeof bv === "number") {
+        return (av - bv) * factor;
+      }
+
+      return String(av).localeCompare(String(bv), undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }) * factor;
+    });
+  }
+
+  function sortHeader(key, label) {
+    const active = state.sort.key === key;
+    const arrow = active ? (state.sort.dir === "asc" ? "▲" : "▼") : "";
+    const ariaSort = active ? (state.sort.dir === "asc" ? "ascending" : "descending") : "none";
+
+    return `<th aria-sort="${ariaSort}">
+      <button class="drops-sort-button ${active ? "is-active" : ""}" type="button" data-bestiary-sort="${esc(key)}">
+        <span>${esc(label)}</span>
+        <span class="drops-sort-arrow" aria-hidden="true">${arrow}</span>
+      </button>
+    </th>`;
+  }
+
+  function renderTable() {
+    const box = qs("#bestiary-placeholder");
+    if (!box) return;
+
+    const rows = sortedRows(visibleRows());
+    const totalPages = Math.max(1, Math.ceil(rows.length / state.pageSize));
+    state.page = Math.min(Math.max(1, state.page), totalPages);
+
+    const start = (state.page - 1) * state.pageSize;
+    const shown = rows.slice(start, start + state.pageSize);
+    const end = start + shown.length;
+
+    const columns = currentColumns();
+    if (!columns.some(([key]) => key === state.sort.key)) {
+      state.sort.key = "enemy";
+      state.sort.dir = "asc";
+    }
+
+    const body = shown.map((row) => `
+      <tr>
+        ${columns.map(([key]) => `<td data-label="${esc(key)}">${esc(displayValue(row, key))}</td>`).join("")}
+      </tr>
+    `).join("");
+
+    const rangeText = rows.length
+      ? ` Showing ${Number(start + 1).toLocaleString()}-${Number(end).toLocaleString()}.`
+      : "";
+
+    box.innerHTML = `
+      <div class="drops-summary">
+        <div>
+          <strong>BB Bestiary</strong>
+          <span>${rows.length.toLocaleString()} matching rows.${rangeText}</span>
+        </div>
+        <span>${state.rows.length.toLocaleString()} total rows</span>
+      </div>
+      <div class="drops-table-wrap">
+        <table class="drops-table bestiary-table">
+          <thead>
+            <tr>${columns.map(([key, label]) => sortHeader(key, label)).join("")}</tr>
+          </thead>
+          <tbody>${body || `<tr><td colspan="${columns.length}">No enemies match these filters.</td></tr>`}</tbody>
+        </table>
+      </div>
+      <div class="leaderboard-pager drops-pager">
+        <button type="button" data-bestiary-page="prev" ${state.page <= 1 ? "disabled" : ""}>Previous</button>
+        <span>Page ${state.page} of ${totalPages}</span>
+        <button type="button" data-bestiary-page="next" ${state.page >= totalPages ? "disabled" : ""}>Next</button>
+      </div>
+    `;
+  }
+
+  function populateFilters() {
+    fillSelect(qs("#bestiary-mode"), uniqueSorted(state.rows, "mode"), "All modes");
+    fillSelect(qs("#bestiary-episode"), uniqueSorted(state.rows, "episode"), "All episodes");
+    fillSelect(qs("#bestiary-difficulty"), orderedDifficulties(state.rows), "All difficulties");
+  }
+
+  async function loadBestiary() {
+    setStatus("Loading BB bestiary...");
+
+    state.index = await fetchJson("generated/bestiary/bb/index.json");
+    state.table = state.index.tables?.[0] || null;
+    state.rows = await fetchJson(`generated/bestiary/bb/${state.table.path}`);
+
+    populateFilters();
+    renderTable();
+  }
+
+  document.addEventListener("DOMContentLoaded", () => {
+    qs("#bestiary-mode")?.addEventListener("change", (event) => {
+      state.filters.mode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-episode")?.addEventListener("change", (event) => {
+      state.filters.episode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-difficulty")?.addEventListener("change", (event) => {
+      state.filters.difficulty = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-view")?.addEventListener("change", () => {
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-search")?.addEventListener("input", (event) => {
+      state.filters.search = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-tier")?.addEventListener("change", () => {
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-xp-bonus")?.addEventListener("change", () => {
+      renderTable();
+    });
+
+    qs("#bestiary-placeholder")?.addEventListener("click", (event) => {
+      const pageButton = event.target.closest("[data-bestiary-page]");
+      if (pageButton) {
+        state.page += pageButton.dataset.bestiaryPage === "next" ? 1 : -1;
+        renderTable();
+        return;
+      }
+
+      const button = event.target.closest("[data-bestiary-sort]");
+      if (!button) return;
+
+      const key = button.dataset.bestiarySort;
+      if (state.sort.key === key) {
+        state.sort.dir = state.sort.dir === "asc" ? "desc" : "asc";
+      } else {
+        state.sort.key = key;
+        state.sort.dir = "asc";
+      }
+
+      state.page = 1;
+      renderTable();
+    });
+
+    loadBestiary().catch((err) => {
+      setStatus(err?.message || "Unable to load bestiary.", "error");
+    });
+  });
+})();

site/bestiary.html

@@ -8,7 +8,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css">
+  <link rel="stylesheet" href="style.css?v=bestiary-table-viewer-20260613-3">
   <script src="app.js?v=saves-synced-20260609-2" defer></script>
 </head>
 <body>
@@ -33,21 +33,46 @@
         <form class="placeholder-form">
           <label for="bestiary-version">Version</label>
           <select id="bestiary-version">
-            <option>V2</option>
-            <option>V3</option>
-            <option>V4</option>
+            <option value="bb">BB</option>
           </select>
 
-          <label for="bestiary-episode" data-bestiary-episode-wrap hidden>Episode</label>
-          <select id="bestiary-episode" data-bestiary-episode-wrap hidden>
-            <option>Episode 1</option>
-            <option>Episode 2</option>
-            <option>Episode 4</option>
+          <label for="bestiary-mode">Mode</label>
+          <select id="bestiary-mode">
+            <option value="">All modes</option>
           </select>
 
+          <label for="bestiary-episode">Episode</label>
+          <select id="bestiary-episode">
+            <option value="">All episodes</option>
+          </select>
+
+          <label for="bestiary-difficulty">Difficulty</label>
+          <select id="bestiary-difficulty">
+            <option value="">All difficulties</option>
+          </select>
+
+          <label for="bestiary-xp-bonus">XP Bonus</label>
+          <select id="bestiary-xp-bonus">
+            <option value="1">No modifier</option>
+            <option value="5">5x</option>
+            <option value="10">10x</option>
+          </select>
+          <p class="drops-field-note">Applies EXP multiplier only.</p>
+
+          <label for="bestiary-view">View</label>
+          <select id="bestiary-view">
+            <option value="stats">Stats</option>
+            <option value="resists">Resists</option>
+            <option value="all">All</option>
+          </select>
+
+          <label for="bestiary-search">Search</label>
+          <input id="bestiary-search" type="search" placeholder="Enemy name...">
+
           <label for="bestiary-tier" data-bestiary-tier-wrap>BP Tier</label>
           <select id="bestiary-tier" data-bestiary-tier-wrap>
-            <option>BP+1</option><option>BP+2</option><option>BP+3</option>
+            
+            <option value="0">No modifier</option><option>BP+1</option><option>BP+2</option><option>BP+3</option>
             <option>BP+4</option><option>BP+5</option><option>BP+6</option>
             <option>BP+7</option><option>BP+8</option><option>BP+9</option>
             <option>BP+10</option><option>BP+11</option>
@@ -89,6 +114,6 @@
       </div>
 </footer>
   </div>
-  <script src="placeholder-pages.js?v=basic-pages-fixed-1" defer></script>
+  <script src="bestiary-tables.js?v=hide-zero-bestiary-rows-1" defer></script>
 </body>
 </html>

site/generated/bestiary/bb/index.json

@@ -0,0 +1,12 @@
+{
+  "label": "BB",
+  "mode": "bestiary",
+  "tables": [
+    {
+      "label": "BB",
+      "path": "bb.json",
+      "rows": 3216,
+      "version": "bb"
+    }
+  ]
+}

site/home-leaderboard.js

@@ -65,7 +65,7 @@
       return;
     }
 
-    const top = rows.slice(0, 5);
+    const top = rows.slice(0, 10);
 
     if (!top.length) {
       list.innerHTML = `<li><span class="rank">1.</span><span>—</span></li>`;

site/index.html

@@ -8,8 +8,9 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css?v=home-hardcore-preline-20260610-1">
+  <link rel="stylesheet" href="style.css?v=home-status-two-boxes-2">
   <script src="app.js?v=account-status-label-20260609" defer></script>
+  <script src="server-status.js?v=home-status-prometheus-2" defer></script>
 </head>
 <body>
   <div class="site-shell">
@@ -52,30 +53,48 @@
 
         <h1 id="server-status-heading" class="section-title">Server Status</h1>
 
-        <div class="status-list" role="list" aria-label="Current server player counts">
-          <div class="status-row status-parent" role="listitem"><span>US Server</span><span></span></div>
+        <div class="status-list status-list--regions" role="list" aria-label="Current server player counts" data-server-status="loading">
+          <div class="status-region" role="group" aria-label="US Server player counts">
+            <div class="status-region-header">
+              <span>US Server</span><span>Loading…</span>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Alis</div>
+              <div class="status-row"><span>V2</span><span>—</span></div>
+              <div class="status-row"><span>V3</span><span>—</span></div>
+              <div class="status-row"><span>BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Abion</div>
+              <div class="status-row"><span>HC/BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">AdHoc-US</div>
+              <div class="status-row"><span>PSP1</span><span>—</span></div>
+              <div class="status-row"><span>PSP2i</span><span>—</span></div>
+            </div>
+          </div>
 
-          <div class="status-row status-parent" role="listitem"><span>Alis</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V2</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V3</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>BB</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Abion</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>HC</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>EU Server</span><span></span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Palma</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V2</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V3</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>BB</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Aiedo</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>HC</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>PSP Ship</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>PSP1</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>PSP2i</span><span>0 Players</span></div>
+          <div class="status-region" role="group" aria-label="EU Server player counts">
+            <div class="status-region-header">
+              <span>EU Server</span><span>Loading…</span>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Palma</div>
+              <div class="status-row"><span>V2</span><span>—</span></div>
+              <div class="status-row"><span>V3</span><span>—</span></div>
+              <div class="status-row"><span>BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Aiedo</div>
+              <div class="status-row"><span>HC/BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">AdHoc-EU</div>
+              <div class="status-row"><span>PSP1</span><span>—</span></div>
+              <div class="status-row"><span>PSP2i</span><span>—</span></div>
+            </div>
+          </div>
         </div>
       </section>
 
@@ -90,22 +109,11 @@
 
         <section class="card leaderboard-card" aria-labelledby="hardcore-heading">
           <h2 id="hardcore-heading" class="section-title">Hardcore Leaderboard</h2>
-          <ol class="leaderboard-list leaderboard-list--home-hardcore" id="home-hardcore-leaderboard-body" aria-label="Top five hardcore players">
+          <ol class="leaderboard-list leaderboard-list--home-hardcore" id="home-hardcore-leaderboard-body" aria-label="Top ten hardcore players">
             <li><span class="rank">1.</span><span>Loading...</span></li>
           </ol>
           <a class="small-link home-leaderboard-more" href="leaderboards.html">more</a>
         </section>
-
-        <section class="card leaderboard-card" aria-labelledby="crank-heading">
-          <h2 id="crank-heading" class="section-title">C Rank Points</h2>
-          <ol class="leaderboard-list" aria-label="Top five C Rank point totals">
-            <li><span class="rank">1.</span><span>—</span></li>
-            <li><span class="rank">2.</span><span>—</span></li>
-            <li><span class="rank">3.</span><span>—</span></li>
-            <li><span class="rank">4.</span><span>—</span></li>
-            <li><span class="rank">5.</span><span>—</span></li>
-          </ol>
-        </section>
       </aside>
     </main>
 
@@ -139,6 +147,6 @@
     </footer>
   </div>
   <script src="hero-cycle.js?v=force-cycle-3" defer></script>
-  <script src="home-leaderboard.js?v=home-hardcore-preline-20260610-1" defer></script>
+  <script src="home-leaderboard.js?v=home-hardcore-top10-1" defer></script>
 </body>
 </html>

site/server-status.js

@@ -0,0 +1,54 @@
+(() => {
+  const list = document.querySelector(".status-list");
+  if (!list) return;
+
+  const esc = (value) => String(value ?? "").replace(/[&<>"']/g, (ch) => ({
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    "\"": "&quot;",
+    "'": "&#39;",
+  }[ch]));
+
+  const players = (value) => {
+    const n = Number(value || 0);
+    return `${n.toLocaleString()} ${n === 1 ? "Player" : "Players"}`;
+  };
+
+  const render = (data) => {
+    const servers = Array.isArray(data?.servers) ? data.servers : [];
+    if (!servers.length) return;
+
+    list.classList.add("status-list--regions");
+    list.innerHTML = servers.map((server) => `
+      <div class="status-region" role="group" aria-label="${esc(server.label)} player counts">
+        <div class="status-row status-parent status-server" role="listitem">
+          <span>${esc(server.label)}</span><span>${players(server.players)}</span>
+        </div>
+        ${(server.ships || []).map((ship) => `
+          <div class="status-row status-parent status-ship" role="listitem">
+            <span>${esc(ship.label)}</span><span></span>
+          </div>
+          ${(ship.rows || []).map((row) => `
+            <div class="status-row status-child" role="listitem">
+              <span>${esc(row.label)}</span><span>${players(row.players)}</span>
+            </div>
+          `).join("")}
+        `).join("")}
+      </div>
+    `).join("");
+  };
+
+  const loadStatus = (url) => fetch(url, { cache: "no-store" })
+    .then((res) => {
+      if (!res.ok) {
+        throw new Error(`status ${res.status}`);
+      }
+      return res.json();
+    });
+
+  loadStatus(`/server-status.json?ts=${Date.now()}`)
+    .catch(() => loadStatus("/api/server-status"))
+    .then((data) => data && render(data))
+    .catch(() => {});
+})();