tt-help-cli-ycl 1.3.80 → 1.3.82

package/src/watch/public/app.js

@@ -961,6 +961,7 @@ let currentTargetTotal = 0;
 let currentTargetLoading = false;
 let currentTargetAllLoaded = false;
 let currentTargetSeq = 0;
+let currentTargetSort = { key: null, asc: true };
 const TARGET_PAGE_SIZE = 200;
 
 async function fetchTargetByCountry() {
@@ -1087,16 +1088,36 @@ function renderTargetTable() {
   const el = document.getElementById("targetTable");
   const moreHint = document.getElementById("targetMoreHint");
 
-  if (currentTargetUsers.length === 0) {
+  // 应用本地排序
+  let displayUsers = currentTargetUsers;
+  if (currentTargetSort.key) {
+    displayUsers = [...currentTargetUsers].sort((a, b) => {
+      let va = a[currentTargetSort.key];
+      let vb = b[currentTargetSort.key];
+      if (va == null && vb == null) return 0;
+      if (va == null) return 1;
+      if (vb == null) return -1;
+      if (typeof va === "number" && typeof vb === "number") {
+        return currentTargetSort.asc ? va - vb : vb - va;
+      }
+      va = String(va).toLowerCase();
+      vb = String(vb).toLowerCase();
+      return currentTargetSort.asc
+        ? va.localeCompare(vb)
+        : vb.localeCompare(va);
+    });
+  }
+
+  if (displayUsers.length === 0) {
     el.innerHTML =
-      '<tr><td colspan="9" style="text-align:center;color:#888;padding:24px">暂无数据</td></tr>';
+      '<tr><td colspan="10" style="text-align:center;color:#888;padding:24px">暂无数据</td></tr>';
     if (moreHint) {
       moreHint.style.display = "none";
     }
     return;
   }
 
-  el.innerHTML = currentTargetUsers
+  el.innerHTML = displayUsers
     .map((u, i) => {
       const nick = (u.nickname || "")
         .replace(/</g, "&lt;")
@@ -1113,6 +1134,13 @@ function renderTargetTable() {
         ? formatTime(u.latestVideoTime * 1000)
         : "-";
       const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
+      const topPlayCount =
+        u.topVideoPlayCount != null && u.topVideoPlayCount > 0
+          ? formatNum(u.topVideoPlayCount)
+          : "-";
+      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}</a></td>`
+        : `<td data-label="最大播放量" style="font-size:11px;color:#888">${topPlayCount}</td>`;
 
       const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
       const locationCell = u.modifiedAt
@@ -1140,6 +1168,7 @@ function renderTargetTable() {
       <td data-label="视频">${videos}</td>
       ${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">${refreshTime}</td>
     </tr>`;
@@ -1325,7 +1354,7 @@ function renderPendingCountryGrid(countries) {
       <div class="pending-country-item${isUnknown ? "" : " has-target"}" 
            onclick="filterByPendingCountry('${safeCountry}')">
         <div class="country-action-btns">
-          <button class="country-action-btn restore" title="重置为需要预处理" onclick="event.stopPropagation(); resetPendingByCountry('${safeCountry}', ${c.count})">↺</button>
+          <!-- <button class="country-action-btn restore" title="重置为需要预处理" onclick="event.stopPropagation(); resetPendingByCountry('${safeCountry}', ${c.count})">↺</button> -->
           <button class="country-action-btn" title="移到毛料库，暂不处理" onclick="event.stopPropagation(); moveCountryJobsToRaw('pending', '${safeCountry}', ${c.count})">✕</button>
         </div>
         <div class="country-name">${isUnknown ? "🌍 " : ""}${c.country}</div>
@@ -1836,11 +1865,37 @@ function initTableSorting() {
   });
 }
 
+function initTargetTableSorting() {
+  document.querySelectorAll("th.sortable-target").forEach((th) => {
+    th.addEventListener("click", () => {
+      const key = th.dataset.sort;
+      if (!key) return;
+      if (currentTargetSort.key === key) {
+        currentTargetSort.asc = !currentTargetSort.asc;
+      } else {
+        currentTargetSort.key = key;
+        currentTargetSort.asc = true;
+      }
+      // 更新排序指示器
+      document.querySelectorAll("th.sortable-target").forEach((h) => {
+        h.classList.remove("sort-asc", "sort-desc");
+        const icon = h.querySelector(".sort-icon");
+        if (icon) icon.textContent = "↕";
+      });
+      th.classList.add(currentTargetSort.asc ? "sort-asc" : "sort-desc");
+      const icon = th.querySelector(".sort-icon");
+      if (icon) icon.textContent = currentTargetSort.asc ? "↑" : "↓";
+      renderTargetTable();
+    });
+  });
+}
+
 // 初始化
 fetchStats();
 fetchUsers();
 fetchClientErrors();
 initTableSorting();
+initTargetTableSorting();
 
 setInterval(fetchStats, 10000);
 setInterval(fetchUsers, 10000);

package/src/watch/public/index.html

@@ -327,7 +327,8 @@
                 <th>视频</th>
                 <th>国家</th>
                 <th>确认国家</th>
-                <th>最近发布</th>
+                <th class="sortable-target" data-sort="topVideoPlayCount">最大播放量 <span class="sort-icon">↕</span></th>
+                <th class="sortable-target" data-sort="latestVideoTime">最近发布 <span class="sort-icon">↕</span></th>
                 <th>最近刷新</th>
               </tr>
             </thead>

package/src/watch/public/style.css

@@ -619,6 +619,31 @@ th.sortable.sort-desc .sort-icon {
   color: #fe2c55;
 }
 
+th.sortable-target {
+  cursor: pointer;
+  user-select: none;
+}
+
+th.sortable-target:hover {
+  color: #fe2c55;
+}
+
+th.sortable-target .sort-icon {
+  font-size: 10px;
+  opacity: 0.4;
+  margin-left: 2px;
+}
+
+th.sortable-target.sort-asc .sort-icon {
+  opacity: 1;
+  color: #fe2c55;
+}
+
+th.sortable-target.sort-desc .sort-icon {
+  opacity: 1;
+  color: #fe2c55;
+}
+
 td {
   padding: 6px 10px;
   border-bottom: 1px solid #1f1f2a;

package/src/watch/server.js

@@ -89,9 +89,14 @@ function sendCSV(res, columns, rows) {
   res.end(body);
 }
 
-export function startWatchServer(dataAnchor, port = 3000, existingStore) {
+export function startWatchServer(
+  dataAnchor,
+  port = 3000,
+  existingStore,
+  options = {},
+) {
   return new Promise((_resolve, reject) => {
-    const store = existingStore || createStore(dataAnchor);
+    const store = existingStore || createStore(dataAnchor, options);
 
     function logJob(action, detail) {
       const ts = new Date().toLocaleTimeString("zh-CN", { hour12: false });
@@ -172,7 +177,7 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
               .filter(Boolean)
           : null;
         const loggedIn = params.loggedIn === "true";
-        const job = store.claimNextJob(
+        const job = await store.claimNextJob(
           userId,
           5 * 60 * 1000,
           locations,
@@ -377,6 +382,7 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         const stats = computeStatsIncremental(store);
         stats.targetLocations = DEFAULT_TARGET_LOCATIONS;
         stats.clientLoginStatus = store.getClientLoginStatus();
+        stats.llmSampleOffsets = store.getLlmSampleOffsets(); // 添加偏移量状态
         sendJSON(res, 200, stats);
         return;
       }
@@ -570,6 +576,8 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
             uniqueId: u.uniqueId,
             nickname: u.nickname || "",
             followerCount: u.followerCount || 0,
+            topVideoPlayCount: u.topVideoPlayCount || null,
+            topVideoHref: u.topVideoHref || null,
           }));
           sendJSON(res, 200, { total: targets.length, users });
         }
@@ -657,12 +665,32 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
               offset: parseInt(params.offset || "0", 10),
             },
           );
+          // 确保每个用户对象包含 topVideoPlayCount 和 topVideoHref
+          if (result.users && Array.isArray(result.users)) {
+            result.users = result.users.map((u) => ({
+              ...u,
+              topVideoPlayCount: u.topVideoPlayCount || null,
+              topVideoHref: u.topVideoHref || null,
+            }));
+          }
           sendJSON(res, 200, result);
           return;
         }
 
         // 默认：全量（兼容旧调用）
         const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
+        // 确保每个用户对象包含 topVideoPlayCount 和 topVideoHref
+        if (result.countries && Array.isArray(result.countries)) {
+          for (const country of result.countries) {
+            if (country.users && Array.isArray(country.users)) {
+              country.users = country.users.map((u) => ({
+                ...u,
+                topVideoPlayCount: u.topVideoPlayCount || null,
+                topVideoHref: u.topVideoHref || null,
+              }));
+            }
+          }
+        }
         sendJSON(res, 200, result);
         return;
       }
@@ -764,6 +792,41 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         return;
       }
 
+      // 手动触发从 raw_jobs 补充任务到 jobs
+      if (req.method === "POST" && routePath === "/api/raw-jobs/refill") {
+        try {
+          const body = await readBody(req);
+          const locationsParam = body.locations || "";
+          const locations = locationsParam
+            ? locationsParam
+                .split(",")
+                .map((s) => s.trim().toUpperCase())
+                .filter(Boolean)
+            : null;
+          const limit = body.limit || 500;
+          const options = {
+            llmScore: !!body.llmScore,
+            llmMinScore: body.llmMinScore ?? 60,
+            llmSampleSize: body.llmSampleSize ?? 100,
+            llmMinReturn: body.llmMinReturn ?? 60,
+            llmMaxBatches: body.llmMaxBatches ?? 10,
+          };
+          const result = await store.refillJobsFromRaw(
+            locations,
+            limit,
+            options,
+          );
+          if (result.error) {
+            sendJSON(res, 400, result);
+            return;
+          }
+          sendJSON(res, 200, result);
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       if (req.method === "POST" && routePath === "/api/attach-stuck/restore") {
         try {
           const body = await readBody(req);