Add generation-scoped first-screen bootstrap

app/bootstrap_api.py

@@ -0,0 +1,56 @@
+import hashlib
+import json
+import threading
+from typing import Any
+
+from fastapi import APIRouter
+from fastapi.responses import JSONResponse
+
+from . import runtime, search_api
+from .search_logic import SearchRequest
+from .storage_lock import serving_lock
+
+
+router = APIRouter()
+bootstrap_cache: tuple[tuple[Any, ...], dict[str, Any]] | None = None
+bootstrap_lock = threading.Lock()
+
+
+def generation_id(generation: tuple[Any, ...]) -> str:
+    return hashlib.sha256(repr(generation).encode()).hexdigest()[:16]
+
+
+@router.get("/api/bootstrap")
+def bootstrap():
+    global bootstrap_cache
+    with bootstrap_lock:
+        generation = runtime.serving_generation_token()
+        if runtime.index_status() == "ready" and bootstrap_cache and bootstrap_cache[0] == generation:
+            return JSONResponse(bootstrap_cache[1], headers={"Cache-Control": "no-store"})
+        if not runtime.serving_generation_ready():
+            return JSONResponse({"error": "serving generation is not ready"}, status_code=503)
+
+        for _attempt in range(2):
+            generation = runtime.serving_generation_token()
+            search_response = search_api.search(SearchRequest())
+            if not isinstance(search_response, JSONResponse) or search_response.status_code != 200:
+                return JSONResponse({"error": "default search is unavailable"}, status_code=503)
+            search_payload = json.loads(search_response.body)
+            with serving_lock():
+                sources = runtime.cached_sources_payload()
+                facets = {
+                    kind: runtime.cached_facet_payload(kind, 1, 200, "")
+                    for kind in ("source", "author", "tag")
+                }
+            if runtime.index_status() != "ready" or runtime.serving_generation_token() != generation:
+                continue
+            payload = {
+                "generation": generation_id(generation),
+                "search": search_payload,
+                "sources": sources,
+                "facets": facets,
+            }
+            bootstrap_cache = (generation, payload)
+            return JSONResponse(payload, headers={"Cache-Control": "no-store"})
+
+        return JSONResponse({"error": "serving generation changed during bootstrap"}, status_code=503)

app/main.py

@@ -6,7 +6,7 @@ from brotli_asgi import BrotliMiddleware
 from fastapi.staticfiles import StaticFiles
 from .config import APP_ROOT
 from .data_loader import initialize_search_tokenizer
-from . import parse_api, preview_api, proofread_api, reindex_api, runtime, search_api, source_files
+from . import bootstrap_api, parse_api, preview_api, proofread_api, reindex_api, runtime, search_api, source_files
 app = FastAPI(title="BHA Search Lite")
 app.add_middleware(
     CORSMiddleware,
@@ -42,6 +42,7 @@ async def close_source_client():
 
 app.include_router(runtime.router)
 app.include_router(search_api.router)
+app.include_router(bootstrap_api.router)
 app.include_router(preview_api.router)
 app.include_router(parse_api.router)
 app.include_router(proofread_api.router)

static/app.js

@@ -73,6 +73,7 @@ let progressTimer = null;
 let searchRequestSeq = 0;
 let searchAbortController = null;
 let searchPrefetchAbortController = null;
+let bootstrapPending = false;
 let pdfjsPromise = null;
 const pdfDocumentCache = new Map();
 const PDF_DOCUMENT_CACHE_LIMIT = 8;
@@ -923,6 +924,54 @@ function prefetchNextSearchPage(basePayload) {
     });
 }
 
+function canUseInitialBootstrap() {
+  const payload = searchPayload();
+  return payload.q === "" && payload.page === 1 && payload.page_size === 20
+    && payload.exact === true && payload.fulltext === true && payload.sort === "relevance"
+    && !payload.source && !payload.author && !payload.tag && !payload.archive_id
+    && !payload.publication_type && !payload.date_from && !payload.date_to
+    && !payload.sources.length && !payload.authors.length && !payload.tags.length
+    && !payload.exclude_sources.length && !payload.exclude_authors.length && !payload.exclude_tags.length
+    && !payload.date_terms.length;
+}
+
+async function loadInitialBootstrap() {
+  bootstrapPending = true;
+  DOM.statusText.textContent = "搜索中...";
+  try {
+    const data = await apiWithTimeout("/api/bootstrap", {}, 25000);
+    const search = data.search || {};
+    if (search.index_status !== "ready" || search.indexing) throw new Error("bootstrap is not ready");
+    STATE.results = search.results || [];
+    STATE.total = Number(search.total || 0);
+    STATE.pageSize = Number(search.page_size || 20);
+    const sources = data.sources || {};
+    const facets = data.facets || {};
+    STATE.facets = {
+      sources: sortFacetItems((facets.source || {}).items || []),
+      authors: sortFacetItems((facets.author || {}).items || []),
+      tags: sortFacetItems((facets.tag || {}).items || []),
+      archives: sortFacetItems(sources.archives || []),
+      types: sortFacetItems(sources.types || []),
+      years: sortFacetItems(sources.years || []),
+    };
+    for (const kind of ["source", "author", "tag"]) {
+      STATE.facetTotals[kind] = Number((facets[kind] || {}).total || 0);
+      STATE.facetHasMore[kind] = Boolean((facets[kind] || {}).has_more);
+    }
+    setCachedSearch(stableStringify(searchPayload()), search);
+    renderFilterOptions({ preserveScroll: false });
+    renderResults({ animate: true });
+    DOM.results.scrollTop = 0;
+    DOM.statusText.textContent = "";
+    DOM.indexProgress.textContent = "";
+  } catch (_error) {
+    await Promise.all([doSearch(), loadFacets()]);
+  } finally {
+    bootstrapPending = false;
+  }
+}
+
 async function loadFacets() {
   const pendingKey = "sources";
   if (facetPending.has(pendingKey)) return facetPending.get(pendingKey);
@@ -1164,6 +1213,7 @@ function scheduleFacetSearch(kind) {
 }
 
 function recoverPageState() {
+  if (bootstrapPending) return;
   if (DOM.statusText.textContent === "搜索中..." && !searchAbortController) DOM.statusText.textContent = "";
   let shouldLoadSources = false;
   for (const kind of ["source", "author", "tag"]) {
@@ -1330,7 +1380,8 @@ async function doSearch() {
     DOM.results.scrollTop = 0;
     if (STATE.preview) previewResultsScrollTop = 0;
     DOM.statusText.textContent = "";
-    updateProgress();
+    if (data.index_status === "ready" && !data.indexing) DOM.indexProgress.textContent = "";
+    else updateProgress();
     prefetchNextSearchPage(payload);
   } catch (error) {
     if (error.name === "AbortError" || requestSeq !== searchRequestSeq) return;
@@ -3719,13 +3770,17 @@ function init() {
   }
   applyStateToDom();
   attachEvents();
-  const initialSearch = STATE.parseMode ? loadParseQueue() : doSearch();
+  const initialSearch = STATE.parseMode
+    ? loadParseQueue()
+    : canUseInitialBootstrap() ? loadInitialBootstrap() : Promise.all([doSearch(), loadFacets()]);
   if (!STATE.parseMode) restorePreview(false);
   initialSearch.finally(() => {
     lastKeepaliveAt = Date.now();
     window.setInterval(() => warmConnection(), KEEPALIVE_INTERVAL_MS);
-    updateProgress();
-    loadFacets();
+    if (STATE.parseMode) {
+      updateProgress();
+      loadFacets();
+    }
   });
 }
 document.addEventListener("DOMContentLoaded", init);