tt-help-cli-ycl 1.3.55 → 1.3.57

package/package.json

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

package/src/cli/open.js

@@ -34,14 +34,13 @@ export async function handleOpen(parsed) {
     console.error("用法: tt-help open <端口>");
     console.error("示例: tt-help open 9222");
     console.error("");
-    console.error("可用端口: 9222 - 9231 (共 10 个)");
-    console.error('运行 "tt-help open --list" 查看所有配置');
+    console.error('运行 "tt-help open --list" 查看内置浏览器配置');
     process.exit(1);
   }
 
   const port = parseInt(openPort);
-  if (isNaN(port) || port < BASE_PORT || port >= BASE_PORT + TOTAL_ACCOUNTS) {
-    console.error(`端口 ${openPort} 不在有效范围内 (9222 - 9231)`);
+  if (isNaN(port) || port < 1 || port > 65535) {
+    console.error(`端口 ${openPort} 无效 (请使用 1 - 65535)`);
     process.exit(1);
   }
 

package/src/scraper/explore-core.js

@@ -38,6 +38,7 @@ async function processExplore(page, username, options, log) {
     keepFollow: false,
     locationCreated: null,
     noVideo: false,
+    restricted: false,
     error: null,
   };
 
@@ -172,6 +173,7 @@ async function processExplore(page, username, options, log) {
       result.videoList = videoArray;
     } else {
       // 国家不匹配
+      result.restricted = true;
       result.keepFollow = false;
       result.discoveredFollowing = [];
       result.discoveredFollowers = [];

package/src/watch/data-store.js

@@ -1168,6 +1168,17 @@ function getRawJobsPageFromDb({ search, location, limit, offset }) {
   };
 }
 
+// 调试接口：直接执行 SQL 查询，返回原始数据
+function rawQuery(sql, params = []) {
+  if (!db) return { error: "db not ready" };
+  try {
+    const rows = db.prepare(sql).all(...params);
+    return { rows };
+  } catch (e) {
+    return { error: e.message };
+  }
+}
+
 function getUsersPageFromDb({
   status,
   search,
@@ -1838,12 +1849,15 @@ export function createStore(filePath) {
         const args = [];
         if (!loggedIn) {
           where.push("COALESCE(tt_seller, 0) != 1");
-          // 未登录用户只能领取 statusCode 为空的任务（209002 只能被登录用户领取）
-          where.push("status_code IS NULL");
+          // 未登录：只能领取 status_code 为空或 0 的任务
+          where.push("(status_code IS NULL OR status_code = 0)");
         } else {
-          // 登录用户可以领取 statusCode 为空 或 statusCode=209002 的任务
-          where.push("status_code IS NULL OR status_code = 209002");
+          // 登录：可以领取 status_code 为空、0、或 209002 的任务
+          where.push(
+            "(status_code IS NULL OR status_code = 0 OR status_code = 209002)",
+          );
         }
+        // 其他 status_code 值的任务不被领取
         if (requireVideo) {
           where.push("COALESCE(video_count, 0) > 0");
         }
@@ -2020,124 +2034,433 @@ export function createStore(filePath) {
       return null;
     }
 
-    const now = Date.now();
+    if (!db) {
+      const now = Date.now();
 
-    // 0. 该客户端有未过期的任务，续期返回
-    const ongoing = data.find(
-      (u) =>
-        u.status === "processing" &&
-        u.claimedBy === userId &&
-        u.claimedAt &&
-        now - u.claimedAt < expireMs,
-    );
-    if (ongoing) {
-      ongoing.claimedAt = now;
-      save();
-      return {
-        uniqueId: ongoing.uniqueId,
-        nickname: ongoing.nickname,
-        claimedAt: ongoing.claimedAt,
-        claimedBy: userId,
-      };
-    }
+      // 0. 该客户端有未过期的任务，续期返回
+      const ongoing = data.find(
+        (u) =>
+          u.status === "processing" &&
+          u.claimedBy === userId &&
+          u.claimedAt &&
+          now - u.claimedAt < expireMs,
+      );
+      if (ongoing) {
+        ongoing.claimedAt = now;
+        save();
+        return {
+          uniqueId: ongoing.uniqueId,
+          nickname: ongoing.nickname,
+          claimedAt: ongoing.claimedAt,
+          claimedBy: userId,
+        };
+      }
 
-    // 按猜测国家梯队排序
-    const tier1 = new Set(["PL", "NL", "BE"]);
-    const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
-    function locationTier(u) {
-      const loc = (u.guessedLocation || "").toUpperCase();
-      if (tier1.has(loc)) return 0;
-      if (tier2.has(loc)) return 1;
-      return 2;
-    }
+      // 按猜测国家梯队排序
+      const tier1 = new Set(["PL", "NL", "BE"]);
+      const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
+      function locationTier(u) {
+        const loc = (u.guessedLocation || "").toUpperCase();
+        if (tier1.has(loc)) return 0;
+        if (tier2.has(loc)) return 1;
+        return 2;
+      }
+
+      // 国家过滤：如果指定了 locations，只保留 guessedLocation 在列表中的用户
+      function locationFilter(u) {
+        if (!locations || locations.length === 0) return true;
+        return isLocationInList(u.guessedLocation, locations);
+      }
+
+      // 从候选列表中按优先级取第一个：pinned > 超时回收 > seed > ttSeller(仅登录) > follow > other
+      function pickCandidate(candidates) {
+        let next = candidates.find((u) => u.pinned);
+
+        if (!next) {
+          const expired = data.find(
+            (u) =>
+              u.status === "processing" &&
+              u.claimedAt &&
+              now - u.claimedAt > expireMs,
+          );
+          if (expired) {
+            expired.status = "pending";
+            markStatsDirty();
+            delete expired.claimedAt;
+            next = expired;
+          }
+        }
+
+        if (!next) {
+          const seed = candidates.filter(
+            (u) => u.sources && u.sources.includes("seed"),
+          );
+          seed.sort((a, b) => locationTier(a) - locationTier(b));
+          next = seed[0] || null;
+        }
+
+        // 未登录时跳过 ttSeller 优先级
+        if (!next && loggedIn) {
+          const ttSeller = candidates.filter(
+            (u) => u.ttSeller === true && u.verified === false,
+          );
+          ttSeller.sort((a, b) => locationTier(a) - locationTier(b));
+          next = ttSeller[0] || null;
+        }
+
+        if (!next) {
+          const follow = candidates.filter(
+            (u) =>
+              u.sources &&
+              (u.sources.includes("following") ||
+                u.sources.includes("follower")),
+          );
+          follow.sort((a, b) => locationTier(a) - locationTier(b));
+          next = follow[0] || null;
+        }
+
+        if (!next) {
+          candidates.sort((a, b) => locationTier(a) - locationTier(b));
+          next = candidates[0] || null;
+        }
+
+        return next;
+      }
+
+      // 先在有视频的 pending 用户中找；找不到再用全部 pending 用户兜底
+      let pending = data.filter((u) => u.status === "pending");
+      // 应用国家过滤
+      if (locations && locations.length > 0) {
+        pending = pending.filter(locationFilter);
+      }
+      // 未登录客户端不能领取 ttSeller 用户
+      if (!loggedIn) {
+        pending = pending.filter((u) => u.ttSeller !== true);
+      }
+      // status_code 过滤：只领取空值、0 或 209002 的任务
+      pending = pending.filter(
+        (u) =>
+          u.statusCode == null ||
+          u.statusCode === 0 ||
+          (loggedIn && u.statusCode === 209002),
+      );
+      let hasVideo = pending.filter((u) => u.videoCount > 0);
+      const next = pickCandidate(hasVideo) || pickCandidate(pending);
 
-    // 国家过滤：如果指定了 locations，只保留 guessedLocation 在列表中的用户
-    function locationFilter(u) {
-      if (!locations || locations.length === 0) return true;
-      return isLocationInList(u.guessedLocation, locations);
+      if (next) {
+        next.status = "processing";
+        markStatsDirty();
+        next.claimedAt = now;
+        next.claimedBy = userId;
+        save();
+        return {
+          uniqueId: next.uniqueId,
+          nickname: next.nickname,
+          claimedAt: next.claimedAt,
+          claimedBy: userId,
+        };
+      }
+      return null;
     }
 
-    // 从候选列表中按优先级取第一个：pinned > 超时回收 > seed > ttSeller(仅登录) > follow > other
-    function pickCandidate(candidates) {
-      let next = candidates.find((u) => u.pinned);
+    return null;
+  }
 
-      if (!next) {
-        const expired = data.find(
-          (u) =>
-            u.status === "processing" &&
-            u.claimedAt &&
-            now - u.claimedAt > expireMs,
-        );
-        if (expired) {
-          expired.status = "pending";
-          markStatsDirty();
-          delete expired.claimedAt;
-          next = expired;
+  function debugClaimNextJob(
+    userId,
+    expireMs = 5 * 60 * 1000,
+    locations = null,
+    loggedIn = true,
+  ) {
+    if (db) {
+      const now = Date.now();
+      const info = {
+        path: "db",
+        userId,
+        expireMs,
+        loggedIn,
+      };
+
+      const ongoingRow = db
+        .prepare(
+          `
+          SELECT *
+          FROM jobs
+          WHERE status = 'processing'
+            AND claimed_by = ?
+            AND claimed_at IS NOT NULL
+            AND ? - claimed_at < ?
+          ORDER BY claimed_at DESC
+          LIMIT 1
+        `,
+        )
+        .get(userId, now, expireMs);
+      info.ongoing = ongoingRow
+        ? {
+            uniqueId: ongoingRow.unique_id,
+            claimedBy: ongoingRow.claimed_by,
+            claimedAt: ongoingRow.claimed_at,
+          }
+        : null;
+
+      const tier1 = new Set(["PL", "NL", "BE"]);
+      const tier2 = new Set(["DE", "FR", "IT", "IE", "ES"]);
+      const normalizedLocations = Array.isArray(locations)
+        ? locations
+            .map((loc) => String(loc).trim().toUpperCase())
+            .filter(Boolean)
+        : [];
+
+      function getLocationGroups() {
+        const selected = normalizedLocations.length
+          ? normalizedLocations
+          : null;
+        const tier1List = selected
+          ? selected.filter((loc) => tier1.has(loc))
+          : [...tier1];
+        const tier2List = selected
+          ? selected.filter((loc) => tier2.has(loc))
+          : [...tier2];
+        const otherList = selected
+          ? selected.filter((loc) => !tier1.has(loc) && !tier2.has(loc))
+          : null;
+        const groups = [];
+        if (tier1List.length > 0)
+          groups.push({ type: "include", values: tier1List });
+        if (tier2List.length > 0)
+          groups.push({ type: "include", values: tier2List });
+        if (selected) {
+          if (otherList.length > 0)
+            groups.push({ type: "include", values: otherList });
+        } else {
+          groups.push({ type: "exclude", values: [...tier1, ...tier2] });
         }
+        return groups;
       }
 
-      if (!next) {
-        const seed = candidates.filter(
-          (u) => u.sources && u.sources.includes("seed"),
+      const locationGroups = getLocationGroups();
+      info.locationGroups = locationGroups;
+
+      function applyLocationGroup(where, args, group) {
+        if (!group) return;
+        if (group.type === "include") {
+          where.push(
+            `UPPER(COALESCE(guessed_location, '')) IN (${group.values.map(() => "?").join(", ")})`,
+          );
+          args.push(...group.values);
+          return;
+        }
+        where.push(
+          `UPPER(COALESCE(guessed_location, '')) NOT IN (${group.values.map(() => "?").join(", ")})`,
         );
-        seed.sort((a, b) => locationTier(a) - locationTier(b));
-        next = seed[0] || null;
+        args.push(...group.values);
       }
 
-      // 未登录时跳过 ttSeller 优先级
-      if (!next && loggedIn) {
-        const ttSeller = candidates.filter(
-          (u) => u.ttSeller === true && u.verified === false,
-        );
-        ttSeller.sort((a, b) => locationTier(a) - locationTier(b));
-        next = ttSeller[0] || null;
+      function queryPendingOne({ requireVideo, group, filters = [] }) {
+        const where = ["status = 'pending'"];
+        const args = [];
+        if (!loggedIn) {
+          where.push("COALESCE(tt_seller, 0) != 1");
+          where.push("(status_code IS NULL OR status_code = 0)");
+        } else {
+          where.push(
+            "(status_code IS NULL OR status_code = 0 OR status_code = 209002)",
+          );
+        }
+        if (requireVideo) {
+          where.push("COALESCE(video_count, 0) > 0");
+        }
+        applyLocationGroup(where, args, group);
+        for (const filter of filters) {
+          where.push(filter);
+        }
+        const sql = `
+          SELECT *
+          FROM jobs
+          WHERE ${where.join(" AND ")}
+          ORDER BY follower_count DESC, created_at ASC, unique_id ASC
+          LIMIT 1
+        `;
+        const row = db.prepare(sql).get(...args);
+        return { row, sql, args };
       }
 
-      if (!next) {
-        const follow = candidates.filter(
-          (u) =>
-            u.sources &&
-            (u.sources.includes("following") || u.sources.includes("follower")),
-        );
-        follow.sort((a, b) => locationTier(a) - locationTier(b));
-        next = follow[0] || null;
+      function queryPendingByGroup({ requireVideo, group, filters = [] }) {
+        if (group?.type === "include" && group.values.length > 1) {
+          for (const location of group.values) {
+            const ret = queryPendingOne({
+              requireVideo,
+              group: { type: "include", values: [location] },
+              filters,
+            });
+            if (ret.row) return ret;
+          }
+          return { row: null, sql: null, args: [] };
+        }
+        return queryPendingOne({ requireVideo, group, filters });
       }
 
-      if (!next) {
-        candidates.sort((a, b) => locationTier(a) - locationTier(b));
-        next = candidates[0] || null;
+      function findPinnedPending(requireVideo) {
+        const where = ["status = 'pending'", "COALESCE(pinned, 0) = 1"];
+        const args = [];
+        if (!loggedIn) {
+          where.push("COALESCE(tt_seller, 0) != 1");
+        }
+        if (requireVideo) {
+          where.push("COALESCE(video_count, 0) > 0");
+        }
+        if (normalizedLocations.length > 0) {
+          where.push(
+            `UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`,
+          );
+          args.push(...normalizedLocations);
+        }
+        const sql = `
+          SELECT *
+          FROM jobs
+          WHERE ${where.join(" AND ")}
+          ORDER BY created_at ASC, unique_id ASC
+          LIMIT 1
+        `;
+        const row = db.prepare(sql).get(...args);
+        return { row, sql, args };
       }
 
-      return next;
-    }
+      const expiredSql = `
+        SELECT *
+        FROM jobs
+        WHERE status = 'processing'
+          AND claimed_at IS NOT NULL
+          AND ? - claimed_at > ?
+        ORDER BY claimed_at ASC
+        LIMIT 1
+      `;
+      const expiredRow = db.prepare(expiredSql).get(now, expireMs);
+      info.expired = expiredRow
+        ? {
+            uniqueId: expiredRow.unique_id,
+            claimedBy: expiredRow.claimed_by,
+            claimedAt: expiredRow.claimed_at,
+            diffMs: now - expiredRow.claimed_at,
+          }
+        : null;
 
-    // 先在有视频的 pending 用户中找；找不到再用全部 pending 用户兜底
-    let pending = data.filter((u) => u.status === "pending");
-    // 应用国家过滤
-    if (locations && locations.length > 0) {
-      pending = pending.filter(locationFilter);
-    }
-    // 未登录客户端不能领取 ttSeller 用户
-    if (!loggedIn) {
-      pending = pending.filter((u) => u.ttSeller !== true);
-    }
-    let hasVideo = pending.filter((u) => u.videoCount > 0);
-    const next = pickCandidate(hasVideo) || pickCandidate(pending);
+      info.requireVideoPasses = [];
+      for (const requireVideo of [true, false]) {
+        const pass = { requireVideo };
+        const pinned = findPinnedPending(requireVideo);
+        pass.pinned = pinned.row
+          ? {
+              uniqueId: pinned.row.unique_id,
+              sql: pinned.sql,
+              args: pinned.args,
+            }
+          : null;
 
-    if (next) {
-      next.status = "processing";
-      markStatsDirty();
-      next.claimedAt = now;
-      next.claimedBy = userId;
-      save();
-      return {
-        uniqueId: next.uniqueId,
-        nickname: next.nickname,
-        claimedAt: next.claimedAt,
-        claimedBy: userId,
-      };
+        if (!pass.pinned) {
+          for (const group of locationGroups) {
+            const seed = queryPendingByGroup({
+              requireVideo,
+              group,
+              filters: [
+                "COALESCE(pinned, 0) = 0",
+                `instr(COALESCE(sources, ''), '"seed"') > 0`,
+              ],
+            });
+            if (seed.row) {
+              pass.seed = {
+                uniqueId: seed.row.unique_id,
+                group,
+                sql: seed.sql,
+                args: seed.args,
+              };
+              break;
+            }
+          }
+        }
+
+        if (!pass.pinned && !pass.seed && loggedIn) {
+          for (const group of locationGroups) {
+            const seller = queryPendingByGroup({
+              requireVideo,
+              group,
+              filters: [
+                "COALESCE(pinned, 0) = 0",
+                "tt_seller = 1",
+                "verified = 0",
+              ],
+            });
+            if (seller.row) {
+              pass.seller = {
+                uniqueId: seller.row.unique_id,
+                group,
+                sql: seller.sql,
+                args: seller.args,
+              };
+              break;
+            }
+          }
+        }
+
+        if (!pass.pinned && !pass.seed && !pass.seller) {
+          for (const group of locationGroups) {
+            const follow = queryPendingByGroup({
+              requireVideo,
+              group,
+              filters: [
+                "COALESCE(pinned, 0) = 0",
+                `(
+                  instr(COALESCE(sources, ''), '"following"') > 0
+                  OR instr(COALESCE(sources, ''), '"follower"') > 0
+                )`,
+              ],
+            });
+            if (follow.row) {
+              pass.follow = {
+                uniqueId: follow.row.unique_id,
+                group,
+                sql: follow.sql,
+                args: follow.args,
+              };
+              break;
+            }
+          }
+        }
+
+        if (!pass.pinned && !pass.seed && !pass.seller && !pass.follow) {
+          for (const group of locationGroups) {
+            const other = queryPendingByGroup({
+              requireVideo,
+              group,
+              filters: ["COALESCE(pinned, 0) = 0"],
+            });
+            if (other.row) {
+              pass.other = {
+                uniqueId: other.row.unique_id,
+                group,
+                sql: other.sql,
+                args: other.args,
+              };
+              break;
+            }
+          }
+        }
+
+        info.requireVideoPasses.push(pass);
+      }
+
+      return info;
     }
-    return null;
+
+    return {
+      path: "memory",
+      userId,
+      expireMs,
+      loggedIn,
+      totalUsers: data.length,
+      processingUsers: data.filter((u) => u.status === "processing").length,
+      pendingUsers: data.filter((u) => u.status === "pending").length,
+    };
   }
 
   function processDiscoveredUsers(result) {
@@ -2246,6 +2569,7 @@ export function createStore(filePath) {
           }
         }
       }
+      user.restricted = true;
       user.processed = true;
       user.processedAt = Date.now();
       user.sources = [...new Set([...(user.sources || []), "restricted"])];
@@ -3024,7 +3348,9 @@ export function createStore(filePath) {
     getVideoCount,
     getPendingCommentTasks,
     commitCommentTask,
+    debugClaimNextJob,
     stopBackup,
+    rawQuery,
     data,
   };
 }