tt-help-cli-ycl 1.3.30 → 1.3.32

package/src/scraper/modules/comment-extractor.js

@@ -1,73 +1,52 @@
 import { delay, getDelayConfig, closeCommentPanel } from "./page-helpers.js";
-import { scrollAndCollect } from "./scroll-collector.js";
 import { waitAndGetCaptcha } from "./captcha-handler.js";
-
-async function openCommentPanel(page) {
-  const tabs = page.locator('[class*="tabbar-item"]');
-  const commentTab = tabs.filter({ hasText: "评论" }).first();
-  await commentTab.click();
-
-  // 等待短暂时间让页面渲染
-  await new Promise(r => setTimeout(r, 2000));
-
-  // 检测验证码
-  const captchaResult = await waitAndGetCaptcha(page, {
-    waitMs: 180000,
-    pollInterval: 5000,
-    log: console.error,
-  });
-
-  await page
-    .waitForSelector('[class*="CommentListContainer"]', { timeout: 5000 })
-    .catch(() => {});
-  await page
-    .waitForFunction(
-      () => {
-        const list = document.querySelector('[class*="CommentListContainer"]');
-        return list && list.children.length > 0;
-      },
-      { timeout: 10000 },
-    )
-    .catch(() => {});
-
-  return { captchaDetected: !!captchaResult.detected };
-}
+import { fetchUserCommentsAPI } from "../../lib/api-interceptor-comment.js";
 
 async function extractCommentAuthors(page, maxComments = 10) {
-  const panelResult = await openCommentPanel(page);
-
   const config = getDelayConfig();
-  const allAuthors = await scrollAndCollect(page, {
-    container: '[class*="CommentMain"]',
-    findScrollable: true,
-    collectFn: (container) => {
-      const list = document.querySelector('[class*="CommentListContainer"]');
-      if (!list) return { items: [] };
-      const authors = [];
-      Array.from(list.children).forEach((wrapper) => {
-        const link = wrapper.querySelector(
-          '[class*="UsernameContentWrapper"] a',
-        );
-        if (link) {
-          const href = link.href || link.getAttribute("href");
-          const m = href && href.match(/@([^/]+)/);
-          if (m) authors.push("@" + m[1]);
-        }
-      });
-      return { items: authors };
-    },
-    uniqueKey: (a) => a,
-    maxItems: maxComments,
-    delayRange: [Math.round(config.commentMax * 0.3), config.commentMax],
-    staleThreshold: 2,
+
+  // 关闭可能已打开的评论面板（用 evaluate 而非 locator，
+  // 因为 closeCommentPanel 是点 overlay 不是点 tab）
+  await closeCommentPanel(page);
+  await delay(800, 1500);
+
+  // API 拦截获取评论
+  const apiResult = await fetchUserCommentsAPI(page, {
+    maxComments,
+    log: console.log,
+    onCaptcha: (pg) => waitAndGetCaptcha(pg, {
+      waitMs: 180000,
+      pollInterval: 5000,
+      log: console.error,
+    }),
   });
 
+  // 关闭评论面板
   await closeCommentPanel(page);
   await delay(Math.round(config.commentMax * 0.3), config.commentMax);
 
+  if (apiResult.error || !apiResult.comments || apiResult.comments.length === 0) {
+    return {
+      authors: [],
+      captchaDetected: apiResult.captchaDetected || false,
+    };
+  }
+
+  // 提取作者名（保持原有接口）
+  const authors = [];
+  for (const comment of apiResult.comments) {
+    if (authors.length >= maxComments) break;
+    const uniqueId = comment.user?.unique_id;
+    if (uniqueId) {
+      authors.push("@" + uniqueId);
+    }
+  }
+
+  const uniqueAuthors = [...new Set(authors)].slice(0, maxComments);
+
   return {
-    authors: allAuthors.slice(0, maxComments),
-    captchaDetected: panelResult.captchaDetected,
+    authors: uniqueAuthors,
+    captchaDetected: apiResult.captchaDetected || false,
   };
 }
 

package/src/watch/data-store.js

@@ -813,6 +813,33 @@ export function createStore(filePath) {
     return videos.length;
   }
 
+  function getPendingCommentTasks(limit) {
+    // 筛选待处理视频（userUpdateCount <= 0 或 null/undefined）
+    const pending = videos.filter(v => (v.userUpdateCount || 0) <= 0);
+    // ttSeller=true 优先
+    pending.sort((a, b) => {
+      if (a.ttSeller && !b.ttSeller) return -1;
+      if (!a.ttSeller && b.ttSeller) return 1;
+      return (a.registeredAt || 0) - (b.registeredAt || 0);
+    });
+    // 取前 limit 个
+    const tasks = pending.slice(0, limit);
+    // userUpdateCount +1
+    for (const task of tasks) {
+      task.userUpdateCount = (task.userUpdateCount || 0) + 1;
+    }
+    saveVideos();
+    return tasks;
+  }
+
+  function commitCommentTask(videoId) {
+    const video = videos.find(v => v.id === videoId);
+    if (!video) return { ok: false, error: 'video not found' };
+    video.userUpdateCount = (video.userUpdateCount || 0) + 1;
+    saveVideos();
+    return { ok: true, userUpdateCount: video.userUpdateCount };
+  }
+
   return {
     save, flushSave, getUser, hasUser, userExists, addUser,
     getPendingUsers, getProcessedUsers, getAllUsers, getStats,
@@ -821,7 +848,7 @@ export function createStore(filePath) {
     getNextRedoJob, commitRedoJob,
     getPendingUserUpdateTasks, updateUserInfo, batchUpdateUserInfo,
     reportClientError, deleteClientError, getClientErrors,
-    registerVideos, getVideos, getVideoCount,
+    registerVideos, getVideos, getVideoCount, getPendingCommentTasks, commitCommentTask,
     stopBackup,
     data,
   };

package/src/watch/server.js

@@ -204,17 +204,18 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
 
       if (req.method === 'POST' && routePath === '/api/users') {
         try {
-          const { usernames } = await readBody(req);
+          const { usernames, sources, guessedLocation } = await readBody(req);
           if (!Array.isArray(usernames) || usernames.length === 0) {
             sendJSON(res, 400, { error: 'usernames \u6570\u7ec4\u4e0d\u80fd\u4e3a\u7a7a' });
             return;
           }
+          const userSources = sources || ['seed'];
           const existingIds = new Set(store.getAllUsers().map(u => u.uniqueId));
           const newUsers = usernames
             .map(u => u.replace(/^@/, '').trim())
             .filter(u => u && !existingIds.has(u));
           for (const nu of newUsers) {
-            store.addUser({ uniqueId: nu, sources: ['seed'], status: 'pending' });
+            store.addUser({ uniqueId: nu, sources: userSources, status: 'pending', guessedLocation: guessedLocation || null });
           }
           store.save();
           sendJSON(res, 200, {
@@ -416,6 +417,33 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         return;
       }
 
+      if (req.method === 'GET' && routePath === '/api/comment-tasks') {
+        const limit = parseInt(params.limit) || 1;
+        const tasks = store.getPendingCommentTasks(limit);
+        const ts = new Date().toISOString().slice(11, 19);
+        console.error(`[JOB ${ts}] COMMENT-TASKS: ${tasks.length} tasks`);
+        sendJSON(res, 200, { total: tasks.length, tasks });
+        return;
+      }
+
+      const commentTaskMatch = routePath.match(/^\/api\/comment-task\/([^/]+)$/);
+      if (req.method === 'PUT' && commentTaskMatch) {
+        const videoId = commentTaskMatch[1];
+        try {
+          const ret = store.commitCommentTask(videoId);
+          if (ret.error) {
+            sendJSON(res, 404, { error: ret.error });
+            return;
+          }
+          const ts = new Date().toISOString().slice(11, 19);
+          console.error(`[JOB ${ts}] COMMENT-TASK-COMMIT: ${videoId} (userUpdateCount=${ret.userUpdateCount})`);
+          sendJSON(res, 200, ret);
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       const redoCommitMatch = routePath.match(/^\/api\/redo-job\/([^/]+)$/);
       if (req.method === 'POST' && redoCommitMatch) {
         const uniqueId = redoCommitMatch[1];