tt-help-cli-ycl 1.3.62 → 1.3.64

package/src/lib/args.js

@@ -180,6 +180,7 @@ function parseExploreArgs(args) {
   let explorePortCount = null;
   let exploreUserId = null;
   let exploreMaxVideos = 16;
+  let exploreProxy = null;
 
   const positional = [];
   const PRESETS = ["fast", "normal", "slow", "stealth"];
@@ -218,6 +219,8 @@ function parseExploreArgs(args) {
       exploreUserId = args[++i];
     } else if (arg === "--max-videos") {
       exploreMaxVideos = parseInt(args[++i]) || 16;
+    } else if (arg === "--proxy") {
+      exploreProxy = args[++i];
     } else {
       positional.push(arg);
     }
@@ -258,6 +261,7 @@ function parseExploreArgs(args) {
     explorePortCount,
     exploreUserId,
     exploreMaxVideos,
+    exploreProxy,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,
@@ -439,39 +443,77 @@ function parseDbImportArgs(args) {
 function parseRefreshArgs(args) {
   let serverUrl = defaultServer;
   let explorePreset = "normal";
-  let exploreMaxComments = 10;
-  let exploreMaxGuess = 0;
+  let exploreInterval = 30;
+  let exploreEnableFollow = true;
+  let exploreMaxFollowing = 100;
+  let exploreMaxFollowers = 100;
+  let exploreLocation = DEFAULT_TARGET_LOCATIONS_CSV;
+  let exploreMaxUsers = 0;
   let explorePort = null;
+  let exploreBasePort = null;
+  let explorePortCount = null;
   let exploreProfile = null;
   let exploreUserId = null;
+  let exploreMaxVideos = 16;
+  let exploreRedoMaxAge = 0;
+  let exploreProxy = null;
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--server") {
       serverUrl = args[++i];
-    } else if (arg === "--comments") {
-      exploreMaxComments = parseInt(args[++i]) || 10;
-    } else if (arg === "--guess") {
-      exploreMaxGuess = parseInt(args[++i]) || 0;
     } else if (arg === "--preset") {
       explorePreset = args[++i];
+    } else if (arg === "-i" || arg === "--interval") {
+      exploreInterval = parseInt(args[++i], 10) || 30;
     } else if (arg === "--port") {
       explorePort = parseInt(args[++i]) || 9222;
+    } else if (arg === "--base-port") {
+      exploreBasePort = parseInt(args[++i]) || 9222;
+    } else if (arg === "--port-count") {
+      explorePortCount = parseInt(args[++i]) || 10;
     } else if (arg === "--profile") {
       exploreProfile = args[++i];
     } else if (arg === "--user-id") {
       exploreUserId = args[++i];
+    } else if (arg === "--max-videos") {
+      exploreMaxVideos = parseInt(args[++i]) || 16;
+    } else if (arg === "--max-following") {
+      exploreMaxFollowing = parseInt(args[++i]) || 100;
+    } else if (arg === "--max-followers") {
+      exploreMaxFollowers = parseInt(args[++i]) || 100;
+    } else if (arg === "--max-age") {
+      exploreRedoMaxAge = parseInt(args[++i]) || 43200;
+    } else if (arg === "--proxy") {
+      exploreProxy = args[++i];
+    } else if (arg === "--location") {
+      exploreLocation = args[++i];
+    } else if (arg === "--enable-follow") {
+      exploreEnableFollow = true;
+    } else if (arg === "--disable-follow") {
+      exploreEnableFollow = false;
+    } else if (arg === "--max-users") {
+      exploreMaxUsers = parseInt(args[++i]) || 0;
     }
   }
 
   return {
     subcommand: "refresh",
     explorePreset,
-    exploreMaxComments,
-    exploreMaxGuess,
+    exploreInterval,
+    exploreEnableFollow,
+    exploreMaxFollowing,
+    exploreMaxFollowers,
+    exploreLocation,
+    exploreMaxUsers,
     explorePort,
+    exploreBasePort,
+    explorePortCount,
     exploreProfile,
     exploreUserId,
+    exploreMaxVideos,
+    exploreRedoMaxAge,
+    exploreProxy,
     serverUrl,
     urls: [],
     outputFormat: "json",
@@ -721,6 +763,10 @@ export function parseArgs() {
     return parseDbImportArgs(args.slice(1));
   }
 
+  if (args.length > 0 && args[0] === "refresh") {
+    return parseRefreshArgs(args.slice(1));
+  }
+
   const urls = [];
   let inputFile = null;
   let outputFile = null;

package/src/lib/browser/cdp.js

@@ -143,7 +143,7 @@ function killEdgeProcesses(targetDir) {
   });
 }
 
-function launchEdgeWithCDP(port, userDataDir) {
+function launchEdgeWithCDP(port, userDataDir, proxyServer) {
   return new Promise((resolve, reject) => {
     const platform = os.platform();
     const edgePath = getEdgePath();
@@ -162,14 +162,19 @@ function launchEdgeWithCDP(port, userDataDir) {
       "--disable-breakpad",
       "--disable-background-networking",
       "--disable-sync",
-    ].join(" ");
+    ];
+    if (proxyServer) {
+      extraArgs.push(`--proxy-server="${proxyServer}"`);
+    }
+
+    const argsStr = extraArgs.join(" ");
 
     if (platform === "darwin") {
-      command = `open -a ${edgePath} --new --args ${extraArgs}`;
+      command = `open -a ${edgePath} --new --args ${argsStr}`;
     } else if (platform === "win32") {
-      command = `start msedge ${extraArgs}`;
+      command = `start msedge ${argsStr}`;
     } else {
-      command = `msedge ${extraArgs} &`;
+      command = `msedge ${argsStr} &`;
     }
 
     exec(command, (err) => {
@@ -194,6 +199,7 @@ export { killEdgeProcesses };
 export async function ensureBrowserReady(options = {}) {
   const port = options.port || DEFAULT_CDP_PORT;
   const userDataDir = options.userDataDir || DEFAULT_USER_DATA_DIR;
+  const proxyServer = options.proxyServer || null;
   const isCustom = port !== DEFAULT_CDP_PORT || !!options.userDataDir;
 
   const isReady = await checkCDPPort(port);

package/src/lib/browser/page.js

@@ -68,6 +68,8 @@ export async function withBrowserRecovery(fn, browser, page, cdpOptions, port) {
 
 const DOM_CHECK_TIMEOUT = 20000; // 单次 DOM 检测超时 20 秒
 const DOM_CHECK_RETRIES = 3; // DOM 检测最大重试次数
+const SAFE_CHECK_ROUNDS = 2; // 安全登录检测轮数（首次检测 + 额外1轮确认）
+const SAFE_CHECK_INTERVAL = 5000; // 安全登录检测每轮间隔 5 秒
 
 /**
  * 判断登录状态：Cookie 为主，DOM 验真为辅。
@@ -102,6 +104,45 @@ export async function isLoggedIn(page) {
   return true;
 }
 
+/**
+ * 安全登录检测：发现未登录时多检测几轮，避免因 TikTok 页面渲染延迟导致误判。
+ * - 首次检测为已登录 → 直接返回 true
+ * - 首次检测为未登录 → 等待后重新导航并检测，连续 SAFE_CHECK_ROUNDS 轮都为未登录才确认
+ * - 任何一轮检测为已登录 → 立即返回 true
+ */
+export async function safeCheckLogin(page) {
+  // 第一轮检测
+  let loggedIn = await isLoggedIn(page);
+  if (loggedIn) {
+    console.error(`[安全登录检测] 第 1 轮: 已登录 ✓`);
+    return true;
+  }
+  console.error(
+    `[安全登录检测] 第 1 轮: 未登录 ✗，等待 ${SAFE_CHECK_INTERVAL / 1000}s 后重检...`,
+  );
+
+  // 后续轮次：等待后重新导航到 TikTok 页面再检测
+  for (let round = 2; round <= SAFE_CHECK_ROUNDS; round++) {
+    await new Promise((r) => setTimeout(r, SAFE_CHECK_INTERVAL));
+    // 重新导航到 TikTok 页面，确保页面状态刷新
+    await page.goto("https://www.tiktok.com", {
+      waitUntil: "domcontentloaded",
+    });
+    loggedIn = await isLoggedIn(page);
+    if (loggedIn) {
+      console.error(`[安全登录检测] 第 ${round} 轮: 已登录 ✓`);
+      return true;
+    }
+    console.error(`[安全登录检测] 第 ${round} 轮: 未登录 ✗`);
+  }
+
+  // 连续 SAFE_CHECK_ROUNDS 轮都为未登录
+  console.error(
+    `[安全登录检测] 连续 ${SAFE_CHECK_ROUNDS} 轮均为未登录，确认为未登录`,
+  );
+  return false;
+}
+
 /**
  * 通过 DOM 元素判断登录状态（验真方案）
  * 使用 locator API + state: 'attached' 来避免 CDP 连接下 waitForSelector 的可见性问题

package/src/lib/constants.js

@@ -131,12 +131,33 @@ const HELP_TEXT = [
   "      --disable-follow          禁用关注/粉丝提取",
   "      --max-following <数量>    最大获取关注数，默认 50",
   "      --max-followers <数量>    最大获取粉丝数，默认 50",
-  "      --max-users <数量>        最大处理用户数，默认无限制",
-  "      -i, --interval <秒数>     无任务时轮询间隔，默认 10 秒",
-  "      --port <端口号>           固定 CDP 端口（调试用，关闭自动轮换）",
-  "      --base-port <端口号>      起始端口，默认 9222",
-  "      --port-count <数量>       端口数量（账户数），默认 10",
-  "      --user-id <编号>          客户端编号（设备ID），默认自动生成",
+      "      --max-users <数量>        最大处理用户数，默认无限制",
+      "      -i, --interval <秒数>     无任务时轮询间隔，默认 10 秒",
+      "      --port <端口号>           固定 CDP 端口（调试用，关闭自动轮换）",
+      "      --base-port <端口号>      起始端口，默认 9222",
+      "      --port-count <数量>       端口数量（账户数），默认 10",
+      "      --user-id <编号>          客户端编号（设备ID），默认自动生成",
+      "      --proxy <地址>            浏览器代理（如 socks5://127.0.0.1:1080）",
+      "",
+      "  tt-help refresh [选项]",
+      "    对目标商家用户进行轮回刷新，重新采集视频 + 关注 + 粉丝",
+      "    筛选条件: tt_seller=1, verified=0, 目标国家",
+      "    选项:",
+      "      --server <URL>            服务端地址，默认 http://127.0.0.1:3001",
+      `      --location <国家代码>     国家筛选，逗号分隔，默认 ${DEFAULT_TARGET_LOCATIONS_CSV}`,
+      "      --max-videos <数量>       每用户最大视频数，默认 16",
+      "      --enable-follow           启用关注/粉丝提取（默认启用）",
+      "      --disable-follow          禁用关注/粉丝提取",
+      "      --max-following <数量>    最大获取关注数，默认 100",
+      "      --max-followers <数量>    最大获取粉丝数，默认 100",
+      "      --max-users <数量>        最大处理用户数，默认无限制",
+      "      -i, --interval <秒数>     无任务时轮询间隔，默认 30 秒",
+      "      --max-age <秒数>          最小刷新间隔，默认 43200（12小时）",
+      "      --port <端口号>           固定 CDP 端口（调试用，关闭自动轮换）",
+      "      --base-port <端口号>      起始端口，默认 9222",
+      "      --port-count <数量>       端口数量（账户数），默认 10",
+      "      --user-id <编号>          客户端编号（设备ID），默认自动生成",
+      "      --proxy <地址>            浏览器代理（如 socks5://127.0.0.1:1080）",
   "",
   "  tt-help info <URL> [URL2 ...] [--onlyvideo]",
   "    获取用户/视频信息，支持多个 URL",
@@ -196,9 +217,10 @@ const HELP_TEXT = [
   "    -h, --help                显示帮助",
   "    --version                 显示版本号",
   "",
-  "  示例: tt-help info https://www.tiktok.com/@nike https://www.tiktok.com/@adidas",
-  "        tt-help explore qiqi23280 fast --location ES --max-comments 50",
-  "        tt-help config set server http://127.0.0.1:3001",
+      "  示例: tt-help info https://www.tiktok.com/@nike https://www.tiktok.com/@adidas",
+      "        tt-help explore qiqi23280 fast --location ES --max-comments 50",
+      "        tt-help refresh --server http://127.0.0.1:3001 --port 9222",
+      "        tt-help config set server http://127.0.0.1:3001",
   "        tt-help attach -p 5 -i 10",
   "        tt-help watch -o data/result.db",
   "        tt-help videostats data/result.db -p 3",

package/src/main.js

@@ -10,6 +10,7 @@ import { handleComments } from "./cli/comments.js";
 import { handleVideoStats } from "./cli/videostats.js";
 import { handleDbImport } from "./cli/db-import.js";
 import { handleWebserver } from "./cli/webserver.js";
+import { handleRefresh } from "./cli/refresh.js";
 
 async function main() {
   const parsed = parseArgs();
@@ -33,6 +34,8 @@ async function main() {
       return handleVideoStats(parsed);
     case "db-import":
       return handleDbImport(parsed);
+    case "refresh":
+      return handleRefresh(parsed);
   }
 
   const {

package/src/npm-main.js

@@ -6,6 +6,7 @@ import { handleAttach } from "./cli/attach.js";
 import { handleConfig, showConfig, showUsage, version } from "./cli/config.js";
 import { handleOpen } from "./cli/open.js";
 import { handleComments } from "./cli/comments.js";
+import { handleRefresh } from "./cli/refresh.js";
 
 function exitUnsupportedCommand(command) {
   console.error(
@@ -33,6 +34,8 @@ async function main() {
       return handleOpen(parsed);
     case "comments":
       return handleComments(parsed);
+    case "refresh":
+      return handleRefresh(parsed);
   }
 
   const {

package/src/watch/data-store.js

@@ -775,6 +775,53 @@ function restoreAttachStuckByCountry(country) {
   return { restored: count, country: normalizedCountry };
 }
 
+function resetPendingByCountry(country) {
+  if (!db) {
+    return { reset: 0, country, error: "db not ready" };
+  }
+
+  const normalizedCountry = String(country == null ? "未知" : country).trim();
+  if (!normalizedCountry) {
+    return {
+      reset: 0,
+      country: normalizedCountry,
+      error: "country is required",
+    };
+  }
+
+  const whereSql = `
+    status = 'pending'
+    AND COALESCE(guessed_location, '未知') = ?
+  `;
+  const count =
+    db
+      .prepare(
+        `
+        SELECT COUNT(*) as c
+        FROM jobs
+        WHERE ${whereSql}
+      `,
+      )
+      .get(normalizedCountry)?.c || 0;
+
+  if (!count) {
+    return { reset: 0, country: normalizedCountry };
+  }
+
+  db.prepare(
+    `
+    UPDATE jobs
+    SET user_update_count = 0,
+        updated_at = ?,
+        claimed_by = NULL,
+        claimed_at = NULL
+    WHERE ${whereSql}
+  `,
+  ).run(Date.now(), normalizedCountry);
+
+  return { reset: count, country: normalizedCountry };
+}
+
 function getRawByCountryFromDb() {
   if (!db) return [];
 
@@ -1077,7 +1124,7 @@ function restoreRawJobById(uniqueId) {
   return { restored: 1, uniqueId: safeId };
 }
 
-function restoreRawJobsByFilter({ search, location }) {
+function restoreRawJobsByFilter({ search, location, hasVideo, hasFollower }) {
   if (!db) {
     return { restored: 0, error: "db not ready" };
   }
@@ -1098,6 +1145,14 @@ function restoreRawJobsByFilter({ search, location }) {
     args.push(location);
   }
 
+  if (hasVideo) {
+    where.push("COALESCE(video_count, 0) > 0");
+  }
+
+  if (hasFollower) {
+    where.push("COALESCE(follower_count, 0) > 0");
+  }
+
   if (where.length === 0) {
     return { restored: 0, error: "at least one filter is required" };
   }
@@ -1140,7 +1195,14 @@ function restoreRawJobsByFilter({ search, location }) {
   return { restored: count };
 }
 
-function getRawJobsPageFromDb({ search, location, limit, offset }) {
+function getRawJobsPageFromDb({
+  search,
+  location,
+  limit,
+  offset,
+  hasVideo,
+  hasFollower,
+}) {
   if (!db) return null;
 
   const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
@@ -1159,6 +1221,12 @@ function getRawJobsPageFromDb({ search, location, limit, offset }) {
     where.push("COALESCE(guessed_location, '未知') = ?");
     args.push(location);
   }
+  if (hasVideo) {
+    where.push("COALESCE(video_count, 0) > 0");
+  }
+  if (hasFollower) {
+    where.push("COALESCE(follower_count, 0) > 0");
+  }
 
   const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
   const total = db
@@ -1329,6 +1397,62 @@ function getTargetUsersFromDb(targetLocations = []) {
   };
 }
 
+function getTargetUsersByCountryFromDb(targetLocations = []) {
+  if (!db) return null;
+  if (!targetLocations.length) {
+    return { countries: [] };
+  }
+
+  const placeholders = targetLocations.map(() => "?").join(", ");
+  const rows = db
+    .prepare(
+      `
+      SELECT
+        unique_id,
+        nickname,
+        follower_count,
+        video_count,
+        tt_seller,
+        verified,
+        location_created,
+        latest_video_time,
+        refresh_time,
+        status,
+        sources
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+      ORDER BY location_created ASC, COALESCE(latest_video_time, 0) DESC
+    `,
+    )
+    .all(...targetLocations)
+    .map(mapJobRow);
+
+  const countryMap = new Map();
+  for (const row of rows) {
+    const country = row.locationCreated || "未知";
+    if (!countryMap.has(country)) {
+      countryMap.set(country, []);
+    }
+    countryMap.get(country).push(row);
+  }
+
+  const countries = [];
+  for (const [country, users] of countryMap) {
+    countries.push({
+      country,
+      count: users.length,
+      users,
+    });
+  }
+
+  return {
+    total: rows.length,
+    countries,
+  };
+}
+
 function snakeToCamel(key) {
   return key.replace(/_([a-z])/g, (_, ch) => ch.toUpperCase());
 }
@@ -2786,9 +2910,10 @@ export function createStore(filePath) {
     return { saved: true, pinned: user.pinned };
   }
 
-  function getNextRedoJob(userId) {
+  function getNextRedoJob(userId, maxAgeSeconds = 43200) {
     if (db) {
       const now = Date.now();
+      const threshold = now - maxAgeSeconds * 1000;
       const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
       const targetLocations = [
         "CZ",
@@ -2813,11 +2938,12 @@ export function createStore(filePath) {
           WHERE tt_seller = 1
             AND verified = 0
             AND location_created IN (${placeholders})
+            AND COALESCE(refresh_time, ?) < ?
           ORDER BY COALESCE(refresh_time, ?) ASC
           LIMIT 1
         `,
         )
-        .get(...targetLocations, defaultTime);
+        .get(...targetLocations, defaultTime, threshold, defaultTime);
       if (!row) return null;
       db.prepare(
         "UPDATE jobs SET refresh_time = ?, updated_at = ? WHERE unique_id = ?",
@@ -2830,6 +2956,7 @@ export function createStore(filePath) {
     }
 
     const now = Date.now();
+    const threshold = now - maxAgeSeconds * 1000;
     const defaultTime = new Date("2016-01-01T00:00:00Z").getTime();
 
     // 筛选目标国家用户，按 refreshTime 升序取最远的（没有则默认 2016-01-01）
@@ -2855,13 +2982,19 @@ export function createStore(filePath) {
     );
     if (targetUsers.length === 0) return null;
 
-    targetUsers.sort((a, b) => {
+    const recentEnough = targetUsers.filter((u) => {
+      const rt = u.refreshTime || defaultTime;
+      return rt < threshold;
+    });
+    if (recentEnough.length === 0) return null;
+
+    recentEnough.sort((a, b) => {
       const ta = a.refreshTime || defaultTime;
       const tb = b.refreshTime || defaultTime;
       return ta - tb;
     });
 
-    const next = targetUsers[0];
+    const next = recentEnough[0];
     next.refreshTime = now;
     save();
     return {
@@ -2889,9 +3022,10 @@ export function createStore(filePath) {
           }
         }
       }
+      const newUsers = processDiscoveredUsers(result);
       const ret = updateJobInfo(uniqueId, user, false);
       if (ret.error) return { saved: false, error: ret.error };
-      return { saved: true };
+      return { saved: true, newUsers };
     }
 
     const user = getUser(uniqueId);
@@ -2908,8 +3042,8 @@ export function createStore(filePath) {
         }
       }
     }
-
-    return { saved: true };
+    const newUsers = processDiscoveredUsers(result);
+    return { saved: true, newUsers };
   }
 
   function reportClientError(
@@ -3349,12 +3483,14 @@ export function createStore(filePath) {
     getRawByCountry: getRawByCountryFromDb,
     moveJobsToRawByCountry,
     restoreAttachStuckByCountry,
+    resetPendingByCountry,
     restoreRawJobsByCountry,
     restoreRawJobById,
     restoreRawJobsByFilter,
     getUsersPage: getUsersPageFromDb,
     getRawJobsPage: getRawJobsPageFromDb,
     getTargetUsers: getTargetUsersFromDb,
+    getTargetUsersByCountry: getTargetUsersByCountryFromDb,
     getStats,
     getStatusGroups,
     markGroupsDirty,