tt-help-cli-ycl 1.4.142 → 1.4.145

package/src/watch/public/style.css

@@ -112,6 +112,12 @@ body {
   color: #f472b6;
 }
 
+/* 精准商家卡片文字改为红色 */
+#statPreciseCard .label,
+#statPreciseCard .value {
+  color: #ef4444;
+}
+
 .stat-card .value-sub {
   font-size: 12px;
   font-weight: 400;
@@ -878,6 +884,14 @@ td.user-id:hover {
   display: block;
 }
 
+#precisePage {
+  display: none;
+}
+
+#precisePage.active {
+  display: block;
+}
+
 #backToTop {
   position: fixed;
   bottom: 32px;
@@ -1834,6 +1848,22 @@ td.user-id:hover {
   background: #e61944;
 }
 
+.settings-form .btn-cancel {
+  padding: 10px 20px;
+  border: 1px solid #333;
+  border-radius: 8px;
+  background: #2a2a3a;
+  color: #ccc;
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.2s;
+}
+
+.settings-form .btn-cancel:hover {
+  background: #333;
+}
+
 /* ── 看门狗页面 ── */
 
 #watchdogPage {
@@ -1876,3 +1906,191 @@ td.user-id:hover {
   color: #888;
   font-weight: 600;
 }
+
+/* ===== 精准商家：视频卡片视图 ===== */
+.precise-list-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  margin-bottom: 8px;
+}
+.precise-list-header h3 {
+  margin: 0;
+}
+.view-toggle {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  border-bottom: 2px solid #2f2f3f;
+}
+.view-toggle button {
+  padding: 7px 18px;
+  border: none;
+  border-bottom: 2px solid transparent;
+  border-radius: 6px 6px 0 0;
+  background: transparent;
+  color: #9aa;
+  font-size: 13px;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+.view-toggle button:hover {
+  color: #ccc;
+}
+.view-toggle button.active {
+  color: #fff;
+  border-bottom-color: #7c3aed;
+  background: rgba(124, 58, 237, 0.14);
+  font-weight: 600;
+}
+
+.precise-video-wrap {
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+}
+.precise-merchant-card {
+  background: #1a1a24;
+  border: 1px solid #2a2a3a;
+  border-radius: 10px;
+  padding: 12px 14px;
+}
+.precise-merchant-head {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: baseline;
+  gap: 10px;
+  margin-bottom: 10px;
+}
+.precise-merchant-head .pm-user {
+  font-weight: 700;
+  color: #60a5fa;
+  text-decoration: none;
+  font-size: 15px;
+}
+.precise-merchant-head .pm-user:hover {
+  text-decoration: underline;
+}
+.precise-merchant-head .pm-nick {
+  color: #ccc;
+  font-size: 13px;
+}
+.precise-merchant-head .pm-country {
+  font-size: 11px;
+  background: #2a2a3a;
+  color: #a78bfa;
+  padding: 1px 7px;
+  border-radius: 10px;
+}
+.precise-merchant-head .pm-stats {
+  color: #888;
+  font-size: 12px;
+  margin-left: auto;
+}
+
+.precise-video-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+  gap: 10px;
+}
+.precise-video-item {
+  background: #20202e;
+  border: 1px solid #2c2c3c;
+  border-radius: 8px;
+  overflow: hidden;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+.precise-video-tile {
+  display: block;
+  position: relative;
+  aspect-ratio: 9 / 14;
+  background: linear-gradient(160deg, #2a2a3a 0%, #1c1c28 100%);
+  color: #e0e0e0;
+  text-decoration: none;
+  overflow: hidden;
+}
+.precise-video-tile:hover {
+  border-color: #7c3aed;
+}
+.precise-video-tile .pv-play {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  width: 42px;
+  height: 42px;
+  border-radius: 50%;
+  background: rgba(0, 0, 0, 0.55);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 20px;
+  color: #fff;
+}
+.precise-video-tile .pv-count {
+  position: absolute;
+  left: 6px;
+  top: 6px;
+  font-size: 12px;
+  color: #fff;
+  text-shadow: 0 1px 2px #000;
+}
+/* 播放量最大的视频：播放量文字特殊高亮 */
+.precise-video-tile .pv-count-max {
+  color: #1a1a24;
+  font-weight: 800;
+  background: #fbbf24;
+  padding: 1px 5px;
+  border-radius: 4px;
+  text-shadow: none;
+  box-shadow: 0 0 6px rgba(251, 191, 36, 0.8);
+}
+.precise-video-tile .pv-time {
+  position: absolute;
+  left: 6px;
+  top: 24px;
+  font-size: 11px;
+  color: #cfcfcf;
+  text-shadow: 0 1px 2px #000;
+}
+.precise-video-tile .pv-ad {
+  position: absolute;
+  right: 6px;
+  top: 6px;
+  font-size: 10px;
+  background: rgba(254, 44, 85, 0.9);
+  color: #fff;
+  padding: 1px 5px;
+  border-radius: 4px;
+}
+/* 商品名悬浮在图片上，最多 2 行、固定高度以容纳 2 行文字 */
+.precise-video-item .pv-product {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 30px 8px 8px;
+  background: linear-gradient(to top, rgba(0, 0, 0, 0.92), rgba(0, 0, 0, 0));
+  color: #fbbf24;
+  font-size: 12px;
+  line-height: 1.35;
+  text-decoration: none;
+  text-align: left;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  overflow: hidden;
+  box-sizing: border-box;
+  height: 71px;
+}
+.precise-video-item .pv-product:hover {
+  color: #fff;
+  text-decoration: underline;
+}
+.precise-video-item .pv-product .pv-product-icon {
+  margin-right: 4px;
+}

package/src/watch/server.js

@@ -8,7 +8,7 @@ import { fileURLToPath } from "url";
 import { spawn } from "child_process";
 import { createStore } from "./data-store.js";
 import { getTagDb } from "./db-schema.js";
-import { DEFAULT_TARGET_LOCATIONS } from "../lib/target-locations.js";
+import { getTargetLocations } from "../lib/app-config.js";
 import { tryHandleWatchdogRoute } from "./watchdog-server.js";
 
 const __filename = fileURLToPath(import.meta.url);
@@ -44,11 +44,17 @@ const SLOW_STATS_TTL = 300000; // 5 分钟
 const usersCache = new Map(); // key -> { result, time }
 const USERS_CACHE_TTL = 3000; // 3 秒
 
-// 目标国家占位符（jobs 表聚合需要 location_created IN (...)）
-const TARGET_PLACEHOLDERS = DEFAULT_TARGET_LOCATIONS.map(() => "?").join(", ");
-const TARGET_IN_SQL = DEFAULT_TARGET_LOCATIONS.length
-  ? `location_created IN (${TARGET_PLACEHOLDERS})`
-  : "1 = 0";
+// 目标国家占位符（jobs 表聚合需要 location_created IN (...)，运行时按 getTargetLocations() 动态生成）
+function targetPlaceholders() {
+  const locs = getTargetLocations();
+  return locs.map(() => "?").join(", ");
+}
+function targetInSql() {
+  const locs = getTargetLocations();
+  return locs.length
+    ? `location_created IN (${targetPlaceholders()})`
+    : "1 = 0";
+}
 
 // 统计分组定义：每组包含若干 SQL（分片执行）与一个聚合函数
 // sqls 项：{ key, sql, mode: 'one'|'all', params: 数组或返回数组的函数 }
@@ -80,8 +86,8 @@ const STAT_GROUPS = {
       {
         key: "jobsAgg",
         mode: "one",
-        params: DEFAULT_TARGET_LOCATIONS,
-        sql: `SELECT
+        params: () => getTargetLocations(),
+        sql: () => `SELECT
           SUM(jobsTotal) as jobsTotal,
           SUM(done) as done,
           SUM(error) as error,
@@ -94,7 +100,7 @@ const STAT_GROUPS = {
             SUM(CASE WHEN status = 'done' THEN 1 ELSE 0 END) as done,
             SUM(CASE WHEN status = 'error' THEN 1 ELSE 0 END) as error,
             SUM(CASE WHEN status = 'restricted' THEN 1 ELSE 0 END) as restricted,
-            SUM(CASE WHEN tt_seller = 1 AND verified = 0 AND ${TARGET_IN_SQL} THEN 1 ELSE 0 END) as targetUsers,
+            SUM(CASE WHEN tt_seller = 1 AND verified = 0 AND ${targetInSql()} THEN 1 ELSE 0 END) as targetUsers,
             SUM(CASE WHEN no_video = 1 THEN 1 ELSE 0 END) as noVideo
           FROM jobs
           UNION ALL
@@ -108,6 +114,22 @@ const STAT_GROUPS = {
           FROM jobs_done
         )`,
       },
+      {
+        // 精确商家计数：目标商家 + 7 天 EC 视频播放>1000 + 有商品 + 评论0 + 销量>10
+        key: "preciseMerchants",
+        mode: "one",
+        params: () => getTargetLocations(),
+        sql: () => `SELECT COUNT(*) AS n FROM jobs
+          WHERE tt_seller = 1 AND verified = 0 AND ${targetInSql()}
+            AND top_video_seo_url IS NOT NULL AND top_video_seo_url != ''
+            AND product_review_count = 0
+            AND product_sold_count > 10
+            AND recent_ec_videos IS NOT NULL AND recent_ec_videos != ''
+            AND EXISTS (
+              SELECT 1 FROM json_each(recent_ec_videos)
+              WHERE CAST(json_extract(value, '$.playCount') AS INTEGER) > 1000
+            )`,
+      },
     ],
     combine(results) {
       const tq = results.tqAgg || {};
@@ -123,6 +145,7 @@ const STAT_GROUPS = {
         restrictedUsers: jb.restricted || 0,
         errorUsers: jb.error || 0,
         targetUsers: jb.targetUsers || 0,
+        preciseMerchants: results.preciseMerchants?.n || 0,
         sourceStats: {
           seed: tq.seed || 0,
           video: tq.video || 0,
@@ -177,10 +200,10 @@ const STAT_GROUPS = {
       {
         key: "targetCountryStats",
         mode: "all",
-        params: DEFAULT_TARGET_LOCATIONS,
-        sql: `SELECT location_created as country, COUNT(*) as count
+        params: () => getTargetLocations(),
+        sql: () => `SELECT location_created as country, COUNT(*) as count
         FROM jobs
-        WHERE tt_seller = 1 AND verified = 0 AND ${TARGET_IN_SQL}
+        WHERE tt_seller = 1 AND verified = 0 AND ${targetInSql()}
         GROUP BY location_created
         ORDER BY count DESC`,
       },
@@ -250,6 +273,7 @@ const EMPTY_GROUP = {
     restrictedUsers: 0,
     errorUsers: 0,
     targetUsers: 0,
+    preciseMerchants: 0,
     sourceStats: {
       seed: 0,
       video: 0,
@@ -284,9 +308,10 @@ function refreshGroupInShards(st, name) {
     if (idx < spec.sqls.length) {
       const s = spec.sqls[idx++];
       try {
+        const sql = typeof s.sql === "function" ? s.sql() : s.sql;
         const params =
           typeof s.params === "function" ? s.params() : s.params || [];
-        const r = st.rawQuery(s.sql, params);
+        const r = st.rawQuery(sql, params);
         if (r?.error) {
           console.error(`[stats] ${name}.${s.key} 查询失败: ${r.error}`);
           results[s.key] = null;
@@ -334,9 +359,10 @@ function computeGroupStats(st, name) {
     try {
       const results = {};
       for (const s of STAT_GROUPS[name].sqls) {
+        const sql = typeof s.sql === "function" ? s.sql() : s.sql;
         const params =
           typeof s.params === "function" ? s.params() : s.params || [];
-        const r = st.rawQuery(s.sql, params);
+        const r = st.rawQuery(sql, params);
         results[s.key] =
           s.mode === "all" ? r?.rows || [] : r?.rows?.[0] || null;
       }
@@ -641,7 +667,7 @@ export function startWatchServer(
         // 按国家维度判断：只为 new 标签不足的国家发现
         const countriesToDiscover = [];
         const { getTagsByStatus } = await import("./db-tags.js");
-        for (const country of DEFAULT_TARGET_LOCATIONS) {
+        for (const country of getTargetLocations()) {
           const newTags = getTagsByStatus("new", 100, 0, country, null, "llm");
           if (newTags.length < DISCOVER_PER_COUNTRY_THRESHOLD) {
             countriesToDiscover.push(country);
@@ -1137,7 +1163,7 @@ export function startWatchServer(
 
       if (req.method === "GET" && routePath === "/api/stats") {
         const stats = computeStatsIncremental(store);
-        stats.targetLocations = DEFAULT_TARGET_LOCATIONS;
+        stats.targetLocations = getTargetLocations();
         stats.clientLoginStatus = store.getClientLoginStatus();
         stats.activeClients = store.getActiveClients();
         sendJSON(res, 200, stats);
@@ -1494,7 +1520,7 @@ export function startWatchServer(
       }
 
       if (req.method === "GET" && routePath === "/api/target-users") {
-        const targetResult = store.getTargetUsers(DEFAULT_TARGET_LOCATIONS);
+        const targetResult = store.getTargetUsers(getTargetLocations());
         const targets = targetResult.users;
         if (req.headers["accept"]?.includes("text/csv")) {
           const columns = [
@@ -1543,25 +1569,64 @@ export function startWatchServer(
         return;
       }
 
+      // GET /api/precise-merchants — 精确商家列表（支持分页+搜索）
+      if (req.method === "GET" && routePath === "/api/precise-merchants") {
+        const result = store.getPreciseMerchants(getTargetLocations(), {
+          search: params.search || undefined,
+          limit: params.limit ? parseInt(params.limit, 10) : undefined,
+          offset: params.offset ? parseInt(params.offset, 10) : undefined,
+        });
+        if (result && result.users) {
+          result.users = result.users.map((u) => ({
+            uniqueId: u.uniqueId,
+            nickname: u.nickname || "",
+            locationCreated: u.locationCreated || null,
+            followerCount: u.followerCount || 0,
+            videoCount: u.videoCount || 0,
+            latestVideoTime: u.latestVideoTime || null,
+            topVideoPlayCount: u.topVideoPlayCount || null,
+            topVideoHref: u.topVideoHref || null,
+            topVideoIsAd: u.topVideoIsAd ?? null,
+            topVideoProductId: u.topVideoProductId || null,
+            topVideoProductTitle: u.topVideoProductTitle || null,
+            topVideoSeoUrl: u.topVideoSeoUrl || null,
+            productRating: u.productRating ?? null,
+            productReviewCount: u.productReviewCount ?? null,
+            productSoldCount: u.productSoldCount ?? null,
+            productName: u.productName || null,
+            ecOver1k: u.ecOver1k || 0,
+            maxEcPlay: u.maxEcPlay || null,
+            recentEcVideos: (() => {
+              try {
+                return Array.isArray(u.recentEcVideos)
+                  ? u.recentEcVideos
+                  : JSON.parse(u.recentEcVideos || "[]");
+              } catch {
+                return [];
+              }
+            })(),
+          }));
+        }
+        sendJSON(res, 200, result);
+        return;
+      }
+
       if (
         req.method === "GET" &&
         routePath === "/api/target-users-by-country"
       ) {
         // 摘要模式：只返回各国统计数
         if (params.summary === "1") {
-          const result = store.getTargetUsersByCountry(
-            DEFAULT_TARGET_LOCATIONS,
-            { summaryOnly: true },
-          );
+          const result = store.getTargetUsersByCountry(getTargetLocations(), {
+            summaryOnly: true,
+          });
           sendJSON(res, 200, result);
           return;
         }
 
         // CSV 导出：全量数据
         if (req.headers["accept"]?.includes("text/csv")) {
-          const result = store.getTargetUsersByCountry(
-            DEFAULT_TARGET_LOCATIONS,
-          );
+          const result = store.getTargetUsersByCountry(getTargetLocations());
           const columns = [
             "uniqueId",
             "nickname",
@@ -1615,17 +1680,14 @@ export function startWatchServer(
 
         // 分页模式：按国家+搜索+分页查询用户
         if (params.limit) {
-          const result = store.getTargetUsersByCountry(
-            DEFAULT_TARGET_LOCATIONS,
-            {
-              country: params.country || undefined,
-              search: params.search || undefined,
-              limit: parseInt(params.limit, 10),
-              offset: parseInt(params.offset || "0", 10),
-              sort: params.sort || undefined,
-              sortOrder: params.sortOrder || "desc",
-            },
-          );
+          const result = store.getTargetUsersByCountry(getTargetLocations(), {
+            country: params.country || undefined,
+            search: params.search || undefined,
+            limit: parseInt(params.limit, 10),
+            offset: parseInt(params.offset || "0", 10),
+            sort: params.sort || undefined,
+            sortOrder: params.sortOrder || "desc",
+          });
           // 确保每个用户对象包含 topVideoPlayCount、topVideoHref 和 topVideoIsAd
           if (result.users && Array.isArray(result.users)) {
             result.users = result.users.map((u) => ({
@@ -1640,7 +1702,7 @@ export function startWatchServer(
         }
 
         // 默认：全量（兼容旧调用）
-        const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        const result = store.getTargetUsersByCountry(getTargetLocations());
         // 确保每个用户对象包含 topVideoPlayCount、topVideoHref 和 topVideoIsAd
         if (result.countries && Array.isArray(result.countries)) {
           for (const country of result.countries) {
@@ -1662,9 +1724,8 @@ export function startWatchServer(
         req.method === "GET" &&
         routePath === "/api/target-users-other-countries"
       ) {
-        const result = store.getModifiedTargetUsersOutsideLocations(
-          DEFAULT_TARGET_LOCATIONS,
-        );
+        const result =
+          store.getModifiedTargetUsersOutsideLocations(getTargetLocations());
         sendJSON(res, 200, result);
         return;
       }
@@ -1842,6 +1903,49 @@ export function startWatchServer(
         return;
       }
 
+      // ====== 目标国家配置（通用 app-config 落盘） ======
+
+      // GET /api/settings/target-locations — 读取当前目标国家
+      if (
+        req.method === "GET" &&
+        routePath === "/api/settings/target-locations"
+      ) {
+        try {
+          const { getTargetLocations } = await import("../lib/app-config.js");
+          sendJSON(res, 200, { locations: getTargetLocations() });
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
+      // POST /api/settings/target-locations — 保存目标国家（body: { locations: ["CZ","GR",...] }）
+      if (
+        req.method === "POST" &&
+        routePath === "/api/settings/target-locations"
+      ) {
+        try {
+          const body = await readBody(req);
+          const { setTargetLocations } = await import("../lib/app-config.js");
+          const saved = setTargetLocations(body.locations);
+          sendJSON(res, 200, { locations: saved });
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
+      // GET /api/settings/config — 读取整份通用配置（便于后续扩展其他配置）
+      if (req.method === "GET" && routePath === "/api/settings/config") {
+        try {
+          const { getConfig } = await import("../lib/app-config.js");
+          sendJSON(res, 200, { config: getConfig() });
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
       // GET /api/llm-test — 直接测试 LLM API 连通性
       if (req.method === "GET" && routePath === "/api/llm-test") {
         try {
@@ -1939,7 +2043,7 @@ export function startWatchServer(
             targetLocation: params.targetLocation,
             limit: params.limit,
             offset: params.offset,
-            targetLocations: DEFAULT_TARGET_LOCATIONS,
+            targetLocations: getTargetLocations(),
           });
           usersCache.set(cacheKey, { result, time: Date.now() });
         }

package/src/watchdog/process-manager.js

@@ -22,8 +22,11 @@ import { pushSelfLog } from "./self-log-buffer.js";
 const MAX_RESTART = 3;
 const MAX_LOG_LINES = 500; // 每个进程最多保留的日志行数
 const IS_WIN = process.platform === "win32";
-const SPAWN_STAGGER_MS = 30000; // 批量启动时每个进程间隔 30 秒，避免抢网络
-const STOP_STAGGER_MS = 10000; // 强制重启时每个命令停止间隔 10 秒（杀 Edge/进程树会瞬时占资源，错峰释放）
+const SPAWN_STAGGER_MS = 30000; // syncCommands 批量启动时每个进程间隔 30 秒，避免抢网络
+// 代理切换后强制重启（restartAll）专用错峰间隔：切换出口后所有命令集中重建连接，
+// 间隔给长一点，避免瞬时抢网络/触发风控（2026-08-29 按需加长）
+const RESTART_STOP_STAGGER_MS = 20000; // 停止错峰 20s（杀 Edge/进程树瞬时占资源，错峰释放）
+const RESTART_SPAWN_STAGGER_MS = 60000; // 启动错峰 60s
 const STALE_LOG_TIMEOUT_MS = 15 * 60 * 1000; // 15 分钟无日志输出视为假死
 
 // === 控制台日志格式化（仅显示层增强，不影响任何功能链路） ===
@@ -739,9 +742,10 @@ export class ProcessManager extends EventEmitter {
     console.error(
       `[watchdog] ${reason}，强制重启全部命令 (${toRestart.length}个)...`,
     );
-    // 错峰停止：第一个立即停，之后每个间隔 STOP_STAGGER_MS（平滑释放资源，避免同时杀 N 个浏览器）
+    // 错峰停止：第一个立即停，之后每个间隔 RESTART_STOP_STAGGER_MS（平滑释放资源，避免同时杀 N 个浏览器）
     for (let i = 0; i < toRestart.length; i++) {
-      if (i > 0) await new Promise((r) => setTimeout(r, STOP_STAGGER_MS));
+      if (i > 0)
+        await new Promise((r) => setTimeout(r, RESTART_STOP_STAGGER_MS));
       if (this.shutdown) {
         console.error("[watchdog] 看门狗已停止，中止停止命令");
         break;
@@ -751,9 +755,10 @@ export class ProcessManager extends EventEmitter {
         `[watchdog] 命令 ${toRestart[i].id} 已停止 (${i + 1}/${toRestart.length})`,
       );
     }
-    // 错峰逐个重启：第一个立即起，之后每个间隔 SPAWN_STAGGER_MS
+    // 错峰逐个重启：第一个立即起，之后每个间隔 RESTART_SPAWN_STAGGER_MS
     for (let i = 0; i < toRestart.length; i++) {
-      if (i > 0) await new Promise((r) => setTimeout(r, SPAWN_STAGGER_MS));
+      if (i > 0)
+        await new Promise((r) => setTimeout(r, RESTART_SPAWN_STAGGER_MS));
       if (this.shutdown) {
         console.error("[watchdog] 看门狗已停止，中止重启命令");
         break;