tt-help-cli-ycl 1.4.18 → 1.4.20

package/src/watch/data-store.js

@@ -556,6 +556,64 @@ function getModifiedTargetUsersOutsideLocations(targetLocations = []) {
   return { total: rows.length, countries };
 }
 
+/**
+ * 目标商家刷新进度统计：按国家统计最近 N 小时内刷新过的 tt_seller 用户数。
+ * 返回格式与 getRefreshStats（tags）一致，便于前端复用渲染逻辑。
+ */
+function getTargetRefreshStats(hours = 24) {
+  if (!getDb()) return { countries: [], total: 0, refreshed: 0 };
+
+  const targetLocations = DEFAULT_TARGET_LOCATIONS;
+  const placeholders = targetLocations.map(() => "?").join(", ");
+
+  // 按国家统计总数
+  const totalRows = getDb()
+    .prepare(
+      `
+      SELECT location_created as country, COUNT(*) as cnt
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+      GROUP BY location_created
+      ORDER BY cnt DESC
+    `,
+    )
+    .all(...targetLocations);
+
+  if (!totalRows.length) return { countries: [], total: 0, refreshed: 0 };
+
+  // 按国家统计最近 N 小时内刷新过的数量
+  const threshold = Date.now() - hours * 3600 * 1000;
+  const refreshedRows = getDb()
+    .prepare(
+      `
+      SELECT location_created as country, COUNT(*) as cnt
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+        AND refresh_time >= ?
+      GROUP BY location_created
+    `,
+    )
+    .all(...targetLocations, threshold);
+  const refreshedMap = new Map();
+  for (const r of refreshedRows) refreshedMap.set(r.country, r.cnt);
+
+  const results = [];
+  let totalAll = 0;
+  let refreshedAll = 0;
+  for (const r of totalRows) {
+    const refreshed = refreshedMap.get(r.country) || 0;
+    totalAll += r.cnt;
+    refreshedAll += refreshed;
+    results.push({ country: r.country, total: r.cnt, refreshed });
+  }
+
+  return { countries: results, total: totalAll, refreshed: refreshedAll };
+}
+
 export function createStore(filePath, options = {}) {
   if (!filePath) {
     throw new Error("createStore requires an explicit .db path");
@@ -1008,7 +1066,7 @@ export function createStore(filePath, options = {}) {
 
     if (normalizedLocations && normalizedLocations.length > 0) {
       conditions.push(
-        `UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`,
+        `(UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
       );
       args.push(...normalizedLocations);
     }
@@ -1164,7 +1222,7 @@ export function createStore(filePath, options = {}) {
           const llmCount =
             getDb()
               .prepare(
-                `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql} AND guessed_location = ? AND (sources NOT LIKE '%tag%' OR sources IS NULL) AND (sources NOT LIKE '%comment%' OR sources IS NULL)`,
+                `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql} AND (guessed_location = ? OR COALESCE(guessed_location, '') = '') AND (sources NOT LIKE '%tag%' OR sources IS NULL) AND (sources NOT LIKE '%comment%' OR sources IS NULL)`,
               )
               .get(...locationArgs)?.c || 0;
 
@@ -1190,7 +1248,7 @@ export function createStore(filePath, options = {}) {
             const samples = getDb()
               .prepare(
                 `
-                SELECT * FROM raw_jobs WHERE ${whereSql} AND guessed_location = ?
+                SELECT * FROM raw_jobs WHERE ${whereSql} AND (guessed_location = ? OR COALESCE(guessed_location, '') = '')
                   AND (sources NOT LIKE '%tag%' OR sources IS NULL)
                   AND (sources NOT LIKE '%comment%' OR sources IS NULL)
                 ORDER BY COALESCE(video_count, 0) DESC, created_at DESC
@@ -1361,7 +1419,7 @@ export function createStore(filePath, options = {}) {
           const currentLimit = Math.max(0, Math.min(quota, safeLimit - moved));
           if (!currentLimit) continue;
 
-          const locationWhere = `${whereSql} AND UPPER(COALESCE(guessed_location, '')) = ?`;
+          const locationWhere = `${whereSql} AND (UPPER(COALESCE(guessed_location, '')) = ? OR COALESCE(guessed_location, '') = '')`;
           const locationArgs = [...args, location];
 
           getDb()
@@ -1488,7 +1546,7 @@ export function createStore(filePath, options = {}) {
         if (!group) return;
         if (group.type === "include") {
           where.push(
-            `UPPER(COALESCE(guessed_location, '')) IN (${group.values.map(() => "?").join(", ")})`,
+            `(UPPER(COALESCE(guessed_location, '')) IN (${group.values.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
           );
           args.push(...group.values);
           return;
@@ -1559,7 +1617,7 @@ export function createStore(filePath, options = {}) {
         }
         if (normalizedLocations.length > 0) {
           where.push(
-            `UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`,
+            `(UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
           );
           args.push(...normalizedLocations);
         }
@@ -1957,7 +2015,7 @@ export function createStore(filePath, options = {}) {
         if (!group) return;
         if (group.type === "include") {
           where.push(
-            `UPPER(COALESCE(guessed_location, '')) IN (${group.values.map(() => "?").join(", ")})`,
+            `(UPPER(COALESCE(guessed_location, '')) IN (${group.values.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
           );
           args.push(...group.values);
           return;
@@ -2025,7 +2083,7 @@ export function createStore(filePath, options = {}) {
         }
         if (normalizedLocations.length > 0) {
           where.push(
-            `UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")})`,
+            `(UPPER(COALESCE(guessed_location, '')) IN (${normalizedLocations.map(() => "?").join(", ")}) OR COALESCE(guessed_location, '') = '')`,
           );
           args.push(...normalizedLocations);
         }
@@ -2677,7 +2735,20 @@ export function createStore(filePath, options = {}) {
   }
 
   function getClientErrors() {
-    return Array.from(clientErrors.values());
+    const now = Date.now();
+    const expired = [];
+    const result = [];
+    for (const [userId, err] of clientErrors) {
+      if (now - err.timestamp > 10 * 60 * 1000) {
+        expired.push(userId);
+      } else {
+        result.push(err);
+      }
+    }
+    for (const userId of expired) {
+      clientErrors.delete(userId);
+    }
+    return result;
   }
 
   function getClientLoginStatus() {
@@ -2817,6 +2888,143 @@ export function createStore(filePath, options = {}) {
     return pending;
   }
 
+  // ===== recheck-jobs：重检 jobs 表中 done 非商家用户 =====
+
+  function getRecheckJobs(limit, countries) {
+    const targetCountries = countries
+      ? countries.map((c) => String(c).trim().toUpperCase())
+      : [];
+    const hasCountryFilter = targetCountries.length > 0;
+
+    if (getDb()) {
+      const l = Math.max(1, parseInt(limit) || 5);
+      const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+
+      let sql = `
+        SELECT *
+        FROM jobs
+        WHERE status = 'done'
+          AND (tt_seller IS NULL OR tt_seller != 1)
+          AND (updated_at IS NULL OR updated_at < ?)
+      `;
+      const sqlParams = [sevenDaysAgo];
+
+      if (hasCountryFilter) {
+        const placeholders = targetCountries.map(() => "?").join(", ");
+        sql += ` AND UPPER(COALESCE(guessed_location, '')) IN (${placeholders})`;
+        sqlParams.push(...targetCountries);
+      }
+
+      sql += ` ORDER BY updated_at ASC LIMIT ?`;
+      sqlParams.push(l);
+
+      const rows = getDb()
+        .prepare(sql)
+        .all(...sqlParams);
+      if (rows.length === 0) return [];
+
+      const now = Date.now();
+      const bumpStmt = getDb().prepare(
+        `UPDATE jobs SET updated_at = ? WHERE unique_id = ?`,
+      );
+      const bumpTxn = getDb().transaction((items) => {
+        for (const item of items) {
+          bumpStmt.run(now, item.unique_id);
+        }
+      });
+      bumpTxn(rows);
+
+      return rows.map((row) => {
+        const mapped = mapJobRow(row);
+        mapped.updatedAt = now;
+        return mapped;
+      });
+    }
+
+    const l = Math.max(1, parseInt(limit) || 5);
+    const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+    const pending = data
+      .filter((u) => {
+        if (u.status !== "done") return false;
+        if (u.ttSeller === 1) return false;
+        if (u.updatedAt && u.updatedAt >= sevenDaysAgo) return false;
+        if (hasCountryFilter) {
+          const loc = (u.guessedLocation || "").toUpperCase();
+          return targetCountries.includes(loc);
+        }
+        return true;
+      })
+      .sort((a, b) => (a.updatedAt || 0) - (b.updatedAt || 0))
+      .slice(0, l);
+    pending.forEach((u) => {
+      u.updatedAt = Date.now();
+    });
+    save();
+    return pending;
+  }
+
+  function batchUpdateRecheckJobs(updates) {
+    if (getDb()) {
+      const results = [];
+      const now = Date.now();
+      const bumpStmt = getDb().prepare(
+        `UPDATE jobs SET updated_at = ? WHERE unique_id = ?`,
+      );
+      const txn = getDb().transaction((items) => {
+        items.forEach((item) => {
+          const uniqueId = item.uniqueId;
+          const info = item.info;
+          if (info && info.error && info.statusCode !== undefined) {
+            // 无效账号：只更新 updated_at，不污染其他字段
+            bumpStmt.run(now, uniqueId);
+            results.push({ uniqueId, ok: true, skipped: true });
+          } else {
+            // 过滤 info 中的 null/undefined/空值，避免覆盖 jobs 表已有数据
+            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 },
+            );
+          }
+        });
+      });
+      txn(updates);
+      return { results };
+    }
+
+    const results = [];
+    const now = Date.now();
+    for (const item of updates) {
+      const { uniqueId, info } = item;
+      if (info && info.error && info.statusCode !== undefined) {
+        // 无效账号：只更新 updated_at
+        const existing = data.find((u) => u.uniqueId === uniqueId);
+        if (existing) existing.updatedAt = now;
+        results.push({ uniqueId, ok: true, skipped: true });
+      } else {
+        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 },
+        );
+      }
+    }
+    save();
+    return { results };
+  }
+
   function updateUserInfo(uniqueId, info) {
     if (getDb()) {
       return updateJobInfo(uniqueId, info, true);
@@ -3363,6 +3571,8 @@ export function createStore(filePath, options = {}) {
     getNextRedoJob,
     commitRedoJob,
     getPendingUserUpdateTasks,
+    getRecheckJobs,
+    batchUpdateRecheckJobs,
     updateUserInfo,
     updateUserLocation,
     setNonSeller,
@@ -3375,6 +3585,7 @@ export function createStore(filePath, options = {}) {
     getActiveClients,
     moveSellerJobsToBase, // 将 jobs/raw_jobs 中 tt_seller=1 且 video_count=0 的记录移动到 jobs_base
     moveRestrictedJobsToBase, // 将 jobs 中 status='restricted' 的记录移动到 jobs_base
+    moveNoCountryJobsToBase, // 将 jobs 中 status='done' 且无国家数据的记录移动到 jobs_base
     moveSingleJobToBase, // 将单个 job 移动到 jobs_base 并重置（目标商家页面用）
     registerVideos,
     getVideo,
@@ -3404,6 +3615,7 @@ export function createStore(filePath, options = {}) {
     claimRefreshTag,
     reportRefreshResult,
     getRefreshStats,
+    getTargetRefreshStats,
     data,
   };
 
@@ -3572,6 +3784,55 @@ export function createStore(filePath, options = {}) {
     return { ok: true, moved: deleted.changes || 0 };
   }
 
+  // 将 jobs 中 status='done' 且无国家数据的记录移动到 jobs_base
+  function moveNoCountryJobsToBase() {
+    const db = getDb();
+    if (!db) return { ok: false, error: "db not ready" };
+
+    const now = Date.now();
+    const condition = `status = 'done'
+      AND (guessed_location IS NULL OR guessed_location = '')
+      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 };
+
+    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);
+
+    const deleted = db.prepare(`DELETE FROM jobs WHERE ${condition}`).run();
+
+    markStatsDirty();
+    return {
+      ok: true,
+      moved: deleted.changes || 0,
+      total: countRow.c,
+    };
+  }
+
   // 将单个 job 移动到 jobs_base（用于目标商家页面"移到base重走流程"）
   function moveSingleJobToBase(uniqueId) {
     const db = getDb();

package/src/watch/db-tags.js

@@ -112,7 +112,7 @@ export function getRefreshStats(hours = 24) {
 
   const rows = db
     .prepare(
-      "SELECT countries FROM tags WHERE status = 'productive' AND score > 70",
+      "SELECT countries FROM tags WHERE status = 'productive' AND score > 60",
     )
     .all();
   const countrySet = new Set();
@@ -128,10 +128,10 @@ export function getRefreshStats(hours = 24) {
   const countryList = [...countrySet].sort();
 
   const stmtTotal = db.prepare(
-    "SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 70 AND countries LIKE ?",
+    "SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 60 AND countries LIKE ?",
   );
   const stmtRefresh = db.prepare(
-    `SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 70 AND countries LIKE ? AND refreshed_at >= datetime('now', ?)`,
+    `SELECT COUNT(*) as cnt FROM tags WHERE status = 'productive' AND score > 60 AND countries LIKE ? AND refreshed_at >= datetime('now', ?)`,
   );
 
   for (const c of countryList) {
@@ -1338,7 +1338,7 @@ function getLang(country) {
 // ===== Tag 刷新 CRUD（productive 标签轮询重新抓取） =====
 
 /**
- * 获取一个待刷新的 productive 标签（score > 70 且未被刷新锁定）
+ * 获取一个待刷新的 productive 标签（score > 60 且未被刷新锁定）
  * 按 refreshed_at ASC 排序（最久未刷新的优先），NULL 排最前
  */
 export function getProductiveRefreshTask() {
@@ -1355,7 +1355,7 @@ export function getProductiveRefreshTask() {
   const row = db
     .prepare(
       `SELECT * FROM tags 
-       WHERE status = 'productive' AND score > 70 AND refreshing = 0 
+       WHERE status = 'productive' AND score > 60 AND refreshing = 0 
        ORDER BY refreshed_at IS NULL DESC, refreshed_at ASC 
        LIMIT 1`,
     )
@@ -1379,7 +1379,7 @@ export function claimRefreshTag(tag) {
   const result = db
     .prepare(
       `UPDATE tags SET refreshing = 1, refreshed_at = datetime('now') 
-       WHERE (tag = ? OR tag = ?) AND status = 'productive' AND score > 70 AND refreshing = 0`,
+       WHERE (tag = ? OR tag = ?) AND status = 'productive' AND score > 60 AND refreshing = 0`,
     )
     .run(normalized, `#${normalized}`);
   if (result.changes === 0) {