tt-help-cli-ycl 1.4.17 → 1.4.18

package/src/watch/public/app.js

@@ -256,13 +256,21 @@ function renderActiveClients(clients) {
   const tbody = document.getElementById("activeClientsBody");
   if (!section || !bar) return;
 
-  const types = ["explore", "refresh", "attach", "comments", "scoring"];
+  const types = [
+    "explore",
+    "refresh",
+    "attach",
+    "comments",
+    "scoring",
+    "tag-refresh",
+  ];
   const labels = {
     explore: "Explore",
     refresh: "Refresh",
     attach: "Attach",
     comments: "Comments",
     scoring: "Scoring",
+    "tag-refresh": "TagRefresh",
   };
   const grouped = {};
   for (const c of clients) {
@@ -352,7 +360,7 @@ function renderCountryChart(countries) {
       const isTarget = targetLocations.includes(c.country);
       const targetBadge =
         c.targetCount > 0
-          ? `<span class="target-badge">🎯 ${c.targetCount}</span>`
+          ? `<span class="target-badge${isTarget ? "" : " target-badge-other"}">🎯 ${c.targetCount}</span>`
           : `<span class="target-badge" style="visibility:hidden"> </span>`;
       return `
     <div class="bar-row${isTarget ? " is-target" : ""}">
@@ -796,6 +804,55 @@ async function confirmNonSeller(uniqueId) {
   }
 }
 
+async function moveToBase(uniqueId) {
+  if (
+    !confirm(
+      `确定要将 @${uniqueId} 移到 jobs_base 并重走流程吗？\n这会将用户从 jobs 表移到 jobs_base，完全从头开始采集。`,
+    )
+  ) {
+    return;
+  }
+  showLoading("正在移动...");
+  try {
+    const res = await fetch(
+      `/api/user-move-to-base/${encodeURIComponent(uniqueId)}`,
+      {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+      },
+    );
+    const data = await res.json();
+    if (data.error) {
+      showToast(data.error, true);
+      return;
+    }
+    showToast(`@${uniqueId} 已移到 jobs_base，将重走流程`);
+
+    // 从当前列表中移除该用户
+    currentTargetUsers = currentTargetUsers.filter(
+      (u) => u.uniqueId !== uniqueId,
+    );
+    currentTargetTotal = Math.max(0, currentTargetTotal - 1);
+    renderTargetTable();
+
+    // 更新统计
+    const statEl = document.getElementById("targetPageStatTotal");
+    if (statEl)
+      statEl.textContent = formatStatNum(currentTargetTotal, { full: true });
+    if (currentStats) {
+      currentStats.targetUsers = Math.max(
+        0,
+        (currentStats.targetUsers || 0) - 1,
+      );
+      flashEl("statTarget", currentStats.targetUsers, { full: true });
+    }
+  } catch (e) {
+    showToast("移动失败: " + e.message, true);
+  } finally {
+    hideLoading();
+  }
+}
+
 async function submitAddUsers() {
   const ta = document.getElementById("modalUserInput");
   const raw = ta.value.trim();
@@ -1051,6 +1108,121 @@ function scrollToTop() {
   window.scrollTo({ top: 0, behavior: "smooth" });
 }
 
+// ── 回顶部按钮拖拽 ──
+(function initBackToTopDrag() {
+  const btn = document.getElementById("backToTop");
+  if (!btn) return;
+
+  let startX,
+    startY,
+    startLeft,
+    startTop,
+    dragging = false,
+    moved = false;
+  const DRAG_THRESHOLD = 5;
+  const STORAGE_KEY = "backToTopPos";
+
+  // 恢复保存的位置
+  const saved = (function () {
+    try {
+      return JSON.parse(localStorage.getItem(STORAGE_KEY));
+    } catch (_) {
+      return null;
+    }
+  })();
+  if (
+    saved &&
+    typeof saved.left === "number" &&
+    typeof saved.top === "number"
+  ) {
+    btn.style.left = saved.left + "px";
+    btn.style.top = saved.top + "px";
+    btn.style.right = "auto";
+    btn.style.bottom = "auto";
+  }
+
+  function clamp(val, min, max) {
+    return Math.min(Math.max(val, min), max);
+  }
+
+  function getPos(e) {
+    if (e.touches) return { x: e.touches[0].clientX, y: e.touches[0].clientY };
+    return { x: e.clientX, y: e.clientY };
+  }
+
+  function onStart(e) {
+    if (e.button !== undefined && e.button !== 0) return; // 只响应左键
+    const pos = getPos(e);
+    startX = pos.x;
+    startY = pos.y;
+    const rect = btn.getBoundingClientRect();
+    startLeft = rect.left;
+    startTop = rect.top;
+    moved = false;
+    dragging = true;
+    btn.classList.add("dragging");
+    btn.style.right = "auto";
+    btn.style.bottom = "auto";
+    btn.style.left = startLeft + "px";
+    btn.style.top = startTop + "px";
+    e.preventDefault();
+  }
+
+  function onMove(e) {
+    if (!dragging) return;
+    const pos = getPos(e);
+    const dx = pos.x - startX;
+    const dy = pos.y - startY;
+    if (
+      !moved &&
+      Math.abs(dx) < DRAG_THRESHOLD &&
+      Math.abs(dy) < DRAG_THRESHOLD
+    )
+      return;
+    moved = true;
+    const newLeft = clamp(
+      startLeft + dx,
+      0,
+      window.innerWidth - btn.offsetWidth,
+    );
+    const newTop = clamp(
+      startTop + dy,
+      0,
+      window.innerHeight - btn.offsetHeight,
+    );
+    btn.style.left = newLeft + "px";
+    btn.style.top = newTop + "px";
+  }
+
+  function onEnd() {
+    if (!dragging) return;
+    dragging = false;
+    btn.classList.remove("dragging");
+    if (moved) {
+      // 保存位置
+      try {
+        localStorage.setItem(
+          STORAGE_KEY,
+          JSON.stringify({
+            left: parseInt(btn.style.left),
+            top: parseInt(btn.style.top),
+          }),
+        );
+      } catch (_) {}
+    } else {
+      // 未拖动则视为点击
+      scrollToTop();
+    }
+  }
+
+  btn.addEventListener("mousedown", onStart);
+  btn.addEventListener("touchstart", onStart, { passive: false });
+  window.addEventListener("mousemove", onMove);
+  window.addEventListener("touchmove", onMove, { passive: false });
+  window.addEventListener("mouseup", onEnd);
+  window.addEventListener("touchend", onEnd);
+})();
+
 function handleRoute() {
   const hash = window.location.hash;
   if (hash === "#pending") {
@@ -1291,6 +1463,7 @@ let currentTagsAllLoaded = false;
 let currentTagsSeq = 0;
 const TAGS_PAGE_SIZE = 200;
 let cachedTagCountries = [];
+let currentRefreshHours = 24;
 
 function showTagsPage() {
   document.getElementById("mainPage").classList.add("hidden");
@@ -1300,7 +1473,9 @@ function showTagsPage() {
   document.getElementById("targetPage").classList.remove("active");
   document.getElementById("tagsPage").classList.add("active");
   showLoading("正在加载关键词...");
-  Promise.all([loadTagStats(), loadTagsPage()]).finally(hideLoading);
+  Promise.all([loadTagStats(), loadTagsPage(), loadRefreshStats()]).finally(
+    hideLoading,
+  );
 }
 
 function setTagsFilter(filter) {
@@ -1325,13 +1500,94 @@ async function loadTagStats() {
     flashEl("tagsPageStatDead", stats.dead || 0);
     flashEl("tagsPageStatNew", (stats.new || 0) + (stats.scoring || 0));
     cachedTagCountries = stats.countries || [];
-    // 初始化国家下拉
     renderTagsCountryFilter();
   } catch (e) {
     console.error("获取关键词统计失败:", e);
   }
 }
 
+async function loadRefreshStats() {
+  try {
+    const res = await fetch(
+      `/api/tags/refresh-stats?hours=${currentRefreshHours}`,
+    );
+    const data = await res.json();
+    renderRefreshStats(data);
+  } catch (e) {
+    console.error("获取刷新统计失败:", e);
+  }
+}
+
+function renderRefreshStats(data) {
+  const el = document.getElementById("tagsRefreshStats");
+  if (!el || !data || !data.countries || data.countries.length === 0) {
+    if (el) el.innerHTML = "";
+    return;
+  }
+  const pct =
+    data.total > 0 ? Math.round((data.refreshed / data.total) * 100) : 0;
+  const barW = Math.min(pct, 100);
+
+  const HOUR_OPTIONS = [12, 24, 36, 48, 72];
+  let html = `<div style="background:#1a1a2e;border:1px solid #2a2a3a;border-radius:10px;padding:16px">
+    <div id="refreshStatsHeader" style="display:flex;align-items:center;gap:16px;cursor:pointer;user-select:none">
+      <span style="font-size:14px;font-weight:600;color:#e0e0e0;position:relative">
+        📊 最近 <span id="refreshHoursLabel" style="color:#60a5fa;cursor:pointer;text-decoration:underline dotted" onclick="event.stopPropagation();toggleHoursDropdown(event)">${currentRefreshHours}h</span> 刷新进度
+        <div id="refreshHoursDropdown" style="display:none;position:absolute;top:100%;left:0;margin-top:4px;background:#1e1e3a;border:1px solid #3b82f6;border-radius:8px;padding:4px 0;z-index:100;box-shadow:0 4px 16px rgba(0,0,0,0.5);min-width:60px">
+          ${HOUR_OPTIONS.map((h) => `<div class="hours-option" data-hours="${h}" style="padding:6px 14px;cursor:pointer;font-size:13px;color:${h === currentRefreshHours ? "#60a5fa" : "#ccc"};font-weight:${h === currentRefreshHours ? "600" : "400"};white-space:nowrap" onclick="event.stopPropagation();selectRefreshHours(${h})">${h}h</div>`).join("")}
+        </div>
+      </span>
+      <span style="font-size:13px;color:#9ca3af">${data.refreshed} / ${data.total}</span>
+      <div style="flex:1;max-width:200px;height:8px;background:#2a2a3a;border-radius:4px;overflow:hidden">
+        <div style="height:100%;width:${barW}%;background:${pct >= 50 ? "#22c55e" : "#facc15"};border-radius:4px;transition:width 0.3s"></div>
+      </div>
+      <span style="font-size:14px;font-weight:700;color:${pct >= 50 ? "#22c55e" : "#facc15"}">${pct}%</span>
+      <span id="refreshStatsArrow" style="color:#888;font-size:12px">▶</span>
+    </div>
+    <div id="refreshStatsBody" style="display:none;margin-top:12px">
+    <table style="width:100%;border-collapse:collapse;font-size:12px">
+      <thead><tr style="color:#888;text-align:left">
+        <th style="padding:4px 8px">国家</th>
+        <th style="padding:4px 8px;text-align:right">需刷新</th>
+        <th style="padding:4px 8px;text-align:right">${currentRefreshHours}h已刷</th>
+        <th style="padding:4px 8px;width:120px">进度</th>
+      </tr></thead>
+      <tbody>`;
+
+  for (const c of data.countries) {
+    const cpct = c.total > 0 ? Math.round((c.refreshed / c.total) * 100) : 0;
+    const cBarW = Math.min(cpct, 100);
+    html += `<tr style="color:#ccc;border-top:1px solid #222">
+      <td style="padding:4px 8px">${c.country}</td>
+      <td style="padding:4px 8px;text-align:right">${c.total}</td>
+      <td style="padding:4px 8px;text-align:right;color:${cpct >= 50 ? "#22c55e" : "#facc15"}">${c.refreshed}</td>
+      <td style="padding:4px 8px">
+        <div style="display:flex;align-items:center;gap:6px">
+          <div style="flex:1;height:6px;background:#2a2a3a;border-radius:3px;overflow:hidden">
+            <div style="height:100%;width:${cBarW}%;background:${cpct >= 50 ? "#22c55e" : "#facc15"};border-radius:3px"></div>
+          </div>
+          <span style="font-size:11px;color:#9ca3af;min-width:28px;text-align:right">${cpct}%</span>
+        </div>
+      </td>
+    </tr>`;
+  }
+
+  html += `</tbody></table></div></div>`;
+  el.innerHTML = html;
+
+  // 绑定展开/折叠
+  const header = document.getElementById("refreshStatsHeader");
+  const body = document.getElementById("refreshStatsBody");
+  const arrow = document.getElementById("refreshStatsArrow");
+  if (header && body && arrow) {
+    header.addEventListener("click", () => {
+      const open = body.style.display !== "none";
+      body.style.display = open ? "none" : "";
+      arrow.textContent = open ? "▶" : "▼";
+    });
+  }
+}
+
 function renderTagsCountryFilter() {
   const sel = document.getElementById("tagsCountryFilter");
   if (!sel) return;
@@ -1441,7 +1697,7 @@ function renderTagsTable() {
       const matchedAuthors = t.matched_authors ?? "-";
       const pushedUsers = t.pushed_users ?? "-";
       const refreshedAt = t.refreshed_at
-        ? t.refreshed_at.slice(0, 16).replace("T", " ")
+        ? formatTime(new Date(t.refreshed_at).getTime())
         : "-";
 
       return `<tr>
@@ -1486,7 +1742,7 @@ document
   .addEventListener("click", async () => {
     showLoading("正在刷新...");
     try {
-      await Promise.all([loadTagStats(), loadTagsPage()]);
+      await Promise.all([loadTagStats(), loadTagsPage(), loadRefreshStats()]);
       showToast("刷新完成");
     } catch (e) {
       showToast("刷新失败: " + e.message, true);
@@ -1519,6 +1775,46 @@ function loadMoreTags() {
   loadTagsPage(true);
 }
 
+// ====== 刷新统计时间切换 ======
+
+function toggleHoursDropdown(event) {
+  const dropdown = document.getElementById("refreshHoursDropdown");
+  if (!dropdown) return;
+  const isOpen = dropdown.style.display !== "none";
+  dropdown.style.display = isOpen ? "none" : "block";
+}
+
+async function selectRefreshHours(hours) {
+  const dropdown = document.getElementById("refreshHoursDropdown");
+  if (dropdown) dropdown.style.display = "none";
+  if (hours === currentRefreshHours) return;
+  currentRefreshHours = hours;
+  showLoading("正在加载...");
+  try {
+    await loadRefreshStats();
+    const label = document.getElementById("refreshHoursLabel");
+    if (label) label.textContent = hours + "h";
+  } catch (e) {
+    console.error("刷新统计失败:", e);
+  } finally {
+    hideLoading();
+  }
+}
+
+// 点击空白处关闭下拉
+document.addEventListener("click", (e) => {
+  const dropdown = document.getElementById("refreshHoursDropdown");
+  const label = document.getElementById("refreshHoursLabel");
+  if (
+    dropdown &&
+    dropdown.style.display !== "none" &&
+    !label?.contains(e.target) &&
+    !dropdown.contains(e.target)
+  ) {
+    dropdown.style.display = "none";
+  }
+});
+
 // 排序
 document.querySelectorAll(".sortable-tag").forEach((th) => {
   th.addEventListener("click", () => {
@@ -1816,7 +2112,7 @@ function renderTargetTable() {
       <td data-label="最近发布" style="font-size:11px;color:#888">${latestVideo}</td>
       <td data-label="最近刷新" style="font-size:11px;color:#888">${refreshTime}</td>
       <td data-label="操作">
-        <button class="btn-non-seller" onclick="confirmNonSeller('${escapeJsString(u.uniqueId)}')" title="将此用户标记为非商家">设为非商家</button>
+        <button class="btn-pending" onclick="moveToBase('${escapeJsString(u.uniqueId)}')" title="移到 jobs_base 重走流程">待确认</button>
       </td>
     </tr>`;
     })
@@ -2587,7 +2883,8 @@ fetchClientErrors();
 initTableSorting();
 initTargetTableSorting();
 
+// 错峰轮询，避免同时发 4 个请求阻塞服务端
 setInterval(fetchStats, 10000);
-setInterval(fetchUsers, 10000);
-setInterval(fetchClientErrors, 10000);
-setInterval(refreshUserUpdateIfActive, 10000);
+setTimeout(() => setInterval(fetchUsers, 10000), 2500);
+setTimeout(() => setInterval(fetchClientErrors, 10000), 5000);
+setTimeout(() => setInterval(refreshUserUpdateIfActive, 10000), 7500);

package/src/watch/public/index.html

@@ -370,7 +370,7 @@
         </div>
       </div>
     </div>
-    <div id="backToTop" title="回到顶部" onclick="scrollToTop()">↑</div>
+    <div id="backToTop" title="回到顶部（可拖动）">↑</div>
   </div>
   <div id="tagsPage">
     <div class="stats" style="margin-bottom:16px">
@@ -397,6 +397,7 @@
         <div class="label">🔄 刷新</div>
       </div>
     </div>
+    <div id="tagsRefreshStats" style="margin-bottom:16px"></div>
     <div class="tags-layout">
       <div class="tags-table-card">
         <h3>关键词列表</h3>

package/src/watch/public/style.css

@@ -306,6 +306,10 @@ body {
   font-weight: 600;
 }
 
+.target-badge-other {
+  color: #666 !important;
+}
+
 .source-row {
   display: flex;
   align-items: center;
@@ -869,6 +873,12 @@ td.user-id:hover {
   display: flex;
 }
 
+#backToTop.dragging {
+  transition: none;
+  opacity: 0.9;
+  cursor: grabbing;
+}
+
 #mainPage.hidden {
   display: none;
 }
@@ -1483,6 +1493,26 @@ td.user-id:hover {
   color: #ef4444;
 }
 
+/* 待确认按钮 */
+.btn-pending {
+  padding: 4px 10px;
+  border: 1px solid #fbbf24;
+  border-radius: 4px;
+  background: transparent;
+  color: #fbbf24;
+  font-size: 11px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.15s;
+  white-space: nowrap;
+}
+
+.btn-pending:hover {
+  background: rgba(251, 191, 36, 0.12);
+  border-color: #f59e0b;
+  color: #f59e0b;
+}
+
 /* ===== 关键词页面 ===== */
 #tagsPage {
   display: none;