tt-help-cli-ycl 1.4.11 → 1.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.11",
+  "version": "1.4.13",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/cli/comments.js

@@ -69,6 +69,8 @@ const CFG = {
   switchPortOnRecycle: true,
   /** 连续任务处理错误阈值（达到后上报服务端） */
   consecutiveTaskErrorsMax: 20,
+  /** 单端口最大运行时间(ms)，超时自动切换端口（默认 48 分钟） */
+  maxSessionRunTimeMs: 48 * 60 * 1000,
 };
 
 /** 从环境变量覆写配置 */
@@ -105,6 +107,10 @@ function loadEnvConfig() {
     1,
     int("COMMENTS_CONSECUTIVE_TASK_ERRORS_MAX", CFG.consecutiveTaskErrorsMax),
   );
+  CFG.maxSessionRunTimeMs = Math.max(
+    60000,
+    int("COMMENTS_MAX_SESSION_RUN_TIME_MS", CFG.maxSessionRunTimeMs),
+  );
 }
 
 // ────────────────────────────────────────
@@ -283,6 +289,7 @@ class CdpSessionManager {
     this.browser = null;
     this.page = null;
     this.lastRecycleAt = 0;
+    this.sessionStartTime = Date.now();
     this._lastMemCheck = 0;
     this._shuttingDown = false;
   }
@@ -362,14 +369,28 @@ class CdpSessionManager {
     this.browser = await ensureBrowserReady(opts);
     this.page = await this._ensurePage();
     this.lastRecycleAt = Date.now();
+    // 端口切换时重置运行计时
+    if (oldPort !== undefined && oldPort !== this.port) {
+      this.sessionStartTime = Date.now();
+    }
   }
 
-  /** 内存检查 + 按需回收（每 30s 最多采样一次） */
+  /** 内存检查 + 定时轮换 + 按需回收（每 30s 最多采样一次） */
   async maybeRecycleForMemory(processedCount) {
     const now = Date.now();
     if (now - this._lastMemCheck < 30000) return;
     this._lastMemCheck = now;
 
+    // 定时轮换：单端口运行超时自动切换
+    const sessionElapsed = now - this.sessionStartTime;
+    if (sessionElapsed >= CFG.maxSessionRunTimeMs) {
+      const mins = Math.round(sessionElapsed / 60000);
+      await this.recycleSession(`定时轮换 (运行 ${mins} 分钟)`, {
+        switchPort: true,
+      });
+      return;
+    }
+
     const mem = process.memoryUsage();
     const rssMB = mem.rss / 1024 / 1024;
     const heapMB = mem.heapUsed / 1024 / 1024;
@@ -507,6 +528,7 @@ async function runAutoMode(options) {
     maxComments,
     basePort,
     proxy: proxyOption,
+    locations,
   } = options;
 
   const actualParallel = Math.max(1, parallel || CFG.parallel);
@@ -514,6 +536,7 @@ async function runAutoMode(options) {
   const actualMaxComments = maxComments || CFG.maxComments;
   const effectiveProxy = proxyOption || configuredProxy;
   const portPoolStart = basePort || CFG.portPoolStart;
+  const jobLocations = locations || null;
 
   loadEnvConfig();
 
@@ -576,8 +599,9 @@ async function runAutoMode(options) {
   console.error(`\n╔══════════════════════════════════════════╗`);
   console.error(`║     自动评论采集模式（CDP 连接已登录浏览器）`);
   console.error(
-    `║  目标国家: ${DEFAULT_TARGET_LOCATIONS.slice(0, 6).join(",")}...`,
+    `║  目标国家: ${jobLocations || DEFAULT_TARGET_LOCATIONS.slice(0, 6).join(",") + "..."}`,
   );
+  if (jobLocations) console.error(`║  任务过滤: ${jobLocations}`);
   console.error(`║  服务端:   ${serverUrl}`);
   console.error(
     `║  CDP 端口池: ${portPoolStart}-${portPoolStart + CFG.portPoolSize - 1}（当前: ${session.port}）`,
@@ -614,9 +638,10 @@ async function runAutoMode(options) {
         // ── 领取任务 ──
         let tasks;
         try {
-          const resp = await apiGet(
-            `${serverUrl}/api/comment-tasks?limit=${actualParallel}`,
-          );
+          const apiUrl = jobLocations
+            ? `${serverUrl}/api/comment-tasks?limit=${actualParallel}&locations=${encodeURIComponent(jobLocations)}`
+            : `${serverUrl}/api/comment-tasks?limit=${actualParallel}`;
+          const resp = await apiGet(apiUrl);
           tasks = resp.tasks || [];
         } catch (err) {
           console.error(`  × 获取任务失败: ${err.message}`);
@@ -783,8 +808,12 @@ async function runAutoMode(options) {
 
             // 每 10 个任务输出内存汇总
             if (totalTasks() % 10 === 0) {
+              const remainingMs =
+                session.sessionStartTime + CFG.maxSessionRunTimeMs - Date.now();
+              const remainingMins =
+                remainingMs > 0 ? Math.round(remainingMs / 60000) : 0;
               console.error(
-                `── #${totalTasks()} ── ${formatMemoryWithBrowser(session.port)}  处理=${processedCount} 跳过=${skippedCount} 错误=${errorCount}`,
+                `── #${totalTasks()} ── ${formatMemoryWithBrowser(session.port)}  处理=${processedCount} 跳过=${skippedCount} 错误=${errorCount}  距切换≈${remainingMins}min`,
               );
             }
           } catch (err) {
@@ -1006,6 +1035,7 @@ export async function handleComments(options) {
     commentsServer,
     commentsBasePort,
     commentsProxy,
+    commentsLocations,
   } = options;
 
   // 自动模式：无 URL
@@ -1017,6 +1047,7 @@ export async function handleComments(options) {
       maxComments: commentsMax,
       basePort: commentsBasePort,
       proxy: commentsProxy,
+      locations: commentsLocations,
     });
   }
 

package/src/lib/args.js

@@ -670,6 +670,7 @@ function parseCommentsArgs(args) {
   let commentsServer = defaultServer;
   let commentsBasePort = 6222;
   let commentsProxy = null;
+  let commentsLocations = null;
 
   const positional = [];
 
@@ -689,6 +690,12 @@ function parseCommentsArgs(args) {
       commentsBasePort = parseInt(args[++i]) || 6222;
     } else if (arg === "--proxy") {
       commentsProxy = args[++i];
+    } else if (
+      arg === "-l" ||
+      arg === "--location" ||
+      arg === "--job-locations"
+    ) {
+      commentsLocations = args[++i];
     } else {
       positional.push(arg);
     }
@@ -709,6 +716,7 @@ function parseCommentsArgs(args) {
     commentsServer,
     commentsBasePort,
     commentsProxy,
+    commentsLocations,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,

package/src/lib/constants.js

@@ -217,10 +217,13 @@ const HELP_TEXT = [
   "      -i, --interval       空闲间隔上限秒（默认: 10，实际 1~N 随机）",
   "      -s, --server         服务端地址（默认: http://127.0.0.1:3001）",
   "      -m, --max-comments   每视频最大评论数（默认: 200）",
-  "      --base-port          浏览器CDP端口（默认: 9222）",
+  "      -l, --location       按国家领取任务，逗号分隔（如: DE,FR,IT）",
+  "                           未指定时领取所有国家的任务",
+  "      --base-port          浏览器CDP端口（默认: 6222）",
   "      --save               去重后保存到服务端，来源标记为 comment",
   "    示例: tt-help comments",
-  "          tt-help comments -p 2 -i 15 --base-port 9223",
+  "          tt-help comments -p 2 -i 15 --base-port 6223",
+  "          tt-help comments -l DE,FR,IT -p 5",
   "          tt-help comments <视频URL> 50 --save",
   "",
   "  tag  <标签名> [...] [选项]",

package/src/watch/data-store.js

@@ -2647,8 +2647,7 @@ export function createStore(filePath, options = {}) {
       let sql = `
         SELECT *
         FROM jobs_base
-        WHERE (COALESCE(tt_seller, '') = '' OR tt_seller = 1)
-          AND COALESCE(user_update_count, 0) <= 0
+        WHERE COALESCE(user_update_count, 0) <= 0
       `;
       const sqlParams = [];
 
@@ -2698,13 +2697,7 @@ export function createStore(filePath, options = {}) {
     const pending = data
       .filter((u) => {
         const updateCount = u.userUpdateCount;
-        // ttSeller 为空 或 ttSeller=1（商家重处理）都可以领取
-        const ttSellerEligible =
-          u.ttSeller === null ||
-          u.ttSeller === undefined ||
-          u.ttSeller === "" ||
-          u.ttSeller === 1;
-        if (!ttSellerEligible) return false;
+        // jobs_base 中所有 user_update_count <= 0 的记录都可以领取
         if (
           updateCount === null ||
           updateCount === undefined ||
@@ -3137,20 +3130,32 @@ export function createStore(filePath, options = {}) {
     return videos.length;
   }
 
-  function getPendingCommentTasks(limit) {
+  function getPendingCommentTasks(limit, locations = null) {
     if (getDb()) {
       const l = Math.max(1, parseInt(limit) || 1);
+      const normalizedLocations =
+        Array.isArray(locations) && locations.length
+          ? locations
+              .map((loc) => String(loc).trim().toUpperCase())
+              .filter(Boolean)
+          : null;
+
+      const locationFilter = normalizedLocations
+        ? `AND UPPER(COALESCE(location_created, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`
+        : "";
+
       const rows = getDb()
         .prepare(
           `
           SELECT *
           FROM videos
-          WHERE user_update_count IS NULL OR user_update_count <= 0
+          WHERE (user_update_count IS NULL OR user_update_count <= 0)
+          ${locationFilter}
           ORDER BY tt_seller DESC, registered_at ASC
           LIMIT ?
         `,
         )
-        .all(l);
+        .all(...(normalizedLocations || []), l);
       if (rows.length === 0) return [];
       const bumpStmt = getDb().prepare(
         `
@@ -3171,7 +3176,19 @@ export function createStore(filePath, options = {}) {
     }
 
     // 筛选待处理视频（userUpdateCount <= 0 或 null/undefined）
-    const pending = videos.filter((v) => (v.userUpdateCount || 0) <= 0);
+    let pending = videos.filter((v) => (v.userUpdateCount || 0) <= 0);
+    // 按 locations 过滤
+    if (Array.isArray(locations) && locations.length > 0) {
+      const upperLocs = locations.map((loc) =>
+        String(loc).trim().toUpperCase(),
+      );
+      pending = pending.filter((v) => {
+        const loc = String(v.locationCreated || "")
+          .trim()
+          .toUpperCase();
+        return upperLocs.includes(loc);
+      });
+    }
     // ttSeller=true 优先
     pending.sort((a, b) => {
       if (a.ttSeller && !b.ttSeller) return -1;
@@ -3395,14 +3412,13 @@ export function createStore(filePath, options = {}) {
       };
     }
 
-    // 5. 验证：统计 jobs_base 中可被 attach 领取的记录数（tt_seller=1 且 user_update_count<=0）
+    // 5. 验证：统计 jobs_base 中可被 attach 领取的记录数（user_update_count<=0）
     let available = 0;
     try {
       const row = db
         .prepare(
           `SELECT COUNT(*) as total FROM jobs_base
-           WHERE tt_seller = 1
-             AND COALESCE(user_update_count, 0) <= 0
+           WHERE COALESCE(user_update_count, 0) <= 0
              AND video_count = 0`,
         )
         .get();

package/src/watch/db-schema.js

@@ -278,8 +278,84 @@ export function initDb(filePath) {
   migrateColumns("tags", {
     discover_round: "INTEGER DEFAULT 0",
     strategy: "TEXT",
+    dead_reason: "TEXT",
+    direction_id: "INTEGER",
   });
 
+  // ===== tag_directions 表（分层探索：通用词/分类/产品） =====
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS tag_directions (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT NOT NULL,
+      level INTEGER NOT NULL DEFAULT 1,
+      parent_id INTEGER,
+      country TEXT,
+      lang_group TEXT,
+      status TEXT NOT NULL DEFAULT 'active',
+      total_experiments INTEGER DEFAULT 0,
+      productive_experiments INTEGER DEFAULT 0,
+      best_score REAL DEFAULT 0,
+      notes TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT
+    )
+  `);
+  migrateColumns("tag_directions", {
+    lang_group: "TEXT",
+  });
+
+  // ===== tag_experiments 表（每次探索的实验记录） =====
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS tag_experiments (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      direction_id INTEGER,
+      country TEXT NOT NULL,
+      hypothesis TEXT,
+      strategy TEXT,
+      tags_tried TEXT NOT NULL DEFAULT '[]',
+      tags_productive TEXT NOT NULL DEFAULT '[]',
+      tags_dead_not_exist TEXT NOT NULL DEFAULT '[]',
+      tags_dead_no_match TEXT NOT NULL DEFAULT '[]',
+      conclusion TEXT,
+      productive_count INTEGER DEFAULT 0,
+      dead_count INTEGER DEFAULT 0,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )
+  `);
+
+  // ===== tag_analyst_reports 表（LLM 分析师定期体检报告） =====
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS tag_analyst_reports (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      report_type TEXT NOT NULL DEFAULT 'daily',
+      countries TEXT NOT NULL DEFAULT '[]',
+      summary TEXT,
+      top_directions TEXT NOT NULL DEFAULT '[]',
+      worst_directions TEXT NOT NULL DEFAULT '[]',
+      cross_country_suggestions TEXT NOT NULL DEFAULT '[]',
+      cleanup_suggestions TEXT NOT NULL DEFAULT '[]',
+      next_strategy TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )
+  `);
+
+  // ===== cross_country_learnings 表（跨国家经验复用记录） =====
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS cross_country_learnings (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      source_country TEXT NOT NULL,
+      source_tag TEXT NOT NULL,
+      source_direction_id INTEGER,
+      target_country TEXT NOT NULL,
+      target_tag TEXT,
+      transferred_at TEXT,
+      result_status TEXT,
+      score REAL,
+      notes TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now'))
+    )
+  `);
+
   // ===== discover_log 表（记录每次 LLM discover 的策略和思考） =====
   db.exec(`
     CREATE TABLE IF NOT EXISTS discover_log (
@@ -334,6 +410,12 @@ export function initDb(filePath) {
     `CREATE INDEX IF NOT EXISTS idx_tags_score ON tags(score DESC)`,
     `CREATE INDEX IF NOT EXISTS idx_discover_log_country ON discover_log(country, round DESC)`,
     `CREATE INDEX IF NOT EXISTS idx_reflection_rules_active ON reflection_rules(country, is_active)`,
+    `CREATE INDEX IF NOT EXISTS idx_tag_directions_country ON tag_directions(country, level)`,
+    `CREATE INDEX IF NOT EXISTS idx_tag_experiments_country ON tag_experiments(country, created_at DESC)`,
+    `CREATE INDEX IF NOT EXISTS idx_tag_experiments_direction ON tag_experiments(direction_id)`,
+    `CREATE INDEX IF NOT EXISTS idx_cross_country_source ON cross_country_learnings(source_country, result_status)`,
+    `CREATE INDEX IF NOT EXISTS idx_cross_country_target ON cross_country_learnings(target_country)`,
+    `CREATE INDEX IF NOT EXISTS idx_tags_dead_reason ON tags(dead_reason)`,
   ];
   for (const sql of indexes) {
     db.exec(sql);

package/src/watch/db-stats.js

@@ -50,7 +50,7 @@ export function getDashboardStatsFromDb(targetLocations = []) {
 
   const userUpdateTasksRow = db
     .prepare(
-      `SELECT COUNT(*) as userUpdateTasks FROM jobs_base WHERE COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0`,
+      `SELECT COUNT(*) as userUpdateTasks FROM jobs_base WHERE COALESCE(user_update_count, 0) <= 0`,
     )
     .get();
 
@@ -147,7 +147,7 @@ export function getUserUpdateByCountryFromDb() {
     .prepare(
       `SELECT COALESCE(guessed_location, '未知') as country, COUNT(*) as count
        FROM jobs_base
-       WHERE tt_seller IS NULL AND COALESCE(user_update_count, 0) <= 0
+       WHERE COALESCE(user_update_count, 0) <= 0
        GROUP BY COALESCE(guessed_location, '未知')
        ORDER BY count DESC`,
     )
@@ -161,7 +161,7 @@ export function getAttachStuckByCountryFromDb() {
     .prepare(
       `SELECT COALESCE(guessed_location, '未知') as country, COUNT(*) as count
        FROM jobs_base
-       WHERE tt_seller IS NULL AND COALESCE(user_update_count, 0) = 1
+       WHERE COALESCE(user_update_count, 0) = 1
        GROUP BY COALESCE(guessed_location, '未知')
        ORDER BY count DESC`,
     )
@@ -194,7 +194,7 @@ export function restoreAttachStuckByCountry(country) {
     };
   }
 
-  const whereSql = `COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) = 1 AND COALESCE(guessed_location, '未知') = ?`;
+  const whereSql = `COALESCE(user_update_count, 0) = 1 AND COALESCE(guessed_location, '未知') = ?`;
   const count =
     db
       .prepare(`SELECT COUNT(*) as c FROM jobs_base WHERE ${whereSql}`)

package/src/watch/db-tags.js

@@ -171,6 +171,23 @@ export function reportTagScore(tag, fields) {
     : null;
   const now = new Date().toISOString();
 
+  // 自动分类 dead_reason
+  let deadReason = null;
+  if (status === "dead" && error) {
+    const errLower = error.toLowerCase();
+    if (
+      errLower.includes("no videos found") ||
+      errLower.includes("tag_not_found") ||
+      errLower.includes("找不到")
+    ) {
+      deadReason = "not_exist";
+    } else if ((matchedAuthors ?? 0) === 0) {
+      deadReason = "no_match";
+    } else {
+      deadReason = "wrong_country";
+    }
+  }
+
   try {
     const result = db
       .prepare(
@@ -183,6 +200,7 @@ export function reportTagScore(tag, fields) {
           matched_countries = COALESCE(?, matched_countries),
           pushed_users = COALESCE(?, pushed_users),
           last_error = COALESCE(?, last_error),
+          dead_reason = COALESCE(?, dead_reason),
           scored_at = ?,
           score_count = score_count + 1
         WHERE tag = ?`,
@@ -196,6 +214,7 @@ export function reportTagScore(tag, fields) {
         matchedCountriesJson,
         pushedUsers ?? null,
         error ?? null,
+        deadReason,
         now,
         tag,
       );

package/src/watch/public/app.js

@@ -163,7 +163,6 @@ function renderStats() {
   if (statJobsBase)
     statJobsBase.textContent = `jobs_base: ${formatStatNum(d.jobsBaseTotal || 0)}`;
   flashEl("statError", d.errorUsers);
-  flashEl("statRestricted", d.restrictedUsers);
   flashEl("statTarget", d.targetUsers, { full: true });
   flashEl("statUserUpdateTasks", d.userUpdateTasks || 0, { full: true });
   flashEl("statRawJobs", d.rawJobs || 0);
@@ -376,7 +375,6 @@ function renderSourceChart(sources) {
     following: "关注",
     follower: "粉丝",
     processed: "已处理",
-    restricted: "受限(跳过)",
     error: "错误(待重试)",
     noVideo: "无视频",
   };
@@ -419,13 +417,10 @@ function renderTable(users) {
       const nowStatus = u.status;
       const changed =
         wasStatus !== nowStatus &&
-        (nowStatus === "done" ||
-          nowStatus === "restricted" ||
-          nowStatus === "error");
+        (nowStatus === "done" || nowStatus === "error");
       const rowClass = changed ? ' class="row-flash"' : "";
 
       const statusTags = {
-        restricted: '<span class="tag error">受限(跳过)</span>',
         error: '<span class="tag error">错误(待重试)</span>',
         done: '<span class="tag processed">已完成</span>',
         processing: '<span class="tag processing">处理中</span>',
@@ -991,33 +986,6 @@ async function resetJob(uniqueId) {
   }
 }
 
-async function moveRestrictedToBase() {
-  const count = currentStats?.restrictedUsers || 0;
-  if (count === 0) {
-    showToast("没有受限用户");
-    return;
-  }
-  if (!confirm(`确定将 ${count} 个受限用户移到 jobs_base 吗？`)) return;
-  showLoading("迁移中...");
-  try {
-    const res = await fetch("/api/jobs/move-restricted-to-base", {
-      method: "POST",
-    });
-    const data = await res.json();
-    if (data.error) {
-      showToast(data.error, true);
-      return;
-    }
-    showToast(`已迁移 ${data.moved} 个受限用户`);
-    fetchStats();
-    fetchUsers();
-  } catch (e) {
-    showToast("迁移失败: " + e.message, true);
-  } finally {
-    hideLoading();
-  }
-}
-
 async function batchResetErrors() {
   const errorUsers = currentUsers.filter((u) => u.status === "error");
   if (errorUsers.length === 0) {
@@ -1762,8 +1730,6 @@ function renderTargetTable() {
         statusTag = '<span class="tag pending">待处理</span>';
       else if (u.status === "error")
         statusTag = '<span class="tag error">错误</span>';
-      else if (u.status === "restricted")
-        statusTag = '<span class="tag error">受限</span>';
       else statusTag = u.status || "-";
 
       return `<tr data-user="${u.uniqueId}">

package/src/watch/public/index.html

@@ -41,10 +41,6 @@
         <div class="label">错误</div>
         <div class="value error" id="statError">0</div>
       </div>
-      <div class="stat-card clickable" onclick="moveRestrictedToBase()">
-        <div class="label">受限</div>
-        <div class="value error" id="statRestricted">0</div>
-      </div>
       <div class="stat-card clickable pending-card" id="statUserUpdateCard" onclick="navigateToUserUpdate()">
         <div class="label">待补资料</div>
         <div class="value target" id="statUserUpdateTasks">0</div>
@@ -122,7 +118,6 @@
         <button data-filter="pending" onclick="setFilter('pending')">待处理</button>
         <button data-filter="done" onclick="setFilter('done')">已完成</button>
         <button data-filter="error" onclick="setFilter('error')">错误</button>
-        <button data-filter="restricted" onclick="setFilter('restricted')">受限</button>
         <button data-filter="target" onclick="setFilter('target')" style="background:#7c3aed;color:#fff">目标商家</button>
         <select id="targetLocationFilter" onchange="onTargetLocationChange()"
           style="padding:6px 10px;border:1px solid #7c3aed;border-radius:6px;background:#2a2a3a;color:#ccc;font-size:12px;cursor:pointer;outline:none;display:none">