tt-help-cli-ycl 1.4.22 → 1.4.23

package/package.json

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

package/src/cli/refresh.js

@@ -541,7 +541,7 @@ export async function handleRefresh(options) {
 
       const payload = {
         userInfo: refreshUserInfo,
-        topRecentVideo: result.topRecentVideo || null,
+        recentEcVideos: result.recentEcVideos || null,
         discoveredFollowing: (result.discoveredFollowing || []).map((f) => ({
           handle: Array.isArray(f) ? f[0] : f,
           displayName: Array.isArray(f) ? f[1] : null,

package/src/scraper/explore-core.js

@@ -42,7 +42,7 @@ async function processExplore(page, username, options, log) {
     keepFollow: false,
     locationCreated: null,
     latestVideoTime: null,
-    topRecentVideo: null,
+    recentEcVideos: null,
     noVideo: false,
     restricted: false,
     error: null,
@@ -97,6 +97,19 @@ async function processExplore(page, username, options, log) {
         nowSeconds - v.createTime <= SEVEN_DAYS_SECONDS,
     );
     if (recentVideos.length > 0) {
+      result.recentEcVideos = recentVideos.map((v) => ({
+        id: v.id,
+        href: v.href,
+        playCount: v.playCount,
+        createTime: v.createTime,
+        isAd: v.isAd,
+      }));
+      const maxPlay = recentVideos.reduce(
+        (max, v) => (v.playCount > max ? v.playCount : max),
+        0,
+      );
+      log(`  7天内 EC视频: ${recentVideos.length} 个, 最高播放 ${maxPlay}`);
+      // 兼容旧字段 topRecentVideo
       const topVideo = recentVideos.reduce((max, v) =>
         v.playCount > max.playCount ? v : max,
       );
@@ -107,9 +120,6 @@ async function processExplore(page, username, options, log) {
         createTime: topVideo.createTime,
         isAd: topVideo.isAd,
       };
-      log(
-        `  7天内 EC视频最高播放: ${topVideo.playCount} 次播放 (${recentVideos.length} 个EC候选)`,
-      );
     }
 
     if (videoArray.length <= 0) {

package/src/watch/data-store.js

@@ -320,7 +320,9 @@ function getTargetUsersFromDb(targetLocations = []) {
           tt_seller, verified, follower_count, following_count,
           location_created, latest_video_time, refresh_time,
           guessed_location, pinned, processed_at, video_count,
-          no_video, claimed_by, claimed_at, created_at, updated_at
+          no_video, claimed_by, claimed_at, created_at, updated_at,
+          top_video_play_count, top_video_href, top_video_is_ad,
+          recent_ec_videos
         FROM jobs
         WHERE tt_seller = 1
         AND verified = 0
@@ -349,6 +351,8 @@ function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
     search,
     limit,
     offset,
+    sort,
+    sortOrder,
   } = options;
   const placeholders = targetLocations.map(() => "?").join(", ");
   const baseParams = [...targetLocations];
@@ -401,6 +405,7 @@ function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
         top_video_play_count,
         top_video_href,
         top_video_is_ad,
+        recent_ec_videos,
         status,
         sources
       FROM jobs
@@ -441,6 +446,50 @@ function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
         .prepare(countSql)
         .get(...params)?.cnt || 0;
 
+    // 服务端排序：当 sort=topVideoPlayCount 时，全量取出后按 EC 最大播放量排序再分页
+    if (sort === "topVideoPlayCount") {
+      const allRows = getDb()
+        .prepare(sql)
+        .all(...params)
+        .map(mapJobRow);
+
+      const getMaxPlay = (u) => {
+        try {
+          const ec =
+            typeof u.recentEcVideos === "string"
+              ? JSON.parse(u.recentEcVideos)
+              : Array.isArray(u.recentEcVideos)
+                ? u.recentEcVideos
+                : [];
+          if (ec.length > 0) {
+            return ec.reduce(
+              (max, v) => (v.playCount > max ? v.playCount : max),
+              0,
+            );
+          }
+        } catch (e) {}
+        return 0;
+      };
+
+      const isAsc = sortOrder === "asc";
+      allRows.sort((a, b) => {
+        const va = getMaxPlay(a);
+        const vb = getMaxPlay(b);
+        return isAsc ? va - vb : vb - va;
+      });
+
+      const safeLimit = Math.min(Math.floor(limit), 10000);
+      const safeOffset = Math.max(Math.floor(offset), 0);
+      const rows = allRows.slice(safeOffset, safeOffset + safeLimit);
+
+      return {
+        total,
+        limit: safeLimit,
+        offset: safeOffset,
+        users: rows,
+      };
+    }
+
     sql += ` LIMIT ? OFFSET ?`;
     const safeLimit = Math.min(Math.floor(limit), 10000);
     const safeOffset = Math.max(Math.floor(offset), 0);
@@ -2414,6 +2463,7 @@ export function createStore(filePath, options = {}) {
         "uniqueId",
         "sources",
         "topRecentVideo", // 单独处理，不进入通用循环
+        "recentEcVideos", // 单独处理，不进入通用循环
       ];
       for (const key of Object.keys(result)) {
         if (extraFields.includes(key)) continue;
@@ -2431,6 +2481,15 @@ export function createStore(filePath, options = {}) {
         user.topVideoHref = result.topRecentVideo.href || null;
         user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
       }
+      // 将 recentEcVideos 数组序列化为 JSON 字符串
+      if (
+        Array.isArray(result.recentEcVideos) &&
+        result.recentEcVideos.length > 0
+      ) {
+        user.recentEcVideos = JSON.stringify(result.recentEcVideos);
+      } else if (result.recentEcVideos === null) {
+        user.recentEcVideos = null;
+      }
       user.sources = [...new Set([...(user.sources || []), "processed"])];
     }
     if (user.status !== oldStatus) markStatsDirty();
@@ -2658,6 +2717,15 @@ export function createStore(filePath, options = {}) {
         user.topVideoHref = result.topRecentVideo.href || null;
         user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
       }
+      // 将 recentEcVideos 数组序列化为 JSON 字符串
+      if (
+        Array.isArray(result.recentEcVideos) &&
+        result.recentEcVideos.length > 0
+      ) {
+        user.recentEcVideos = JSON.stringify(result.recentEcVideos);
+      } else if (result.recentEcVideos === null) {
+        user.recentEcVideos = null;
+      }
       const newUsers = processDiscoveredUsers(result);
       const ret = updateJobInfo(uniqueId, user, false);
       if (ret.error) return { saved: false, error: ret.error };
@@ -2684,6 +2752,15 @@ export function createStore(filePath, options = {}) {
       user.topVideoHref = result.topRecentVideo.href || null;
       user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
     }
+    // 将 recentEcVideos 数组序列化为 JSON 字符串
+    if (
+      Array.isArray(result.recentEcVideos) &&
+      result.recentEcVideos.length > 0
+    ) {
+      user.recentEcVideos = JSON.stringify(result.recentEcVideos);
+    } else if (result.recentEcVideos === null) {
+      user.recentEcVideos = null;
+    }
     const newUsers = processDiscoveredUsers(result);
     return { saved: true, newUsers };
   }

package/src/watch/db-columns.js

@@ -49,6 +49,7 @@ export const JOB_EXT_COLUMNS = [
   "top_video_play_count",
   "top_video_href",
   "top_video_is_ad",
+  "recent_ec_videos",
 ];
 
 // 完整的 jobs 列 = 核心列 + 扩展列
@@ -91,6 +92,7 @@ export const WRITABLE_JOB_COLUMNS = new Set([
   "top_video_href",
   "top_video_is_ad",
   "user_create_time",
+  "recent_ec_videos",
 ]);
 
 // ===== Boolean 列（存储时 0/1，读取时转为 true/false/null） =====

package/src/watch/db-schema.js

@@ -129,6 +129,7 @@ export function initDb(filePath) {
     top_video_href: "TEXT",
     top_video_is_ad: "INTEGER",
     user_create_time: "INTEGER",
+    recent_ec_videos: "TEXT",
   });
 
   // ===== jobs_base 表 =====

package/src/watch/llm-config.js

@@ -133,7 +133,12 @@ export function loadLlmConfig() {
     process.env.LLM_MODEL ||
     LLM_PROVIDERS[0].models[0].id;
   _cachedProvider = dbConfig.llm_provider || LLM_PROVIDERS[0].id;
-  _cachedApiKey = dbConfig.llm_apikey || process.env.APIKEY || "";
+  // 按 provider 隔离读取 API Key：优先 llm_apikey_{provider}，兼容旧 llm_apikey，最后 env
+  _cachedApiKey =
+    dbConfig[`llm_apikey_${_cachedProvider}`] ||
+    dbConfig.llm_apikey ||
+    process.env.APIKEY ||
+    "";
   _loaded = true;
 
   console.error(
@@ -163,15 +168,45 @@ export function getLlmUrl() {
   return _cachedUrl;
 }
 
-// Auto 模式的候选模型池（按优先级排列，优先用快的）
-const AUTO_POOL = [
-  "qwen-turbo",
-  "qwen-plus",
-  "qwen3.6-flash",
-  "qwen3.6-27b",
-  "qwen3.5-plus",
-  "qwen3.6-plus",
-];
+// Auto 模式的候选模型池缓存（从 DashScope provider 动态构建，排除 auto 自身）
+let _autoPoolCache = null;
+
+/** 从 DashScope provider 动态构建 auto 候选池（按优先级：flash/turbo > plus > 27b/35b > max/pro > 第三方） */
+function buildAutoPool() {
+  if (_autoPoolCache) return _autoPoolCache;
+  const dashscope = LLM_PROVIDERS.find((p) => p.id === "dashscope");
+  if (!dashscope) return [];
+  const models = dashscope.models.filter((m) => m.id !== "auto");
+
+  const priority = (id) => {
+    if (/flash|turbo/i.test(id)) return 0;
+    if (/plus/i.test(id)) return 1;
+    if (/27b|35b/i.test(id)) return 2;
+    if (/max|pro/i.test(id)) return 3;
+    return 4; // deepseek, glm, kimi 等第三方
+  };
+
+  // 记录原始顺序，排序时优先按 capability tier，同 tier 保持原始顺序
+  const indexed = models.map((m, i) => ({ id: m.id, idx: i }));
+  indexed.sort((a, b) => {
+    const pa = priority(a.id);
+    const pb = priority(b.id);
+    if (pa !== pb) return pa - pb;
+    return a.idx - b.idx;
+  });
+
+  _autoPoolCache = indexed.map((m) => m.id);
+  console.error(
+    `[llm-config] auto 候选池已构建: ${_autoPoolCache.length} 个模型（${_autoPoolCache.slice(0, 5).join(", ")}...）`,
+  );
+  return _autoPoolCache;
+}
+
+/** 清除 auto 候选池缓存（provider 变更后调用） */
+function clearAutoPoolCache() {
+  _autoPoolCache = null;
+}
+
 let _lastAutoSuccess = null; // 上次成功的模型，下次优先用它
 
 /** 是否处于 auto 模式 */
@@ -187,7 +222,7 @@ export function recordAutoSuccess(model) {
 
 /** 获取 auto 模式候选池（上次成功的排最前，失败时依次尝试） */
 export function getAutoPool() {
-  const pool = [...AUTO_POOL];
+  const pool = [...buildAutoPool()];
   if (_lastAutoSuccess) {
     const idx = pool.indexOf(_lastAutoSuccess);
     if (idx > 0) {
@@ -202,9 +237,10 @@ export function getAutoPool() {
 /** 解析当前实际使用的 model（auto 模式下轮询选一个） */
 function resolveModel() {
   if (_cachedModel !== "auto") return _cachedModel;
-  const idx = _autoRoundIdx % AUTO_POOL.length;
+  const pool = buildAutoPool();
+  const idx = _autoRoundIdx % pool.length;
   _autoRoundIdx++;
-  return AUTO_POOL[idx];
+  return pool[idx];
 }
 
 /** 获取当前 LLM Model（内部调用，auto 模式自动轮询） */
@@ -226,17 +262,31 @@ export function getLlmApiKey() {
 export function updateLlmConfig(updates = {}) {
   if (!_loaded) loadLlmConfig();
 
-  // Provider 变更：切换 URL，Model 用指定的或默认第一个
+  // Provider 变更：切换 URL，Model 用指定的或默认第一个，同时加载对应 provider 的 API Key
   if (updates.provider !== undefined) {
     const provider = findProvider(updates.provider);
+    const prevProvider = _cachedProvider;
     _cachedProvider = provider.id;
     _cachedUrl = provider.url;
+    clearAutoPoolCache(); // provider 变了，auto 候选池也需重建
     // 如果同时传了 model 且在 provider 中存在，用指定的；否则用第一个
     const specifiedModel =
       updates.model !== undefined
         ? provider.models.find((m) => m.id === updates.model)
         : null;
     _cachedModel = specifiedModel ? specifiedModel.id : provider.models[0].id;
+    // 切换到新 provider：从 DB 加载该 provider 的 API Key
+    if (provider.id !== prevProvider) {
+      const dbConfig = loadFromDb();
+      _cachedApiKey =
+        dbConfig[`llm_apikey_${provider.id}`] ||
+        dbConfig.llm_apikey ||
+        process.env.APIKEY ||
+        "";
+      console.error(
+        `[llm-config] 切换到 ${provider.id}，API Key: ${_cachedApiKey ? "已加载" : "未设置"}`,
+      );
+    }
     saveToDb("llm_provider", provider.id);
     saveToDb("llm_url", provider.url);
     saveToDb("llm_model", _cachedModel);
@@ -252,12 +302,12 @@ export function updateLlmConfig(updates = {}) {
     saveToDb("llm_url", updates.url);
   }
 
-  // API Key（跳过提示字符串：含 "..." 且长度 < 20 的视为 hint，不覆盖）
+  // API Key（按 provider 隔离存储，跳过提示字符串）
   if (updates.apiKey !== undefined && updates.apiKey !== "") {
     const isHint = updates.apiKey.includes("...") && updates.apiKey.length < 20;
     if (!isHint) {
       _cachedApiKey = updates.apiKey;
-      saveToDb("llm_apikey", updates.apiKey);
+      saveToDb(`llm_apikey_${_cachedProvider}`, updates.apiKey);
     }
   }
 

package/src/watch/public/app.js

@@ -2289,6 +2289,10 @@ async function loadTargetUsersPage(append = false, skipLoading = false) {
     if (currentTargetLocation)
       url += `&country=${encodeURIComponent(currentTargetLocation)}`;
     if (search) url += `&search=${encodeURIComponent(search)}`;
+    if (currentTargetSort.key) {
+      url += `&sort=${encodeURIComponent(currentTargetSort.key)}`;
+      url += `&sortOrder=${currentTargetSort.asc ? "asc" : "desc"}`;
+    }
 
     const res = await fetch(url);
     data = await res.json();
@@ -2329,9 +2333,9 @@ function renderTargetTable() {
   const el = document.getElementById("targetTable");
   const moreHint = document.getElementById("targetMoreHint");
 
-  // 应用本地排序
+  // 应用本地排序（topVideoPlayCount 由服务端排序，此处跳过）
   let displayUsers = currentTargetUsers;
-  if (currentTargetSort.key) {
+  if (currentTargetSort.key && currentTargetSort.key !== "topVideoPlayCount") {
     displayUsers = [...currentTargetUsers].sort((a, b) => {
       let va = a[currentTargetSort.key];
       let vb = b[currentTargetSort.key];
@@ -2378,16 +2382,47 @@ function renderTargetTable() {
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
-      const topPlayCount =
-        u.topVideoPlayCount != null && u.topVideoPlayCount >= 1000
-          ? formatNum(u.topVideoPlayCount)
-          : "-";
-      const adTag = u.topVideoIsAd
-        ? ' <span style="color:red">(AD)</span>'
-        : "";
-      const topPlayCountCell = u.topVideoHref
-        ? `<td data-label="最大播放量" style="font-size:11px;color:#888"><a href="${u.topVideoHref}" target="_blank" style="color:#3b82f6;text-decoration:none" title="点击查看视频">${topPlayCount}${adTag}</a></td>`
-        : `<td data-label="最大播放量" style="font-size:11px;color:#888">${topPlayCount}${adTag}</td>`;
+
+      // 解析 recentEcVideos JSON，获取所有高播放 EC 视频
+      let ecVideos = [];
+      try {
+        if (typeof u.recentEcVideos === "string") {
+          ecVideos = JSON.parse(u.recentEcVideos);
+        } else if (Array.isArray(u.recentEcVideos)) {
+          ecVideos = u.recentEcVideos;
+        }
+      } catch (e) {
+        ecVideos = [];
+      }
+
+      // 最大播放量单元格：列出所有 playCount >= 1000 的视频
+      const highPlayVideos = ecVideos.filter((v) => v.playCount >= 1000);
+      let topPlayCountCell;
+      if (highPlayVideos.length > 0) {
+        const videoLinks = highPlayVideos
+          .sort((a, b) => b.playCount - a.playCount)
+          .map((v) => {
+            const adTag = v.isAd ? ' <span style="color:red">(AD)</span>' : "";
+            return `<a href="${v.href}" target="_blank" style="color:#3b82f6;text-decoration:none;display:block;line-height:1.6" title="点击查看视频">${formatNum(v.playCount)}${adTag}</a>`;
+          })
+          .join("");
+        topPlayCountCell = `<td data-label="最大播放量" style="font-size:11px;color:#888">${videoLinks}</td>`;
+      } else {
+        topPlayCountCell = `<td data-label="最大播放量" style="font-size:11px;color:#888">-</td>`;
+      }
+
+      // 最近发布时间：仅当有 playCount >= 1000 的视频时才显示
+      let latestEcTime;
+      if (highPlayVideos.length > 0) {
+        const maxCreateTime = ecVideos.reduce(
+          (max, v) => (v.createTime > max ? v.createTime : max),
+          0,
+        );
+        if (maxCreateTime > 0) {
+          latestEcTime = formatTime(maxCreateTime * 1000);
+        }
+      }
+      const latestVideoCell = latestEcTime || "-";
 
       const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
       const locationCell = u.modifiedAt
@@ -2414,7 +2449,7 @@ function renderTargetTable() {
       ${locationCell}
       <td data-label="确认国家" style="font-size:11px">${confirmedLocation}</td>
       ${topPlayCountCell}
-      <td data-label="最近发布" style="font-size:11px;color:#888">${latestVideo}</td>
+      <td data-label="最近发布" style="font-size:11px;color:#888">${latestVideoCell}</td>
       <td data-label="最近刷新" style="font-size:11px;color:#888">${refreshTime}</td>
       <td data-label="操作">
         <button class="btn-pending" onclick="moveToBase('${escapeJsString(u.uniqueId)}')" title="移到 jobs_base 重走流程">待确认</button>
@@ -3158,6 +3193,7 @@ function initTableSorting() {
 }
 
 function initTargetTableSorting() {
+  console.log("[target-sort] 初始化排序监听...");
   document.querySelectorAll("th.sortable-target").forEach((th) => {
     th.addEventListener("click", () => {
       const key = th.dataset.sort;
@@ -3166,7 +3202,7 @@ function initTargetTableSorting() {
         currentTargetSort.asc = !currentTargetSort.asc;
       } else {
         currentTargetSort.key = key;
-        currentTargetSort.asc = true;
+        currentTargetSort.asc = false; // 默认降序（高播放在前）
       }
       // 更新排序指示器
       document.querySelectorAll("th.sortable-target").forEach((h) => {
@@ -3177,7 +3213,8 @@ function initTargetTableSorting() {
       th.classList.add(currentTargetSort.asc ? "sort-asc" : "sort-desc");
       const icon = th.querySelector(".sort-icon");
       if (icon) icon.textContent = currentTargetSort.asc ? "↑" : "↓";
-      renderTargetTable();
+      // 重新从服务端加载（带排序参数）
+      loadTargetUsersPage(false);
     });
   });
 }

package/src/watch/server.js

@@ -993,6 +993,9 @@ export function startWatchServer(
             followerCount: u.followerCount || 0,
             topVideoPlayCount: u.topVideoPlayCount || null,
             topVideoHref: u.topVideoHref || null,
+            topVideoIsAd: u.topVideoIsAd ?? null,
+            recentEcVideos: u.recentEcVideos || null,
+            latestVideoTime: u.latestVideoTime || null,
           }));
           sendJSON(res, 200, { total: targets.length, users });
         }
@@ -1078,6 +1081,8 @@ export function startWatchServer(
               search: params.search || undefined,
               limit: parseInt(params.limit, 10),
               offset: parseInt(params.offset || "0", 10),
+              sort: params.sort || undefined,
+              sortOrder: params.sortOrder || "desc",
             },
           );
           // 确保每个用户对象包含 topVideoPlayCount、topVideoHref 和 topVideoIsAd