tt-help-cli-ycl 1.4.149 → 1.4.151

package/src/watch/data-store.js

@@ -20,7 +20,23 @@ import fs from "fs";
 import path from "path";
 import Database from "better-sqlite3";
 import { isLocationInList } from "../lib/target-locations.js";
-import { getTargetLocations } from "../lib/app-config.js";
+import { getTargetLocations, locationRank } from "../lib/app-config.js";
+
+/**
+ * 按目标国家配置顺序解析领取顺序（优先级 = 配置顺序，越靠前越先领）。
+ * 传入子集时：配置内国家按配置顺序在前，配置外国家按传入顺序附在后面。
+ */
+function resolveOrderedLocations(normalizedLocations) {
+  const configured = getTargetLocations();
+  if (!normalizedLocations || normalizedLocations.length === 0)
+    return [...configured];
+  const configSet = new Set(configured);
+  const requestedSet = new Set(normalizedLocations);
+  return [
+    ...configured.filter((loc) => requestedSet.has(loc)),
+    ...normalizedLocations.filter((loc) => !configSet.has(loc)),
+  ];
+}
 
 // Schema 与连接管理
 import {
@@ -667,7 +683,13 @@ function getPreciseMerchantsFromDb(targetLocations = [], options = {}) {
       product_review_count,
       product_sold_count,
       product_name,
+      product_skus,
       recent_ec_videos,
+      (CASE WHEN json_valid(product_skus) THEN
+        (SELECT COUNT(*) FROM json_each(product_skus)) ELSE 0 END) AS skuCount,
+      (CASE WHEN json_valid(product_skus) THEN
+        (SELECT COALESCE(SUM(CAST(json_extract(value, '$.stock') AS INTEGER)), 0)
+          FROM json_each(product_skus)) ELSE 0 END) AS skuTotalStock,
       (SELECT COUNT(*) FROM json_each(recent_ec_videos)
         WHERE CAST(json_extract(value, '$.playCount') AS INTEGER) > 1000) AS ecOver1k,
       (SELECT MAX(CAST(json_extract(value, '$.playCount') AS INTEGER))
@@ -925,13 +947,9 @@ export function createStore(filePath, options = {}) {
   let statusGroups = null;
   let groupsDirty = true;
 
-  const tier1LocSet = new Set(["PL", "NL", "BE"]);
-  const tier2LocSet = new Set(["DE", "FR", "IT", "IE", "ES"]);
+  // 优先级 = 目标国家配置顺序（越靠前越优先），空/配置外国家排最后
   function locationTier(u) {
-    const loc = (u.guessedLocation || "").toUpperCase();
-    if (tier1LocSet.has(loc)) return 0;
-    if (tier2LocSet.has(loc)) return 1;
-    return 2;
+    return locationRank(u.guessedLocation);
   }
 
   function sortGroup(key, arr) {
@@ -1278,13 +1296,13 @@ export function createStore(filePath, options = {}) {
         };
       }
 
-      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)
         : [];
+      // 优先级 = 目标国家配置顺序；传子集时按配置顺序取交集（配置外国家按传入顺序排后）
+      const orderedCountries = resolveOrderedLocations(normalizedLocations);
 
       // ---- 过期 processing 回收 ----
       const expiredRow = getDb()
@@ -1304,31 +1322,19 @@ export function createStore(filePath, options = {}) {
         expiredCandidate = expiredRow;
       }
 
-      // ---- 构建统一优先级查询（合并原 20+ 次独立 SELECT 为 1 次 UNION） ----
+      // ---- 逐级短路查询：按优先级顺序逐个分支执行，命中即领取 ----
       const statusCodeWhere = loggedIn
         ? "(status_code IS NULL OR status_code = 0 OR status_code = 209002)"
         : "(status_code IS NULL OR status_code = 0)";
       const notSellerWhere = loggedIn ? "" : "AND COALESCE(tt_seller, 0) != 1";
 
-      const tier1List = normalizedLocations.length
-        ? normalizedLocations.filter((loc) => tier1.has(loc))
-        : [...tier1];
-      const tier2List = normalizedLocations.length
-        ? normalizedLocations.filter((loc) => tier2.has(loc))
-        : [...tier2];
-      const otherFiltered = normalizedLocations.length
-        ? normalizedLocations.filter(
-            (loc) => !tier1.has(loc) && !tier2.has(loc),
-          )
-        : null;
-
-      const locIn = (list) => {
+      const locIn = (list, { includeEmpty = true } = {}) => {
         if (!list || list.length === 0) return null;
         const ph = list.map(() => "?").join(", ");
-        return {
-          sql: `(UPPER(COALESCE(guessed_location, '')) IN (${ph}) OR COALESCE(guessed_location, '') = '')`,
-          params: [...list],
-        };
+        const sql = includeEmpty
+          ? `(UPPER(COALESCE(guessed_location, '')) IN (${ph}) OR COALESCE(guessed_location, '') = '')`
+          : `UPPER(COALESCE(guessed_location, '')) IN (${ph})`;
+        return { sql, params: [...list] };
       };
       const locNotIn = (list) => {
         if (!list || list.length === 0) return null;
@@ -1338,13 +1344,6 @@ export function createStore(filePath, options = {}) {
           params: [...list],
         };
       };
-      const locOther = () => {
-        if (otherFiltered && otherFiltered.length > 0)
-          return locIn(otherFiltered);
-        if (normalizedLocations.length === 0)
-          return locNotIn([...tier1, ...tier2]);
-        return null;
-      };
 
       // 全局 location 过滤（pinned 查询用）
       let pinnedLocSql = "";
@@ -1355,45 +1354,38 @@ export function createStore(filePath, options = {}) {
         pinnedLocParams.push(...normalizedLocations);
       }
 
-      const sqlParts = [];
-      const allParams = [];
+      // 逐级短路：单分支 LIMIT 1 走索引仅几十 ms；原 26 分支 UNION ALL 需 MERGE
+      // 收集全部分支结果再排序，task_queue 增长后成为 CPU/延迟瓶颈。
+      // 语义与原「UNION ALL + ORDER BY _prio,_sub_prio,... LIMIT 1」完全等价：
+      // 分支添加顺序即 (_prio,_sub_prio)，首个非空分支的最优行即全局最优行。
+      const branchOrder =
+        " ORDER BY follower_count DESC, created_at ASC, unique_id ASC LIMIT 1";
+      const branches = [];
 
-      const addPart = (prio, subPrio, conditions, params) => {
-        sqlParts.push(
-          `SELECT *, ${prio} as _prio, ${subPrio} as _sub_prio FROM task_queue WHERE ${conditions}`,
-        );
-        allParams.push(...params);
+      const addBranch = (conditions, params) => {
+        branches.push({ conditions, params });
       };
 
       // prio 0: pinned + hasVideo
-      addPart(
-        0,
-        0,
+      addBranch(
         `status = 'pending' AND pinned = 1 AND video_count > 0 ${pinnedLocSql} AND ${statusCodeWhere} ${notSellerWhere}`,
         pinnedLocParams,
       );
       // prio 1: pinned (no video req)
-      addPart(
-        1,
-        0,
+      addBranch(
         `status = 'pending' AND pinned = 1 ${pinnedLocSql} AND ${statusCodeWhere} ${notSellerWhere}`,
         pinnedLocParams,
       );
 
       // prio 2-3: expired candidate（回收的超时任务优先）
       if (expiredCandidate) {
-        addPart(
-          2,
-          0,
+        addBranch(
           `unique_id = ? AND video_count > 0 AND ${statusCodeWhere} ${notSellerWhere}`,
           [expiredCandidate.unique_id],
         );
-        addPart(
-          3,
-          0,
-          `unique_id = ? AND ${statusCodeWhere} ${notSellerWhere}`,
-          [expiredCandidate.unique_id],
-        );
+        addBranch(`unique_id = ? AND ${statusCodeWhere} ${notSellerWhere}`, [
+          expiredCandidate.unique_id,
+        ]);
       }
 
       // 非 pinned 优先级：seed → seller → follow → other，每级 × 3 个 location tier × (hasVideo / noVideoReq)
@@ -1402,7 +1394,11 @@ export function createStore(filePath, options = {}) {
           filter: `instr(COALESCE(sources, ''), '"seed"') > 0`,
           loggedInOnly: false,
         },
-        { filter: `tt_seller = 1 AND verified = 0`, loggedInOnly: true },
+        {
+          filter: `tt_seller = 1 AND verified = 0`,
+          loggedInOnly: true,
+          sellerAnyCountry: true,
+        },
         {
           filter: `(instr(COALESCE(sources, ''), '"following"') > 0 OR instr(COALESCE(sources, ''), '"follower"') > 0 OR instr(COALESCE(sources, ''), '"comment"') > 0)`,
           loggedInOnly: false,
@@ -1413,27 +1409,45 @@ export function createStore(filePath, options = {}) {
       let basePrio = 4;
       for (const p of priorities) {
         if (p.loggedInOnly && !loggedIn) continue;
-        const tierLocations = [
-          { list: tier1List, fn: locIn },
-          { list: tier2List, fn: locIn },
-          { list: null, fn: locOther },
-        ];
+        // 逐国顺序分支：配置内国家按优先级顺序；未传子集时末尾补“配置外国家”兑底。
+        // 空位置（loc=''）只在首个国家的分支参与：首国的 noVideoReq 分支 miss 即意味着
+        // 空位置池已耗尽，后续分支无需再 OR ''（避免反复扫描空位置大池）
+        const locationBranches = orderedCountries.map((loc, idx) =>
+          locIn([loc], { includeEmpty: idx === 0 }),
+        );
+        if (normalizedLocations.length === 0)
+          locationBranches.push(locNotIn(orderedCountries));
+        // 商家级专用（sellerAnyCountry）：国家对商家放开——末尾追加"任意国家"分支。
+        // 传了国家子集时对应国家的商家仍优先，领完再兜任意国家（含空位置商家）；
+        // 未传国家时同理（配置内各国 → 配置外 → 任意）。其他来源级分支不受影响。
+        if (p.sellerAnyCountry) locationBranches.push(null); // null → 任意国家分支
         let subPrio = 0;
-        for (const tl of tierLocations) {
-          const loc = tl.fn(tl.list);
+        for (const loc of locationBranches) {
+          // 商家任意国家分支：不限 guessed_location（含空位置的商家）
+          if (loc === null) {
+            // hasVideo
+            addBranch(
+              `status = 'pending' AND pinned = 0 AND ${p.filter} AND video_count > 0 AND ${statusCodeWhere} ${notSellerWhere}`,
+              [],
+            );
+            subPrio++;
+            // noVideoReq
+            addBranch(
+              `status = 'pending' AND pinned = 0 AND ${p.filter} AND ${statusCodeWhere} ${notSellerWhere}`,
+              [],
+            );
+            subPrio++;
+            continue;
+          }
           if (!loc) continue;
           // hasVideo
-          addPart(
-            basePrio,
-            subPrio,
+          addBranch(
             `status = 'pending' AND pinned = 0 AND ${p.filter} AND video_count > 0 AND ${loc.sql} AND ${statusCodeWhere} ${notSellerWhere}`,
             loc.params,
           );
           subPrio++;
           // noVideoReq
-          addPart(
-            basePrio + 1,
-            subPrio,
+          addBranch(
             `status = 'pending' AND pinned = 0 AND ${p.filter} AND ${loc.sql} AND ${statusCodeWhere} ${notSellerWhere}`,
             loc.params,
           );
@@ -1442,14 +1456,16 @@ export function createStore(filePath, options = {}) {
         basePrio += 2;
       }
 
+      // 逐级执行：首个命中分支的最优行即领取结果（未命中继续下一优先级分支）
       let selectedRow = null;
-      if (sqlParts.length > 0) {
-        const unionSql =
-          sqlParts.join(" UNION ALL ") +
-          " ORDER BY _prio, _sub_prio, follower_count DESC, created_at ASC, unique_id ASC LIMIT 1";
-        selectedRow = getDb()
-          .prepare(unionSql)
-          .get(...allParams);
+      for (const b of branches) {
+        selectedRow =
+          getDb()
+            .prepare(
+              `SELECT * FROM task_queue WHERE ${b.conditions}${branchOrder}`,
+            )
+            .get(...b.params) || null;
+        if (selectedRow) break;
       }
 
       if (selectedRow) {
@@ -1493,15 +1509,8 @@ export function createStore(filePath, options = {}) {
         };
       }
 
-      // 按猜测国家梯队排序
-      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 locationTier = (u) => locationRank(u.guessedLocation);
 
       // 国家过滤：如果指定了 locations，只保留 guessedLocation 在列表中的用户
       function locationFilter(u) {
@@ -1641,8 +1650,6 @@ export function createStore(filePath, options = {}) {
           }
         : 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())
@@ -1650,29 +1657,11 @@ export function createStore(filePath, options = {}) {
         : [];
 
       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] });
-        }
+        const ordered = resolveOrderedLocations(normalizedLocations);
+        if (ordered.length === 0) return [];
+        const groups = [{ type: "include", values: ordered }];
+        if (normalizedLocations.length === 0)
+          groups.push({ type: "exclude", values: [...ordered] });
         return groups;
       }
 
@@ -2493,28 +2482,40 @@ export function createStore(filePath, options = {}) {
     const placeholders = targetLocations.map(() => "?").join(",");
 
     // SELECT 候选用户
-    const selected = getDb()
-      .prepare(
-        `
-        SELECT unique_id, nickname, video_count, COALESCE(refresh_time, ?) AS refresh_time
-        FROM jobs
+    // 性能三件套（76 万行实测 1~3s → ~80ms）：
+    // 1. WHERE/ORDER BY 不用 COALESCE(refresh_time, ?)（表达式挡索引）；
+    //    ASC 排序 NULL 天然最前，与 COALESCE 2016 默认值语义等价
+    // 2. INDEXED BY 强制走 idx_jobs_precheck 部分索引（优化器无统计时会
+    //    误选 idx_jobs_seller_verified_loc 走 TEMP B-TREE 全排序）
+    // 3. ORDER BY jobs.refresh_time 限定表名——裸列名会被 SELECT 输出别名
+    //    refresh_time（COALESCE 表达式）遮蔽，又退回表达式排序
+    // 索引不存在的环境（老库未重启）抛 "no such index"，自动回退普通查询。
+    const baseWhere = `
         WHERE tt_seller = 1
           AND verified = 0
           AND (pending_refresh IS NULL OR pending_refresh = 0)
           AND location_created IN (${placeholders})
-          AND COALESCE(refresh_time, ?) < ?
-        ORDER BY COALESCE(refresh_time, ?) ASC
-        LIMIT ?
-      `,
-      )
-      .all(
-        defaultTime,
-        ...targetLocations,
-        defaultTime,
-        threshold,
-        defaultTime,
-        limit,
-      );
+          AND (refresh_time IS NULL OR refresh_time < ?)`;
+    const orderLimit = `
+        ORDER BY jobs.refresh_time ASC
+        LIMIT ?`;
+    const selectSql = `SELECT unique_id, nickname, video_count, COALESCE(refresh_time, ?) AS refresh_time
+        FROM jobs`;
+    const args = [defaultTime, ...targetLocations, threshold, limit];
+
+    let selected;
+    try {
+      selected = getDb()
+        .prepare(
+          `${selectSql} INDEXED BY idx_jobs_precheck${baseWhere}${orderLimit}`,
+        )
+        .all(...args);
+    } catch (e) {
+      if (!/no such index/i.test(e.message)) throw e;
+      selected = getDb()
+        .prepare(`${selectSql}${baseWhere}${orderLimit}`)
+        .all(...args);
+    }
 
     // 立即更新 refresh_time 防重复领取（非事务，小概率并发重复可接受）
     if (selected.length > 0) {
@@ -2840,8 +2841,9 @@ export function createStore(filePath, options = {}) {
   /**
    * 回写商品详情到 jobs 表（product_* 列）
    * @param {string} uniqueId
-   * @param {{rating?:number, reviewCount?:number, soldCount?:number, productName?:string}} productDetail
+   * @param {{rating?:number, reviewCount?:number, soldCount?:number, productName?:string, skus?:Array}} productDetail
    *   rating = -1 为哨兵值：商品不可售/已下架，写入后任务移出候选（正常评分 0-5）
+   *   skus = 多 SKU 概要数组（skuId/specs/stock/stockStatus/warehouseId），存 product_skus JSON
    */
   function updateProductInfo(uniqueId, productDetail) {
     if (getDb()) {
@@ -2855,6 +2857,10 @@ export function createStore(filePath, options = {}) {
           productReviewCount: productDetail.reviewCount ?? null,
           productSoldCount: productDetail.soldCount ?? null,
           productName: productDetail.productName || null,
+          // 多 SKU 概要：数组经 normalizeJobValue 自动序列化为 JSON（无 skus 存 null）
+          productSkus: Array.isArray(productDetail.skus)
+            ? productDetail.skus
+            : null,
         },
         false, // 商品补全与用户刷新计数无关，不增加 user_update_count
         "jobs",

package/src/watch/db-columns.js

@@ -99,6 +99,7 @@ export const WRITABLE_JOB_COLUMNS = new Set([
   "product_review_count",
   "product_sold_count",
   "product_name",
+  "product_skus",
   "user_create_time",
   "recent_ec_videos",
   "pending_refresh",

package/src/watch/db-schema.js

@@ -173,6 +173,7 @@ export function initDb(filePath) {
     product_review_count: "INTEGER",
     product_sold_count: "INTEGER",
     product_name: "TEXT",
+    product_skus: "TEXT",
     user_create_time: "INTEGER",
     recent_ec_videos: "TEXT",
   });
@@ -209,6 +210,7 @@ export function initDb(filePath) {
     product_review_count: "INTEGER",
     product_sold_count: "INTEGER",
     product_name: "TEXT",
+    product_skus: "TEXT",
     user_create_time: "INTEGER",
     recent_ec_videos: "TEXT",
   });
@@ -246,6 +248,7 @@ export function initDb(filePath) {
     product_review_count: "INTEGER",
     product_sold_count: "INTEGER",
     product_name: "TEXT",
+    product_skus: "TEXT",
     user_create_time: "INTEGER",
     recent_ec_videos: "TEXT",
   });
@@ -446,19 +449,28 @@ export function initDb(filePath) {
     db.exec(`CREATE INDEX IF NOT EXISTS idx_videos_old_id ON videos_old(id)`);
   }
 
-  // ===== task_queue 索引（对应 claimNextJob UNION 查询的 4 个部分索引） =====
+  // ===== task_queue 索引（claimNextJob 逐级短路查询 + 监控列表） =====
+  // idx_tq_claim_fast：claim 分支查询主索引（2026-09-17 实战验证：分支 7s→1ms）。
+  // 普通复合索引，不依赖部分索引的 WHERE 表达式文本匹配（旧 4 个部分索引因
+  // pinned=0 与 COALESCE(pinned,0)=0 文本不一致、首国分支 OR 空串，从未被命中，已废弃清理）。
   const tqIndexes = [
     `CREATE INDEX IF NOT EXISTS idx_tq_status ON task_queue(status)`,
     `CREATE INDEX IF NOT EXISTS idx_tq_claimed_by_status ON task_queue(claimed_by, status, claimed_at)`,
     `CREATE INDEX IF NOT EXISTS idx_tq_status_claimed_at ON task_queue(status, claimed_at)`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_pinned ON task_queue(created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 1`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_seller ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0 AND tt_seller = 1 AND verified = 0`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_follow ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0 AND (instr(COALESCE(sources, ''), '"following"') > 0 OR instr(COALESCE(sources, ''), '"follower"') > 0)`,
-    `CREATE INDEX IF NOT EXISTS idx_tq_claim_pending_other ON task_queue(UPPER(COALESCE(guessed_location, '')), follower_count DESC, created_at ASC, unique_id ASC) WHERE status = 'pending' AND COALESCE(pinned, 0) = 0`,
+    `CREATE INDEX IF NOT EXISTS idx_tq_claim_fast ON task_queue(status, UPPER(COALESCE(guessed_location,'')), follower_count DESC, created_at ASC, unique_id ASC)`,
     // 监控页面用户列表查询加速
     `CREATE INDEX IF NOT EXISTS idx_tq_list_pending ON task_queue(pinned, processed_at, follower_count, unique_id) WHERE status = 'pending'`,
     `CREATE INDEX IF NOT EXISTS idx_tq_list_processing ON task_queue(pinned, processed_at, follower_count, unique_id) WHERE status = 'processing'`,
   ];
+  // 清理从未被命中的旧 claim 部分索引（省写入开销与空间，幂等）
+  for (const oldIdx of [
+    "idx_tq_claim_pending_pinned",
+    "idx_tq_claim_pending_seller",
+    "idx_tq_claim_pending_follow",
+    "idx_tq_claim_pending_other",
+  ]) {
+    db.exec(`DROP INDEX IF EXISTS ${oldIdx}`);
+  }
   for (const sql of tqIndexes) {
     db.exec(sql);
   }

package/src/watch/db-tags.js

@@ -375,15 +375,25 @@ export function getAllTags(
 }
 
 export function rawQuery(sql, params = []) {
-  // 通用查询器：默认查主库（stats/db-query 复用），勿切到 tag 库
+  // 通用查询器：默认查主库（stats/db-query 复用），勿切到 tag 库。
+  // 注意：原实现用 prepare().all() 跑一切语句，DDL（CREATE INDEX 等）会抛
+  // "This statement does not return data" 且被 catch 吞成 {error} 返回——
+  // server.js 启动清单 ensureIdx 曾因此静默失效（生产库从未建过启动索引）。
+  // 现按语句类型分流：DDL/写语句走 exec，查询走 all；失败时抛错让调用方感知。
   const db = getMainDb();
-  if (!db) return { error: "db not ready" };
-  try {
+  if (!db) throw new Error("db not ready");
+  const trimmed = sql.trim().toUpperCase();
+  const isQuery =
+    trimmed.startsWith("SELECT") ||
+    trimmed.startsWith("PRAGMA") ||
+    trimmed.startsWith("EXPLAIN") ||
+    trimmed.startsWith("WITH");
+  if (isQuery) {
     const rows = db.prepare(sql).all(...params);
     return { rows };
-  } catch (e) {
-    return { error: e.message };
   }
+  db.exec(sql);
+  return { rows: [] };
 }
 
 export function normalizeTags() {