tt-help-cli-ycl 1.4.144 → 1.4.145

package/src/watch/server.js

@@ -114,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 || {};
@@ -129,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,
@@ -256,6 +273,7 @@ const EMPTY_GROUP = {
     restrictedUsers: 0,
     errorUsers: 0,
     targetUsers: 0,
+    preciseMerchants: 0,
     sourceStats: {
       seed: 0,
       video: 0,
@@ -1551,6 +1569,48 @@ 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"

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;