tt-help-cli-ycl 1.4.134 → 1.4.136

package/src/watch/data-store.js

@@ -29,7 +29,10 @@ import {
   getDb,
   getDbPath,
   initDb,
+  initTagDb,
+  deriveTagDbPath,
   resetDbConnection,
+  resetTagDbConnection,
   loadLegacyUsersFromFiles,
   loadLegacyVideosFromFile,
 } from "./db-schema.js";
@@ -123,7 +126,9 @@ export function importLegacyJsonToDb({
   videosFilePath,
 }) {
   resetDbConnection();
+  resetTagDbConnection();
   initDb(dbFilePath);
+  initTagDb(deriveTagDbPath(dbFilePath));
 
   const db = getDb();
   const dbPath = getDbPath();
@@ -193,6 +198,7 @@ export function importLegacyJsonToDb({
 
 export function closeStoreDb() {
   resetDbConnection();
+  resetTagDbConnection();
 }
 
 function getUsersPageFromDb({
@@ -207,7 +213,7 @@ function getUsersPageFromDb({
 }) {
   if (!getDb()) return null;
 
-  const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
+  const safeLimit = Math.max(1, Math.min(50, parseInt(limit) || 50));
   const safeOffset = Math.max(0, parseInt(offset) || 0);
   const where = [];
   const args = [];
@@ -258,16 +264,20 @@ function getUsersPageFromDb({
   const jobsOrder = `pinned DESC, COALESCE(processed_at, 0) DESC, COALESCE(follower_count, 0) DESC, unique_id ASC`;
 
   // ── COUNT 查询 ──
+  // done 状态分布在 jobs（商家 done）+ jobs_done（非商家 done 冷归档），需 UNION
+  const doneUnionSql = `SELECT ${selectCols} FROM jobs ${whereSql}
+    UNION ALL
+    SELECT ${selectCols} FROM jobs_done ${whereSql}`;
   let countSql;
   let countArgs = args;
 
   if (status === "pending" || status === "processing") {
     countSql = `SELECT COUNT(*) as c FROM task_queue ${whereSql}`;
-  } else if (
-    status === "done" ||
-    status === "error" ||
-    status === "restricted"
-  ) {
+  } else if (status === "done") {
+    countSql = `SELECT COUNT(*) as c FROM (${doneUnionSql})`;
+    // UNION 的两个子查询各自含 whereSql 占位符，参数需复制两份
+    countArgs = [...args, ...args];
+  } else if (status === "error" || status === "restricted") {
     countSql = `SELECT COUNT(*) as c FROM jobs ${whereSql}`;
   } else {
     // all: 只查 task_queue（处理中+待处理），不碰 jobs 表
@@ -303,11 +313,16 @@ function getUsersPageFromDb({
       .prepare(sql)
       .all(...args, safeLimit, safeOffset)
       .map(mapJobRow);
-  } else if (
-    status === "done" ||
-    status === "error" ||
-    status === "restricted"
-  ) {
+  } else if (status === "done") {
+    // done 跨 jobs + jobs_done 两表（参数复制两份给两个子查询）
+    const sql = `SELECT * FROM (${doneUnionSql})
+      ORDER BY ${jobsOrder}
+      LIMIT ? OFFSET ?`;
+    rows = getDb()
+      .prepare(sql)
+      .all(...args, ...args, safeLimit, safeOffset)
+      .map(mapJobRow);
+  } else if (status === "error" || status === "restricted") {
     // 单表：直接查
     const sql = `SELECT ${selectCols} FROM jobs ${whereSql}
       ORDER BY ${jobsOrder}
@@ -752,6 +767,8 @@ export function createStore(filePath, options = {}) {
   if (filePath) {
     // 初始化 SQLite 用户表（用于判重）
     initDb(filePath);
+    // 初始化独立 tag 库（tags.db 由主库路径派生）
+    initTagDb(deriveTagDbPath(filePath));
     // 从数据库恢复偏移量
   }
 
@@ -778,7 +795,11 @@ export function createStore(filePath, options = {}) {
         .prepare(
           `
           SELECT status, COUNT(*) as count
-          FROM jobs
+          FROM (
+            SELECT status FROM jobs
+            UNION ALL
+            SELECT status FROM jobs_done
+          )
           GROUP BY status
         `,
         )
@@ -2027,15 +2048,19 @@ export function createStore(filePath, options = {}) {
       updateUserFromResult(user, result);
       user.claimedAt = null;
       const newUsers = processDiscoveredUsers(result);
-      // Phase 1: 先更新 task_queue，再搬移到 jobs 归档，最后从 task_queue 删除
+      // Phase 1: 先更新 task_queue，再搬移到归档表，最后从 task_queue 删除
       const persistRet = updateJobInfo(uniqueId, user, false, "task_queue");
       if (persistRet.error) {
         return { saved: false, error: persistRet.error };
       }
-      // 整行搬移到 jobs 归档
+      // 分流：status='done' 且非商家（ttSeller 非 true）→ jobs_done 冷归档；
+      // 其余（商家 done / error 等）→ jobs
+      const isDoneNonSeller = user.status === "done" && !user.ttSeller;
+      const targetTable = isDoneNonSeller ? "jobs_done" : "jobs";
+      // 整行搬移到归档表
       getDb()
         .prepare(
-          `INSERT OR REPLACE INTO jobs SELECT * FROM task_queue WHERE unique_id = ?`,
+          `INSERT OR REPLACE INTO ${targetTable} SELECT * FROM task_queue WHERE unique_id = ?`,
         )
         .run(uniqueId);
       getDb()
@@ -2135,18 +2160,24 @@ export function createStore(filePath, options = {}) {
       const inTq = getDb()
         .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
         .get(uniqueId);
-      const tableName = inTq ? "task_queue" : "jobs";
+      const inJobs = getDb()
+        .prepare("SELECT 1 FROM jobs WHERE unique_id = ?")
+        .get(uniqueId);
+      // 非商家 done 在 jobs_done 冷归档，也支持直接重置回流程
+      const tableName = inTq ? "task_queue" : inJobs ? "jobs" : "jobs_done";
       const ret = updateJobInfo(uniqueId, user, false, tableName);
       if (ret.error) return { saved: false, error: ret.error };
 
-      // 如果原来在 jobs，重置后需移入 task_queue（pending 应在热表）
+      // 如果原来在 jobs / jobs_done，重置后需移入 task_queue（pending 应在热表）
       if (!inTq) {
         getDb()
           .prepare(
-            "INSERT OR REPLACE INTO task_queue SELECT * FROM jobs WHERE unique_id = ?",
+            `INSERT OR REPLACE INTO task_queue SELECT * FROM ${tableName} WHERE unique_id = ?`,
           )
           .run(uniqueId);
-        getDb().prepare("DELETE FROM jobs WHERE unique_id = ?").run(uniqueId);
+        getDb()
+          .prepare(`DELETE FROM ${tableName} WHERE unique_id = ?`)
+          .run(uniqueId);
       }
       markStatsDirty();
       return { saved: true };
@@ -2171,11 +2202,8 @@ export function createStore(filePath, options = {}) {
       const user = getJob(uniqueId);
       if (!user) return { saved: false, error: "user not found" };
       const nextPinned = !user.pinned;
-      // Phase 2: 判断用户在哪个表
-      const inTq = getDb()
-        .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
-        .get(uniqueId);
-      const tableName = inTq ? "task_queue" : "jobs";
+      // Phase 2: 判断用户在哪个表（task_queue / jobs / jobs_done）
+      const tableName = getUserTable(uniqueId) || "jobs";
       const ret = updateJobInfo(
         uniqueId,
         { pinned: nextPinned },
@@ -2733,7 +2761,7 @@ export function createStore(filePath, options = {}) {
     return { ok: false, error: "db not initialized" };
   }
 
-  // ===== recheck-jobs：重检 jobs 表中 done 非商家用户 =====
+  // ===== recheck-jobs：重检 jobs_done 表中 done 非商家用户 =====
 
   function getRecheckJobs(limit, countries) {
     const targetCountries = countries
@@ -2745,9 +2773,10 @@ export function createStore(filePath, options = {}) {
       const l = Math.max(1, parseInt(limit) || 5);
       const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
 
+      // 非商家 done 已迁移到 jobs_done 冷归档表
       let sql = `
         SELECT *
-        FROM jobs
+        FROM jobs_done
         WHERE status = 'done'
           AND (tt_seller IS NULL OR tt_seller != 1)
           AND (updated_at IS NULL OR updated_at < ?)
@@ -2770,7 +2799,7 @@ export function createStore(filePath, options = {}) {
 
       const now = Date.now();
       const bumpStmt = getDb().prepare(
-        `UPDATE jobs SET updated_at = ? WHERE unique_id = ?`,
+        `UPDATE jobs_done SET updated_at = ? WHERE unique_id = ?`,
       );
       const bumpTxn = getDb().transaction((items) => {
         for (const item of items) {
@@ -2813,7 +2842,7 @@ export function createStore(filePath, options = {}) {
       const results = [];
       const now = Date.now();
       const bumpStmt = getDb().prepare(
-        `UPDATE jobs SET updated_at = ? WHERE unique_id = ?`,
+        `UPDATE jobs_done SET updated_at = ? WHERE unique_id = ?`,
       );
       const txn = getDb().transaction((items) => {
         items.forEach((item) => {
@@ -2824,19 +2853,35 @@ export function createStore(filePath, options = {}) {
             bumpStmt.run(now, uniqueId);
             results.push({ uniqueId, ok: true, skipped: true });
           } else {
-            // 过滤 info 中的 null/undefined/空值，避免覆盖 jobs 表已有数据
+            // 过滤 info 中的 null/undefined/空值，避免覆盖 jobs_done 表已有数据
             const cleanInfo = {};
             for (const [k, v] of Object.entries(info || {})) {
               if (v !== null && v !== undefined && v !== "") {
                 cleanInfo[k] = v;
               }
             }
-            const ret = updateJobInfo(uniqueId, cleanInfo, true);
-            results.push(
-              ret.error
-                ? { uniqueId, error: ret.error }
-                : { uniqueId, ok: true },
-            );
+            const ret = updateJobInfo(uniqueId, cleanInfo, true, "jobs_done");
+            if (ret.error) {
+              results.push({ uniqueId, error: ret.error });
+            } else {
+              // 重检后确认是商家（tt_seller=1）→ 从 jobs_done 回移到 jobs，
+              // 保持"jobs_done=非商家 done / jobs=商家 done"的冷热表语义，
+              // 否则该商家会从 targetUsers/product-fill/redo 等商家查询中消失
+              const row = getDb()
+                .prepare("SELECT tt_seller FROM jobs_done WHERE unique_id = ?")
+                .get(uniqueId);
+              if (row && row.tt_seller === 1) {
+                getDb()
+                  .prepare(
+                    `INSERT OR REPLACE INTO jobs SELECT * FROM jobs_done WHERE unique_id = ?`,
+                  )
+                  .run(uniqueId);
+                getDb()
+                  .prepare(`DELETE FROM jobs_done WHERE unique_id = ?`)
+                  .run(uniqueId);
+              }
+              results.push({ uniqueId, ok: true });
+            }
           }
         });
       });
@@ -2872,7 +2917,9 @@ export function createStore(filePath, options = {}) {
 
   function updateUserInfo(uniqueId, info) {
     if (getDb()) {
-      return updateJobInfo(uniqueId, info, true);
+      // 按用户实际所在表更新（task_queue / jobs / jobs_done）
+      const tableName = getUserTable(uniqueId) || "jobs";
+      return updateJobInfo(uniqueId, info, true, tableName);
     }
 
     const user = getUser(uniqueId);
@@ -2891,14 +2938,13 @@ export function createStore(filePath, options = {}) {
 
   function updateUserLocation(uniqueId, location) {
     if (getDb()) {
-      const existing = getDb()
-        .prepare("SELECT * FROM jobs WHERE unique_id = ?")
-        .get(uniqueId);
+      const existing = getJobRow(uniqueId);
       if (!existing) return { error: "user not found" };
+      const tableName = getUserTable(uniqueId) || "jobs";
       const now = Date.now();
       getDb()
         .prepare(
-          "UPDATE jobs SET location_created = ?, modified_at = ?, updated_at = ? WHERE unique_id = ?",
+          `UPDATE ${tableName} SET location_created = ?, modified_at = ?, updated_at = ? WHERE unique_id = ?`,
         )
         .run(location, now, now, uniqueId);
       return { ok: true, location, modifiedAt: now };
@@ -2916,14 +2962,13 @@ export function createStore(filePath, options = {}) {
 
   function setNonSeller(uniqueId) {
     if (getDb()) {
-      const existing = getDb()
-        .prepare("SELECT * FROM jobs WHERE unique_id = ?")
-        .get(uniqueId);
+      const existing = getJobRow(uniqueId);
       if (!existing) return { error: "user not found" };
+      const tableName = getUserTable(uniqueId) || "jobs";
       const now = Date.now();
       getDb()
         .prepare(
-          "UPDATE jobs SET tt_seller = 0, updated_at = ? WHERE unique_id = ?",
+          `UPDATE ${tableName} SET tt_seller = 0, updated_at = ? WHERE unique_id = ?`,
         )
         .run(now, uniqueId);
       console.error(`[DB] setNonSeller: ${uniqueId} → tt_seller=0`);
@@ -2982,12 +3027,14 @@ export function createStore(filePath, options = {}) {
     ].join(", ");
 
     const moveSingleTxn = getDb().transaction(() => {
-      // Phase 2: 先查 task_queue，再查 jobs
+      // 先查 task_queue，再查 jobs，最后 jobs_done
       const fromTable = getDb()
         .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
         .get(safeId)
         ? "task_queue"
-        : "jobs";
+        : getDb().prepare("SELECT 1 FROM jobs WHERE unique_id = ?").get(safeId)
+          ? "jobs"
+          : "jobs_done";
 
       getDb()
         .prepare(
@@ -3734,7 +3781,7 @@ export function createStore(filePath, options = {}) {
     return { ok: true, moved: deleted.changes || 0 };
   }
 
-  // 将 jobs 中 status='done' 且无国家数据的记录移动到 jobs_base
+  // 将 jobs / jobs_done 中 status='done' 且无国家数据的记录移动到 jobs_base
   function moveNoCountryJobsToBase() {
     const db = getDb();
     if (!db) return { ok: false, error: "db not ready" };
@@ -3745,41 +3792,48 @@ export function createStore(filePath, options = {}) {
       AND (location_created IS NULL OR location_created = '')
       AND (confirmed_location IS NULL OR confirmed_location = '')`;
 
-    const countRow = db
-      .prepare(`SELECT COUNT(*) as c FROM jobs WHERE ${condition}`)
-      .get();
-    if (!countRow?.c) return { ok: true, moved: 0 };
+    let total = 0;
+    for (const srcTable of ["jobs", "jobs_done"]) {
+      const countRow = db
+        .prepare(`SELECT COUNT(*) as c FROM ${srcTable} WHERE ${condition}`)
+        .get();
+      const cnt = countRow?.c || 0;
+      if (!cnt) continue;
 
-    db.prepare(
-      `
-      INSERT OR REPLACE INTO jobs_base (
-        unique_id, nickname, sources, pinned, no_video, user_update_count,
-        tt_seller, verified, video_count, comment_count, guessed_location,
-        location_created, follower_count, following_count, heart_count,
-        refresh_time, region, signature, sec_uid, status_code,
-        latest_video_time, bio_link, status, restricted, error, claimed_by,
-        claimed_at, processed, processed_at, created_at, updated_at
-      )
-      SELECT
-        unique_id, nickname, sources, pinned, no_video, 0,
-        CASE WHEN tt_seller = 0 THEN NULL ELSE tt_seller END,
-        verified, video_count, comment_count, guessed_location,
-        location_created, follower_count, following_count, heart_count,
-        refresh_time, region, signature, sec_uid, status_code,
-        latest_video_time, bio_link,
-        'pending', 0, NULL, NULL, NULL, 0, NULL,
-        COALESCE(created_at, ?), ?
-      FROM jobs WHERE ${condition}
-    `,
-    ).run(now, now);
+      db.prepare(
+        `
+        INSERT OR REPLACE INTO jobs_base (
+          unique_id, nickname, sources, pinned, no_video, user_update_count,
+          tt_seller, verified, video_count, comment_count, guessed_location,
+          location_created, follower_count, following_count, heart_count,
+          refresh_time, region, signature, sec_uid, status_code,
+          latest_video_time, bio_link, status, restricted, error, claimed_by,
+          claimed_at, processed, processed_at, created_at, updated_at
+        )
+        SELECT
+          unique_id, nickname, sources, pinned, no_video, 0,
+          CASE WHEN tt_seller = 0 THEN NULL ELSE tt_seller END,
+          verified, video_count, comment_count, guessed_location,
+          location_created, follower_count, following_count, heart_count,
+          refresh_time, region, signature, sec_uid, status_code,
+          latest_video_time, bio_link,
+          'pending', 0, NULL, NULL, NULL, 0, NULL,
+          COALESCE(created_at, ?), ?
+        FROM ${srcTable} WHERE ${condition}
+      `,
+      ).run(now, now);
 
-    const deleted = db.prepare(`DELETE FROM jobs WHERE ${condition}`).run();
+      const deleted = db
+        .prepare(`DELETE FROM ${srcTable} WHERE ${condition}`)
+        .run();
+      total += deleted.changes || 0;
+    }
 
-    markStatsDirty();
+    if (total > 0) markStatsDirty();
     return {
       ok: true,
-      moved: deleted.changes || 0,
-      total: countRow.c,
+      moved: total,
+      total,
     };
   }
 

package/src/watch/db-crud.js

@@ -312,25 +312,37 @@ export function addJob(user) {
 export function getJobRow(uniqueId) {
   const db = getDb();
   if (!db) return null;
-  // 优先查 task_queue（热数据），回退 jobs（归档）
+  // 优先查 task_queue（热数据），回退 jobs（归档），再回退 jobs_done（冷归档）
   const row = db
     .prepare("SELECT * FROM task_queue WHERE unique_id = ?")
     .get(uniqueId);
   if (row) return row;
-  return db.prepare("SELECT * FROM jobs WHERE unique_id = ?").get(uniqueId);
+  const row2 = db
+    .prepare("SELECT * FROM jobs WHERE unique_id = ?")
+    .get(uniqueId);
+  if (row2) return row2;
+  return db
+    .prepare("SELECT * FROM jobs_done WHERE unique_id = ?")
+    .get(uniqueId);
 }
 
 /**
- * 判断用户在哪个表，返回 'task_queue' 或 'jobs'
+ * 判断用户在哪个表，返回 'task_queue' | 'jobs' | 'jobs_done'
  * 用于需要更新正确表的场景（置顶、重置、移动等）
  */
 export function getUserTable(uniqueId) {
   const db = getDb();
   if (!db) return null;
-  return db
-    .prepare("SELECT 1 FROM task_queue WHERE unique_id = ?")
-    .get(uniqueId)
-    ? "task_queue"
+  if (
+    db.prepare("SELECT 1 FROM task_queue WHERE unique_id = ?").get(uniqueId)
+  ) {
+    return "task_queue";
+  }
+  if (db.prepare("SELECT 1 FROM jobs WHERE unique_id = ?").get(uniqueId)) {
+    return "jobs";
+  }
+  return db.prepare("SELECT 1 FROM jobs_done WHERE unique_id = ?").get(uniqueId)
+    ? "jobs_done"
     : "jobs";
 }
 
@@ -361,10 +373,13 @@ export function getBulkAuthorLocations(uniqueIds) {
     SELECT unique_id, location_created FROM jobs
     WHERE unique_id IN (${placeholders}) AND location_created IS NOT NULL AND location_created != ''
     UNION
+    SELECT unique_id, location_created FROM jobs_done
+    WHERE unique_id IN (${placeholders}) AND location_created IS NOT NULL AND location_created != ''
+    UNION
     SELECT unique_id, location_created FROM jobs_base
     WHERE unique_id IN (${placeholders}) AND location_created IS NOT NULL AND location_created != ''
   `;
-  const rows = db.prepare(sql).all(...uniqueIds, ...uniqueIds);
+  const rows = db.prepare(sql).all(...uniqueIds, ...uniqueIds, ...uniqueIds);
   const result = {};
   for (const r of rows) {
     if (!result[r.unique_id]) {
@@ -377,7 +392,11 @@ export function getBulkAuthorLocations(uniqueIds) {
 export function getAllJobs() {
   const db = getDb();
   if (!db) return [];
-  return db.prepare("SELECT * FROM jobs").all().map(mapJobRow);
+  // jobs（商家 done + error/restricted 等）+ jobs_done（非商家 done 冷归档）
+  return db
+    .prepare("SELECT * FROM jobs UNION ALL SELECT * FROM jobs_done")
+    .all()
+    .map(mapJobRow);
 }
 
 // ===== 查询 Video =====
@@ -482,7 +501,13 @@ export function getUserDbCount() {
 export function getJobsCount() {
   const db = getDb();
   if (!db) return 0;
-  return db.prepare("SELECT COUNT(*) as c FROM jobs").get().c;
+  // jobs + jobs_done 冷归档合并计数
+  const row = db
+    .prepare(
+      "SELECT (SELECT COUNT(*) FROM jobs) + (SELECT COUNT(*) FROM jobs_done) as c",
+    )
+    .get();
+  return row?.c || 0;
 }
 
 export function getPendingJobsCount() {