Upload 5 files

static/app.js

@@ -18,16 +18,15 @@ const STATE = {
   minSize: null,
   maxSize: null,
   exact: true,
-  fulltext: false,
+  fulltext: true,
   searchPaths: true,
-  fulltextManifest: null,
-  fulltextLoaded: {},
   historyEnabled: true,
   leftSidebarOpen: true,
   rightSidebarOpen: false,
   isMobile: false,
   isDark: true,
   isLoading: false,
+  searchController: null,
   multiSelect: false,
   selectedIds: new Set(),
 };
@@ -137,12 +136,13 @@ const API = {
     const resp = await fetch("/api/sources");
     return resp.json();
   },
-  async search(body, sourceSlug) {
+  async search(body, sourceSlug, signal) {
     const url = sourceSlug ? `/api/search/${sourceSlug}` : "/api/search";
     const resp = await fetch(url, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body),
+      signal,
     });
     return resp.json();
   },
@@ -159,27 +159,11 @@ const API = {
     const resp = await fetch(`/api/preview/${encodeURIComponent(docId)}`);
     return resp.json();
   },
-  async snippet(docId, query) {
-    const resp = await fetch(`/api/snippet/${encodeURIComponent(docId)}?q=${encodeURIComponent(query || "")}`);
-    return resp.json();
-  },
   async random(sourceSlug) {
     const url = sourceSlug ? `/api/random?source=${encodeURIComponent(sourceSlug)}` : "/api/random";
     const resp = await fetch(url);
     return resp.json();
   },
-  async fulltextManifest() {
-    const resp = await fetch("/api/fulltext-manifest");
-    return resp.json();
-  },
-  async fulltextIndex(path) {
-    const resp = await fetch(`/data/${path}`);
-    const blob = await resp.blob();
-    const ds = new DecompressionStream("gzip");
-    const stream = blob.stream().pipeThrough(ds);
-    const text = await new Response(stream).text();
-    return JSON.parse(text);
-  },
 };
 
 function cacheDom() {
@@ -400,7 +384,7 @@ function syncUrl(replace = true) {
   if (STATE.maxSize !== null) params.set("max_size", String(STATE.maxSize));
   if (DOM.sortSelect.value !== "relevance") params.set("sort", DOM.sortSelect.value);
   if (!STATE.exact) params.set("exact", "0");
-  if (STATE.fulltext) params.set("fulltext", "1");
+  if (!STATE.fulltext) params.set("fulltext", "0");
   if (!STATE.searchPaths) params.set("search_paths", "0");
   if (!STATE.historyEnabled) params.set("history", "0");
   if (!STATE.leftSidebarOpen) params.set("sidebar", "0");
@@ -415,13 +399,14 @@ function syncUrl(replace = true) {
 
 function loadUrlState() {
   const params = new URLSearchParams(window.location.search);
+  STATE.page = 1;
   STATE.query = params.get("q") || "";
   STATE.selectedSources = params.getAll("source");
   STATE.folderSelections = params.getAll("folder");
   STATE.minSize = bytesFromUrl(params.get("min_size"));
   STATE.maxSize = bytesFromUrl(params.get("max_size"));
   STATE.exact = params.get("exact") !== "0";
-  STATE.fulltext = params.get("fulltext") === "1";
+  STATE.fulltext = params.get("fulltext") !== "0";
   STATE.searchPaths = params.get("search_paths") !== "0";
   STATE.historyEnabled = params.get("history") !== "0";
   const sort = params.get("sort") || "relevance";
@@ -440,147 +425,53 @@ function loadUrlState() {
   restoreSizeInput(DOM.filterMaxSize, DOM.filterMaxUnit, STATE.maxSize);
 }
 
-async function ensureFulltextLoaded() {
-  let loadedCount = 0;
-  if (!STATE.fulltextManifest) {
-    showToast("正在加载全文索引，首次可能较慢...", 5000);
-    STATE.fulltextManifest = await API.fulltextManifest();
-  }
-  const sourceSlugs = STATE.source ? [STATE.source] : (STATE.selectedSources.length ? STATE.selectedSources : STATE.sources.map((source) => source.slug));
-  const pendingSlugs = sourceSlugs.filter((slug) => !STATE.fulltextLoaded[slug]);
-  if (pendingSlugs.length) showToast("正在加载全文索引，首次可能较慢...", 5000);
-  for (const slug of sourceSlugs) {
-    if (STATE.fulltextLoaded[slug]) continue;
-    const item = (STATE.fulltextManifest.sources || []).find((source) => source.slug === slug);
-    if (!item) continue;
-    showToast(`加载全文索引: ${slug}`, 5000);
-    STATE.fulltextLoaded[slug] = await API.fulltextIndex(item.path);
-    loadedCount += 1;
-  }
-  if (loadedCount) showToast("全文索引加载完成");
-}
-
-function scoreFulltextDoc(docId, payload, queryTokens, exactQuery) {
-  if (exactQuery) {
-    const snippet = (payload.snippets[docId] || "").toLowerCase();
-    return snippet.includes(exactQuery.toLowerCase()) ? 100 : 1;
-  }
-  let score = 0;
-  for (const token of queryTokens) {
-    if ((payload.snippets[docId] || "").toLowerCase().includes(token)) score += 4;
-    if ((payload.docs[docId]?.display_name || "").toLowerCase().includes(token)) score += 1;
-  }
-  return score;
-}
-
-async function fulltextSearch() {
-  await ensureFulltextLoaded();
-  const query = STATE.query.trim();
-  const queryTokens = tokenize(query);
-  const sourceSlugs = STATE.source ? [STATE.source] : (STATE.selectedSources.length ? STATE.selectedSources : STATE.sources.map((source) => source.slug));
-  let results = [];
-  for (const slug of sourceSlugs) {
-    const payload = STATE.fulltextLoaded[slug];
-    if (!payload) continue;
-    let matchedIds = null;
-    if (STATE.exact) {
-      matchedIds = Object.keys(payload.docs).filter((docId) => {
-        const snippet = (payload.snippets[docId] || "") + " " + (payload.docs[docId]?.display_name || "");
-        return matchesExactQuery(snippet, query);
-      });
-    } else {
-      for (const token of queryTokens) {
-        const docIds = payload.index[token] || [];
-        const set = new Set(docIds);
-        if (matchedIds === null) matchedIds = set;
-        else matchedIds = new Set(Array.from(matchedIds).filter((docId) => set.has(docId)));
-      }
-      matchedIds = Array.from(matchedIds || []);
-    }
-    for (const docId of matchedIds) {
-      const meta = payload.docs[docId];
-      const folderParts = meta.display_rel_path.split("/");
-      const fileName = folderParts.pop();
-      const displayName = fileName.replace(/\.txt$/i, "");
-      results.push({
-        doc_id: docId,
-        Source: slug,
-        SourceName: STATE.sourceMap[slug]?.name || slug,
-        File: displayName,
-        Extension: "txt",
-        Folder: folderParts,
-        DisplayPath: meta.display_rel_path,
-        Size: meta.size,
-        HasTxt: true,
-        snippet: payload.snippets[docId] || "",
-        _score: scoreFulltextDoc(docId, payload, queryTokens, query),
-      });
-    }
-  }
-  if (STATE.folderSelections.length) {
-    results = results.filter((item) => {
-      const folder = item.Folder.join("/");
-      return STATE.folderSelections.some((selected) => folder === selected || folder.startsWith(selected + "/"));
-    });
-  }
-  if (STATE.minSize !== null) results = results.filter((item) => item.Size >= STATE.minSize);
-  if (STATE.maxSize !== null) results = results.filter((item) => item.Size <= STATE.maxSize);
-  if (DOM.sortSelect.value === "name") results.sort((a, b) => a.DisplayPath.localeCompare(b.DisplayPath, "zh"));
-  else if (DOM.sortSelect.value === "size") results.sort((a, b) => (b.Size - a.Size) || a.DisplayPath.localeCompare(b.DisplayPath, "zh"));
-  else results.sort((a, b) => (b._score - a._score) || a.DisplayPath.localeCompare(b.DisplayPath, "zh"));
-  const snippetTargets = results.slice(0, STATE.page * STATE.pageSize);
-  await Promise.all(snippetTargets.map(async (item) => {
-    const data = await API.snippet(item.doc_id, query);
-    item.snippet = data && data.snippet ? data.snippet : "";
-  }));
-  STATE.total = results.length;
-  STATE.results = results.slice(0, STATE.page * STATE.pageSize);
-}
-
-async function pathSearch() {
+async function pathSearch(signal) {
   const body = {
     q: STATE.query,
     sources: getSelectedSourcesForSearch(),
     folders: STATE.folderSelections,
     min_size: STATE.minSize,
     max_size: STATE.maxSize,
-    page: 1,
-    page_size: STATE.page * STATE.pageSize,
+    page: STATE.page,
+    page_size: STATE.pageSize,
     sort: DOM.sortSelect.value,
     exact: STATE.exact,
     search_paths: STATE.searchPaths,
+    fulltext: STATE.fulltext,
   };
-  const data = await API.search(body, STATE.source);
+  const data = await API.search(body, STATE.source, signal);
   STATE.total = data.total || 0;
-  STATE.results = data.results || [];
+  STATE.results = STATE.page === 1 ? (data.results || []) : STATE.results.concat(data.results || []);
 }
 
 async function doSearch() {
+  if (STATE.searchController) STATE.searchController.abort();
+  const controller = new AbortController();
+  STATE.searchController = controller;
   STATE.isLoading = true;
   DOM.resultsLoading.style.display = "flex";
   DOM.previewPanel.style.display = "none";
   try {
-    if (STATE.fulltext && STATE.query.trim()) {
-      await fulltextSearch();
-    } else {
-      await pathSearch();
-    }
+    await pathSearch(controller.signal);
     renderResults();
     updateStatus();
   } catch (error) {
+    if (error.name === "AbortError") return;
     console.error(error);
     showToast("搜索失败");
   } finally {
+    if (STATE.searchController !== controller) return;
+    STATE.searchController = null;
     STATE.isLoading = false;
     DOM.resultsLoading.style.display = "none";
   }
 }
 
 function resultPathHtml(item) {
-  const sourcePrefix = `<span class="path-folder" data-source="${escapeHTML(item.Source)}" data-folder="">${highlightText(item.SourceName, STATE.fulltext ? "" : STATE.query)}</span>`;
+  const sourcePrefix = `<span class="path-folder" data-source="${escapeHTML(item.Source)}" data-folder="">${highlightText(item.SourceName, STATE.query)}</span>`;
   const rest = (item.Folder || []).map((part, index) => {
     const path = item.Folder.slice(0, index + 1).join("/");
-    return `<span class="path-sep">/</span><span class="path-folder" data-source="${escapeHTML(item.Source)}" data-folder="${escapeHTML(path)}">${highlightText(part, STATE.fulltext ? "" : STATE.query)}</span>`;
+    return `<span class="path-sep">/</span><span class="path-folder" data-source="${escapeHTML(item.Source)}" data-folder="${escapeHTML(path)}">${highlightText(part, STATE.query)}</span>`;
   }).join("");
   return sourcePrefix + rest;
 }
@@ -595,7 +486,7 @@ function renderResults() {
   }
   DOM.emptyState.style.display = "none";
   DOM.resultsList.innerHTML = STATE.results.map((item) => {
-    const titleHtml = `${highlightText(item.File, STATE.fulltext ? "" : STATE.query)}<span style="opacity:0.5;font-size:12px">.txt</span>`;
+    const titleHtml = `${highlightText(item.File, STATE.query)}<span style="opacity:0.5;font-size:12px">.txt</span>`;
     const snippetHtml = item.snippet ? `<div class="result-snippet">${highlightText(item.snippet, STATE.query)}</div>` : "";
     return `
       <div class="result-item" data-doc-id="${escapeHTML(item.doc_id)}">
@@ -1042,6 +933,7 @@ function updateSidebarVisibility() {
 }
 
 function clearFilters() {
+  STATE.page = 1;
   STATE.folderSelections = [];
   STATE.selectedSources = [];
   STATE.minSize = null;
@@ -1208,7 +1100,7 @@ function attachEvents() {
     if (!STATE.historyEnabled) saveHistory([]);
     syncUrl();
   });
-  DOM.fulltextToggle.addEventListener("change", async () => {
+  DOM.fulltextToggle.addEventListener("change", () => {
     STATE.fulltext = DOM.fulltextToggle.checked;
     if (DOM.searchPathsToggle) {
       DOM.searchPathsToggle.disabled = STATE.fulltext;
@@ -1217,7 +1109,6 @@ function attachEvents() {
     }
     DOM.searchInput.placeholder = STATE.fulltext ? "全文搜索 TXT 正文..." : "搜索 TXT 文件或路径...";
     STATE.page = 1;
-    if (STATE.fulltext) await ensureFulltextLoaded();
     syncUrl();
     doSearch();
   });

static/index.html

@@ -22,7 +22,7 @@
   <div class="header-center">
     <div class="search-box">
       <span class="search-icon"><span class="ui-icon ui-icon-search" aria-hidden="true"></span></span>
-      <input type="search" id="search-input" class="search-input" placeholder="搜索 TXT 文件或路径..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
+      <input type="search" id="search-input" class="search-input" placeholder="全文搜索 TXT 正文..." autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false">
       <kbd class="search-kbd">/</kbd>
       <div id="search-history-dropdown" class="search-history-dropdown" style="display:none"></div>
     </div>
@@ -88,7 +88,7 @@
       <div class="filter-section" id="fulltext-toggle-section">
         <label class="toggle-row">
           <span class="toggle-label">全文搜索</span>
-          <input type="checkbox" id="fulltext-toggle">
+          <input type="checkbox" id="fulltext-toggle" checked>
           <span class="toggle-switch"></span>
         </label>
       </div>
@@ -108,7 +108,7 @@
       </div>
       <div class="filter-section" id="exact-search-section">
         <label class="toggle-row">
-          <span class="toggle-label">精准搜索(支持通配符*和?)</span>
+          <span class="toggle-label">精准搜索</span>
           <input type="checkbox" id="exact-search-toggle" checked>
           <span class="toggle-switch"></span>
         </label>

static/style.css

@@ -489,6 +489,13 @@ ul, li {
   overflow: hidden;
 }
 
+.result-snippet mark {
+  background: var(--primary-container);
+  color: var(--on-primary-container);
+  border-radius: 2px;
+  padding: 0 1px;
+}
+
 /* ═══════════════════════════════════════════════════════════
    Layout
    ═══════════════════════════════════════════════════════════ */

static/sw.js

@@ -1,4 +1,4 @@
-const CACHE_NAME = "vomebook-search-v1";
+const CACHE_NAME = "vomebook-search-v2";
 
 const PRECACHE_URLS = [
   "/",