tt-help-cli-ycl 1.3.72 → 1.3.74

package/src/watch/public/app.js

@@ -33,7 +33,7 @@ async function fetchStats() {
   }
 }
 
-async function fetchUsers() {
+async function fetchUsers(showLoad) {
   try {
     const params = new URLSearchParams();
     if (currentFilter === "target") {
@@ -46,11 +46,13 @@ async function fetchUsers() {
     const search = document.getElementById("searchInput").value.trim();
     if (search) params.set("search", search);
     if (currentLocation) params.set("location", currentLocation);
-    params.set("limit", "200");
+    params.set("limit", "100");
+    if (showLoad) showLoading("加载中...");
     const res = await fetch("/api/users?" + params.toString());
     const data = await res.json();
     currentUsers = data.users || [];
     renderTable(currentUsers);
+    if (showLoad) hideLoading();
   } catch (e) {}
 }
 
@@ -434,7 +436,7 @@ function setFilter(f) {
     targetLocSel.style.display = "none";
     currentTargetLocation = "";
   }
-  fetchUsers();
+  fetchUsers(true);
 }
 
 function renderLocationFilter() {
@@ -454,15 +456,20 @@ function renderLocationFilter() {
 }
 
 function onLocationChange() {
-  const sel = document.getElementById("locationFilter");
-  currentLocation = sel.value;
-  fetchUsers();
-}
-
-function onTargetLocationChange() {
-  const sel = document.getElementById("targetLocationFilter");
-  currentTargetLocation = sel.value;
-  fetchUsers();
+  const locationSel = document.getElementById("locationFilter");
+  currentLocation = locationSel.value;
+  fetchUsers(true);
+  const targetSel = document.getElementById("targetLocationFilter");
+  currentTargetLocation = targetSel.value;
+  // 判断当前在哪个页面
+  if (document.getElementById("targetPage").classList.contains("active")) {
+    if (currentTargetSummary) {
+      renderTargetCountryGrid(currentTargetSummary.countries || []);
+      loadTargetUsersPage();
+    }
+  } else {
+    fetchUsers();
+  }
 }
 
 let searchTimer = null;
@@ -591,40 +598,6 @@ async function selectLocation(uniqueId, location) {
     }
     showToast(`@${uniqueId} 国家已更新为 ${location}`);
 
-    // 同步更新内存数据：将用户从旧国家组移到新国家组
-    if (currentTargetData && currentTargetData.countries) {
-      let oldCountry = null;
-      let userObj = null;
-      for (const country of currentTargetData.countries) {
-        const idx = country.users.findIndex((u) => u.uniqueId === uniqueId);
-        if (idx !== -1) {
-          oldCountry = country;
-          userObj = country.users.splice(idx, 1)[0];
-          break;
-        }
-      }
-      if (userObj) {
-        userObj.locationCreated = location;
-        userObj.modifiedAt = Date.now();
-        // 找到或创建新国家组
-        let newCountry = currentTargetData.countries.find(
-          (c) => c.country === location,
-        );
-        if (!newCountry) {
-          newCountry = { country: location, count: 0, users: [] };
-          currentTargetData.countries.push(newCountry);
-        }
-        newCountry.users.push(userObj);
-        newCountry.count = newCountry.users.length;
-        // 更新旧国家组的 count
-        if (oldCountry) oldCountry.count = oldCountry.users.length;
-        // 重新渲染左侧国家列表和表格
-        renderTargetCountryGrid(currentTargetData.countries);
-        renderTargetLocationFilter(currentTargetData.countries);
-        renderTargetTable(currentTargetData.countries);
-      }
-    }
-
     // 只更新当前行 DOM
     const tr = document.querySelector(`tr[data-user="${uniqueId}"]`);
     if (tr) {
@@ -634,8 +607,16 @@ async function selectLocation(uniqueId, location) {
         locCell.className = "location-cell modified";
         locCell.innerHTML = `${location}${editIcon}`;
         locCell.title = `点击修改国家（已修改: ${formatTime(Date.now())})`;
+        locCell.onclick = () => openLocationModal(uniqueId, location);
       }
     }
+
+    // 在内存用户列表中也更新
+    const userInMem = currentTargetUsers.find((u) => u.uniqueId === uniqueId);
+    if (userInMem) {
+      userInMem.locationCreated = location;
+      userInMem.modifiedAt = Date.now();
+    }
   } catch (e) {
     showToast("更新失败: " + e.message, true);
   } finally {
@@ -960,6 +941,7 @@ function showTargetPage() {
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
   document.getElementById("targetPage").classList.add("active");
+  showLoading("正在加载目标商家数据...");
   fetchTargetByCountry();
   // 同步统计
   if (currentStats) {
@@ -970,16 +952,21 @@ function showTargetPage() {
   }
 }
 
-let currentTargetData = null;
+let currentTargetSummary = null;
+let currentTargetUsers = [];
+let currentTargetTotal = 0;
+let currentTargetLoading = false;
+let currentTargetAllLoaded = false;
+let currentTargetSeq = 0;
+const TARGET_PAGE_SIZE = 200;
 
 async function fetchTargetByCountry() {
   try {
-    const res = await fetch("/api/target-users-by-country");
+    const res = await fetch("/api/target-users-by-country?summary=1");
     const data = await res.json();
-    currentTargetData = data;
+    currentTargetSummary = data;
     renderTargetCountryGrid(data.countries || []);
-    renderTargetLocationFilter(data.countries || []);
-    renderTargetTable(data.countries || []);
+    renderTargetPageLocationFilter(data.countries || []);
     document.getElementById("targetPageStatTotal").textContent = formatStatNum(
       data.total || 0,
       { full: true },
@@ -987,8 +974,11 @@ async function fetchTargetByCountry() {
     document.getElementById("targetPageStatCountries").textContent = (
       data.countries || []
     ).length;
+    await loadTargetUsersPage(false, true);
   } catch (e) {
     console.error("获取目标商家数据失败:", e);
+  } finally {
+    hideLoading();
   }
 }
 
@@ -999,17 +989,18 @@ function renderTargetCountryGrid(countries) {
       '<span style="color:#666;font-size:12px">暂无目标商家</span>';
     return;
   }
-  const total = countries.reduce((sum, c) => sum + c.count, 0);
+  const total = countries.reduce((sum, c) => sum + (c.count || 0), 0);
   grid.innerHTML = countries
     .map((c) => {
-      const pct = ((c.count / total) * 100).toFixed(1);
+      const cnt = c.count || 0;
+      const pct = total > 0 ? ((cnt / total) * 100).toFixed(1) : "0.0";
       const safeCountry = escapeJsString(c.country);
       const sel = currentTargetLocation === c.country ? " selected" : "";
       return `
       <div class="pending-country-item has-target${sel}"
            onclick="filterTargetByCountry('${safeCountry}')">
         <div class="country-name">${c.country}</div>
-        <div class="country-count">${c.count}</div>
+        <div class="country-count">${cnt}</div>
         <div class="country-label">${pct}% 目标商家</div>
       </div>
     `;
@@ -1017,7 +1008,7 @@ function renderTargetCountryGrid(countries) {
     .join("");
 }
 
-function renderTargetLocationFilter(countries) {
+function renderTargetPageLocationFilter(countries) {
   const sel = document.getElementById("targetLocationFilter");
   if (!sel) return;
   const val = sel.value;
@@ -1026,46 +1017,90 @@ function renderTargetLocationFilter(countries) {
     countries
       .map(
         (c) =>
-          `<option value="${c.country}"${val === c.country ? " selected" : ""}>${c.country} (${c.count})</option>`,
+          `<option value="${c.country}"${val === c.country ? " selected" : ""}>${c.country} (${c.count || 0})</option>`,
       )
       .join("");
 }
 
-function renderTargetTable(countries) {
-  const el = document.getElementById("targetTable");
+async function loadTargetUsersPage(append = false, skipLoading = false) {
+  if (currentTargetLoading) return;
+  currentTargetLoading = true;
+
+  const seq = ++currentTargetSeq;
   const search = document.getElementById("targetSearchInput")
-    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    ? document.getElementById("targetSearchInput").value.trim()
     : "";
-  const location = currentTargetLocation;
+  const offset = append ? currentTargetUsers.length : 0;
 
-  let allUsers = [];
-  for (const c of countries) {
-    if (location && c.country !== location) continue;
-    allUsers = allUsers.concat(c.users);
+  // 非追加模式（重置加载）时显示 loading，除非外层已经显示了
+  if (!append && !skipLoading) {
+    showLoading("正在加载数据...");
   }
 
-  if (search) {
-    allUsers = allUsers.filter(
-      (u) =>
-        (u.uniqueId || "").toLowerCase().includes(search) ||
-        (u.nickname || "").toLowerCase().includes(search),
-    );
+  let data = null;
+  let error = null;
+  try {
+    let url = `/api/target-users-by-country?limit=${TARGET_PAGE_SIZE}&offset=${offset}`;
+    if (currentTargetLocation)
+      url += `&country=${encodeURIComponent(currentTargetLocation)}`;
+    if (search) url += `&search=${encodeURIComponent(search)}`;
+
+    const res = await fetch(url);
+    data = await res.json();
+  } catch (e) {
+    error = e;
+    console.error("加载目标用户失败:", e);
+  } finally {
+    // 非追加模式时隐藏 loading，除非外层负责隐藏
+    if (!append && !skipLoading) {
+      hideLoading();
+    }
+    currentTargetLoading = false;
+
+    if (error || !data) return;
+
+    // 防止旧请求覆盖新请求的结果
+    if (seq !== currentTargetSeq && !append) return;
+
+    if (!append) {
+      currentTargetUsers = data.users || [];
+      currentTargetTotal = data.total || 0;
+      currentTargetAllLoaded = currentTargetUsers.length >= currentTargetTotal;
+    } else {
+      currentTargetUsers = currentTargetUsers.concat(data.users || []);
+      currentTargetAllLoaded = currentTargetUsers.length >= currentTargetTotal;
+    }
+
+    // 所有状态更新完成后，再渲染
+    renderTargetTable();
   }
+}
 
-  if (!allUsers.length) {
+function updateLoadMoreButton() {
+  // 按钮已移除，保留函数名以兼容旧调用
+}
+
+function renderTargetTable() {
+  const el = document.getElementById("targetTable");
+  const moreHint = document.getElementById("targetMoreHint");
+
+  if (currentTargetUsers.length === 0) {
     el.innerHTML =
-      '<tr><td colspan="8" style="color:#666;text-align:center;padding:24px">暂无目标商家</td></tr>';
+      '<tr><td colspan="9" style="text-align:center;color:#888;padding:24px">暂无数据</td></tr>';
+    if (moreHint) {
+      moreHint.style.display = "none";
+    }
     return;
   }
 
-  el.innerHTML = allUsers
-    .map((u) => {
+  el.innerHTML = currentTargetUsers
+    .map((u, i) => {
       const nick = (u.nickname || "")
         .replace(/</g, "&lt;")
         .replace(/>/g, "&gt;");
       const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
       const videos = u.videoCount != null ? u.videoCount : "-";
-      const location = u.locationCreated || "-";
+      const userLocation = u.locationCreated || "-";
       const confirmedLocation = u.confirmedLocation
         ? u.confirmedLocation === u.locationCreated
           ? `<span style="color:#22c55e">${u.confirmedLocation} ✓</span>`
@@ -1075,13 +1110,11 @@ function renderTargetTable(countries) {
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
-      const sources = (u.sources || []).join(", ");
 
-      // 修改过的国家用特殊颜色，带编辑图标
       const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
       const locationCell = u.modifiedAt
-        ? `<td data-label="国家" class="location-cell modified" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家（已修改: ${formatTime(u.modifiedAt)}）">${location}${editIcon}</td>`
-        : `<td data-label="国家" class="location-cell" onclick="openLocationModal('${u.uniqueId}','${location}')" title="点击修改国家">${location}${editIcon}</td>`;
+        ? `<td data-label="国家" class="location-cell modified" onclick="openLocationModal('${u.uniqueId}','${userLocation}')" title="点击修改国家（已修改: ${formatTime(u.modifiedAt)}）">${userLocation}${editIcon}</td>`
+        : `<td data-label="国家" class="location-cell" onclick="openLocationModal('${u.uniqueId}','${userLocation}')" title="点击修改国家">${userLocation}${editIcon}</td>`;
 
       let statusTag = "";
       if (u.status === "done")
@@ -1097,6 +1130,7 @@ function renderTargetTable(countries) {
       else statusTag = u.status || "-";
 
       return `<tr data-user="${u.uniqueId}">
+      <td style="color:#9ca3af;font-size:12px;text-align:center" data-label="#">${i + 1}</td>
       <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
       <td data-label="昵称">${nick}</td>
       <td data-label="粉丝">${fans}</td>
@@ -1108,6 +1142,24 @@ function renderTargetTable(countries) {
     </tr>`;
     })
     .join("");
+
+  if (moreHint) {
+    moreHint.style.display = "";
+    if (currentTargetAllLoaded) {
+      moreHint.innerHTML = `共 <b>${currentTargetTotal}</b> 条，已全部加载`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "default";
+    } else if (currentTargetLoading) {
+      moreHint.innerHTML = `已加载 <b>${currentTargetUsers.length}</b> / ${currentTargetTotal} 条，加载中...`;
+      moreHint.style.color = "#9ca3af";
+      moreHint.style.cursor = "wait";
+    } else {
+      moreHint.innerHTML = `已加载 <b>${currentTargetUsers.length}</b> / ${currentTargetTotal} 条，<u style="color:#3b82f6">点击此处加载更多</u> ↓`;
+      moreHint.style.color = "#6b7280";
+      moreHint.style.cursor = "pointer";
+    }
+  }
+  updateLoadMoreButton();
 }
 
 function filterTargetByCountry(country) {
@@ -1116,18 +1168,9 @@ function filterTargetByCountry(country) {
   if (sel) sel.value = country;
   const btn = document.getElementById("targetReprocessBtn");
   if (btn) btn.style.display = "";
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
-  }
-}
-
-function onTargetLocationChange() {
-  const sel = document.getElementById("targetLocationFilter");
-  currentTargetLocation = sel.value;
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
+  if (currentTargetSummary) {
+    renderTargetCountryGrid(currentTargetSummary.countries || []);
+    loadTargetUsersPage();
   }
 }
 
@@ -1139,53 +1182,54 @@ function clearTargetFilters() {
   if (locationFilter) locationFilter.value = "";
   const btn = document.getElementById("targetReprocessBtn");
   if (btn) btn.style.display = "none";
-  if (currentTargetData) {
-    renderTargetCountryGrid(currentTargetData.countries || []);
-    renderTargetTable(currentTargetData.countries || []);
+  if (currentTargetSummary) {
+    renderTargetCountryGrid(currentTargetSummary.countries || []);
+    loadTargetUsersPage();
   }
 }
 
 async function reprocessTargetUsers() {
-  if (!currentTargetLocation || !currentTargetData) return;
+  if (!currentTargetLocation) return;
   const country = currentTargetLocation;
-  const countryData = currentTargetData.countries.find((c) => c.country === country);
-  const users = countryData ? countryData.users : [];
   const search = document.getElementById("targetSearchInput")
-    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    ? document.getElementById("targetSearchInput").value.trim()
     : "";
-  const filtered = search
-    ? users.filter(
-        (u) =>
-          (u.uniqueId || "").toLowerCase().includes(search) ||
-          (u.nickname || "").toLowerCase().includes(search),
-      )
-    : users;
-  if (filtered.length === 0) {
-    showToast("当前筛选结果为空", true);
-    return;
-  }
-  if (
-    !confirm(
-      `确定要重新处理 ${country} 的 ${filtered.length} 个目标商家吗？\n这将重置它们的任务状态，使客户端重新采集。`,
-    )
-  ) {
-    return;
-  }
-  const userIds = filtered.map((u) => u.uniqueId);
-  showLoading("正在批量重置...");
+
+  // 加载该国家全量用户用于重置
+  showLoading("正在加载用户列表...");
   try {
-    const res = await fetch("/api/jobs/batch-reset", {
+    let url = `/api/target-users-by-country?limit=99999&offset=0&country=${encodeURIComponent(country)}`;
+    if (search) url += `&search=${encodeURIComponent(search)}`;
+    const res = await fetch(url);
+    const data = await res.json();
+    const users = data.users || [];
+
+    if (users.length === 0) {
+      showToast("当前筛选结果为空", true);
+      return;
+    }
+    if (
+      !confirm(
+        `确定要重新处理 ${country} 的 ${users.length} 个目标商家吗？\n这将重置它们的任务状态，使客户端重新采集。`,
+      )
+    ) {
+      hideLoading();
+      return;
+    }
+    showLoading("正在批量重置...");
+    const userIds = users.map((u) => u.uniqueId);
+    const resetRes = await fetch("/api/jobs/batch-reset", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ userIds }),
     });
-    const data = await res.json();
-    if (data.error) {
-      showToast(data.error, true);
+    const resetData = await resetRes.json();
+    if (resetData.error) {
+      showToast(resetData.error, true);
       return;
     }
-    showToast(`已重置 ${data.reset} / ${data.total} 个用户`);
-    fetchTargetData();
+    showToast(`已重置 ${resetData.reset} / ${resetData.total} 个用户`);
+    fetchTargetByCountry();
   } catch (e) {
     showToast("批量重置失败: " + e.message, true);
   } finally {
@@ -1198,8 +1242,8 @@ let targetSearchTimer = null;
 document.getElementById("targetSearchInput").addEventListener("input", () => {
   if (targetSearchTimer) clearTimeout(targetSearchTimer);
   targetSearchTimer = setTimeout(() => {
-    if (currentTargetData) {
-      renderTargetTable(currentTargetData.countries || []);
+    if (currentTargetSummary) {
+      loadTargetUsersPage();
     }
   }, 300);
 });
@@ -1228,6 +1272,29 @@ document
     }
   });
 
+document
+  .getElementById("refreshTargetBtn")
+  .addEventListener("click", async () => {
+    showLoading("正在刷新...");
+    try {
+      currentTargetLocation = "";
+      const searchInput = document.getElementById("targetSearchInput");
+      const locationFilter = document.getElementById("targetLocationFilter");
+      if (searchInput) searchInput.value = "";
+      if (locationFilter) locationFilter.value = "";
+      const btn = document.getElementById("targetReprocessBtn");
+      if (btn) btn.style.display = "none";
+      await fetchTargetByCountry();
+      showToast("刷新完成");
+    } catch (e) {
+      showToast("刷新失败: " + e.message, true);
+    } finally {
+      hideLoading();
+    }
+  });
+
+// 加载更多按钮由 HTML 中 onclick="loadTargetUsersPage(true)" 直接触发
+
 async function fetchPendingByCountry() {
   try {
     const res = await fetch("/api/pending-by-country");
@@ -1771,6 +1838,7 @@ fetchStats();
 fetchUsers();
 fetchClientErrors();
 initTableSorting();
+
 setInterval(fetchStats, 10000);
 setInterval(fetchUsers, 10000);
 setInterval(fetchClientErrors, 10000);

package/src/watch/public/index.html

@@ -296,6 +296,9 @@
       <div class="stat-card clickable" id="exportTargetCsvBtn" style="background:rgba(34,197,94,0.12);cursor:pointer">
         <div class="label">导出 CSV</div>
       </div>
+      <div class="stat-card clickable" id="refreshTargetBtn" style="background:rgba(59,130,246,0.12);cursor:pointer">
+        <div class="label">🔄 刷新</div>
+      </div>
     </div>
     <div class="target-page-layout">
       <div class="target-side-card">
@@ -316,6 +319,7 @@
           <table>
             <thead>
               <tr>
+                <th style="width:48px">#</th>
                 <th>用户名</th>
                 <th>昵称</th>
                 <th>粉丝</th>
@@ -328,6 +332,9 @@
             </thead>
             <tbody id="targetTable"></tbody>
           </table>
+          <div id="targetMoreHint" onclick="loadTargetUsersPage(true)"
+            style="text-align:center;padding:10px 8px;font-size:13px;color:#6b7280;cursor:default;user-select:none;transition:color 0.2s">
+          </div>
         </div>
       </div>
     </div>

package/src/watch/server.js

@@ -24,8 +24,24 @@ function getLocalIP() {
 const __dirname = dirname(__filename);
 const publicDir = join(__dirname, "public");
 
+// Stats 缓存：避免每次请求都扫描 100 万+ 条 jobs 数据
+let statsCache = null;
+let statsCacheTime = 0;
+const STATS_CACHE_TTL = 10000; // 10 秒缓存
+
+function invalidateStatsCache() {
+  statsCache = null;
+  statsCacheTime = 0;
+}
+
 function computeStatsIncremental(st) {
-  return st.getDashboardStats(DEFAULT_TARGET_LOCATIONS);
+  const now = Date.now();
+  if (statsCache && now - statsCacheTime < STATS_CACHE_TTL) {
+    return statsCache;
+  }
+  statsCache = st.getDashboardStats(DEFAULT_TARGET_LOCATIONS);
+  statsCacheTime = now;
+  return statsCache;
 }
 
 function readBody(req) {
@@ -553,8 +569,21 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         req.method === "GET" &&
         routePath === "/api/target-users-by-country"
       ) {
-        const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        // 摘要模式：只返回各国统计数
+        if (params.summary === "1") {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+            { summaryOnly: true },
+          );
+          sendJSON(res, 200, result);
+          return;
+        }
+
+        // CSV 导出：全量数据
         if (req.headers["accept"]?.includes("text/csv")) {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+          );
           const columns = [
             "uniqueId",
             "nickname",
@@ -603,9 +632,27 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
             columns.map((c) => csvEscape(r[c])).join(","),
           );
           res.end(BOM + [header, ...lines].join("\r\n"));
-        } else {
+          return;
+        }
+
+        // 分页模式：按国家+搜索+分页查询用户
+        if (params.limit) {
+          const result = store.getTargetUsersByCountry(
+            DEFAULT_TARGET_LOCATIONS,
+            {
+              country: params.country || undefined,
+              search: params.search || undefined,
+              limit: parseInt(params.limit, 10),
+              offset: parseInt(params.offset || "0", 10),
+            },
+          );
           sendJSON(res, 200, result);
+          return;
         }
+
+        // 默认：全量（兼容旧调用）
+        const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        sendJSON(res, 200, result);
         return;
       }