tt-help-cli-ycl 1.4.144 → 1.4.146

package/src/watch/public/app.js

@@ -185,6 +185,7 @@ function renderStats() {
   flashEl("statPending", d.pendingUsers);
   flashEl("statError", d.errorUsers);
   flashEl("statTarget", d.targetUsers, { full: true });
+  flashEl("statPrecise", d.preciseMerchants, { full: true });
   // 检测目标商家新增，放烟花（仅首页，且开关开启时）
   const hash = window.location.hash.replace(/^#/, "");
   if (
@@ -1137,6 +1138,10 @@ document.getElementById("statTargetCard").addEventListener("click", () => {
   navigateToTarget();
 });
 
+document.getElementById("statPreciseCard").addEventListener("click", () => {
+  navigateToPrecise();
+});
+
 // Hash 路由
 window.addEventListener("hashchange", handleRoute);
 window.addEventListener("DOMContentLoaded", handleRoute);
@@ -1290,6 +1295,8 @@ function handleRoute() {
     showRawPage();
   } else if (hash === "#target") {
     showTargetPage();
+  } else if (hash === "#precise") {
+    showPrecisePage();
   } else if (hash === "#tags") {
     showTagsPage();
   } else if (hash === "#settings") {
@@ -1323,6 +1330,7 @@ function showPendingPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   fetchPendingByCountry();
@@ -1335,6 +1343,7 @@ function showUserUpdatePage() {
   document.getElementById("userUpdatePage").classList.add("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   fetchUserUpdateByCountry();
@@ -1354,6 +1363,7 @@ function showRawPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.add("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   fetchRawByCountry();
@@ -1366,6 +1376,7 @@ function showMainPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   document.getElementById("watchdogPage").classList.remove("active");
@@ -1379,6 +1390,20 @@ function navigateToTarget() {
   window.location.hash = "#target";
 }
 
+function navigateToPrecise() {
+  window.location.hash = "#precise";
+}
+
+// product-fill 任务查询条件表单：折叠 / 展开
+function togglePreciseCriteria() {
+  const body = document.getElementById("preciseCriteriaBody");
+  const arrow = document.getElementById("preciseCriteriaArrow");
+  if (!body) return;
+  const collapsed = body.style.display === "none";
+  body.style.display = collapsed ? "" : "none";
+  if (arrow) arrow.textContent = collapsed ? "▼" : "▶";
+}
+
 function navigateToTags() {
   window.location.hash = "#tags";
 }
@@ -1399,6 +1424,7 @@ function hideAllPages() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   document.getElementById("watchdogPage").classList.remove("active");
@@ -1858,6 +1884,220 @@ async function submitAddTags() {
   }
 }
 
+// ========== 精准商家页面 ==========
+
+async function showPrecisePage() {
+  hideAllPages();
+  document.getElementById("precisePage").classList.add("active");
+  // 每次进入都默认视频模式
+  setPreciseView("video");
+  showLoading("正在加载精准商家数据...");
+  await loadPreciseUsersPage(false, true);
+  hideLoading();
+}
+
+let currentPreciseUsers = [];
+let currentPreciseTotal = 0;
+let currentPreciseLoading = false;
+let currentPreciseAllLoaded = false;
+let currentPreciseSeq = 0;
+let currentPreciseView = "video";
+const PRECISE_PAGE_SIZE = 200;
+
+async function loadPreciseUsersPage(append = false, skipLoading = false) {
+  if (currentPreciseLoading) return;
+  currentPreciseLoading = true;
+  const seq = ++currentPreciseSeq;
+  const search = document.getElementById("preciseSearchInput")
+    ? document.getElementById("preciseSearchInput").value.trim()
+    : "";
+  const offset = append ? currentPreciseUsers.length : 0;
+  if (!append && !skipLoading) showLoading("正在加载数据...");
+
+  let data = null;
+  let error = null;
+  try {
+    let url = `/api/precise-merchants?limit=${PRECISE_PAGE_SIZE}&offset=${offset}`;
+    if (search) url += `&search=${encodeURIComponent(search)}`;
+    const res = await fetch(url);
+    data = await res.json();
+  } catch (e) {
+    error = e;
+    console.error("加载精准商家失败:", e);
+  } finally {
+    if (!append && !skipLoading) hideLoading();
+    currentPreciseLoading = false;
+    if (error || !data) return;
+    if (seq !== currentPreciseSeq && !append) return;
+    if (!append) {
+      currentPreciseUsers = data.users || [];
+      currentPreciseTotal = data.total || 0;
+    } else {
+      currentPreciseUsers = currentPreciseUsers.concat(data.users || []);
+      currentPreciseTotal = data.total || 0;
+    }
+    currentPreciseAllLoaded = currentPreciseUsers.length >= currentPreciseTotal;
+    renderPreciseView();
+  }
+}
+
+function setPreciseView(view) {
+  currentPreciseView = view === "table" ? "table" : "video";
+  const tableBtn = document.getElementById("preciseViewTableBtn");
+  const videoBtn = document.getElementById("preciseViewVideoBtn");
+  if (tableBtn)
+    tableBtn.classList.toggle("active", currentPreciseView === "table");
+  if (videoBtn)
+    videoBtn.classList.toggle("active", currentPreciseView === "video");
+  const videoWrap = document.getElementById("preciseVideoWrap");
+  const tableWrap = document.getElementById("preciseTableWrap");
+  if (videoWrap)
+    videoWrap.style.display = currentPreciseView === "video" ? "" : "none";
+  if (tableWrap)
+    tableWrap.style.display = currentPreciseView === "table" ? "" : "none";
+  renderPreciseView();
+}
+
+function renderPreciseView() {
+  if (currentPreciseView === "table") {
+    renderPreciseTable();
+  } else {
+    renderPreciseVideos();
+  }
+  updatePreciseMoreHint();
+}
+
+function updatePreciseMoreHint() {
+  const moreHint = document.getElementById("preciseMoreHint");
+  const totalEl = document.getElementById("precisePageStatTotal");
+  if (totalEl)
+    totalEl.textContent = formatStatNum(currentPreciseTotal, { full: true });
+  if (!moreHint) return;
+  if (currentPreciseTotal === 0) {
+    moreHint.textContent = "";
+    moreHint.style.display = "none";
+  } else if (currentPreciseAllLoaded) {
+    moreHint.textContent = `共 ${currentPreciseTotal} 个，已全部加载`;
+    moreHint.onclick = null;
+    moreHint.style.cursor = "default";
+    moreHint.style.color = "#6b7280";
+  } else {
+    moreHint.textContent = "点击加载更多";
+    moreHint.onclick = () => loadPreciseUsersPage(true);
+    moreHint.style.cursor = "pointer";
+    moreHint.style.color = "#60a5fa";
+  }
+}
+
+function renderPreciseTable() {
+  const el = document.getElementById("preciseTable");
+  if (!el) return;
+  if (!currentPreciseUsers.length) {
+    el.innerHTML =
+      '<tr><td colspan="12" style="text-align:center;color:#666;padding:20px">暂无精准商家</td></tr>';
+    return;
+  }
+  el.innerHTML = currentPreciseUsers
+    .map((u, i) => {
+      const sold = u.productSoldCount ?? 0;
+      const ec = u.ecOver1k ?? 0;
+      const maxEc = u.maxEcPlay ?? 0;
+      const title = (u.productName || "").replace(/</g, "&lt;");
+      return `<tr>
+        <td style="text-align:right;color:#666">${i + 1}</td>
+        <td><a href="https://www.tiktok.com/@${encodeURIComponent(u.uniqueId)}" target="_blank">@${escapeHtml(u.uniqueId)}</a></td>
+        <td>${escapeHtml(u.nickname || "-")}</td>
+        <td>${formatNum(u.followerCount || 0)}</td>
+        <td>${u.videoCount || 0}</td>
+        <td>${u.locationCreated || "-"}</td>
+        <td style="color:#22c55e">${formatNum(sold)}</td>
+        <td style="color:#f87171">${u.productReviewCount ?? 0}</td>
+        <td>${u.productRating != null ? u.productRating : "-"}</td>
+        <td>${ec}</td>
+        <td>${formatNum(maxEc)}</td>
+        <td style="max-width:220px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="${title}">${title || "-"}</td>
+      </tr>`;
+    })
+    .join("");
+}
+
+function renderPreciseVideos() {
+  const wrap = document.getElementById("preciseVideoWrap");
+  if (!wrap) return;
+  if (!currentPreciseUsers.length) {
+    wrap.innerHTML =
+      '<div style="color:#666;text-align:center;padding:24px">暂无精准商家</div>';
+    return;
+  }
+  wrap.innerHTML = currentPreciseUsers
+    .map((u) => {
+      const vids = Array.isArray(u.recentEcVideos) ? u.recentEcVideos : [];
+      const maxPlay = vids.reduce((m, v) => Math.max(m, v.playCount || 0), 0);
+      const sold = u.productSoldCount ?? 0;
+      const review = u.productReviewCount ?? 0;
+      const rating = u.productRating != null ? u.productRating : "-";
+      const userLink = `https://www.tiktok.com/@${encodeURIComponent(u.uniqueId)}`;
+      const tiles = vids
+        .reduce((acc, v) => {
+          const play = v.playCount || 0;
+          const time = v.createTime ? formatShortDate(v.createTime) : "";
+          const isAd = v.isAd ? '<span class="pv-ad">广告</span>' : "";
+          const prod = v.seoUrl
+            ? `<a class="pv-product" href="${escapeAttr(v.seoUrl)}" target="_blank" title="${escapeHtml(v.productTitle || "查看商品")}"><span class="pv-product-icon">🛒</span>${escapeHtml((v.productTitle || "查看商品").slice(0, 80))}</a>`
+            : "";
+          acc.push(`<div class="precise-video-item">
+          <a class="precise-video-tile" href="${escapeAttr(v.href || "#")}" target="_blank" title="播放视频">
+            <span class="pv-play">▶</span>
+            <span class="pv-count${maxPlay > 0 && play === maxPlay ? " pv-count-max" : ""}">${formatNum(play)}</span>
+            <span class="pv-time">${time}</span>
+            ${isAd}
+          </a>
+          ${prod}
+        </div>`);
+          return acc;
+        }, [])
+        .join("");
+      return `<div class="precise-merchant-card">
+        <div class="precise-merchant-head">
+          <a class="pm-user" href="${userLink}" target="_blank">@${escapeHtml(u.uniqueId)}</a>
+          <span class="pm-nick">${escapeHtml(u.nickname || "-")}</span>
+          <span class="pm-country">${u.locationCreated || "-"}</span>
+          <span class="pm-stats">粉丝 ${formatNum(u.followerCount || 0)} · 视频 ${u.videoCount || 0} · 销量 ${formatNum(sold)} · 评论 ${review} · 评分 ${rating} · EC视频 ${vids.length}</span>
+        </div>
+        ${tiles ? `<div class="precise-video-grid">${tiles}</div>` : '<div style="color:#666;font-size:12px;padding:6px 0">该商家暂无 EC 视频数据</div>'}
+      </div>`;
+    })
+    .join("");
+}
+
+function formatShortDate(sec) {
+  if (!sec) return "";
+  const d = new Date(sec * 1000);
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+function escapeAttr(str) {
+  return String(str)
+    .replace(/&/g, "&amp;")
+    .replace(/"/g, "&quot;")
+    .replace(/</g, "&lt;");
+}
+
+function clearPreciseFilters() {
+  const input = document.getElementById("preciseSearchInput");
+  if (input) input.value = "";
+  loadPreciseUsersPage();
+}
+
+let preciseSearchTimer = null;
+document.getElementById("preciseSearchInput").addEventListener("input", () => {
+  if (preciseSearchTimer) clearTimeout(preciseSearchTimer);
+  preciseSearchTimer = setTimeout(() => {
+    loadPreciseUsersPage();
+  }, 300);
+});
+
 // ========== 关键词页面 ==========
 
 let currentTags = [];
@@ -1879,6 +2119,7 @@ function showTagsPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.remove("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.add("active");
   document.getElementById("settingsPage").classList.remove("active");
   showLoading("正在加载关键词...");
@@ -2353,6 +2594,7 @@ function showTargetPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.add("active");
+  document.getElementById("precisePage").classList.remove("active");
   document.getElementById("tagsPage").classList.remove("active");
   document.getElementById("settingsPage").classList.remove("active");
   showLoading("正在加载目标商家数据...");
@@ -3569,12 +3811,14 @@ fetchUsers();
 fetchClientErrors();
 initTableSorting();
 initTargetTableSorting();
+fetchWatchdogBadge();
 
 // 错峰轮询（服务端已缓存，瞬时响应无压力）
 setInterval(fetchStats, 10000);
 setTimeout(() => setInterval(fetchUsers, 10000), 2500);
 setTimeout(() => setInterval(fetchClientErrors, 10000), 5000);
 setTimeout(() => setInterval(refreshUserUpdateIfActive, 10000), 7500);
+setTimeout(() => setInterval(fetchWatchdogBadge, 30000), 9000);
 
 // ========== 看门狗页面 ==========
 
@@ -3598,6 +3842,7 @@ async function fetchWatchdogData() {
   try {
     const res = await fetch("/api/watchdog/clients");
     _wdData = await res.json();
+    updateWatchdogBadge(_wdData.clients || [], _wdData.clientCommands || {});
     renderWatchdogDashboard(
       _wdData.clients || [],
       _wdData.clientCommands || {},
@@ -3613,6 +3858,51 @@ async function fetchWatchdogData() {
   }
 }
 
+// ── 导航栏"看门狗"离线 badge ──
+// 离线数口径与看门狗页面卡片一致：
+//   = 已注册但离线的客户端数 + 配置了命令但从未注册（renderOfflineCard）的 userId 数
+function updateWatchdogBadge(clients, clientCommands) {
+  const badge = document.getElementById("wdOfflineBadge");
+  if (!badge) return;
+  const offlineClients = clients.filter(function (c) {
+    return !c.online;
+  }).length;
+  const registeredUids = {};
+  clients.forEach(function (c) {
+    if (c.config && c.config.userId) {
+      registeredUids[c.config.userId] = true;
+    }
+  });
+  let neverRegistered = 0;
+  for (var uid in clientCommands) {
+    if (
+      clientCommands[uid] &&
+      clientCommands[uid].length > 0 &&
+      !registeredUids[uid]
+    ) {
+      neverRegistered++;
+    }
+  }
+  const total = offlineClients + neverRegistered;
+  if (total > 0) {
+    badge.textContent = total;
+    badge.style.display = "";
+  } else {
+    badge.style.display = "none";
+  }
+}
+
+// 独立轻量轮询：导航栏 badge 在任何页面都实时显示离线数
+async function fetchWatchdogBadge() {
+  try {
+    const res = await fetch("/api/watchdog/clients");
+    const data = await res.json();
+    updateWatchdogBadge(data.clients || [], data.clientCommands || {});
+  } catch (e) {
+    // 静默失败，保留旧值
+  }
+}
+
 // ── 渲染辅助 ──
 
 function tag(tagName, attrs, content) {

package/src/watch/public/index.html

@@ -21,7 +21,9 @@
         <span>🎆</span>
       </label>
       <a class="script-link" onclick="navigateToSettings()" style="cursor:pointer">⚙️ 配置</a>
-      <a class="script-link" onclick="navigateToWatchdog()" style="cursor:pointer">🐕 看门狗</a>
+      <a class="script-link" onclick="navigateToWatchdog()" style="cursor:pointer;position:relative"
+        title="看门狗离线客户端数">🐕 看门狗<span id="wdOfflineBadge"
+          style="display:none;position:absolute;top:-9px;right:-8px;background:#ef4444;color:#fff;border-radius:10px;font-size:10px;font-weight:700;line-height:1;padding:3px 6px;box-shadow:0 0 6px rgba(239,68,68,0.6);white-space:nowrap">0</span></a>
       <span class="status" id="lastUpdate">--</span>
     </div>
   </div>
@@ -59,6 +61,10 @@
         <div class="label">目标商家</div>
         <div class="value target" id="statTarget">0</div>
       </div>
+      <div class="stat-card clickable" id="statPreciseCard" onclick="navigateToPrecise()">
+        <div class="label">精准商家</div>
+        <div class="value target" id="statPrecise">0</div>
+      </div>
       <div class="stat-card clickable pending-card" id="statCommentTaskCard">
         <div class="label">待评论任务</div>
         <div class="value rose" id="statCommentTask">0</div>
@@ -379,6 +385,98 @@
     </div>
     <div id="backToTop" title="回到顶部（可拖动）">↑</div>
   </div>
+  <div id="precisePage">
+    <div class="stats" style="margin-bottom:16px">
+      <div class="stat-card">
+        <div class="label">精准商家</div>
+        <div class="value target" id="precisePageStatTotal">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>
+    <!-- 精准商家检索条件（静态表单展示，与 src/watch/data-store.js getPreciseMerchantsFromDb 保持一致） -->
+    <div style="margin-bottom:16px;background:#1a1a24;border:1px solid #333;border-radius:8px;overflow:hidden">
+      <div
+        style="display:flex;align-items:center;justify-content:space-between;padding:10px 14px;cursor:pointer;user-select:none"
+        onclick="togglePreciseCriteria()" title="点击展开/收起">
+        <div style="display:flex;align-items:center;gap:8px;flex-wrap:wrap">
+          <span style="color:#f59e0b;font-size:14px">🎯</span>
+          <span style="font-size:13px;color:#e0e0e0;font-weight:600">精准商家检索条件</span>
+          <span style="font-size:11px;color:#666">（阈值参数 · jobs 表）</span>
+        </div>
+        <span id="preciseCriteriaArrow" style="color:#888;font-size:12px">▼</span>
+      </div>
+      <div id="preciseCriteriaBody" style="padding:2px 14px 14px">
+        <div style="font-size:11px;color:#888;margin-bottom:10px">以下阈值条件全部满足（AND），其余条件为固有规则：</div>
+        <div style="display:grid;grid-template-columns:repeat(auto-fill,minmax(260px,1fr));gap:10px">
+          <div style="background:#14141d;border:1px solid #2a2a3a;border-radius:8px;padding:10px 12px">
+            <div style="display:flex;justify-content:space-between;align-items:center;gap:8px">
+              <span style="font-size:12px;color:#60a5fa;font-weight:600">商品评论数</span>
+              <span style="font-size:10px;color:#666;font-family:monospace">product_review_count</span>
+            </div>
+            <div style="margin-top:6px;font-size:16px;color:#4ade80;font-weight:700">= 0</div>
+            <div style="margin-top:4px;font-size:11px;color:#888;line-height:1.5">商品评论数为 0</div>
+          </div>
+          <div style="background:#14141d;border:1px solid #2a2a3a;border-radius:8px;padding:10px 12px">
+            <div style="display:flex;justify-content:space-between;align-items:center;gap:8px">
+              <span style="font-size:12px;color:#60a5fa;font-weight:600">商品销量</span>
+              <span style="font-size:10px;color:#666;font-family:monospace">product_sold_count</span>
+            </div>
+            <div style="margin-top:6px;font-size:16px;color:#4ade80;font-weight:700">&gt; 10</div>
+            <div style="margin-top:4px;font-size:11px;color:#888;line-height:1.5">商品销量大于 10</div>
+          </div>
+          <div style="background:#14141d;border:1px solid #2a2a3a;border-radius:8px;padding:10px 12px">
+            <div style="display:flex;justify-content:space-between;align-items:center;gap:8px">
+              <span style="font-size:12px;color:#60a5fa;font-weight:600">EC 视频播放量</span>
+              <span style="font-size:10px;color:#666;font-family:monospace">playCount</span>
+            </div>
+            <div style="margin-top:6px;font-size:16px;color:#4ade80;font-weight:700">&gt; 1000</div>
+            <div style="margin-top:4px;font-size:11px;color:#888;line-height:1.5">最近 7 天发布的 EC 视频（isECVideo）中，存在播放量超过
+              1000 的视频</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="table-wrap">
+      <div class="precise-list-header">
+        <h3>精准商家列表</h3>
+        <div class="view-toggle">
+          <button id="preciseViewTableBtn" onclick="setPreciseView('table')">表格</button>
+          <button id="preciseViewVideoBtn" onclick="setPreciseView('video')" class="active">视频</button>
+        </div>
+      </div>
+      <div class="controls">
+        <input type="text" id="preciseSearchInput" placeholder="搜索精准商家用户名 / 昵称...">
+        <button onclick="clearPreciseFilters()">清空筛选</button>
+      </div>
+      <div id="preciseVideoWrap"></div>
+      <div class="table-scroll" id="preciseTableWrap" style="display:none">
+        <table>
+          <thead>
+            <tr>
+              <th style="width:48px">#</th>
+              <th>用户名</th>
+              <th>昵称</th>
+              <th>粉丝</th>
+              <th>视频</th>
+              <th>国家</th>
+              <th>销量</th>
+              <th>评论</th>
+              <th>评分</th>
+              <th>EC超1k视频数</th>
+              <th>最高EC播放</th>
+              <th>商品</th>
+            </tr>
+          </thead>
+          <tbody id="preciseTable"></tbody>
+        </table>
+      </div>
+      <div id="preciseMoreHint" onclick="loadPreciseUsersPage(true)"
+        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 id="tagsPage">
     <div class="stats" style="margin-bottom:16px">
       <div class="stat-card">