feat(web): cache dashboard aggregations with version invalidation

reaction_board/cli.py

@@ -433,6 +433,8 @@ def cmd_run(args, logger: JsonLogger, *, serve_web: bool = False) -> int:
                 ttl_days=cfg.schedule.candidate_ttl_days
             )
             expired = repo.expire_fav_actions()
+            if removed or expired:
+                repo.bump_cache_version("videos")
             logger.info(
                 "cleanup.done",
                 candidates_removed=removed, fav_actions_expired=expired,

reaction_board/repository.py

@@ -555,6 +555,43 @@ class Repository:
             (key, str(value)),
         ))
 
+    # ------------------------------------------------------------ cache version
+
+    @staticmethod
+    def cache_version_key(group: str) -> str:
+        return f"cache:v:{group}"
+
+    def cache_version(self, group: str) -> int:
+        def run(conn: sqlite3.Connection) -> int:
+            row = conn.execute(
+                "SELECT v FROM kv WHERE k = ?", (self.cache_version_key(group),)
+            ).fetchone()
+            if row is None:
+                return 0
+            try:
+                return int(str(row["v"]))
+            except ValueError:
+                return 0
+        return self.db.read(run)
+
+    def bump_cache_version(self, group: str, *, now: int | None = None) -> int:
+        now = self._now() if now is None else int(now)
+        key = self.cache_version_key(group)
+
+        def run(conn: sqlite3.Connection) -> int:
+            row = conn.execute("SELECT v FROM kv WHERE k = ?", (key,)).fetchone()
+            try:
+                value = int(str(row["v"])) + 1 if row is not None else 1
+            except ValueError:
+                value = 1
+            conn.execute(
+                "INSERT INTO kv(k, v) VALUES (?, ?) "
+                "ON CONFLICT(k) DO UPDATE SET v = excluded.v",
+                (key, str(value)),
+            )
+            return value
+        return self.db.write(run)
+
     # ------------------------------------------------------------ candidate
 
     def known_aid(self, aid: int) -> bool:

reaction_board/services/discovery.py

@@ -106,6 +106,8 @@ class DiscoveryService:
                     self._handle_item(item, channel, cfg, summary, pending, now)
 
         self._notify(pending, summary, now)
+        if summary.candidates or summary.notified:
+            self.repo.bump_cache_version("videos")
         summary.finished_at = self._now()
         self._log(
             "info" if not summary.errors else "warning",

reaction_board/services/favorites.py

@@ -176,6 +176,7 @@ class FavoriteActionService:
                 aid=aid, folder_id=folder.media_id, position=position,
                 already=already,
             )
+            self.repo.bump_cache_version("videos")
             return ActionResult(
                 ok=True, aid=aid, action="favorite", state="done",
                 position=position, already_in_folder=already,
@@ -201,6 +202,7 @@ class FavoriteActionService:
                 message="候选不存在或已处理",
             )
         self.repo.mark_candidate_decision(aid, "rejected", now=self._now())
+        self.repo.bump_cache_version("videos")
         return ActionResult(
             ok=True, aid=aid, action="ignore", state="rejected",
             message="已忽略",
@@ -228,6 +230,7 @@ class FavoriteActionService:
         )
         rejected = self.repo.reject_pending_for_up(up_mid, now=self._now())
         self.repo.mark_candidate_decision(aid, "rejected", now=self._now())
+        self.repo.bump_cache_version("videos")
         return ActionResult(
             ok=True, aid=aid, action="blacklist", state="rejected",
             message=f"已拉黑 UP，并忽略该 UP 的 {rejected} 条待决策候选",

reaction_board/services/folder_sync.py

@@ -200,6 +200,8 @@ class FolderSyncService:
             errors=len(summary.errors),
             elapsed=max(0, summary.finished_at - summary.started_at),
         )
+        if summary.added or summary.removed or summary.refreshed:
+            self.repo.bump_cache_version("videos")
         return summary
 
     def _sync_folder(

reaction_board/services/snapshot.py

@@ -284,6 +284,11 @@ class SnapshotService:
 
         self._run_backup(cfg, stat_date, summary)
 
+        if summary.success or summary.removed or summary.failed:
+            self.repo.bump_cache_version("videos")
+        if summary.fans_ok or summary.fans_failed:
+            self.repo.bump_cache_version("fans")
+
         summary.finished_at = self._now()
         self._log(
             "info" if summary.completed else "warning",

reaction_board/web/cache.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+"""看板聚合结果的内存 TTL 缓存。
+
+缓存键包含数据库路径和数据版本；版本存放在 ``kv``（``cache:v:<group>``），
+因此同一个进程内的调度任务和 Web 线程都会看到一致的失效，跨进程的 CLI
+导入也可以通过提升版本让旧缓存失效。
+"""
+
+from __future__ import annotations
+
+import threading
+import time
+from typing import Any, Callable, Hashable
+
+TTL_VIDEOS = 3600
+TTL_FANS = 86400
+
+
+class TTLCache:
+    def __init__(self, *, clock: Callable[[], float] = time.time, max_items: int = 256) -> None:
+        self._clock = clock
+        self._max_items = max(16, int(max_items))
+        self._lock = threading.RLock()
+        self._items: dict[Hashable, tuple[float, Any]] = {}
+
+    def get(self, key: Hashable) -> Any | None:
+        with self._lock:
+            entry = self._items.get(key)
+            if entry is None:
+                return None
+            expires_at, value = entry
+            if expires_at <= self._clock():
+                self._items.pop(key, None)
+                return None
+            return value
+
+    def set(self, key: Hashable, ttl: float, value: Any) -> None:
+        with self._lock:
+            now = self._clock()
+            self._items[key] = (now + float(ttl), value)
+            if len(self._items) > self._max_items:
+                expired = [k for k, (exp, _) in self._items.items() if exp <= now]
+                for item in expired:
+                    self._items.pop(item, None)
+                if len(self._items) > self._max_items:
+                    oldest = sorted(self._items.items(), key=lambda kv: kv[1][0])
+                    for item, _ in oldest[: len(self._items) - self._max_items]:
+                        self._items.pop(item, None)
+
+    def clear(self) -> None:
+        with self._lock:
+            self._items.clear()
+
+    def __len__(self) -> int:
+        with self._lock:
+            return len(self._items)
+
+
+DASHBOARD_CACHE = TTLCache()
+
+
+def build_cache_key(
+    scope: str,
+    group: str,
+    version: int,
+    params: dict[str, Any] | None = None,
+) -> tuple[Any, ...]:
+    frozen = tuple(sorted((str(key), str(value)) for key, value in (params or {}).items()))
+    return (scope, group, int(version), frozen)

reaction_board/web/queries.py

@@ -28,6 +28,7 @@ from ..analytics import (
 from ..config import ConfigStore
 from ..database import Database
 from ..timeutil import day_bounds, next_daily_run, shanghai_date, shanghai_datetime
+from .cache import DASHBOARD_CACHE, TTL_FANS, TTL_VIDEOS, build_cache_key
 
 TRACKED_STATUSES = ("active", "unfaved")
 VIDEO_SORTS = {
@@ -179,6 +180,30 @@ class DashboardQueries:
         self.db = db
         self.config_store = config_store
         self._clock = clock
+        self._cache_scope = str(getattr(db, "path", "db"))
+
+    def _cache_version(self, group: str) -> int:
+        def run(conn: sqlite3.Connection) -> int:
+            row = conn.execute(
+                "SELECT v FROM kv WHERE k = ?", (f"cache:v:{group}",)
+            ).fetchone()
+            if row is None:
+                return 0
+            try:
+                return int(str(row["v"]))
+            except ValueError:
+                return 0
+        return self.db.read(run)
+
+    def _cached(self, group: str, params: dict[str, Any], ttl: float, builder):
+        version = self._cache_version(group)
+        key = build_cache_key(self._cache_scope, group, version, params)
+        hit = DASHBOARD_CACHE.get(key)
+        if hit is not None:
+            return hit
+        value = builder()
+        DASHBOARD_CACHE.set(key, ttl, value)
+        return value
 
     # ------------------------------------------------------------ helpers
 
@@ -358,6 +383,9 @@ class DashboardQueries:
     # ------------------------------------------------------------ overview
 
     def overview(self) -> dict[str, Any]:
+        return self._cached("videos", {}, TTL_VIDEOS, self._overview_uncached)
+
+    def _overview_uncached(self) -> dict[str, Any]:
         def run(conn: sqlite3.Connection) -> dict[str, Any]:
             latest = self._latest_date(conn)
             snapshot_days = self._snapshot_days(conn)
@@ -602,6 +630,38 @@ class DashboardQueries:
         q: str | None = None,
         page: int = 1,
         page_size: int = 20,
+    ) -> dict[str, Any]:
+        params = {
+            "sort": sort,
+            "within_days": within_days,
+            "growth_days": growth_days,
+            "folder_id": folder_id,
+            "q": q or "",
+            "page": page,
+            "page_size": page_size,
+        }
+        return self._cached(
+            "videos", params, TTL_VIDEOS, lambda: self._list_videos_uncached(
+                sort=sort,
+                within_days=within_days,
+                growth_days=growth_days,
+                folder_id=folder_id,
+                q=q,
+                page=page,
+                page_size=page_size,
+            ),
+        )
+
+    def _list_videos_uncached(
+        self,
+        *,
+        sort: str = "heat",
+        within_days: int | None = None,
+        growth_days: int = 7,
+        folder_id: int | None = None,
+        q: str | None = None,
+        page: int = 1,
+        page_size: int = 20,
     ) -> dict[str, Any]:
         if sort not in VIDEO_SORTS:
             raise ValueError(f"不支持的排序: {sort}")
@@ -809,6 +869,35 @@ class DashboardQueries:
         min_videos: int = 1,
         page: int = 1,
         page_size: int = 20,
+    ) -> dict[str, Any]:
+        params = {
+            "sort": sort,
+            "within_days": within_days,
+            "q": q or "",
+            "min_videos": min_videos,
+            "page": page,
+            "page_size": page_size,
+        }
+        return self._cached(
+            "videos", params, TTL_VIDEOS, lambda: self._list_ups_uncached(
+                sort=sort,
+                within_days=within_days,
+                q=q,
+                min_videos=min_videos,
+                page=page,
+                page_size=page_size,
+            ),
+        )
+
+    def _list_ups_uncached(
+        self,
+        *,
+        sort: str = "avg_views",
+        within_days: int | None = None,
+        q: str | None = None,
+        min_videos: int = 1,
+        page: int = 1,
+        page_size: int = 20,
     ) -> dict[str, Any]:
         if sort not in UP_SORTS:
             raise ValueError(f"不支持的 UP 排序: {sort}")
@@ -981,6 +1070,32 @@ class DashboardQueries:
         start: str | None = None,
         end: str | None = None,
         recent_days: int = 14,
+    ) -> dict[str, Any]:
+        params = {
+            "mid": mid if mid is not None else "",
+            "days": days,
+            "start": start or "",
+            "end": end or "",
+            "recent_days": recent_days,
+        }
+        return self._cached(
+            "fans", params, TTL_FANS, lambda: self._fans_uncached(
+                mid=mid,
+                days=days,
+                start=start,
+                end=end,
+                recent_days=recent_days,
+            ),
+        )
+
+    def _fans_uncached(
+        self,
+        mid: int | None = None,
+        *,
+        days: int = 90,
+        start: str | None = None,
+        end: str | None = None,
+        recent_days: int = 14,
     ) -> dict[str, Any]:
         if days < 1:
             raise ValueError("days 必须大于 0")

reaction_board/web/static/app.js

@@ -62,7 +62,7 @@ function icon(name) {
 }
 
 function renderNav() {
-  const nav = document.querySelector("#bottom-nav");
+  const nav = document.querySelector("#nav-items");
   const items = NAV_ITEMS.filter(
     (item) => !item.protected || canAccessProtected(),
   );
@@ -86,8 +86,9 @@ function activeNav(path) {
 function setTitle(route, path) {
   const title = route?.title || "看板";
   document.title = `${title} · 咻咻满 Reaction`;
-  const element = document.querySelector("#topbar-title");
-  if (element) element.textContent = title;
+  document.querySelectorAll(".brand-subtitle").forEach((element) => {
+    element.textContent = title;
+  });
   activeNav(path);
 }
 
@@ -113,8 +114,6 @@ window.addEventListener("error", (event) => {
 
 async function boot() {
   const banner = document.querySelector("#preview-banner");
-  const hint = document.querySelector("#topbar-hint");
-  const authLink = document.querySelector("#topbar-auth");
   try {
     const data = await session();
     authState = {
@@ -123,10 +122,14 @@ async function boot() {
     };
     if (data?.preview) {
       banner.hidden = false;
-      if (hint) hint.hidden = false;
+      document.querySelectorAll(".topbar-preview").forEach((element) => {
+        element.hidden = false;
+      });
     }
-    if (authLink && authState.authEnabled && !authState.authenticated) {
-      authLink.hidden = false;
+    if (authState.authEnabled && !authState.authenticated) {
+      document.querySelectorAll(".topbar-auth").forEach((element) => {
+        element.hidden = false;
+      });
     }
   } catch {
     toast("无法连接看板服务", "error");

reaction_board/web/static/index.html

@@ -12,25 +12,38 @@
 </head>
 <body>
   <div class="app" id="app">
-    <header class="topbar">
+    <header class="topbar mobile-topbar">
       <a class="brand" href="/home">
-        <span class="brand-mark">咻</span>
+        <span class="brand-mark">满</span>
         <span class="brand-text">
           <strong>Reaction 看板</strong>
-          <small id="topbar-title">最新动态</small>
+          <small class="brand-subtitle">最新动态</small>
         </span>
       </a>
-      <a class="topbar-hint" id="topbar-auth" href="/login" hidden>登录</a>
-      <span class="topbar-hint" id="topbar-hint" hidden>预览</span>
+      <a class="topbar-hint topbar-auth" href="/login" hidden>登录</a>
+      <span class="topbar-hint topbar-preview" hidden>预览</span>
     </header>
     <div class="preview-banner" id="preview-banner" hidden>预览数据 · 不影响真实数据库</div>
     <main class="main-shell">
       <div id="view"></div>
     </main>
-    <nav class="bottom-nav" id="bottom-nav" aria-label="主导航"></nav>
+    <nav class="bottom-nav" id="bottom-nav" aria-label="主导航">
+      <div class="sidebar-topbar">
+        <a class="brand" href="/home">
+          <span class="brand-mark">满</span>
+          <span class="brand-text">
+            <strong>Reaction 看板</strong>
+            <small class="brand-subtitle">最新动态</small>
+          </span>
+        </a>
+        <a class="topbar-hint topbar-auth" href="/login" hidden>登录</a>
+        <span class="topbar-hint topbar-preview" hidden>预览</span>
+      </div>
+      <div class="nav-items" id="nav-items"></div>
+    </nav>
   </div>
   <div class="toast" id="toast" role="status" aria-live="polite"></div>
   <script src="/static/vendor/echarts.min.js"></script>
   <script type="module" src="/static/app.js"></script>
 </body>
-</html>
+</html>

reaction_board/web/static/style.css

@@ -123,6 +123,16 @@ h1, h2, h3, p { margin: 0; }
   color: var(--muted);
   font-size: 11px;
 }
+.sidebar-topbar {
+  display: none;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 8px;
+  width: 100%;
+  padding: 0 4px 12px;
+  border-bottom: 1px solid var(--border);
+}
+.nav-items { display: flex; flex-direction: row; width: 100%; height: 100%; }
 
 .preview-banner {
   position: sticky;
@@ -160,6 +170,7 @@ h1, h2, h3, p { margin: 0; }
 }
 .page-head h1 { font-size: 24px; letter-spacing: -0.4px; }
 .page-sub { margin-top: 4px; color: var(--muted); font-size: 12.5px; }
+.page-head h1 .page-sub { margin-top: 0; margin-left: 8px; font-weight: 400; }
 .home-head { align-items: center; }
 .back-link { color: var(--muted); font-size: 13px; }
 .back-link:hover { color: var(--accent); }
@@ -825,17 +836,12 @@ h1, h2, h3, p { margin: 0; }
 }
 
 @media (min-width: 900px) {
-  .topbar {
-    position: fixed;
-    left: var(--nav-width);
-    right: 0;
-    height: 64px;
-    padding: 0 28px;
-  }
-  .preview-banner { top: 64px; margin-left: var(--nav-width); }
+  .mobile-topbar { display: none; }
+  .sidebar-topbar { display: flex; }
+  .preview-banner { top: 0; margin-left: var(--nav-width); }
   .main-shell {
     margin-left: var(--nav-width);
-    padding: 82px 28px 40px;
+    padding: 16px 28px 40px;
   }
   .bottom-nav {
     top: 0;
@@ -845,11 +851,15 @@ h1, h2, h3, p { margin: 0; }
     height: 100vh;
     flex-direction: column;
     justify-content: flex-start;
-    gap: 4px;
-    padding: 82px 12px 20px;
+    gap: 10px;
+    padding: 18px 12px 20px;
     border-top: 0;
     border-right: 1px solid var(--border);
   }
+  .nav-items {
+    flex-direction: column;
+    gap: 4px;
+  }
   .nav-item {
     flex: 0 0 auto;
     flex-direction: row;

reaction_board/web/static/views/rankings.js

@@ -126,10 +126,7 @@ export async function renderRankings(root, { query }) {
 
   root.innerHTML = `<section class="page rankings-page">
     <header class="page-head">
-      <div>
-        <h1>榜单</h1>
-        <p class="page-sub">共 ${formatCount(data.total)} ${scope === "up" ? "个 UP" : "条视频"}</p>
-      </div>
+      <h1>榜单 <span class="page-sub">共 ${formatCount(data.total)} ${scope === "up" ? "个 UP" : "条视频"}</span></h1>
     </header>
     ${controls({ scope, sort, within, growthDays, q, folder, minVideos, folders })}
     ${data.available === false ? `<div class="notice-row warning">