tt-help-cli-ycl 1.4.18 → 1.4.20

package/src/watch/public/app.js

@@ -21,6 +21,7 @@ let currentRawLocation = "";
 let currentSort = { key: null, asc: true };
 let prevStatValues = {};
 let prevUserMap = {};
+let prevTargetUsers = 0;
 
 async function fetchStats() {
   try {
@@ -164,6 +165,13 @@ function renderStats() {
     statJobsBase.textContent = `jobs_base: ${formatStatNum(d.jobsBaseTotal || 0)}`;
   flashEl("statError", d.errorUsers);
   flashEl("statTarget", d.targetUsers, { full: true });
+  // 检测目标商家新增，放烟花（仅首页）
+  const hash = window.location.hash.replace(/^#/, "");
+  if (!hash && prevTargetUsers > 0 && d.targetUsers > prevTargetUsers) {
+    const diff = d.targetUsers - prevTargetUsers;
+    triggerFirework(diff);
+  }
+  prevTargetUsers = d.targetUsers || 0;
   flashEl("statUserUpdateTasks", d.userUpdateTasks || 0, { full: true });
   flashEl("statRawJobs", d.rawJobs || 0);
   flashEl("statCommentTask", d.commentTaskCount || 0, { full: true });
@@ -1464,6 +1472,7 @@ let currentTagsSeq = 0;
 const TAGS_PAGE_SIZE = 200;
 let cachedTagCountries = [];
 let currentRefreshHours = 24;
+let currentTargetRefreshHours = 24;
 
 function showTagsPage() {
   document.getElementById("mainPage").classList.add("hidden");
@@ -1801,6 +1810,111 @@ async function selectRefreshHours(hours) {
   }
 }
 
+// ===== 目标商家刷新进度（复用 tags 页面的 UI 模式）=====
+
+async function loadTargetRefreshStats() {
+  try {
+    const res = await fetch(
+      `/api/targets/refresh-stats?hours=${currentTargetRefreshHours}`,
+    );
+    const data = await res.json();
+    renderTargetRefreshStats(data);
+  } catch (e) {
+    console.error("获取目标商家刷新统计失败:", e);
+  }
+}
+
+function renderTargetRefreshStats(data) {
+  const el = document.getElementById("targetRefreshStats");
+  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="targetRefreshStatsHeader" 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="targetRefreshHoursLabel" style="color:#60a5fa;cursor:pointer;text-decoration:underline dotted" onclick="event.stopPropagation();toggleTargetHoursDropdown(event)">${currentTargetRefreshHours}h</span> 刷新进度
+        <div id="targetRefreshHoursDropdown" 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 === currentTargetRefreshHours ? "#60a5fa" : "#ccc"};font-weight:${h === currentTargetRefreshHours ? "600" : "400"};white-space:nowrap" onclick="event.stopPropagation();selectTargetRefreshHours(${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="targetRefreshStatsArrow" style="color:#888;font-size:12px">▶</span>
+    </div>
+    <div id="targetRefreshStatsBody" 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">${currentTargetRefreshHours}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("targetRefreshStatsHeader");
+  const body = document.getElementById("targetRefreshStatsBody");
+  const arrow = document.getElementById("targetRefreshStatsArrow");
+  if (header && body && arrow) {
+    header.addEventListener("click", () => {
+      const open = body.style.display !== "none";
+      body.style.display = open ? "none" : "";
+      arrow.textContent = open ? "▶" : "▼";
+    });
+  }
+}
+
+function toggleTargetHoursDropdown(event) {
+  const dropdown = document.getElementById("targetRefreshHoursDropdown");
+  if (!dropdown) return;
+  const isOpen = dropdown.style.display !== "none";
+  dropdown.style.display = isOpen ? "none" : "block";
+}
+
+async function selectTargetRefreshHours(hours) {
+  const dropdown = document.getElementById("targetRefreshHoursDropdown");
+  if (dropdown) dropdown.style.display = "none";
+  if (hours === currentTargetRefreshHours) return;
+  currentTargetRefreshHours = hours;
+  try {
+    await loadTargetRefreshStats();
+    const label = document.getElementById("targetRefreshHoursLabel");
+    if (label) label.textContent = hours + "h";
+  } catch (e) {
+    console.error("目标商家刷新统计失败:", e);
+  }
+}
+
 // 点击空白处关闭下拉
 document.addEventListener("click", (e) => {
   const dropdown = document.getElementById("refreshHoursDropdown");
@@ -1844,6 +1958,7 @@ function showTargetPage() {
   showLoading("正在加载目标商家数据...");
   fetchTargetByCountry();
   fetchTargetOtherCountries();
+  loadTargetRefreshStats();
   // 同步统计
   if (currentStats) {
     document.getElementById("targetPageStatTotal").textContent = formatStatNum(
@@ -1860,7 +1975,7 @@ let currentTargetLoading = false;
 let currentTargetAllLoaded = false;
 let currentTargetSeq = 0;
 let currentTargetSort = { key: null, asc: true };
-const TARGET_PAGE_SIZE = 200;
+const TARGET_PAGE_SIZE = 500;
 
 async function fetchTargetOtherCountries() {
   try {
@@ -2256,6 +2371,7 @@ document
       const btn = document.getElementById("targetReprocessBtn");
       if (btn) btn.style.display = "none";
       await fetchTargetByCountry();
+      await loadTargetRefreshStats();
       showToast("刷新完成");
     } catch (e) {
       showToast("刷新失败: " + e.message, true);
@@ -2876,6 +2992,136 @@ function initTargetTableSorting() {
   });
 }
 
+// ========== 烟花/鞭炮动画 ==========
+function triggerFirework(newCount) {
+  const canvas = document.getElementById("fireworkCanvas");
+  if (!canvas) return;
+  const ctx = canvas.getContext("2d");
+
+  canvas.width = window.innerWidth;
+  canvas.height = window.innerHeight;
+
+  const colors = [
+    "#fe2c55",
+    "#ff6b6b",
+    "#ffd93d",
+    "#6bcb77",
+    "#4d96ff",
+    "#a78bfa",
+    "#ff922b",
+    "#20c997",
+    "#f06595",
+    "#ffe066",
+    "#5c7cfa",
+    "#ff8787",
+  ];
+
+  const particles = [];
+  const burstCount = Math.min(newCount, 5) + 2; // 最多 7 朵烟花
+
+  // 创建多朵烟花
+  for (let b = 0; b < burstCount; b++) {
+    const cx = Math.random() * canvas.width * 0.8 + canvas.width * 0.1;
+    const cy = Math.random() * canvas.height * 0.5 + canvas.height * 0.1;
+    const hue = Math.random() * 360;
+    const count = 80 + Math.floor(Math.random() * 60);
+
+    for (let i = 0; i < count; i++) {
+      const angle = (Math.PI * 2 * i) / count + (Math.random() - 0.5) * 0.3;
+      const speed = 2 + Math.random() * 6;
+      const color = colors[Math.floor(Math.random() * colors.length)];
+      particles.push({
+        x: cx,
+        y: cy,
+        vx: Math.cos(angle) * speed,
+        vy: Math.sin(angle) * speed,
+        life: 1,
+        decay: 0.008 + Math.random() * 0.02,
+        size: 1.5 + Math.random() * 2.5,
+        color,
+        gravity: 0.04,
+      });
+    }
+  }
+
+  let animFrame;
+  function animate() {
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+
+    let alive = false;
+    for (const p of particles) {
+      p.x += p.vx;
+      p.y += p.vy;
+      p.vy += p.gravity;
+      p.life -= p.decay;
+
+      if (p.life > 0) {
+        alive = true;
+        ctx.save();
+        ctx.globalAlpha = p.life;
+        ctx.fillStyle = p.color;
+        ctx.shadowColor = p.color;
+        ctx.shadowBlur = 6;
+        ctx.beginPath();
+        ctx.arc(p.x, p.y, p.size, 0, Math.PI * 2);
+        ctx.fill();
+        ctx.restore();
+      }
+    }
+
+    if (alive) {
+      animFrame = requestAnimationFrame(animate);
+    } else {
+      ctx.clearRect(0, 0, canvas.width, canvas.height);
+    }
+  }
+
+  if (animFrame) cancelAnimationFrame(animFrame);
+  animate();
+
+  // 显示提示文字
+  showFireworkToast(newCount);
+}
+
+function showFireworkToast(count) {
+  let toast = document.getElementById("firework-toast");
+  if (!toast) {
+    toast = document.createElement("div");
+    toast.id = "firework-toast";
+    toast.style.cssText = `
+      position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);
+      font-size:48px;font-weight:900;z-index:10000;pointer-events:none;
+      color:#ffd93d;text-shadow:0 0 30px #fe2c55,0 0 60px #fe2c55,0 0 90px #ff6b6b;
+      animation:fireworkToast 2.5s ease-out forwards;
+      white-space:nowrap;
+    `;
+    document.body.appendChild(toast);
+    // 注入动画 keyframes
+    if (!document.getElementById("fw-style")) {
+      const style = document.createElement("style");
+      style.id = "fw-style";
+      style.textContent = `
+        @keyframes fireworkToast {
+          0% { opacity:0; transform:translate(-50%,-50%) scale(0.3); }
+          15% { opacity:1; transform:translate(-50%,-50%) scale(1.2); }
+          25% { opacity:1; transform:translate(-50%,-50%) scale(1); }
+          80% { opacity:1; transform:translate(-50%,-50%) scale(1); }
+          100% { opacity:0; transform:translate(-50%,-60%) scale(1.5); }
+        }
+      `;
+      document.head.appendChild(style);
+    }
+  }
+  toast.textContent = `🎆 +${count} 目标商家！`;
+  toast.style.animation = "none";
+  void toast.offsetWidth;
+  toast.style.animation = "fireworkToast 2.5s ease-out forwards";
+
+  setTimeout(() => {
+    if (toast.parentNode) toast.remove();
+  }, 2600);
+}
+
 // 初始化
 fetchStats();
 fetchUsers();

package/src/watch/public/index.html

@@ -9,6 +9,7 @@
 </head>
 
 <body>
+  <canvas id="fireworkCanvas"></canvas>
   <div class="header">
     <h1>TikTok 采集监控</h1>
     <div class="meta" id="fileMeta">加载中...</div>
@@ -325,6 +326,7 @@
         <div class="label">🔄 刷新</div>
       </div>
     </div>
+    <div id="targetRefreshStats" style="margin-bottom:16px"></div>
     <div class="target-page-layout">
       <div class="target-side-card">
         <h3>🎯 目标商家国家分布</h3>

package/src/watch/public/style.css

@@ -1612,3 +1612,14 @@ td.user-id:hover {
 .checkbox-label input[type="checkbox"] {
   accent-color: #a78bfa;
 }
+
+/* ========== 烟花画布 ========== */
+#fireworkCanvas {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 9999;
+}

package/src/watch/server.js

@@ -92,6 +92,7 @@ function sendCSV(res, columns, rows) {
 function inferClientType(routePath) {
   if (routePath.startsWith("/api/redo-job")) return "refresh";
   if (routePath.startsWith("/api/user-update-tasks")) return "attach";
+  if (routePath.startsWith("/api/recheck-jobs")) return "recheck";
   if (routePath.startsWith("/api/comment-task")) return "comments";
   if (routePath.startsWith("/api/tags/refresh")) return "tag-refresh";
   if (routePath.startsWith("/api/tags")) return "scoring";
@@ -482,6 +483,30 @@ export function startWatchServer(
         return;
       }
 
+      // 将 jobs 中 status='done' 且无国家数据的记录移动到 jobs_base
+      if (
+        req.method === "POST" &&
+        routePath === "/api/jobs/move-no-country-to-base"
+      ) {
+        try {
+          const result = store.moveNoCountryJobsToBase();
+          const ts = new Date().toISOString().slice(11, 19);
+          if (result.ok) {
+            console.error(
+              `[JOB ${ts}] MOVE-NO-COUNTRY-TO-BASE: moved=${result.moved}, total=${result.total}`,
+            );
+          } else {
+            console.error(
+              `[JOB ${ts}] MOVE-NO-COUNTRY-TO-BASE ERROR: ${result.error}`,
+            );
+          }
+          sendJSON(res, result.ok ? 200 : 400, result);
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
       // 将 jobs/raw_jobs 中 tt_seller=1 且 video_count=0 的记录移动到 jobs_base
       if (
         req.method === "POST" &&
@@ -730,6 +755,47 @@ export function startWatchServer(
         return;
       }
 
+      // ── recheck-jobs 端点 ──
+      if (req.method === "GET" && routePath === "/api/recheck-jobs") {
+        const limit = params.limit;
+        const countries = params.countries
+          ? params.countries
+              .split(",")
+              .map((c) => c.trim().toUpperCase())
+              .filter(Boolean)
+          : [];
+        const tasks = store.getRecheckJobs(limit, countries);
+        const ts = new Date().toISOString().slice(11, 19);
+        console.error(
+          `[JOB ${ts}] RECHECK-JOBS: ${tasks.length} tasks${countries.length ? ` (countries: ${countries.join(",")})` : ""}`,
+        );
+        sendJSON(res, 200, { total: tasks.length, tasks });
+        return;
+      }
+
+      if (req.method === "POST" && routePath === "/api/recheck-jobs-batch") {
+        try {
+          const body = await readBody(req);
+          const updates = body.updates || [];
+          const { results } = store.batchUpdateRecheckJobs(updates);
+          const okCount = results.filter((r) => r.ok).length;
+          const errCount = results.filter((r) => r.error).length;
+          const ts = new Date().toISOString().slice(11, 19);
+          console.error(
+            `[JOB ${ts}] RECHECK-JOBS-BATCH: ${okCount} ok, ${errCount} error (total=${updates.length})`,
+          );
+          sendJSON(res, 200, {
+            results,
+            total: updates.length,
+            ok: okCount,
+            error: errCount,
+          });
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       const userInfoCommitMatch = routePath.match(
         /^\/api\/user-info\/([^/]+)$/,
       );
@@ -1047,6 +1113,14 @@ export function startWatchServer(
         return;
       }
 
+      // GET /api/targets/refresh-stats — 目标商家最近 N 小时刷新进度
+      if (req.method === "GET" && routePath === "/api/targets/refresh-stats") {
+        const hours = Math.max(1, parseInt(params.hours) || 24);
+        const data = store.getTargetRefreshStats(hours);
+        sendJSON(res, 200, data);
+        return;
+      }
+
       if (req.method === "GET" && routePath === "/api/client-errors") {
         sendJSON(res, 200, { clients: store.getClientErrors() });
         return;
@@ -2219,6 +2293,27 @@ export function startWatchServer(
         );
       }
 
+      // 每 2 小时自动将无国家数据的 done job 移入 jobs_base 重走流程
+      const NO_COUNTRY_MOVE_INTERVAL_MS = 2 * 60 * 60 * 1000;
+      setInterval(() => {
+        try {
+          const result = store.moveNoCountryJobsToBase();
+          const ts = new Date().toISOString().slice(11, 19);
+          if (result.moved > 0) {
+            console.error(
+              `[JOB ${ts}] AUTO-MOVE-NO-COUNTRY: moved=${result.moved}, total=${result.total}`,
+            );
+          }
+        } catch (e) {
+          console.error(
+            `[JOB] AUTO-MOVE-NO-COUNTRY 定时任务异常: ${e.message}`,
+          );
+        }
+      }, NO_COUNTRY_MOVE_INTERVAL_MS);
+      console.error(
+        `[job] 无国家数据自动回炉已启动: 间隔 ${NO_COUNTRY_MOVE_INTERVAL_MS / 3600000} 小时`,
+      );
+
       _resolve({ server, port });
     });