tt-help-cli-ycl 1.3.96 → 1.3.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.96",
+  "version": "1.3.98",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/cli/tag.js

@@ -730,6 +730,7 @@ export async function handleScoreAll(parsed) {
         }
 
         // 抓取视频（CDP 连接已登录 Edge）
+        const fetchStart = Date.now();
         log(`  抓取 TikTok 标签页...`);
         const tagResult = await fetchTagData(tag, {
           port: cdpPort,
@@ -739,8 +740,9 @@ export async function handleScoreAll(parsed) {
             );
           },
         });
+        const fetchSec = ((Date.now() - fetchStart) / 1000).toFixed(1);
         log(
-          `\r  完成: ${tagResult.videoCount} 视频, ${tagResult.uniqueAuthorCount} 作者\x1b[K`,
+          `\r  完成: ${tagResult.videoCount} 视频, ${tagResult.uniqueAuthorCount} 作者 (${fetchSec}s)\x1b[K`,
         );
 
         result.totalPosts = tagResult.totalPosts || 0;
@@ -748,11 +750,24 @@ export async function handleScoreAll(parsed) {
         let videos = tagResult.videos;
 
         if (!videos || videos.length === 0) {
-          log("  ⚠️ 无视频，标记 dead");
+          const deadSec = ((Date.now() - fetchStart) / 1000).toFixed(1);
+          const memMB = (process.memoryUsage().heapUsed / 1024 / 1024).toFixed(
+            0,
+          );
+          log(`  ⚠️ 无视频 (${deadSec}s) mem=${memMB}MB，标记 dead`);
           result.status = "dead";
           result.error = "no videos found";
           await reportToServer(baseUrl, result, clientId, clientMeta);
           totalScored++;
+          // 随机等待 3-7 秒，避免连续访问 TikTok 触发风控
+          await randomDelay(0, 5000);
+          // 导航到 about:blank 释放页面状态再跳过
+          await page
+            .goto("about:blank", {
+              waitUntil: "domcontentloaded",
+              timeout: 5000,
+            })
+            .catch(() => {});
           continue;
         }
 
@@ -772,6 +787,20 @@ export async function handleScoreAll(parsed) {
         const enriched = await enrichVideosWithLocation(videos, enrichOpts);
         videos = enriched.videos;
 
+        // CDN 限流检测：有拦截则冷却 + 重启 scraper
+        const cdnBlocked = enriched.cdnBlockedCount || 0;
+        if (cdnBlocked > 0) {
+          const cdnRatio = cdnBlocked / (videos.length || 1);
+          const coolSec = cdnRatio > 0.3 ? 120 : 60;
+          log(
+            `  ⚠️ CDN 限流: ${cdnBlocked}/${videos.length} (${(cdnRatio * 100).toFixed(0)}%)，冷却 ${coolSec} 秒后重启 scraper`,
+          );
+          await new Promise((r) => setTimeout(r, coolSec * 1000));
+          log(`  正在重启 TikTokScraper...`);
+          await enrichScraper.restart();
+          log(`  ✅ TikTokScraper 已重启`);
+        }
+
         // 过滤 + 算分 (共用函数)
         const { matchedAuthorSet } = applyFilterAndScore(
           videos,
@@ -807,23 +836,21 @@ export async function handleScoreAll(parsed) {
         const mc = result.matchedCountries
           .map((c) => `${c.c}:${c.n}`)
           .join(" ");
+        // Node.js 进程内存占用
+        const memMB = (process.memoryUsage().heapUsed / 1024 / 1024).toFixed(0);
+        const memStr = ` mem=${memMB}MB`;
         log(
-          `  ${icon} ${result.status} score=${result.score} authors=${result.authorCount} matched=${result.matchedAuthors} (${elapsed}s)${mc ? "  " + mc : ""}`,
+          `  ${icon} ${result.status} score=${result.score} authors=${result.authorCount} matched=${result.matchedAuthors} (${elapsed}s)${mc ? "  " + mc : ""}${memStr}`,
         );
         log("");
 
-        // 随机等待 3-7 秒，避免连续访问 TikTok 触发风控
+        // 导航到 about:blank 卸载页面，状态清零，下次 goto 重新初始化
+        await page
+          .goto("about:blank", { waitUntil: "domcontentloaded", timeout: 5000 })
+          .catch((e) => {
+            log(`  ⚠️ about:blank 跳转失败: ${e.message}`);
+          });
         await randomDelay(3000, 7000);
-
-        // 每打 200 个 tag 重建一次 page，释放浏览器内存
-        if (totalScored % 200 === 0) {
-          log(`🔄 已打 ${totalScored} 个标签，重建页面释放内存...`);
-          try {
-            await page.close();
-          } catch {}
-          page = await getOrCreatePage(browser);
-          log("✅ 页面已重建");
-        }
       } catch (e) {
         // 区分网络错误和业务错误
         const isNetworkError =

package/src/lib/tag-fetcher.js

@@ -2,6 +2,7 @@ import { chromium } from "playwright";
 import { ensureBrowserReady } from "./browser/cdp.js";
 import { getOrCreatePage } from "./browser/page.js";
 import { TikTokScraper } from "./tiktok-scraper.mjs";
+import { CDNBlockedError } from "./parse-ssr.mjs";
 
 const TAG_URL = "https://www.tiktok.com/tag";
 const SCROLL_INTERVAL = 3000;
@@ -199,7 +200,7 @@ export async function fetchTagData(tag, options = {}) {
  * @param {number} [options.poolSize=3] - 并发页面数
  * @param {number} [options.maxRetries=3] - 单个请求最大重试次数
  * @param {Function} [options.onProgress] - 进度回调 ({ done, total, current, locationCreated })
- * @returns {Promise<{ videos: Array, locationMap: Record<string, string|null> }>}
+ * @returns {Promise<{ videos: Array, locationMap: Record<string, string|null>, cdnBlockedCount: number }>}
  */
 export async function enrichVideosWithLocation(videos, options = {}) {
   const {
@@ -221,6 +222,8 @@ export async function enrichVideosWithLocation(videos, options = {}) {
     const locationMap = {};
     let done = 0;
 
+    let cdnBlockedCount = 0;
+
     if (mode === "users") {
       const uniqueAuthors = [
         ...new Set(videos.map((v) => v.authorUniqueId).filter(Boolean)),
@@ -241,7 +244,10 @@ export async function enrichVideosWithLocation(videos, options = {}) {
                 current: uniqueId,
                 locationCreated: location,
               });
-          } catch {
+          } catch (err) {
+            if (err instanceof CDNBlockedError) {
+              cdnBlockedCount++;
+            }
             locationMap[uniqueId] = null;
             done++;
             if (onProgress)
@@ -279,7 +285,10 @@ export async function enrichVideosWithLocation(videos, options = {}) {
                 current: videoUrl,
                 locationCreated: location,
               });
-          } catch {
+          } catch (err) {
+            if (err instanceof CDNBlockedError) {
+              cdnBlockedCount++;
+            }
             v.locationCreated = null;
             locationMap[v.id] = null;
             done++;
@@ -297,7 +306,7 @@ export async function enrichVideosWithLocation(videos, options = {}) {
       await Promise.allSettled(tasks);
     }
 
-    return { videos: enriched, locationMap };
+    return { videos: enriched, locationMap, cdnBlockedCount };
   } finally {
     if (ownsScraper) await scraper.close();
   }

package/src/lib/tiktok-scraper.mjs

@@ -267,6 +267,14 @@ export class TikTokScraper {
     const slot = this._pickSlot();
     return slot.lock.run(async () => {
       let rawHtml = await this._fetchViewSource(videoUrl, slot);
+      // CDN 限流立即抛出，不重试
+      if (detectAccessDenied(rawHtml)) {
+        const denied = detectAccessDenied(rawHtml);
+        throw new CDNBlockedError(
+          `CDN限流 (Access Denied, ref:${denied.reference || "N/A"})`,
+          denied.reference,
+        );
+      }
       let result = parseVideoInfo(rawHtml);
       for (let attempt = 1; !result && attempt <= maxRetries; attempt++) {
         // 检查是否值得重试
@@ -278,6 +286,14 @@ export class TikTokScraper {
         } catch {}
         await delay(500 * attempt);
         rawHtml = await this._fetchViewSource(videoUrl, slot);
+        // 重试中也检查 CDN 限流
+        if (detectAccessDenied(rawHtml)) {
+          const denied = detectAccessDenied(rawHtml);
+          throw new CDNBlockedError(
+            `CDN限流 (Access Denied, ref:${denied.reference || "N/A"})`,
+            denied.reference,
+          );
+        }
         result = parseVideoInfo(rawHtml);
       }
       return result || null;

package/src/watch/data-store.js

@@ -92,6 +92,7 @@ import {
   reportTagScore,
   resetStaleScoringTags,
   getAllTags,
+  getTagStats,
   rawQuery,
   normalizeTags,
   clearTags,
@@ -1416,6 +1417,7 @@ export function createStore(filePath, options = {}) {
               `(
                 instr(COALESCE(sources, ''), '"following"') > 0
                 OR instr(COALESCE(sources, ''), '"follower"') > 0
+                OR instr(COALESCE(sources, ''), '"comment"') > 0
               )`,
             ],
           });
@@ -1640,7 +1642,8 @@ export function createStore(filePath, options = {}) {
             (u) =>
               u.sources &&
               (u.sources.includes("following") ||
-                u.sources.includes("follower")),
+                u.sources.includes("follower") ||
+                u.sources.includes("comment")),
           );
           follow.sort((a, b) => locationTier(a) - locationTier(b));
           next = follow[0] || null;
@@ -3182,6 +3185,7 @@ export function createStore(filePath, options = {}) {
     reportTagScore,
     resetStaleScoringTags,
     getAllTags,
+    getTagStats,
     normalizeTags,
     clearTags,
     data,

package/src/watch/db-stats.js

@@ -93,8 +93,11 @@ export function getDashboardStatsFromDb(targetLocations = []) {
     .prepare("SELECT COUNT(*) as total FROM jobs_base")
     .get().total;
 
+  const tagCount = db.prepare("SELECT COUNT(*) as total FROM tags").get().total;
+
   return {
     totalUsers: aggregateRow.total,
+    tagCount,
     rawJobs: getRawJobsCount(),
     dbTotalUsers: getUserDbCount(),
     jobsTotal: aggregateRow.total,

package/src/watch/db-tags.js

@@ -33,17 +33,61 @@ export function insertTag(tag, countries, source = "llm") {
   }
 }
 
-export function getTagsByStatus(status, limit = 100) {
+export function getTagsByStatus(
+  status,
+  limit = 100,
+  offset = 0,
+  country = null,
+) {
   const db = getDb();
   if (!db) return [];
-  const rows = db
-    .prepare(
-      "SELECT * FROM tags WHERE status = ? ORDER BY score ASC, created_at ASC LIMIT ?",
-    )
-    .all(status, limit);
+  let sql = "SELECT * FROM tags WHERE status = ?";
+  const params = [status];
+  if (country) {
+    sql += " AND countries LIKE ?";
+    params.push(`%"${country}"%`);
+  }
+  sql += " ORDER BY score ASC, created_at ASC LIMIT ? OFFSET ?";
+  params.push(limit, offset);
+  const rows = db.prepare(sql).all(...params);
   return rows.map(parseTagRow);
 }
 
+export function getTagStats(country = null) {
+  const db = getDb();
+  if (!db) return null;
+  let sql = `SELECT
+    COUNT(*) as total,
+    SUM(CASE WHEN status = 'productive' THEN 1 ELSE 0 END) as productive,
+    SUM(CASE WHEN status = 'dead' THEN 1 ELSE 0 END) as dead,
+    SUM(CASE WHEN status = 'new' THEN 1 ELSE 0 END) as newCount,
+    SUM(CASE WHEN status = 'scoring' THEN 1 ELSE 0 END) as scoring
+  FROM tags`;
+  const params = [];
+  if (country) {
+    sql += " WHERE countries LIKE ?";
+    params.push(`%"${country}"%`);
+  }
+  const row = db.prepare(sql).get(...params);
+  // 获取所有出现过的国家
+  const allRows = db.prepare("SELECT countries FROM tags").all();
+  const countrySet = new Set();
+  for (const r of allRows) {
+    try {
+      const arr = JSON.parse(r.countries || "[]");
+      for (const c of arr) countrySet.add(c);
+    } catch {}
+  }
+  return {
+    total: row.total,
+    productive: row.productive || 0,
+    dead: row.dead || 0,
+    new: row.newCount || 0,
+    scoring: row.scoring || 0,
+    countries: [...countrySet].sort(),
+  };
+}
+
 export function getTagsByCountry(country, minScore = 0) {
   const db = getDb();
   if (!db) return [];
@@ -153,12 +197,18 @@ export function reportTagScore(tag, fields) {
   }
 }
 
-export function getAllTags(limit = 200) {
+export function getAllTags(limit = 200, offset = 0, country = null) {
   const db = getDb();
   if (!db) return [];
-  const rows = db
-    .prepare("SELECT * FROM tags ORDER BY score DESC, created_at DESC LIMIT ?")
-    .all(limit);
+  let sql = "SELECT * FROM tags";
+  const params = [];
+  if (country) {
+    sql += " WHERE countries LIKE ?";
+    params.push(`%"${country}"%`);
+  }
+  sql += " ORDER BY score DESC, created_at DESC LIMIT ? OFFSET ?";
+  params.push(limit, offset);
+  const rows = db.prepare(sql).all(...params);
   return rows.map(parseTagRow);
 }
 

package/src/watch/public/app.js

@@ -167,6 +167,7 @@ function renderStats() {
   flashEl("statTarget", d.targetUsers, { full: true });
   flashEl("statUserUpdateTasks", d.userUpdateTasks || 0, { full: true });
   flashEl("statRawJobs", d.rawJobs || 0);
+  flashEl("statTags", d.tagCount || 0, { full: true });
   // 同步子页面 stats
   const pendingTotal = document.getElementById("pendingStatTotal");
   if (pendingTotal) pendingTotal.textContent = formatStatNum(d.totalUsers);
@@ -1037,6 +1038,8 @@ function handleRoute() {
     showRawPage();
   } else if (hash === "#target") {
     showTargetPage();
+  } else if (hash === "#tags") {
+    showTagsPage();
   } else {
     showMainPage();
   }
@@ -1064,6 +1067,7 @@ function showPendingPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("tagsPage").classList.remove("active");
   fetchPendingByCountry();
   fetchAttachStuckByCountry();
 }
@@ -1074,6 +1078,7 @@ function showUserUpdatePage() {
   document.getElementById("userUpdatePage").classList.add("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("tagsPage").classList.remove("active");
   fetchUserUpdateByCountry();
   fetchAttachStuckByCountry();
 }
@@ -1091,6 +1096,7 @@ function showRawPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.add("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("tagsPage").classList.remove("active");
   fetchRawByCountry();
   fetchRawJobs();
 }
@@ -1101,18 +1107,419 @@ function showMainPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("tagsPage").classList.remove("active");
 }
 
 function navigateToTarget() {
   window.location.hash = "#target";
 }
 
+function navigateToTags() {
+  window.location.hash = "#tags";
+}
+
+// ========== 添加关键词弹窗 ==========
+
+function openAddTagModal() {
+  let overlay = document.getElementById("addTagModalOverlay");
+  if (overlay) return;
+  overlay = document.createElement("div");
+  overlay.id = "addTagModalOverlay";
+  overlay.className = "modal-overlay";
+  overlay.innerHTML = `
+    <div class="modal">
+      <h3>添加关键词</h3>
+      <div class="hint">每行一个关键词，不带 # 号。新关键词默认待打分状态。</div>
+      <textarea id="addTagModalInput" placeholder="例如：&#10;fashion&#10;beauty&#10;skincare&#10;travel" style="height:160px"></textarea>
+      <div class="preview" id="addTagModalPreview"></div>
+      <div class="form-row">
+        <label style="color:#aaa;font-size:12px">选择国家（可多选）：</label>
+        <div id="addTagCountryCheckboxes" style="display:flex;flex-wrap:wrap;gap:6px;margin-top:6px">
+        </div>
+      </div>
+      <div class="btn-row">
+        <button class="btn-cancel" onclick="closeAddTagModal()">取消</button>
+        <button class="btn-submit" onclick="submitAddTags()">确认添加</button>
+      </div>
+    </div>
+  `;
+  document.body.appendChild(overlay);
+  overlay.addEventListener("click", (e) => {
+    if (e.target === overlay) closeAddTagModal();
+  });
+
+  // 渲染国家复选框
+  const countryGrid = document.getElementById("addTagCountryCheckboxes");
+  const TARGET_LOCATIONS = [
+    "AT",
+    "BE",
+    "CZ",
+    "DE",
+    "ES",
+    "FR",
+    "GR",
+    "HU",
+    "IE",
+    "IT",
+    "NL",
+    "PL",
+    "PT",
+  ];
+  countryGrid.innerHTML = TARGET_LOCATIONS.map(
+    (c) =>
+      `<label class="checkbox-label"><input type="checkbox" value="${c}" checked> ${c}</label>`,
+  ).join("");
+
+  const ta = document.getElementById("addTagModalInput");
+  ta.focus();
+  ta.addEventListener("input", () => updateAddTagPreview());
+  ta.addEventListener("keydown", (e) => {
+    if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      submitAddTags();
+    }
+  });
+  document.addEventListener(
+    "keydown",
+    (window.addTagEscHandler = (e) => {
+      if (e.key === "Escape") closeAddTagModal();
+    }),
+  );
+}
+
+function closeAddTagModal() {
+  const overlay = document.getElementById("addTagModalOverlay");
+  if (overlay) overlay.remove();
+  if (window.addTagEscHandler) {
+    document.removeEventListener("keydown", window.addTagEscHandler);
+    delete window.addTagEscHandler;
+  }
+}
+
+function updateAddTagPreview() {
+  const ta = document.getElementById("addTagModalInput");
+  const preview = document.getElementById("addTagModalPreview");
+  if (!ta || !preview) return;
+  const tags = ta.value
+    .split("\n")
+    .map((s) => s.trim().replace(/^#+/, ""))
+    .filter(Boolean);
+  preview.textContent = tags.length ? `共 ${tags.length} 个关键词` : "";
+}
+
+async function submitAddTags() {
+  const ta = document.getElementById("addTagModalInput");
+  const raw = ta ? ta.value.trim() : "";
+  if (!raw) {
+    showToast("请输入关键词", true);
+    return;
+  }
+
+  const tags = raw
+    .split("\n")
+    .map((s) => s.trim().replace(/^#+/, ""))
+    .filter(Boolean);
+  if (tags.length === 0) {
+    showToast("请输入有效关键词", true);
+    return;
+  }
+
+  // 获取选中的国家
+  const checkedBoxes = document.querySelectorAll(
+    "#addTagCountryCheckboxes input[type=checkbox]:checked",
+  );
+  const countries = Array.from(checkedBoxes).map((cb) => cb.value);
+  if (countries.length === 0) {
+    showToast("请至少选择一个国家", true);
+    return;
+  }
+
+  showLoading("正在添加关键词...");
+  try {
+    const res = await fetch("/api/tags/batch-add", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ tags, countries }),
+    });
+    const data = await res.json();
+    if (data.error) {
+      showToast(data.error, true);
+      return;
+    }
+    closeAddTagModal();
+    showToast(`已添加 ${data.added} 个关键词`);
+    loadTagsPage();
+  } catch (e) {
+    showToast("添加失败: " + e.message, true);
+  } finally {
+    hideLoading();
+  }
+}
+
+// ========== 关键词页面 ==========
+
+let currentTags = [];
+let currentTagsFilter = "all";
+let currentTagsCountry = "";
+let currentTagsSort = { key: null, asc: true };
+let currentTagsTotal = 0;
+let currentTagsLoading = false;
+let currentTagsAllLoaded = false;
+let currentTagsSeq = 0;
+const TAGS_PAGE_SIZE = 200;
+let cachedTagCountries = [];
+
+function showTagsPage() {
+  document.getElementById("mainPage").classList.add("hidden");
+  document.getElementById("pendingPage").classList.remove("active");
+  document.getElementById("userUpdatePage").classList.remove("active");
+  document.getElementById("rawPage").classList.remove("active");
+  document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("tagsPage").classList.add("active");
+  showLoading("正在加载关键词...");
+  Promise.all([loadTagStats(), loadTagsPage()]).finally(hideLoading);
+}
+
+function setTagsFilter(filter) {
+  currentTagsFilter = filter;
+  currentTags = [];
+  currentTagsAllLoaded = false;
+  document
+    .querySelectorAll("#tagsPage .controls button[data-tags-filter]")
+    .forEach((b) => {
+      b.classList.toggle("active", b.dataset.tagsFilter === filter);
+    });
+  loadTagsPage();
+}
+
+async function loadTagStats() {
+  try {
+    const res = await fetch("/api/tags/stats");
+    const stats = await res.json();
+    if (!stats) return;
+    document.getElementById("tagsPageStatTotal").textContent = stats.total || 0;
+    flashEl("tagsPageStatProductive", stats.productive || 0);
+    flashEl("tagsPageStatDead", stats.dead || 0);
+    flashEl("tagsPageStatNew", (stats.new || 0) + (stats.scoring || 0));
+    cachedTagCountries = stats.countries || [];
+    // 初始化国家下拉
+    renderTagsCountryFilter();
+  } catch (e) {
+    console.error("获取关键词统计失败:", e);
+  }
+}
+
+function renderTagsCountryFilter() {
+  const sel = document.getElementById("tagsCountryFilter");
+  if (!sel) return;
+  const val = sel.value;
+  sel.innerHTML =
+    '<option value="">全部国家</option>' +
+    cachedTagCountries
+      .map(
+        (c) =>
+          `<option value="${c}"${val === c ? " selected" : ""}>${c}</option>`,
+      )
+      .join("");
+}
+
+async function loadTagsPage(append = false) {
+  if (append && (currentTagsAllLoaded || currentTagsLoading)) return;
+  if (append) currentTagsLoading = true;
+
+  const seq = ++currentTagsSeq;
+  const country = document.getElementById("tagsCountryFilter").value;
+  const offset = append ? currentTags.length : 0;
+
+  try {
+    let url = `/api/tags?limit=${TAGS_PAGE_SIZE}&offset=${offset}`;
+    if (currentTagsFilter !== "all") url += `&status=${currentTagsFilter}`;
+    if (country) url += `&country=${encodeURIComponent(country)}`;
+
+    const res = await fetch(url);
+    const data = await res.json();
+
+    if (seq !== currentTagsSeq) return; // 旧请求丢弃
+
+    if (append) {
+      currentTags = currentTags.concat(data.tags || []);
+    } else {
+      currentTags = data.tags || [];
+      currentTagsTotal = data.total || 0;
+    }
+    currentTagsAllLoaded = currentTags.length >= currentTagsTotal;
+
+    renderTagsTable();
+  } catch (e) {
+    console.error("加载关键词失败:", e);
+  } finally {
+    if (append) currentTagsLoading = false;
+  }
+}
+
+function renderTagsTable() {
+  const el = document.getElementById("tagsTable");
+  const moreHint = document.getElementById("tagsMoreHint");
+  let display = [...currentTags];
+
+  // 搜索过滤（本地二次过滤）
+  const searchVal =
+    document.getElementById("tagsSearchInput")?.value.trim().toLowerCase() ||
+    "";
+  if (searchVal) {
+    display = display.filter((t) => t.tag.toLowerCase().includes(searchVal));
+  }
+
+  // 本地排序
+  if (currentTagsSort.key) {
+    display.sort((a, b) => {
+      let va = a[currentTagsSort.key];
+      let vb = b[currentTagsSort.key];
+      if (va == null && vb == null) return 0;
+      if (va == null) return 1;
+      if (vb == null) return -1;
+      if (typeof va === "number" && typeof vb === "number") {
+        return currentTagsSort.asc ? va - vb : vb - va;
+      }
+      va = String(va).toLowerCase();
+      vb = String(vb).toLowerCase();
+      return currentTagsSort.asc ? va.localeCompare(vb) : vb.localeCompare(va);
+    });
+  }
+
+  if (display.length === 0) {
+    el.innerHTML =
+      '<tr><td colspan="11" style="text-align:center;color:#888;padding:24px">暂无数据</td></tr>';
+    if (moreHint) moreHint.style.display = "none";
+    return;
+  }
+
+  const statusLabels = {
+    new: '<span class="tag pending">待打分</span>',
+    scoring: '<span class="tag processing">打分中</span>',
+    productive: '<span class="tag seller">有效</span>',
+    dead: '<span class="tag no-video">无效</span>',
+  };
+  const sourceLabels = {
+    llm: "LLM",
+    manual: "手动",
+  };
+
+  el.innerHTML = display
+    .map((t, i) => {
+      const countries = (t.countries || []).join(", ") || "-";
+      const statusTag =
+        statusLabels[t.status] ||
+        `<span class="tag pending">${t.status}</span>`;
+      const source = sourceLabels[t.source] || t.source || "-";
+      const created = t.created_at || "-";
+      const score = t.score != null ? t.score.toFixed(1) : "-";
+      const authorCount = t.author_count ?? "-";
+      const totalPosts = t.total_posts ?? "-";
+      const matchedAuthors = t.matched_authors ?? "-";
+      const pushedUsers = t.pushed_users ?? "-";
+
+      return `<tr>
+      <td style="color:#9ca3af;font-size:12px;text-align:center">${i + 1}</td>
+      <td style="font-weight:600;color:#e0e0e0">#${escapeHtml(t.tag)}</td>
+      <td style="color:${t.score >= 5 ? "#22c55e" : t.score >= 3 ? "#facc15" : "#888"}">${score}</td>
+      <td>${authorCount}</td>
+      <td>${totalPosts}</td>
+      <td>${matchedAuthors}</td>
+      <td>${pushedUsers}</td>
+      <td style="font-size:11px">${countries}</td>
+      <td>${statusTag}</td>
+      <td style="font-size:11px;color:#888">${source}</td>
+      <td style="font-size:11px;color:#888">${created}</td>
+    </tr>`;
+    })
+    .join("");
+
+  if (moreHint) {
+    moreHint.style.display = "";
+    if (currentTagsAllLoaded) {
+      moreHint.innerHTML = `已全部加载`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "default";
+    } else if (currentTagsLoading) {
+      moreHint.innerHTML = `加载中...`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "wait";
+    } else {
+      moreHint.innerHTML = `<u style="color:#3b82f6">点击加载更多</u> ↓`;
+      moreHint.style.color = "#6b7280";
+      moreHint.style.cursor = "pointer";
+    }
+  }
+}
+
+// ====== 关键词页面事件绑定 ======
+
+// 刷新
+document
+  .getElementById("refreshTagsBtn")
+  .addEventListener("click", async () => {
+    showLoading("正在刷新...");
+    try {
+      await Promise.all([loadTagStats(), loadTagsPage()]);
+      showToast("刷新完成");
+    } catch (e) {
+      showToast("刷新失败: " + e.message, true);
+    } finally {
+      hideLoading();
+    }
+  });
+
+// 国家筛选（事件委托，避免替换 innerHTML 后绑定丢失）
+document.getElementById("tagsPage").addEventListener("change", (e) => {
+  if (e.target && e.target.id === "tagsCountryFilter") {
+    currentTagsCountry = e.target.value;
+    showLoading("正在加载...");
+    loadTagsPage().finally(hideLoading);
+  }
+});
+
+// 搜索防抖
+let tagsSearchTimer = null;
+document.getElementById("tagsSearchInput").addEventListener("input", () => {
+  if (tagsSearchTimer) clearTimeout(tagsSearchTimer);
+  tagsSearchTimer = setTimeout(() => {
+    showLoading("正在搜索...");
+    loadTagsPage().finally(hideLoading);
+  }, 300);
+});
+
+// 加载更多
+function loadMoreTags() {
+  loadTagsPage(true);
+}
+
+// 排序
+document.querySelectorAll(".sortable-tag").forEach((th) => {
+  th.addEventListener("click", () => {
+    const key = th.dataset.sort;
+    if (currentTagsSort.key === key) {
+      currentTagsSort.asc = !currentTagsSort.asc;
+    } else {
+      currentTagsSort.key = key;
+      currentTagsSort.asc = true;
+    }
+    th.querySelectorAll(".sort-icon").forEach(
+      (icon) => (icon.textContent = "↕"),
+    );
+    const icon = th.querySelector(".sort-icon");
+    if (icon) icon.textContent = currentTagsSort.asc ? "↑" : "↓";
+    renderTagsTable();
+  });
+});
+
 function showTargetPage() {
   document.getElementById("mainPage").classList.add("hidden");
   document.getElementById("pendingPage").classList.remove("active");
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.add("active");
+  document.getElementById("tagsPage").classList.remove("active");
   showLoading("正在加载目标商家数据...");
   fetchTargetByCountry();
   // 同步统计
@@ -1307,7 +1714,7 @@ function renderTargetTable() {
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
       const topPlayCount =
-        u.topVideoPlayCount != null && u.topVideoPlayCount > 0
+        u.topVideoPlayCount != null && u.topVideoPlayCount >= 1000
           ? formatNum(u.topVideoPlayCount)
           : "-";
       const topPlayCountCell = u.topVideoHref

package/src/watch/public/index.html

@@ -57,6 +57,10 @@
         <div class="label">目标商家</div>
         <div class="value target" id="statTarget">0</div>
       </div>
+      <div class="stat-card clickable pending-card" id="statTagsCard" onclick="navigateToTags()" style="cursor:pointer">
+        <div class="label">关键词</div>
+        <div class="value target" id="statTags">0</div>
+      </div>
     </div>
     <div id="activeClientsSection" class="active-clients-section" style="display:none">
       <div class="active-clients-bar" id="activeClientsBar"></div>
@@ -363,6 +367,77 @@
       </div>
     </div>
   </div>
+  <div id="tagsPage">
+    <div class="stats" style="margin-bottom:16px">
+      <div class="stat-card">
+        <div class="label">关键词总数</div>
+        <div class="value target" id="tagsPageStatTotal">0</div>
+      </div>
+      <div class="stat-card clickable pending-card" onclick="navigateToMain()" style="background:rgba(167,139,250,0.1)">
+        <div class="label">← 返回主页面</div>
+      </div>
+      <div class="stat-card">
+        <div class="label">有效</div>
+        <div class="value done" id="tagsPageStatProductive">0</div>
+      </div>
+      <div class="stat-card">
+        <div class="label">无效</div>
+        <div class="value error" id="tagsPageStatDead">0</div>
+      </div>
+      <div class="stat-card">
+        <div class="label">待打分</div>
+        <div class="value pending" id="tagsPageStatNew">0</div>
+      </div>
+      <div class="stat-card clickable" id="refreshTagsBtn" style="background:rgba(59,130,246,0.12);cursor:pointer">
+        <div class="label">🔄 刷新</div>
+      </div>
+    </div>
+    <div class="tags-layout">
+      <div class="tags-table-card">
+        <h3>关键词列表</h3>
+        <div class="controls">
+          <button onclick="openAddTagModal()"
+            style="padding:6px 12px;border:1px solid #a78bfa;border-radius:6px;background:rgba(167,139,250,0.12);color:#a78bfa;font-size:12px;font-weight:600;cursor:pointer;white-space:nowrap;transition:all 0.15s">+
+            添加关键词</button>
+          <input type="text" id="tagsSearchInput" placeholder="搜索关键词...">
+          <button data-tags-filter="all" class="active" onclick="setTagsFilter('all')">全部</button>
+          <button data-tags-filter="new" onclick="setTagsFilter('new')">待打分</button>
+          <button data-tags-filter="scoring" onclick="setTagsFilter('scoring')">打分中</button>
+          <button data-tags-filter="productive" onclick="setTagsFilter('productive')"
+            style="background:#166534;color:#fff">有效</button>
+          <button data-tags-filter="dead" onclick="setTagsFilter('dead')"
+            style="background:#7f1d1d;color:#fff">无效</button>
+          <select id="tagsCountryFilter"
+            style="padding:6px 10px;border:1px solid #333;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;">
+            <option value="">全部国家</option>
+          </select>
+        </div>
+        <div class="table-scroll">
+          <table>
+            <thead>
+              <tr>
+                <th style="width:40px">#</th>
+                <th style="min-width:120px">关键词</th>
+                <th class="sortable-tag" data-sort="score">评分 <span class="sort-icon">↕</span></th>
+                <th class="sortable-tag" data-sort="author_count">作者数 <span class="sort-icon">↕</span></th>
+                <th class="sortable-tag" data-sort="total_posts">帖子数 <span class="sort-icon">↕</span></th>
+                <th class="sortable-tag" data-sort="matched_authors">匹配作者 <span class="sort-icon">↕</span></th>
+                <th class="sortable-tag" data-sort="pushed_users">推送用户 <span class="sort-icon">↕</span></th>
+                <th>国家</th>
+                <th>状态</th>
+                <th>来源</th>
+                <th>创建时间</th>
+              </tr>
+            </thead>
+            <tbody id="tagsTable"></tbody>
+          </table>
+          <div id="tagsMoreHint" onclick="loadMoreTags()"
+            style="text-align:center;padding:10px 8px;font-size:13px;color:#6b7280;cursor:default;user-select:none;transition:color 0.2s">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
   <script src="app.js"></script>
 </body>
 

package/src/watch/public/style.css

@@ -1439,3 +1439,103 @@ td.user-id:hover {
   border-color: #ef4444;
   color: #ef4444;
 }
+
+/* ===== 关键词页面 ===== */
+#tagsPage {
+  display: none;
+  padding-bottom: 40px;
+}
+
+#tagsPage.active {
+  display: block;
+}
+
+.tags-layout {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.tags-table-card {
+  background: #1c1c26;
+  border-radius: 10px;
+  padding: 16px;
+}
+
+.tags-table-card h3 {
+  font-size: 14px;
+  color: #e0e0e0;
+  margin-bottom: 12px;
+}
+
+#tagsPage .controls {
+  margin-bottom: 12px;
+}
+
+#tagsPage .controls button {
+  padding: 5px 10px;
+  border: 1px solid #333;
+  border-radius: 4px;
+  background: #2a2a3a;
+  color: #ccc;
+  font-size: 11px;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+#tagsPage .controls button.active {
+  background: #7c3aed;
+  color: #fff;
+  border-color: #7c3aed;
+}
+
+#tagsPage .controls button:hover:not(.active) {
+  border-color: #7c3aed;
+  color: #a78bfa;
+}
+
+#tagsTable td {
+  font-size: 12px;
+}
+
+#tagsTable td:nth-child(3),
+#tagsTable td:nth-child(4),
+#tagsTable td:nth-child(5),
+#tagsTable td:nth-child(6),
+#tagsTable td:nth-child(7) {
+  font-family: monospace;
+  text-align: right;
+  color: #9ca3af;
+}
+
+.form-row {
+  margin-top: 12px;
+}
+
+.form-row label {
+  display: block;
+  margin-bottom: 4px;
+}
+
+.checkbox-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 4px 10px;
+  border: 1px solid #333;
+  border-radius: 4px;
+  background: #0f0f13;
+  color: #ccc;
+  font-size: 12px;
+  cursor: pointer;
+  transition: all 0.15s;
+  user-select: none;
+}
+
+.checkbox-label:hover {
+  border-color: #a78bfa;
+}
+
+.checkbox-label input[type="checkbox"] {
+  accent-color: #a78bfa;
+}

package/src/watch/server.js

@@ -1147,26 +1147,32 @@ export function startWatchServer(
         return;
       }
 
-      // GET /api/tags?status=&country=&limit=
+      // GET /api/tags/stats — 关键词统计（总数/各状态/国家列表）
+      if (req.method === "GET" && routePath === "/api/tags/stats") {
+        const stats = store.getTagStats();
+        sendJSON(res, 200, stats || { total: 0, countries: [] });
+        return;
+      }
+
+      // GET /api/tags?status=&country=&limit=&offset=
       if (req.method === "GET" && routePath === "/api/tags") {
         const status = params.status || null;
         const country = params.country || null;
-        const limit = Math.min(parseInt(params.limit) || 100, 500);
+        const limit = Math.min(parseInt(params.limit) || 200, 500);
+        const offset = parseInt(params.offset) || 0;
+        const upperCountry = country ? country.toUpperCase() : null;
 
         let tags;
         if (status) {
-          tags = store.getTagsByStatus(status, limit);
+          tags = store.getTagsByStatus(status, limit, offset, upperCountry);
         } else {
-          tags = store.getAllTags(limit);
-        }
-
-        if (country) {
-          tags = tags.filter((t) =>
-            t.countries.includes(country.toUpperCase()),
-          );
+          tags = store.getAllTags(limit, offset, upperCountry);
         }
 
-        sendJSON(res, 200, { tags, total: tags.length });
+        // 获取总数（带国家过滤）
+        const stats = store.getTagStats(upperCountry);
+        const total = stats ? stats.total : tags.length;
+        sendJSON(res, 200, { tags, total, offset, limit });
         return;
       }
 
@@ -1193,6 +1199,33 @@ export function startWatchServer(
         return;
       }
 
+      // POST /api/tags/batch-add — 批量添加关键词
+      if (req.method === "POST" && routePath === "/api/tags/batch-add") {
+        try {
+          const body = await readBody(req);
+          const { tags, countries } = body || {};
+          if (!Array.isArray(tags) || tags.length === 0) {
+            sendJSON(res, 400, { error: "tags 不能为空" });
+            return;
+          }
+          if (!Array.isArray(countries) || countries.length === 0) {
+            sendJSON(res, 400, { error: "countries 不能为空" });
+            return;
+          }
+          let added = 0;
+          for (const tag of tags) {
+            for (const c of countries) {
+              const ret = store.insertTag(tag, [c]);
+              if (ret.inserted) added++;
+            }
+          }
+          sendJSON(res, 200, { ok: true, added });
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
       // POST /api/tags/productive — CLI 模式上报 productive tag
       if (req.method === "POST" && routePath === "/api/tags/productive") {
         try {