tt-help-cli-ycl 1.3.58 → 1.3.60

package/package.json

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

package/src/lib/browser/page.js

@@ -67,20 +67,50 @@ export async function withBrowserRecovery(fn, browser, page, cdpOptions, port) {
 }
 
 /**
- * 稳定判断登录状态：先检查 sessionid Cookie，再用页面 DOM 做验真。
- * 仅有 sessionid 不足以说明会话仍然有效，因此需要二次确认。
+ * 判断登录状态：Cookie 为主，DOM 验真为辅。
+ * - 无 sessionid Cookie → 未登录
+ * - sessionid Cookie 已过期 → 未登录
+ * - 有 Cookie + DOM 确认已登录 → 已登录
+ * - 有 Cookie + DOM 确认未登录（出现登录按钮）→ 未登录
+ * - 有 Cookie + DOM 无法判断（超时/元素未找到）→ 信任 Cookie，判定已登录
  */
 export async function isLoggedIn(page) {
   const cookies = await page.context().cookies("https://www.tiktok.com");
-  const hasSessionId = cookies.some((c) => c.name === "sessionid");
-  if (!hasSessionId) return false;
+  const sessionCookie = cookies.find((c) => c.name === "sessionid");
 
-  return await isLoggedInByDom(page);
+  if (!sessionCookie) {
+    console.error("[登录检测] 无 sessionid Cookie，判定未登录");
+    return false;
+  }
+
+  // Cookie 过期检查：TikTok sessionid 可能是 session cookie（expires=-1）
+  // 只有当 expires > 0 且已过期时才判定无效
+  if (
+    sessionCookie.expires > 0 &&
+    sessionCookie.expires < Math.floor(Date.now() / 1000)
+  ) {
+    console.error("[登录检测] sessionid Cookie 已过期，判定未登录");
+    return false;
+  }
+
+  const domResult = await isLoggedInByDom(page);
+  // domResult: true=已登录, false=明确未登录, null=无法判断
+  if (domResult === true) {
+    console.error("[登录检测] DOM 验真确认已登录");
+    return true;
+  }
+  if (domResult === false) {
+    console.error("[登录检测] DOM 验真发现登录按钮，判定未登录（Cookie 可能已失效）");
+    return false;
+  }
+  // null: DOM 无法判断，信任 Cookie
+  console.error("[登录检测] DOM 验真超时，信任 Cookie 判定已登录");
+  return true;
 }
 
 /**
  * 通过 DOM 元素判断登录状态（验真方案）
- * 依赖页面渲染完成，因此不单独作为主判断，而是和 Cookie 组合使用。
+ * @returns {boolean|null} true=已登录, false=明确未登录, null=无法判断
  */
 export async function isLoggedInByDom(page) {
   // 先等客户端渲染完成：登录态元素或登录按钮，哪个先出现就停止等待
@@ -94,9 +124,33 @@ export async function isLoggedInByDom(page) {
     'button:has-text("Sign in")',
   ].join(", ");
 
-  await page
-    .waitForSelector(loginOrLoggedInSelector, { timeout: 10000 })
-    .catch(() => {});
+  // 分阶段等待：先 5 秒，超时再重试 10 秒
+  const timeouts = [5000, 10000];
+  let selectorFound = false;
+
+  for (let i = 0; i < timeouts.length; i++) {
+    const found = await page
+      .waitForSelector(loginOrLoggedInSelector, { timeout: timeouts[i] })
+      .then(() => true)
+      .catch(() => false);
+
+    if (found) {
+      selectorFound = true;
+      break;
+    }
+    // 非最后一次，输出重试日志
+    if (i < timeouts.length - 1) {
+      console.error(
+        `[登录检测] DOM 元素等待超时 (${timeouts[i]}ms)，重试中...`,
+      );
+    }
+  }
+
+  if (!selectorFound) {
+    // 所有阶段都超时，DOM 无法判断
+    console.error(`[登录检测] DOM 验真超时 (${timeouts[timeouts.length - 1]}ms)，无法判断`);
+    return null;
+  }
 
   return page.evaluate(() => {
     const hasProfileContainer = !!document.querySelector(
@@ -109,7 +163,12 @@ export async function isLoggedInByDom(page) {
       document.querySelectorAll('button, [role="button"]'),
     ).some((el) => /^(登录|Log in|Sign in)$/i.test(el.textContent.trim()));
 
-    return (hasProfileContainer || hasUserMenu) && !hasLoginButton;
+    // 明确看到登录按钮 → 未登录
+    if (hasLoginButton) return false;
+    // 看到已登录元素 → 已登录
+    if (hasProfileContainer || hasUserMenu) return true;
+    // 元素已出现但都不是登录/未登录标志 → 无法判断
+    return null;
   });
 }
 

package/src/scraper/explore-core.js

@@ -183,7 +183,7 @@ async function processExplore(page, username, options, log) {
       result.videoList = videoArray;
     } else {
       // 国家不匹配
-      result.restricted = true;
+      // result.restricted = true;//不应该属于受限
       result.keepFollow = false;
       result.discoveredFollowing = [];
       result.discoveredFollowers = [];

package/src/watch/data-store.js

@@ -1519,6 +1519,8 @@ export function createStore(filePath) {
   // uniqueId → index 内存索引，O(1) 查找
   let uidIndex = new Map();
   let clientErrors = new Map();
+  // 客户端登录状态：userId → boolean
+  let clientLoginStatus = new Map();
   if (filePath) {
     // 初始化 SQLite 用户表（用于判重）
     initUserDb(filePath);
@@ -1782,6 +1784,8 @@ export function createStore(filePath) {
     locations = null,
     loggedIn = true,
   ) {
+    // 记录客户端登录状态
+    clientLoginStatus.set(userId, !!loggedIn);
     if (db) {
       const now = Date.now();
       const ongoingRow = db
@@ -2959,6 +2963,10 @@ export function createStore(filePath) {
     return Array.from(clientErrors.values());
   }
 
+  function getClientLoginStatus() {
+    return Object.fromEntries(clientLoginStatus);
+  }
+
   function getPendingUserUpdateTasks(limit, countries) {
     const targetCountries = countries
       ? countries.map((c) => String(c).trim().toUpperCase())
@@ -3363,6 +3371,7 @@ export function createStore(filePath) {
     reportClientError,
     deleteClientError,
     getClientErrors,
+    getClientLoginStatus,
     registerVideos,
     getVideo,
     getVideos,

package/src/watch/public/app.js

@@ -18,6 +18,7 @@ let currentUsers = [];
 let currentLocation = "";
 let currentTargetLocation = "";
 let currentRawLocation = "";
+let currentSort = { key: null, asc: true };
 let prevStatValues = {};
 let prevUserMap = {};
 
@@ -285,6 +286,23 @@ function renderSourceChart(sources) {
 }
 
 function renderTable(users) {
+  // 应用本地排序
+  if (currentSort.key) {
+    users = [...users].sort((a, b) => {
+      let va = a[currentSort.key];
+      let vb = b[currentSort.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 currentSort.asc ? va - vb : vb - va;
+      }
+      va = String(va).toLowerCase();
+      vb = String(vb).toLowerCase();
+      return currentSort.asc ? va.localeCompare(vb) : vb.localeCompare(va);
+    });
+  }
+
   const el = document.getElementById("userTable");
 
   const newUserMap = {};
@@ -332,6 +350,22 @@ function renderTable(users) {
         : "-";
       const guessedLoc = u.guessedLocation || "-";
       const claimer = u.claimedBy || "-";
+      // 只有处理中的用户才显示登录状态
+      const loginStatus =
+        u.status === "processing"
+          ? currentStats?.clientLoginStatus?.[claimer]
+          : undefined;
+      let claimerDisplay = claimer;
+      let loginBadge = "";
+      if (claimer && claimer !== "-" && u.status === "processing") {
+        if (loginStatus === true) {
+          loginBadge =
+            ' <span class="tag keep-follow" style="font-size:9px">已登录</span>';
+        } else if (loginStatus === false) {
+          loginBadge =
+            ' <span class="tag no-follow" style="font-size:9px">未登录</span>';
+        }
+      }
       const claimTime = u.claimedAt ? formatTime(u.claimedAt) : "-";
       const procTime = u.processedAt ? formatTime(u.processedAt) : "-";
       const statusCodeDisplay =
@@ -349,7 +383,7 @@ function renderTable(users) {
       <td data-label="来源">${sources || "-"}</td>
       <td data-label="状态">${statusTag} ${extraTags.join(" ")}</td>
       <td data-label="StatusCode">${statusCodeDisplay}</td>
-      <td data-label="处理端" style="font-size:11px;color:#888">${claimer}</td>
+      <td data-label="处理端" style="font-size:11px;color:#888">${claimerDisplay}${loginBadge}</td>
       <td data-label="领取时间" style="font-size:11px;color:#888">${claimTime}</td>
       <td data-label="完成时间" style="font-size:11px;color:#888">${procTime}</td>
     </tr>`;
@@ -1256,10 +1290,36 @@ function filterByUserUpdateCountry(country) {
   }, 100);
 }
 
+function initTableSorting() {
+  document.querySelectorAll("th.sortable").forEach((th) => {
+    th.addEventListener("click", () => {
+      const key = th.dataset.sort;
+      if (!key) return;
+      if (currentSort.key === key) {
+        currentSort.asc = !currentSort.asc;
+      } else {
+        currentSort.key = key;
+        currentSort.asc = true;
+      }
+      // 更新排序指示器
+      document.querySelectorAll("th.sortable").forEach((h) => {
+        h.classList.remove("sort-asc", "sort-desc");
+        const icon = h.querySelector(".sort-icon");
+        if (icon) icon.textContent = "↕";
+      });
+      th.classList.add(currentSort.asc ? "sort-asc" : "sort-desc");
+      const icon = th.querySelector(".sort-icon");
+      if (icon) icon.textContent = currentSort.asc ? "↑" : "↓";
+      renderTable(currentUsers);
+    });
+  });
+}
+
 // 初始化
 fetchStats();
 fetchUsers();
 fetchClientErrors();
+initTableSorting();
 setInterval(fetchStats, 10000);
 setInterval(fetchUsers, 10000);
 setInterval(fetchClientErrors, 10000);

package/src/watch/public/index.html

@@ -125,7 +125,7 @@
               <th>粉丝</th>
               <th>视频</th>
               <th>国家</th>
-              <th>最近发布</th>
+              <th class="sortable" data-sort="latestVideoTime">最近发布 <span class="sort-icon">↕</span></th>
               <th>猜测国家</th>
               <th>来源</th>
               <th>状态</th>

package/src/watch/public/style.css

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

package/src/watch/server.js

@@ -349,6 +349,7 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
       if (req.method === "GET" && routePath === "/api/stats") {
         const stats = computeStatsIncremental(store);
         stats.targetLocations = DEFAULT_TARGET_LOCATIONS;
+        stats.clientLoginStatus = store.getClientLoginStatus();
         sendJSON(res, 200, stats);
         return;
       }