tt-help-cli-ycl 1.3.55 → 1.3.57

package/src/watch/public/index.html

@@ -421,6 +421,55 @@
       color: #fff;
     }
 
+    .loading-overlay {
+      position: fixed;
+      inset: 0;
+      background: rgba(0, 0, 0, 0.5);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 9999;
+      opacity: 0;
+      transition: opacity 0.2s;
+      pointer-events: none;
+    }
+
+    .loading-overlay.visible {
+      opacity: 1;
+      pointer-events: auto;
+    }
+
+    .loading-spinner {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 12px;
+      background: #1a1a24;
+      padding: 24px 36px;
+      border-radius: 12px;
+      border: 1px solid #2a2a3a;
+    }
+
+    .loading-spinner .spinner {
+      width: 36px;
+      height: 36px;
+      border: 3px solid #2a2a3a;
+      border-top-color: #fe2c55;
+      border-radius: 50%;
+      animation: spin 0.8s linear infinite;
+    }
+
+    .loading-spinner .loading-text {
+      color: #ccc;
+      font-size: 14px;
+    }
+
+    @keyframes spin {
+      to {
+        transform: rotate(360deg);
+      }
+    }
+
     @keyframes flashChange {
       0% {
         filter: brightness(1.8);
@@ -1385,19 +1434,20 @@
       } catch (e) { }
     }
 
-    function formatStatNum(value) {
+    function formatStatNum(value, { full = false } = {}) {
       const num = Number(value) || 0;
+      if (full) return num.toLocaleString('zh-CN');
       if (Math.abs(num) < 1000) return String(num);
       if (Math.abs(num) < 10000) return num.toLocaleString('zh-CN');
       const wan = num / 10000;
       return wan.toFixed(1).replace(/\.0+$/, '') + '万';
     }
 
-    function flashEl(id, value) {
+    function flashEl(id, value, options) {
       const el = document.getElementById(id);
       if (!el) return;
       const prev = prevStatValues[id];
-      el.textContent = formatStatNum(value);
+      el.textContent = formatStatNum(value, options);
       if (prev !== undefined && prev !== value) {
         el.classList.remove('flash-change');
         void el.offsetWidth;
@@ -1415,8 +1465,8 @@
       flashEl('statPending', d.pendingUsers);
       flashEl('statError', d.errorUsers);
       flashEl('statRestricted', d.restrictedUsers);
-      flashEl('statTarget', d.targetUsers);
-      flashEl('statUserUpdateTasks', d.userUpdateTasks || 0);
+      flashEl('statTarget', d.targetUsers, { full: true });
+      flashEl('statUserUpdateTasks', d.userUpdateTasks || 0, { full: true });
       flashEl('statRawJobs', d.rawJobs || 0);
       // 同步子页面 stats
       const pendingTotal = document.getElementById('pendingStatTotal');
@@ -1424,7 +1474,7 @@
       const pendingCount = document.getElementById('pendingStatPending');
       if (pendingCount) pendingCount.textContent = formatStatNum(d.pendingUsers);
       const pendingUserUpdate = document.getElementById('pendingStatUserUpdateTasks');
-      if (pendingUserUpdate) pendingUserUpdate.textContent = formatStatNum(d.userUpdateTasks || 0);
+      if (pendingUserUpdate) pendingUserUpdate.textContent = formatStatNum(d.userUpdateTasks || 0, { full: true });
       const pendingRawJobs = document.getElementById('pendingStatRawJobs');
       if (pendingRawJobs) pendingRawJobs.textContent = formatStatNum(d.rawJobs || 0);
       const userUpdateTotal = document.getElementById('userUpdateStatTotal');
@@ -1432,7 +1482,7 @@
       const userUpdatePending = document.getElementById('userUpdateStatPending');
       if (userUpdatePending) userUpdatePending.textContent = formatStatNum(d.pendingUsers);
       const userUpdateTasks = document.getElementById('userUpdateStatUserUpdateTasks');
-      if (userUpdateTasks) userUpdateTasks.textContent = formatStatNum(d.userUpdateTasks || 0);
+      if (userUpdateTasks) userUpdateTasks.textContent = formatStatNum(d.userUpdateTasks || 0, { full: true });
       const userUpdateRawJobs = document.getElementById('userUpdateStatRawJobs');
       if (userUpdateRawJobs) userUpdateRawJobs.textContent = formatStatNum(d.rawJobs || 0);
       const rawPageRawJobs = document.getElementById('rawPageStatRawJobs');
@@ -1672,6 +1722,7 @@
       const names = parseUsernames(raw);
       if (names.length === 0) return;
 
+      showLoading('正在添加用户...');
       try {
         const res = await fetch('/api/users', {
           method: 'POST',
@@ -1686,6 +1737,8 @@
         fetchUsers();
       } catch (e) {
         showToast('\u63d2\u5165\u5931\u8d25: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -1704,6 +1757,30 @@
       setTimeout(() => { toast.style.display = 'none'; }, 3000);
     }
 
+    function showLoading(text) {
+      let overlay = document.getElementById('loadingOverlay');
+      if (!overlay) {
+        overlay = document.createElement('div');
+        overlay.id = 'loadingOverlay';
+        overlay.className = 'loading-overlay';
+        overlay.innerHTML = `
+      <div class="loading-spinner">
+        <div class="spinner"></div>
+        <div class="loading-text" id="loadingText">处理中...</div>
+      </div>
+    `;
+        document.body.appendChild(overlay);
+      }
+      const textEl = document.getElementById('loadingText');
+      if (textEl) textEl.textContent = text || '处理中...';
+      overlay.classList.add('visible');
+    }
+
+    function hideLoading() {
+      const overlay = document.getElementById('loadingOverlay');
+      if (overlay) overlay.classList.remove('visible');
+    }
+
     function escapeJsString(str) {
       return String(str).replace(/\\/g, '\\\\').replace(/'/g, "\\'");
     }
@@ -1778,6 +1855,7 @@
     });
 
     async function togglePin(uniqueId) {
+      showLoading('操作中...');
       try {
         const res = await fetch('/api/job/' + encodeURIComponent(uniqueId) + '/pin', {
           method: 'POST',
@@ -1791,10 +1869,13 @@
         }
       } catch (e) {
         showToast('操作失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
     async function resetJob(uniqueId) {
+      showLoading('重置任务...');
       try {
         const res = await fetch('/api/job/' + encodeURIComponent(uniqueId) + '/reset', {
           method: 'POST',
@@ -1809,6 +1890,8 @@
         }
       } catch (e) {
         showToast('\u91cd\u7f6e\u5931\u8d25: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -1820,11 +1903,7 @@
         return;
       }
       const userIds = errorUsers.map(u => u.uniqueId);
-      const origText = btn.innerHTML;
-      btn.disabled = true;
-      btn.style.opacity = '0.6';
-      btn.style.cursor = 'not-allowed';
-      btn.innerHTML = '&#x21bb; 处理中...';
+      showLoading('正在批量重置...');
       try {
         const res = await fetch('/api/jobs/batch-reset', {
           method: 'POST',
@@ -1842,14 +1921,12 @@
       } catch (e) {
         showToast('\u6279\u91cf\u91cd\u7f6e\u5931\u8d25: ' + e.message, true);
       } finally {
-        btn.disabled = false;
-        btn.style.opacity = '1';
-        btn.style.cursor = 'pointer';
-        btn.innerHTML = origText;
+        hideLoading();
       }
     }
 
     document.getElementById('statTargetCard').addEventListener('click', async () => {
+      showLoading('正在导出目标用户...');
       try {
         const res = await fetch('/api/target-users', {
           headers: { 'Accept': 'text/csv' },
@@ -1877,6 +1954,8 @@
         showToast('CSV 文件已开始下载');
       } catch (e) {
         showToast('获取失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     });
 
@@ -2090,6 +2169,7 @@
       if (!window.confirm(`确认将 ${country} 下 attach 未成功的任务恢复为待补资料吗？${countText}`)) {
         return;
       }
+      showLoading('正在恢复任务...');
       try {
         const res = await fetch('/api/attach-stuck/restore', {
           method: 'POST',
@@ -2111,6 +2191,8 @@
         }
       } catch (e) {
         showToast('恢复 attach 任务失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -2120,6 +2202,7 @@
       if (!window.confirm(`确认将 ${country} 的${scopeLabel}移到毛料库吗？${countText} 这些任务会先暂存，不再进入当前处理队列。`)) {
         return;
       }
+      showLoading('正在移到毛料库...');
       try {
         const res = await fetch('/api/jobs/move-to-raw', {
           method: 'POST',
@@ -2143,6 +2226,8 @@
         }
       } catch (e) {
         showToast('移到毛料库失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -2259,6 +2344,7 @@
       if (!window.confirm(`确认将 @${uniqueId} 从毛料库恢复到 jobs 队列吗？`)) {
         return;
       }
+      showLoading('正在恢复...');
       try {
         const res = await fetch('/api/raw-jobs/restore', {
           method: 'POST',
@@ -2276,6 +2362,8 @@
         await fetchRawJobs();
       } catch (e) {
         showToast('恢复失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -2289,6 +2377,7 @@
       if (!window.confirm(`确认将毛料库中符合【${desc}】的任务恢复到 jobs 队列吗？`)) {
         return;
       }
+      showLoading('正在恢复筛选任务...');
       try {
         const body = {};
         if (search) body.search = search;
@@ -2309,6 +2398,8 @@
         await fetchRawJobs();
       } catch (e) {
         showToast('恢复失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 
@@ -2317,6 +2408,7 @@
       if (!window.confirm(`确认将 ${country} 从毛料库恢复到 jobs 队列吗？${countText}`)) {
         return;
       }
+      showLoading('正在恢复...');
       try {
         const res = await fetch('/api/raw-jobs/restore', {
           method: 'POST',
@@ -2334,6 +2426,8 @@
         await fetchRawJobs();
       } catch (e) {
         showToast('恢复失败: ' + e.message, true);
+      } finally {
+        hideLoading();
       }
     }
 

package/src/watch/server.js

@@ -180,6 +180,41 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
         return;
       }
 
+      if (req.method === "GET" && routePath === "/api/job-debug") {
+        const userId = params.userId || "";
+        const locationsParam = params.locations || "";
+        const locations = locationsParam
+          ? locationsParam
+              .split(",")
+              .map((s) => s.trim().toUpperCase())
+              .filter(Boolean)
+          : null;
+        const loggedIn = params.loggedIn === "true";
+        const debug = store.debugClaimNextJob(
+          userId,
+          5 * 60 * 1000,
+          locations,
+          loggedIn,
+        );
+        sendJSON(res, 200, debug);
+        return;
+      }
+
+      // 调试接口：直接查询数据库原始数据
+      if (req.method === "GET" && routePath === "/api/db-query") {
+        const sql = params.sql || "SELECT * FROM jobs LIMIT 10";
+        const limit = Math.min(parseInt(params.limit) || 100, 1000);
+        // 安全限制：自动加 LIMIT
+        const safeSql = sql.replace(/LIMIT\s+\d+/gi, "") + ` LIMIT ${limit}`;
+        try {
+          const result = store.rawQuery(safeSql);
+          sendJSON(res, 200, result);
+        } catch (e) {
+          sendJSON(res, 400, { error: e.message });
+        }
+        return;
+      }
+
       const jobCommitMatch = routePath.match(/^\/api\/job\/([^/]+)$/);
       if (req.method === "POST" && jobCommitMatch) {
         const uniqueId = jobCommitMatch[1];
@@ -334,11 +369,16 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
       if (req.method === "GET" && routePath === "/api/user-update-tasks") {
         const limit = params.limit;
         const countries = params.countries
-          ? params.countries.split(",").map((c) => c.trim().toUpperCase()).filter(Boolean)
+          ? params.countries
+              .split(",")
+              .map((c) => c.trim().toUpperCase())
+              .filter(Boolean)
           : [];
         const tasks = store.getPendingUserUpdateTasks(limit, countries);
         const ts = new Date().toISOString().slice(11, 19);
-        console.error(`[JOB ${ts}] USER-UPDATE-TASKS: ${tasks.length} tasks${countries.length ? ` (countries: ${countries.join(",")})` : ""}`);
+        console.error(
+          `[JOB ${ts}] USER-UPDATE-TASKS: ${tasks.length} tasks${countries.length ? ` (countries: ${countries.join(",")})` : ""}`,
+        );
         sendJSON(res, 200, { total: tasks.length, tasks });
         return;
       }
@@ -554,7 +594,9 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
           } else if (body.country) {
             result = store.restoreRawJobsByCountry(body.country);
           } else {
-            sendJSON(res, 400, { error: "missing filter: uniqueId, country, or search/location" });
+            sendJSON(res, 400, {
+              error: "missing filter: uniqueId, country, or search/location",
+            });
             return;
           }
           if (result.error) {

package/scripts/run-explore copy.bat

@@ -1,101 +0,0 @@
-@ECHO OFF
-SETLOCAL EnableDelayedExpansion
-
-SET "PACKAGENAME=tt-help-cli-ycl"
-SET "TARGET_SERVER=http://117.71.53.99:17301"
-SET "LOCAL_IP="
-SET "GET_IP_PS1=%TEMP%\tt_get_local_ip.ps1"
->"%GET_IP_PS1%" ECHO $ip = $null
->>"%GET_IP_PS1%" ECHO try {
->>"%GET_IP_PS1%" ECHO   $ip = Get-WmiObject Win32_NetworkAdapterConfiguration ^| Where-Object { $_.IPEnabled -eq $true } ^| ForEach-Object { $_.IPAddress } ^| Where-Object { $_ -match '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' -and $_ -ne '127.0.0.1' -and $_ -notlike '169.254.*' } ^| Select-Object -First 1
->>"%GET_IP_PS1%" ECHO } catch {}
->>"%GET_IP_PS1%" ECHO if (-not $ip) {
->>"%GET_IP_PS1%" ECHO   try {
->>"%GET_IP_PS1%" ECHO     $ip = Get-NetIPAddress -AddressFamily IPv4 -ErrorAction Stop ^| Where-Object { $_.IPAddress -ne '127.0.0.1' -and $_.IPAddress -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddress
->>"%GET_IP_PS1%" ECHO   } catch {}
->>"%GET_IP_PS1%" ECHO }
->>"%GET_IP_PS1%" ECHO if (-not $ip) {
->>"%GET_IP_PS1%" ECHO   try {
->>"%GET_IP_PS1%" ECHO     $ip = [System.Net.Dns]::GetHostAddresses([System.Net.Dns]::GetHostName()) ^| Where-Object { $_.AddressFamily -eq [System.Net.Sockets.AddressFamily]::InterNetwork -and $_.IPAddressToString -ne '127.0.0.1' -and $_.IPAddressToString -notlike '169.254.*' } ^| Select-Object -First 1 -ExpandProperty IPAddressToString
->>"%GET_IP_PS1%" ECHO   } catch {}
->>"%GET_IP_PS1%" ECHO }
->>"%GET_IP_PS1%" ECHO if ($ip) { [Console]::Write($ip) }
-FOR /F "usebackq delims=" %%I IN (`powershell -NoProfile -ExecutionPolicy Bypass -File "%GET_IP_PS1%"`) DO (
-    SET "LOCAL_IP=%%I"
-)
-
-ECHO [INFO] Local IP: %LOCAL_IP%
-
-IF DEFINED LOCAL_IP IF "%LOCAL_IP:~0,11%"=="172.18.154." SET "TARGET_SERVER=http://172.18.154.201:3001"
-
-IF NOT DEFINED LOCAL_IP (
-    ECHO [INFO] No local IPv4 detected, using public server
-) ELSE IF "%LOCAL_IP:~0,11%"=="172.18.154." (
-    ECHO [INFO] Intranet IP detected, using intranet server
-) ELSE (
-    ECHO [INFO] No intranet IP detected, using public server
-)
-SET "CONFIG_PATH=%USERPROFILE%\.tt-help.json"
-
-ECHO ========================================
-ECHO   tt-help-cli-ycl one-click launcher (Windows CMD)
-ECHO ========================================
-
-REM ---------- 1. Check/install latest version ----------
-FOR /F "delims=" %%V IN ('npm view %PACKAGENAME% version 2^>nul') DO SET "LATEST_VERSION=%%V"
-
-IF NOT DEFINED LATEST_VERSION (
-    ECHO [ERROR] Cannot get latest version from npm
-    EXIT /B 1
-)
-
-FOR /F "tokens=2 delims=@" %%V IN ('npm list -g %PACKAGENAME% --depth=0 2^>nul ^| findstr /i "%PACKAGENAME%"') DO SET "INSTALLED_VERSION=%%V"
-
-IF NOT DEFINED INSTALLED_VERSION (
-    ECHO [INFO] %PACKAGENAME% not installed, installing latest...
-    CALL npm install -g %PACKAGENAME%
-    IF %ERRORLEVEL% EQU 0 (
-        ECHO [OK] Installed: %LATEST_VERSION%
-    ) ELSE (
-        ECHO [ERROR] Install failed, run manually: npm install -g %PACKAGENAME%
-        EXIT /B 1
-    )
-) ELSE IF "%INSTALLED_VERSION%"=="%LATEST_VERSION%" (
-    ECHO [OK] %PACKAGENAME% is up to date: %LATEST_VERSION%
-) ELSE (
-    ECHO [INFO] Current: %INSTALLED_VERSION%, Latest: %LATEST_VERSION%
-    ECHO [INFO] Upgrading to latest...
-    CALL npm install -g %PACKAGENAME%
-    IF %ERRORLEVEL% EQU 0 (
-        ECHO [OK] Upgraded: %LATEST_VERSION%
-    ) ELSE (
-        ECHO [WARN] Upgrade failed, run manually: npm install -g %PACKAGENAME%
-    )
-)
-
-REM ---------- 2. Check/set server config ----------
-SET "CURRENT_SERVER="
-IF EXIST "%CONFIG_PATH%" (
-    FOR /F "usebackq delims=" %%S IN (`powershell -NoProfile -Command "$p=$env:CONFIG_PATH; if (Test-Path $p) { try { $cfg = Get-Content $p -Raw | ConvertFrom-Json; if ($null -ne $cfg.server) { [Console]::Write($cfg.server) } } catch {} }"`) DO SET "CURRENT_SERVER=%%S"
-)
-
-IF "%CURRENT_SERVER%"=="%TARGET_SERVER%" (
-    ECHO [OK] Server config is correct: %TARGET_SERVER%
-) ELSE (
-    IF "%CURRENT_SERVER%"=="" (
-        ECHO [INFO] Current server: not set, target: %TARGET_SERVER%
-    ) ELSE (
-        ECHO [INFO] Current server: %CURRENT_SERVER%, target: %TARGET_SERVER%
-    )
-    ECHO [INFO] Setting server config...
-    node -e "const fs=require('fs'),path=require('path');const p=path.join(require('os').homedir(),'.tt-help.json');let c={};try{c=JSON.parse(fs.readFileSync(p,'utf-8'))}catch(e){}c.server='%TARGET_SERVER%';fs.writeFileSync(p,JSON.stringify(c,null,2),'utf-8');console.log('  Written to: '+p);"
-    ECHO [OK] Server config set
-)
-
-REM ---------- 3. Start tt-help explore ----------
-ECHO.
-ECHO ========================================
-ECHO   Starting tt-help explore
-ECHO ========================================
-tt-help explore --port 9223 --profile p9223
-DEL "%GET_IP_PS1%" 2>NUL

package/scripts/test-captcha-lib.mjs

@@ -1,68 +0,0 @@
-import { chromium } from 'playwright';
-
-const URL = 'https://www.tiktok.com/@mariaelenasanchez607/video/7630110959650000150';
-
-async function main() {
-  const browser = await chromium.connectOverCDP('http://127.0.0.1:9222');
-  const page = browser.contexts()[0].pages()[0];
-
-  // 测试 detectCaptcha
-  console.error('=== 测试 detectCaptcha (无验证码) ===');
-  await page.goto(URL, { waitUntil: 'domcontentloaded', timeout: 30000 });
-  await page.waitForTimeout(3000);
-
-  const { detectCaptcha, closeCaptcha, handleCaptcha } = await import('../src/scraper/modules/captcha-handler.mjs');
-
-  const r1 = await detectCaptcha(page);
-  console.error('未点击评论:', JSON.stringify(r1));
-
-  // 点击评论触发验证码
-  await page.evaluate(() => {
-    const all = document.querySelectorAll('button');
-    for (const el of all) {
-      if (/^评论$/.test(el.textContent?.trim()) && el.offsetParent !== null && el.getBoundingClientRect().width > 0) {
-        el.click();
-        break;
-      }
-    }
-  });
-  await page.waitForTimeout(3000);
-
-  console.error('\n=== 测试 detectCaptcha (有验证码) ===');
-  const r2 = await detectCaptcha(page);
-  console.error('点击评论后:', JSON.stringify(r2));
-
-  console.error('\n=== 测试 closeCaptcha ===');
-  const r3 = await closeCaptcha(page);
-  await page.waitForTimeout(1000);
-  console.error('关闭结果:', JSON.stringify(r3));
-
-  const r4 = await detectCaptcha(page);
-  console.error('关闭后检测:', JSON.stringify(r4));
-
-  console.error('\n=== 测试 handleCaptcha (完整流程) ===');
-  // 重新触发
-  await page.goto(URL, { waitUntil: 'domcontentloaded', timeout: 30000 });
-  await page.waitForTimeout(3000);
-  await page.evaluate(() => {
-    const all = document.querySelectorAll('button');
-    for (const el of all) {
-      if (/^评论$/.test(el.textContent?.trim()) && el.offsetParent !== null && el.getBoundingClientRect().width > 0) {
-        el.click();
-        break;
-      }
-    }
-  });
-  await page.waitForTimeout(3000);
-
-  const r5 = await handleCaptcha(page);
-  console.error('handleCaptcha 结果:', JSON.stringify(r5));
-
-  await page.screenshot({ path: '/tmp/lib-test-final.png' });
-  console.error('\n最终截图: /tmp/lib-test-final.png');
-}
-
-main().catch(err => {
-  console.error('错误:', err);
-  process.exit(1);
-});

package/scripts/test-captcha.mjs

@@ -1,81 +0,0 @@
-import { ensureBrowserReady } from '../src/lib/browser/cdp.js';
-
-const url = 'https://www.tiktok.com/@mariaelenasanchez607/video/7630110959650000150';
-
-async function main() {
-  const browser = await ensureBrowserReady();
-  const defaultContext = browser.contexts()[0];
-  const pages = defaultContext.pages();
-  const page = pages[0] || await defaultContext.newPage();
-
-  await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
-  await page.waitForTimeout(5000);
-
-  // 用 force: true 点击评论按钮
-  const clicked = await page.evaluate(() => {
-    const btn = document.querySelector('[data-e2e="comments"]');
-    if (btn && btn.getBoundingClientRect().width > 0) {
-      btn.click();
-      return { success: true, rect: btn.getBoundingClientRect() };
-    }
-    return { success: false };
-  });
-
-  console.error('点击结果:', JSON.stringify(clicked));
-
-  // 等待可能的验证码
-  await page.waitForTimeout(5000);
-
-  // 截图
-  await page.screenshot({ path: '/tmp/tiktok-comment-clicked.png' });
-  console.error('截图: /tmp/tiktok-comment-clicked.png');
-
-  // 全面检测验证码
-  const captcha = await page.evaluate(() => {
-    const result = {};
-
-    // 大尺寸 Verify 元素
-    const verifyEls = Array.from(document.querySelectorAll('[class*="Verify"], [class*="verify"]'));
-    result.verifyElements = verifyEls.filter(el => {
-      const r = el.getBoundingClientRect();
-      return r.width > 100 && r.height > 100 && el.offsetParent !== null;
-    }).map(el => ({
-      class: el.className.substring(0, 200),
-      text: el.textContent?.substring(0, 300),
-      rect: { w: Math.round(el.getBoundingClientRect().width), h: Math.round(el.getBoundingClientRect().height), x: Math.round(el.getBoundingClientRect().x), y: Math.round(el.getBoundingClientRect().y) }
-    }));
-
-    // 全屏遮罩
-    result.fullScreenOverlays = Array.from(document.querySelectorAll('div')).filter(d => {
-      const r = d.getBoundingClientRect();
-      const style = window.getComputedStyle(d);
-      return r.width > 500 && r.height > 500 && parseInt(style.zIndex) > 900 && d.offsetParent !== null;
-    }).map(d => ({
-      class: d.className.substring(0, 100),
-      zIndex: window.getComputedStyle(d).zIndex,
-      rect: { w: Math.round(d.getBoundingClientRect().width), h: Math.round(d.getBoundingClientRect().height) }
-    }));
-
-    result.iframes = Array.from(document.querySelectorAll('iframe')).map(f => ({
-      src: (f.src || f.getAttribute('src') || '').substring(0, 300)
-    }));
-
-    return result;
-  });
-
-  console.error('\n=== 验证码检测 ===');
-  console.error(JSON.stringify(captcha, null, 2));
-
-  if (captcha.verifyElements.length > 0 || captcha.fullScreenOverlays.length > 0 || captcha.iframes.length > 0) {
-    console.error('\n⚠️  检测到验证码或遮罩层！');
-  } else {
-    console.error('\n✅ 未检测到验证码');
-  }
-
-  await browser.close();
-}
-
-main().catch(err => {
-  console.error('错误:', err);
-  process.exit(1);
-});