tt-help-cli-ycl 1.4.17 → 1.4.19

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>
@@ -370,7 +372,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 +399,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;
@@ -1582,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

@@ -103,12 +103,115 @@ function inferClientType(routePath) {
   return null;
 }
 
+// ── 简易登录鉴权 ──
+let WATCH_PASSWORD = "";
+let PASSWORD_ENABLED = false;
+const AUTH_COOKIE = "watch_token";
+const AUTH_MAX_AGE = 86400; // 24 小时
+const authSessions = new Map(); // token -> expiry (ms timestamp)
+
+function todayPassword() {
+  const d = new Date();
+  const pad = (n) => String(n).padStart(2, "0");
+  return `tt@${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}`;
+}
+
+function generateToken() {
+  return Array.from({ length: 32 }, () =>
+    Math.floor(Math.random() * 36).toString(36),
+  ).join("");
+}
+
+function parseAuthToken(req, params) {
+  // Cookie
+  const cookie = req.headers.cookie || "";
+  const cookieMatch = cookie.match(new RegExp(`${AUTH_COOKIE}=([^;]+)`));
+  if (cookieMatch) return cookieMatch[1];
+  // Header
+  const headerToken = req.headers["x-watch-token"];
+  if (headerToken) return headerToken;
+  // Query param
+  if (params.token) return params.token;
+  return null;
+}
+
+function serveLoginPage(res, errorMsg) {
+  const err = errorMsg
+    ? `<p style="color:#fe2c55;margin-top:12px">${errorMsg}</p>`
+    : "";
+  const html = `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
+<title>登录 - TikTok 采集监控</title>
+<style>
+*{margin:0;padding:0;box-sizing:border-box}
+body{background:#0d0d0d;color:#e0e0e0;font-family:-apple-system,BlinkMacSystemFont,sans-serif;display:flex;align-items:center;justify-content:center;height:100vh}
+.box{background:#1e1e1e;border:1px solid #333;border-radius:12px;padding:40px;text-align:center;min-width:320px}
+h1{font-size:20px;margin-bottom:4px}
+p.sub{color:#888;font-size:13px;margin-bottom:20px}
+input[type="password"]{width:100%;padding:12px;border:1px solid #444;border-radius:6px;background:#2a2a2a;color:#e0e0e0;font-size:14px;margin-bottom:12px;outline:none}
+input[type="password"]:focus{border-color:#fe2c55}
+.remember-row{display:flex;align-items:center;justify-content:center;gap:8px;margin-bottom:14px;font-size:13px;color:#aaa;cursor:pointer}
+.remember-row input[type="checkbox"]{width:auto;margin:0;accent-color:#fe2c55;cursor:pointer}
+.remember-row label{cursor:pointer;user-select:none}
+button{width:100%;padding:12px;background:#fe2c55;color:#fff;border:none;border-radius:6px;cursor:pointer;font-size:15px;font-weight:600}
+button:hover{opacity:.9}
+</style>
+</head>
+<body>
+<div class="box">
+<h1>TikTok 采集监控</h1>
+<p class="sub">请输入监控密码</p>
+<form method="post" action="/api/login" id="login-form">
+<input name="password" id="password" type="password" placeholder="密码" autocomplete="off" autofocus>
+<div class="remember-row">
+<input type="checkbox" id="remember-pwd">
+<label for="remember-pwd">记住密码</label>
+</div>
+<button type="submit">登录</button>
+</form>
+${err}
+</div>
+<script>
+(function() {
+  var pw = document.getElementById('password');
+  var cb = document.getElementById('remember-pwd');
+  var form = document.getElementById('login-form');
+  // 页面加载时恢复已保存的密码
+  try {
+    var saved = localStorage.getItem('watch_pwd');
+    if (saved) { pw.value = saved; cb.checked = true; }
+  } catch(e) {}
+  // 提交时保存或清除密码
+  form.addEventListener('submit', function() {
+    try {
+      if (cb.checked) {
+        localStorage.setItem('watch_pwd', pw.value);
+      } else {
+        localStorage.removeItem('watch_pwd');
+      }
+    } catch(e) {}
+  });
+})();
+</script>
+</body>
+</html>`;
+  res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+  res.end(html);
+}
+
 export function startWatchServer(
   dataAnchor,
   port = 3000,
   existingStore,
   options = {},
+  password = null,
 ) {
+  PASSWORD_ENABLED = true;
+  if (password) WATCH_PASSWORD = password;
+  // 不传 -P 时 WATCH_PASSWORD 保持空，登录时动态计算当日密码
   return new Promise((_resolve, reject) => {
     const store = existingStore || createStore(dataAnchor, options);
 
@@ -124,6 +227,12 @@ export function startWatchServer(
     }
 
     // ── 标签发现机制（定时 + 按需双保险） ──
+    // --no-llm-discover 或 TAG_DISCOVER_DISABLE=1 可关闭 LLM tag 发现
+    const DISCOVER_DISABLED =
+      options.llmDiscover === false ||
+      ["1", "true", "yes"].includes(
+        (process.env.TAG_DISCOVER_DISABLE || "").toLowerCase(),
+      );
     const DISCOVER_INTERVAL_MS = Math.max(
       180000,
       parseInt(process.env.TAG_DISCOVER_INTERVAL_MS || "300000", 10) || 300000,
@@ -151,6 +260,10 @@ export function startWatchServer(
     );
 
     async function runAutoDiscover(trigger = "timer") {
+      if (DISCOVER_DISABLED) {
+        console.error("[discover] LLM tag 发现已禁用 (TAG_DISCOVER_DISABLE=1)");
+        return;
+      }
       if (discoverRunning) return;
       const elapsed = Date.now() - lastDiscoverTime;
       if (elapsed < DISCOVER_COOLDOWN_MS) {
@@ -369,6 +482,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" &&
@@ -691,6 +828,27 @@ export function startWatchServer(
         return;
       }
 
+      // 移到 jobs_base 重走流程（待确认）
+      const moveToBaseMatch = routePath.match(
+        /^\/api\/user-move-to-base\/([^/]+)$/,
+      );
+      if (req.method === "PUT" && moveToBaseMatch) {
+        const uniqueId = moveToBaseMatch[1];
+        try {
+          const ret = store.moveSingleJobToBase(uniqueId);
+          if (ret.error) {
+            sendJSON(res, 404, { error: ret.error });
+            return;
+          }
+          const ts = new Date().toISOString().slice(11, 19);
+          console.error(`[JOB ${ts}] MOVE-TO-BASE: ${uniqueId} → jobs_base`);
+          sendJSON(res, 200, ret);
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       if (req.method === "GET" && routePath === "/api/comment-tasks") {
         const limit = parseInt(params.limit) || 1;
         const locationsParam = params.locations || "";
@@ -913,6 +1071,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;
@@ -1286,6 +1452,14 @@ export function startWatchServer(
         return;
       }
 
+      // GET /api/tags/refresh-stats — 最近 24h 每国刷新进度
+      if (req.method === "GET" && routePath === "/api/tags/refresh-stats") {
+        const hours = Math.max(1, parseInt(params.hours) || 24);
+        const data = store.getRefreshStats(hours);
+        sendJSON(res, 200, data);
+        return;
+      }
+
       // GET /api/tags?status=&country=&limit=&offset=
       if (req.method === "GET" && routePath === "/api/tags") {
         const status = params.status || null;
@@ -1907,12 +2081,77 @@ export function startWatchServer(
         return;
       }
 
-      // ====== 原有静态资源 ======
+      // POST /api/login — HTML 表单提交（密码正确则设 Cookie 跳转，错误则显示错误页）
+      // 同时也支持 JSON 请求
+      if (req.method === "POST" && routePath === "/api/login") {
+        try {
+          const rawBody = await new Promise((resolve) => {
+            let body = "";
+            req.on("data", (chunk) => (body += chunk));
+            req.on("end", () => resolve(body));
+          });
+          const isForm = req.headers["content-type"]?.includes(
+            "x-www-form-urlencoded",
+          );
+          const pwd = isForm
+            ? new URLSearchParams(rawBody).get("password") || ""
+            : (() => {
+                try {
+                  return JSON.parse(rawBody).password || "";
+                } catch {
+                  return "";
+                }
+              })();
+
+          const expectedPassword = WATCH_PASSWORD || todayPassword();
+          if (pwd === expectedPassword) {
+            const token = generateToken();
+            authSessions.set(token, Date.now() + AUTH_MAX_AGE * 1000);
+            if (isForm) {
+              res.writeHead(302, {
+                Location: "/",
+                "Set-Cookie": `${AUTH_COOKIE}=${token}; Path=/; HttpOnly; Max-Age=${AUTH_MAX_AGE}; SameSite=Lax`,
+              });
+              res.end();
+            } else {
+              res.writeHead(200, {
+                "Content-Type": "application/json; charset=utf-8",
+                "Set-Cookie": `${AUTH_COOKIE}=${token}; Path=/; HttpOnly; Max-Age=${AUTH_MAX_AGE}; SameSite=Lax`,
+              });
+              res.end(JSON.stringify({ ok: true }));
+            }
+          } else {
+            if (isForm) {
+              serveLoginPage(res, "密码错误");
+            } else {
+              sendJSON(res, 401, { error: "密码错误" });
+            }
+          }
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
+      // ====== 静态资源（HTML 页面需登录） ======
 
       if (
         req.method === "GET" &&
         (routePath === "/" || routePath === "/index.html")
       ) {
+        // 设有密码时，检查登录态
+        if (PASSWORD_ENABLED) {
+          const token = parseAuthToken(req, params);
+          const valid =
+            token &&
+            authSessions.has(token) &&
+            authSessions.get(token) > Date.now();
+          if (!valid) {
+            serveLoginPage(res);
+            return;
+          }
+          authSessions.set(token, Date.now() + AUTH_MAX_AGE * 1000);
+        }
         const html = readFileSync(join(publicDir, "index.html"), "utf-8");
         res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
         res.end(html);
@@ -1997,13 +2236,40 @@ export function startWatchServer(
       }
 
       // 启动后 30 秒首次发现（给服务启动缓冲），之后定时执行
-      const discoverTimer = setInterval(
-        () => runAutoDiscover("timer"),
-        DISCOVER_INTERVAL_MS,
-      );
-      setTimeout(() => runAutoDiscover("startup"), 30000);
+      if (DISCOVER_DISABLED) {
+        console.error(
+          `[discover] LLM tag 发现已禁用 (TAG_DISCOVER_DISABLE=1)，不会启动定时发现`,
+        );
+      } else {
+        const discoverTimer = setInterval(
+          () => runAutoDiscover("timer"),
+          DISCOVER_INTERVAL_MS,
+        );
+        setTimeout(() => runAutoDiscover("startup"), 30000);
+        console.error(
+          `[discover] 定时+按需发现已启动: 定时间隔 ${DISCOVER_INTERVAL_MS / 60000} 分钟, 每国 ${DISCOVER_COUNT_PER_COUNTRY} 个标签, 每国不足阈值 ${DISCOVER_PER_COUNTRY_THRESHOLD}, 按需触发阈值 ${DISCOVER_LOW_THRESHOLD}, 冷却期 ${DISCOVER_COOLDOWN_MS / 1000}s`,
+        );
+      }
+
+      // 每 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(
-        `[discover] 定时+按需发现已启动: 定时间隔 ${DISCOVER_INTERVAL_MS / 60000} 分钟, 每国 ${DISCOVER_COUNT_PER_COUNTRY} 个标签, 每国不足阈值 ${DISCOVER_PER_COUNTRY_THRESHOLD}, 按需触发阈值 ${DISCOVER_LOW_THRESHOLD}, 冷却期 ${DISCOVER_COOLDOWN_MS / 1000}s`,
+        `[job] 无国家数据自动回炉已启动: 间隔 ${NO_COUNTRY_MOVE_INTERVAL_MS / 3600000} 小时`,
       );
 
       _resolve({ server, port });