tt-help-cli-ycl 1.3.41 → 1.3.43

package/package.json

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

package/scripts/run-explore.bat

@@ -127,6 +127,8 @@ CALL ECHO   User ID: %%USER_ID%%
 CALL ECHO   Base port: %%BASE_PORT%%
 CALL ECHO   Port count: %%PORT_COUNT%%
 IF NOT "%JOB_LOCATIONS%"=="" ECHO   Job locations: %JOB_LOCATIONS%
+ECHO   Max following: 5
+ECHO   Max followers: 5
 ECHO   Speed: stealth (slowest)
 ECHO ========================================
-CALL tt-help explore stealth --user-id %%USER_ID%% --base-port %%BASE_PORT%% --port-count %%PORT_COUNT%% %%JOB_LOC_ARGS%%
+CALL tt-help explore stealth --user-id %%USER_ID%% --base-port %%BASE_PORT%% --port-count %%PORT_COUNT%% --max-following 5 --max-followers 5 %%JOB_LOC_ARGS%%

package/scripts/run-explore.ps1

@@ -152,6 +152,8 @@ Write-Host "  用户编号: $userId"
 Write-Host "  起始端口: $basePort"
 Write-Host "  端口数量: $portCount"
 if ($inputJobLocations) { Write-Host "  任务国家: $inputJobLocations" }
+Write-Host "  最大关注: 5"
+Write-Host "  最大粉丝: 5"
 Write-Host "  速度: stealth (最慢)"
 Write-Host "========================================"
-tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount $jobLocationsArg
+tt-help explore stealth --user-id $userId --base-port $basePort --port-count $portCount --max-following 5 --max-followers 5 $jobLocationsArg

package/scripts/run-explore.sh

@@ -112,8 +112,10 @@ echo "  用户编号: $USER_ID"
 echo "  起始端口: $BASE_PORT"
 echo "  端口数量: $PORT_COUNT"
 if [ -n "$INPUT_JOB_LOCATIONS" ]; then echo "  任务国家: $INPUT_JOB_LOCATIONS"; fi
+echo "  最大关注: 5"
+echo "  最大粉丝: 5"
 echo "  速度: stealth (最慢)"
 echo "========================================"
 JOB_LOC_ARGS=""
 if [ -n "$INPUT_JOB_LOCATIONS" ]; then JOB_LOC_ARGS="--job-locations $INPUT_JOB_LOCATIONS"; fi
-tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT" $JOB_LOC_ARGS
+tt-help explore stealth --user-id "$USER_ID" --base-port "$BASE_PORT" --port-count "$PORT_COUNT" --max-following 5 --max-followers 5 $JOB_LOC_ARGS

package/src/cli/explore.js

@@ -24,6 +24,7 @@ import path from "path";
 import os from "os";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
+const STARTUP_TIKTOK_URL = "https://www.tiktok.com/@ycl5007";
 
 async function withRetry(label, fn) {
   let backoff = 1000;
@@ -164,8 +165,8 @@ export async function handleExplore(options) {
 
     const page = await getOrCreatePage(browser);
 
-    // 先导航到 TikTok 首页，再检测登录状态
-    await page.goto("https://www.tiktok.com", {
+    // 先导航到 TikTok 页面，再检测登录状态
+    await page.goto(STARTUP_TIKTOK_URL, {
       waitUntil: "domcontentloaded",
     });
 
@@ -214,8 +215,8 @@ export async function handleExplore(options) {
         userDataDir: nextAccount.userDataDir,
       });
       console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
-      // 切换账户后先导航到 TikTok，再重新检测登录状态
-      await page.goto("https://www.tiktok.com", {
+      // 切换账户后先导航到 TikTok 页面，再重新检测登录状态
+      await page.goto(STARTUP_TIKTOK_URL, {
         waitUntil: "domcontentloaded",
       });
       loggedIn = await isLoggedIn(page);

package/src/lib/args.js

@@ -203,7 +203,7 @@ function parseExploreArgs(args) {
       exploreEnableFollow = false;
     } else if (arg === "--max-following") {
       exploreMaxFollowing = parseInt(args[++i]) || 50;
-
+    } else if (arg === "--max-followers") {
       exploreMaxFollowers = parseInt(args[++i]) || 50;
     } else if (arg === "--max-users") {
       exploreMaxUsers = parseInt(args[++i]) || 0;

package/src/lib/constants.js

@@ -128,7 +128,7 @@ const HELP_TEXT = [
   "      --max-videos <数量>       每用户最大视频数，默认 16",
   "      --enable-follow           启用关注/粉丝提取（默认启用）",
   "      --disable-follow          禁用关注/粉丝提取",
-  "      --max-following <数量>    最大获取关注数，默认 50（同时设置粉丝数）",
+  "      --max-following <数量>    最大获取关注数，默认 50",
   "      --max-followers <数量>    最大获取粉丝数，默认 50",
   "      --max-users <数量>        最大处理用户数，默认无限制",
   "      -i, --interval <秒数>     无任务时轮询间隔，默认 10 秒",

package/src/watch/data-store.js

@@ -116,6 +116,38 @@ function initUserDb(filePath) {
       sec_uid TEXT
     )
   `);
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS raw_jobs (
+      unique_id TEXT PRIMARY KEY,
+      nickname TEXT,
+      status TEXT DEFAULT 'pending',
+      sources TEXT,
+      claimed_by TEXT,
+      claimed_at INTEGER,
+      error TEXT,
+      pinned INTEGER DEFAULT 0,
+      no_video INTEGER DEFAULT 0,
+      restricted INTEGER DEFAULT 0,
+      user_update_count INTEGER DEFAULT 0,
+      tt_seller INTEGER,
+      verified INTEGER,
+      video_count INTEGER DEFAULT 0,
+      comment_count INTEGER DEFAULT 0,
+      guessed_location TEXT,
+      location_created TEXT,
+      follower_count INTEGER DEFAULT 0,
+      following_count INTEGER DEFAULT 0,
+      heart_count INTEGER DEFAULT 0,
+      refresh_time INTEGER,
+      processed INTEGER DEFAULT 0,
+      processed_at INTEGER,
+      created_at INTEGER,
+      updated_at INTEGER,
+      region TEXT,
+      signature TEXT,
+      sec_uid TEXT
+    )
+  `);
   db.exec(`
     CREATE TABLE IF NOT EXISTS videos (
       id TEXT PRIMARY KEY,
@@ -454,6 +486,11 @@ function getPendingJobsUserUpdateCount() {
     .get().c;
 }
 
+function getRawJobsCount() {
+  if (!db) return 0;
+  return db.prepare("SELECT COUNT(*) as c FROM raw_jobs").get().c;
+}
+
 function getDashboardStatsFromDb(targetLocations = []) {
   if (!db) return null;
 
@@ -560,6 +597,7 @@ function getDashboardStatsFromDb(targetLocations = []) {
 
   return {
     totalUsers: total,
+    rawJobs: getRawJobsCount(),
     dbTotalUsers: getUserDbCount(),
     jobsTotal: total,
     jobsPending: getPendingJobsCount(),
@@ -587,6 +625,415 @@ function getDashboardStatsFromDb(targetLocations = []) {
   };
 }
 
+function getPendingByCountryFromDb() {
+  if (!db) return [];
+
+  // 按 guessed_location 分组统计待处理任务
+  const rows = db
+    .prepare(
+      `
+      SELECT
+        COALESCE(guessed_location, '未知') as country,
+        COUNT(*) as count
+      FROM jobs
+      WHERE status = 'pending'
+      GROUP BY COALESCE(guessed_location, '未知')
+      ORDER BY count DESC
+    `,
+    )
+    .all();
+
+  return rows;
+}
+
+function getUserUpdateByCountryFromDb() {
+  if (!db) return [];
+
+  // 按 guessed_location 分组统计待补资料任务
+  const rows = db
+    .prepare(
+      `
+      SELECT
+        COALESCE(guessed_location, '未知') as country,
+        COUNT(*) as count
+      FROM jobs
+      WHERE COALESCE(tt_seller, '') = ''
+        AND COALESCE(user_update_count, 0) <= 0
+      GROUP BY COALESCE(guessed_location, '未知')
+      ORDER BY count DESC
+    `,
+    )
+    .all();
+
+  return rows;
+}
+
+function getAttachStuckByCountryFromDb() {
+  if (!db) return [];
+
+  return db
+    .prepare(
+      `
+      SELECT
+        COALESCE(guessed_location, '未知') as country,
+        COUNT(*) as count
+      FROM jobs
+      WHERE COALESCE(tt_seller, '') = ''
+        AND COALESCE(user_update_count, 0) = 1
+      GROUP BY COALESCE(guessed_location, '未知')
+      ORDER BY count DESC
+    `,
+    )
+    .all();
+}
+
+function restoreAttachStuckByCountry(country) {
+  if (!db) {
+    return { restored: 0, country, error: "db not ready" };
+  }
+
+  const normalizedCountry = String(country == null ? "未知" : country).trim();
+  if (!normalizedCountry) {
+    return {
+      restored: 0,
+      country: normalizedCountry,
+      error: "country is required",
+    };
+  }
+
+  const whereSql = `
+    COALESCE(tt_seller, '') = ''
+    AND COALESCE(user_update_count, 0) = 1
+    AND COALESCE(guessed_location, '未知') = ?
+  `;
+  const count =
+    db
+      .prepare(
+        `
+        SELECT COUNT(*) as c
+        FROM jobs
+        WHERE ${whereSql}
+      `,
+      )
+      .get(normalizedCountry)?.c || 0;
+
+  if (!count) {
+    return { restored: 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 { restored: count, country: normalizedCountry };
+}
+
+function getRawByCountryFromDb() {
+  if (!db) return [];
+
+  return db
+    .prepare(
+      `
+      SELECT
+        COALESCE(guessed_location, '未知') as country,
+        COUNT(*) as count
+      FROM raw_jobs
+      GROUP BY COALESCE(guessed_location, '未知')
+      ORDER BY count DESC
+    `,
+    )
+    .all();
+}
+
+function moveJobsToRawByCountry(scope, country) {
+  if (!db) {
+    return { moved: 0, scope, country, error: "db not ready" };
+  }
+
+  const normalizedScope = String(scope || "").trim();
+  const normalizedCountry = String(country == null ? "未知" : country).trim();
+  if (!normalizedCountry) {
+    return {
+      moved: 0,
+      scope: normalizedScope,
+      country: normalizedCountry,
+      error: "country is required",
+    };
+  }
+
+  let scopeWhere = "";
+  if (normalizedScope === "pending") {
+    scopeWhere = `status = 'pending'`;
+  } else if (normalizedScope === "userUpdate") {
+    scopeWhere = `COALESCE(tt_seller, '') = '' AND COALESCE(user_update_count, 0) <= 0`;
+  } else {
+    return {
+      moved: 0,
+      scope: normalizedScope,
+      country: normalizedCountry,
+      error: "unsupported scope",
+    };
+  }
+
+  const whereSql = `
+    ${scopeWhere}
+    AND COALESCE(guessed_location, '未知') = ?
+  `;
+  const count =
+    db
+      .prepare(
+        `
+        SELECT COUNT(*) as c
+        FROM jobs
+        WHERE ${whereSql}
+      `,
+      )
+      .get(normalizedCountry)?.c || 0;
+
+  if (!count) {
+    return { moved: 0, scope: normalizedScope, country: normalizedCountry };
+  }
+
+  const moveTxn = db.transaction((targetCountry) => {
+    db.prepare(
+      `
+      INSERT OR REPLACE INTO raw_jobs (
+        unique_id,
+        nickname,
+        status,
+        sources,
+        claimed_by,
+        claimed_at,
+        error,
+        pinned,
+        no_video,
+        restricted,
+        user_update_count,
+        tt_seller,
+        verified,
+        video_count,
+        comment_count,
+        guessed_location,
+        location_created,
+        follower_count,
+        following_count,
+        heart_count,
+        refresh_time,
+        processed,
+        processed_at,
+        created_at,
+        updated_at,
+        region,
+        signature,
+        sec_uid
+      )
+      SELECT
+        unique_id,
+        nickname,
+        status,
+        sources,
+        claimed_by,
+        claimed_at,
+        error,
+        pinned,
+        no_video,
+        restricted,
+        user_update_count,
+        tt_seller,
+        verified,
+        video_count,
+        comment_count,
+        guessed_location,
+        location_created,
+        follower_count,
+        following_count,
+        heart_count,
+        refresh_time,
+        processed,
+        processed_at,
+        created_at,
+        updated_at,
+        region,
+        signature,
+        sec_uid
+      FROM jobs
+      WHERE ${whereSql}
+    `,
+    ).run(targetCountry);
+
+    db.prepare(
+      `
+      DELETE FROM jobs
+      WHERE ${whereSql}
+    `,
+    ).run(targetCountry);
+  });
+
+  moveTxn(normalizedCountry);
+  return { moved: count, scope: normalizedScope, country: normalizedCountry };
+}
+
+function restoreRawJobsByCountry(country) {
+  if (!db) {
+    return { restored: 0, country, error: "db not ready" };
+  }
+
+  const normalizedCountry = String(country == null ? "未知" : country).trim();
+  if (!normalizedCountry) {
+    return {
+      restored: 0,
+      country: normalizedCountry,
+      error: "country is required",
+    };
+  }
+
+  const whereSql = `COALESCE(guessed_location, '未知') = ?`;
+  const count =
+    db
+      .prepare(
+        `
+        SELECT COUNT(*) as c
+        FROM raw_jobs
+        WHERE ${whereSql}
+      `,
+      )
+      .get(normalizedCountry)?.c || 0;
+
+  if (!count) {
+    return { restored: 0, country: normalizedCountry };
+  }
+
+  const restoreTxn = db.transaction((targetCountry) => {
+    db.prepare(
+      `
+      INSERT OR REPLACE INTO jobs (
+        unique_id,
+        nickname,
+        status,
+        sources,
+        claimed_by,
+        claimed_at,
+        error,
+        pinned,
+        no_video,
+        restricted,
+        user_update_count,
+        tt_seller,
+        verified,
+        video_count,
+        comment_count,
+        guessed_location,
+        location_created,
+        follower_count,
+        following_count,
+        heart_count,
+        refresh_time,
+        processed,
+        processed_at,
+        created_at,
+        updated_at,
+        region,
+        signature,
+        sec_uid
+      )
+      SELECT
+        unique_id,
+        nickname,
+        status,
+        sources,
+        claimed_by,
+        claimed_at,
+        error,
+        pinned,
+        no_video,
+        restricted,
+        user_update_count,
+        tt_seller,
+        verified,
+        video_count,
+        comment_count,
+        guessed_location,
+        location_created,
+        follower_count,
+        following_count,
+        heart_count,
+        refresh_time,
+        processed,
+        processed_at,
+        created_at,
+        updated_at,
+        region,
+        signature,
+        sec_uid
+      FROM raw_jobs
+      WHERE ${whereSql}
+    `,
+    ).run(targetCountry);
+
+    db.prepare(
+      `
+      DELETE FROM raw_jobs
+      WHERE ${whereSql}
+    `,
+    ).run(targetCountry);
+  });
+
+  restoreTxn(normalizedCountry);
+  return { restored: count, country: normalizedCountry };
+}
+
+function getRawJobsPageFromDb({ search, location, limit, offset }) {
+  if (!db) return null;
+
+  const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
+  const safeOffset = Math.max(0, parseInt(offset) || 0);
+  const where = [];
+  const args = [];
+
+  if (search) {
+    where.push(
+      "(LOWER(unique_id) LIKE ? OR LOWER(COALESCE(nickname, '')) LIKE ?)",
+    );
+    const pattern = `%${String(search).toLowerCase()}%`;
+    args.push(pattern, pattern);
+  }
+  if (location) {
+    where.push("COALESCE(guessed_location, '未知') = ?");
+    args.push(location);
+  }
+
+  const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
+  const total = db
+    .prepare(`SELECT COUNT(*) as c FROM raw_jobs ${whereSql}`)
+    .get(...args).c;
+
+  const rows = db
+    .prepare(
+      `
+      SELECT *
+      FROM raw_jobs
+      ${whereSql}
+      ORDER BY created_at DESC, unique_id ASC
+      LIMIT ? OFFSET ?
+    `,
+    )
+    .all(...args, safeLimit, safeOffset);
+
+  return {
+    total,
+    limit: safeLimit,
+    offset: safeOffset,
+    users: rows.map(mapJobRow),
+  };
+}
+
 function getUsersPageFromDb({
   status,
   search,
@@ -2356,10 +2803,19 @@ export function createStore(filePath) {
     getAllUsers,
     getUserDbCount,
     getJobsCount,
+    getRawJobsCount,
     getPendingJobsCount,
     getPendingJobsUserUpdateCount,
     getDashboardStats: getDashboardStatsFromDb,
+    getPendingByCountry: getPendingByCountryFromDb,
+    getUserUpdateByCountry: getUserUpdateByCountryFromDb,
+    getAttachStuckByCountry: getAttachStuckByCountryFromDb,
+    getRawByCountry: getRawByCountryFromDb,
+    moveJobsToRawByCountry,
+    restoreAttachStuckByCountry,
+    restoreRawJobsByCountry,
     getUsersPage: getUsersPageFromDb,
+    getRawJobsPage: getRawJobsPageFromDb,
     getTargetUsers: getTargetUsersFromDb,
     getStats,
     getStatusGroups,