tt-help-cli-ycl 1.3.24 → 1.3.25

package/package.json

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

package/src/cli/explore.js

@@ -2,8 +2,9 @@ import { getOrCreatePage, isBrowserClosedError, relaunchBrowser } from '../lib/b
 import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-helpers.js';
 import { userId as configuredUserId, saveUserId } from '../lib/constants.js';
 import { getMacOrUuid } from '../lib/mac-or-uuid.js';
-import { ensureBrowserReady as ensureBrowserReadyCDP } from '../lib/browser/cdp.js';
+import { ensureBrowserReady as ensureBrowserReadyCDP, switchAccount } from '../lib/browser/cdp.js';
 import { showResourceUsage } from '../utils/index.js';
+import { HealthChecker } from '../lib/browser/health-checker.js';
 import path from 'path';
 import os from 'os';
 
@@ -70,15 +71,22 @@ export async function handleExplore(options) {
   console.error(`关注/粉丝: ${exploreEnableFollow ? '启用' : '禁用'}`);
   console.error(`服务器: ${serverUrl}（断开会自动重连）`);
   if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
-  console.error(`CDP 端口: ${explorePort || 9222}, 用户编号: ${userId}`);
-  if (exploreProfile) console.error(`浏览器配置: ${exploreProfile}`);
+
+  const healthChecker = new HealthChecker();
+  let currentAccount = healthChecker.getCurrentAccount();
 
   const cdpOptions = {};
   if (explorePort) cdpOptions.port = explorePort;
   if (exploreProfile) {
     cdpOptions.userDataDir = path.join(os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${exploreProfile}`);
+  } else {
+    cdpOptions.port = currentAccount.port;
+    cdpOptions.userDataDir = currentAccount.userDataDir;
   }
 
+  console.error(`CDP 端口: ${cdpOptions.port || 9222}, 用户编号: ${userId}`);
+  if (exploreProfile || cdpOptions.userDataDir) console.error(`浏览器配置: ${exploreProfile || path.basename(cdpOptions.userDataDir)}`);
+
   let browser = await ensureBrowserReadyCDP(cdpOptions);
   const { processExplore } = await import('../scraper/explore-core.js');
 
@@ -94,6 +102,36 @@ export async function handleExplore(options) {
     }
   });
 
+  // 账户切换后，重新初始化 page
+  async function setupNewPage(newBrowser) {
+    const newPage = await getOrCreatePage(newBrowser);
+    await newPage.route("**/*", (route) => {
+      const resourceType = route.request().resourceType();
+      if (resourceType === 'image' || resourceType === 'stylesheet') {
+        route.abort();
+      } else {
+        route.continue();
+      }
+    });
+    return newPage;
+  }
+
+  async function handleAccountSwitch(reason) {
+    console.error(`\n[健康检查] ${reason}，切换到下一个账户...`);
+    const oldAccount = currentAccount;
+    const nextAccount = healthChecker.getNextAccount();
+    currentAccount = nextAccount;
+    const newBrowser = await switchAccount(
+      { port: oldAccount.port, userDataDir: oldAccount.userDataDir },
+      { port: nextAccount.port, userDataDir: nextAccount.userDataDir }
+    );
+    browser = newBrowser;
+    const newPage = await setupNewPage(browser);
+    Object.assign(page, newPage);
+    Object.assign(cdpOptions, { port: nextAccount.port, userDataDir: nextAccount.userDataDir });
+    console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
+  }
+
   let processedCount = 0;
   let errorCount = 0;
   let consecutiveNetworkErrors = 0;
@@ -109,6 +147,11 @@ export async function handleExplore(options) {
       showResourceUsage();
     }
 
+    const checkResult = healthChecker.check();
+    if (checkResult.shouldSwitch) {
+      await handleAccountSwitch(checkResult.reason);
+    }
+
     if (consecutiveNetworkErrors > 0) {
       const waitTime = consecutiveNetworkErrors <= 2
         ? 0
@@ -137,9 +180,9 @@ export async function handleExplore(options) {
 
     // 浏览器关闭检测：processExplore 内部 catch 了异常，需要从 result.error 判断
     if (result.error && isBrowserClosedError(new Error(result.error))) {
-      const newBrowser = await relaunchBrowser(cdpOptions, explorePort || 9222);
+      const newBrowser = await relaunchBrowser(cdpOptions, cdpOptions.port || 9222);
       browser = newBrowser;
-      const newPage = await getOrCreatePage(browser);
+      const newPage = await setupNewPage(browser);
       Object.assign(page, newPage);
       // 重试当前用户
       result = await processExplore(page, username, {
@@ -178,8 +221,8 @@ export async function handleExplore(options) {
         })
       ).catch(() => {});
       if (errorType === '被封') {
-        console.error(`\n账号被封，停止处理`);
-        break;
+        await handleAccountSwitch('账号被封');
+        continue;
       }
       if (exploreMaxUsers > 0 && processedCount >= exploreMaxUsers) {
         console.error(`\n已达上限 ${exploreMaxUsers} 个用户，停止处理`);

package/src/cli/open.js

@@ -0,0 +1,102 @@
+import { ensureBrowserReady, killEdgeProcesses } from '../lib/browser/cdp.js';
+import path from 'path';
+import os from 'os';
+
+const BASE_PORT = 9222;
+const TOTAL_ACCOUNTS = 10;
+
+export async function handleOpen(parsed) {
+  const { openPort, openList } = parsed;
+
+  if (openList) {
+    console.error('内置浏览器配置:');
+    for (let i = 0; i < TOTAL_ACCOUNTS; i++) {
+      const port = BASE_PORT + i;
+      const profile = `p${port}`;
+      const userDataDir = path.join(os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${profile}`);
+      console.error(`  open ${port}  →  profile: ${profile}, userDataDir: ${userDataDir}`);
+    }
+    console.error('');
+    console.error('用法: tt-help open <端口>');
+    console.error('示例: tt-help open 9222');
+    process.exit(0);
+  }
+
+  if (!openPort) {
+    console.error('用法: tt-help open <端口>');
+    console.error('示例: tt-help open 9222');
+    console.error('');
+    console.error('可用端口: 9222 - 9231 (共 10 个)');
+    console.error('运行 "tt-help open --list" 查看所有配置');
+    process.exit(1);
+  }
+
+  const port = parseInt(openPort);
+  if (isNaN(port) || port < BASE_PORT || port >= BASE_PORT + TOTAL_ACCOUNTS) {
+    console.error(`端口 ${openPort} 不在有效范围内 (9222 - 9231)`);
+    process.exit(1);
+  }
+
+  const profile = `p${port}`;
+  const userDataDir = path.join(os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${profile}`);
+
+  console.error(`正在启动浏览器... 端口: ${port}, profile: ${profile}`);
+  console.error(`userDataDir: ${userDataDir}`);
+  console.error('');
+  console.error('启动后请在浏览器中登录 TikTok 账户');
+  console.error('登录完成后关闭浏览器即可，下次 open 会保留登录状态');
+  console.error('');
+  console.error('按 Ctrl+C 退出并关闭浏览器');
+
+  let browser = null;
+
+  try {
+    const cdpOptions = {};
+    cdpOptions.port = port;
+    cdpOptions.userDataDir = userDataDir;
+
+    browser = await ensureBrowserReady(cdpOptions);
+
+    // Ctrl+C 关闭浏览器
+    process.on('SIGINT', async () => {
+      console.error('\n正在关闭浏览器...');
+      try {
+        await killEdgeProcesses(userDataDir);
+        await browser.close();
+      } catch { /* ignore */ }
+      console.error('浏览器已关闭');
+      process.exit(0);
+    });
+
+    console.error('');
+    console.error('浏览器已启动并连接成功');
+    console.error('TikTok 页面将在浏览器中自动打开...');
+
+    // 打开 TikTok 首页
+    try {
+      const pages = await browser.pages();
+      let page = pages.find(p => !p.url().startsWith('devtools'));
+      if (!page) {
+        const context = await browser.newBrowserCDPSession();
+        await context.send('Target.createTarget', { url: '' });
+        await new Promise(r => setTimeout(r, 1000));
+        const newPages = await browser.pages();
+        page = newPages.find(p => !p.url().startsWith('devtools'));
+      }
+
+      if (page) {
+        await page.goto('https://www.tiktok.com', { waitUntil: 'domcontentloaded', timeout: 30000 });
+        console.error('已打开 https://www.tiktok.com');
+      }
+    } catch (e) {
+      console.error(`打开页面时出错: ${e.message}`);
+      console.error('浏览器已启动，可以手动在浏览器中打开 TikTok');
+    }
+
+    // 保持进程运行
+    await new Promise(() => {});
+  } catch (err) {
+    console.error(`启动失败: ${err.message}`);
+    process.exit(1);
+  }
+}

package/src/lib/args.js

@@ -426,6 +426,36 @@ function parseAttachArgs(args) {
   };
 }
 
+function parseOpenArgs(args) {
+  let openPort = null;
+  let openList = false;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--list') {
+      openList = true;
+    } else if (!arg.startsWith('-')) {
+      openPort = arg;
+    }
+  }
+
+  return {
+    subcommand: 'open',
+    openPort,
+    openList,
+    urls: [],
+    outputFormat: 'json',
+    exploreCount: 0,
+    showConfig: false,
+    showHelp: false,
+    customProxy: null,
+    configAction: null,
+    configValue: null,
+    pipeMode: false,
+    filterStr: null,
+  };
+}
+
 export function parseArgs() {
   const args = process.argv.slice(2);
 
@@ -452,6 +482,10 @@ export function parseArgs() {
     return parseAttachArgs(args.slice(1));
   }
 
+  if (args.length > 0 && args[0] === 'open') {
+    return parseOpenArgs(args.slice(1));
+  }
+
   const urls = [];
   let inputFile = null;
   let outputFile = null;

package/src/lib/browser/cdp.js

@@ -1,5 +1,6 @@
 import { exec } from 'child_process';
 import { execSync } from 'child_process';
+import fs from 'fs';
 import http from 'http';
 import os from 'os';
 import path from 'path';
@@ -82,8 +83,33 @@ function killEdgeProcesses(targetDir) {
         command = 'killall -9 "Microsoft Edge" 2>/dev/null; rm -f ~/Library/Caches/Microsoft\\ Edge/Singleton*; true';
       }
     } else if (platform === 'win32') {
-      command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
-    } else {
+      if (targetDir) {
+        try {
+          const ps1Path = path.join(os.tmpdir(), `kill-edge-${Date.now()}.ps1`);
+          const escapedDir = targetDir.replace(/'/g, "''");
+          const ps1Content = `$procs = Get-CimInstance Win32_Process -Filter "Name='msedge.exe'" 2>$null; ` +
+            `$count = 0; ` +
+            `foreach ($p in $procs) { ` +
+            `  if ($p.CommandLine -and $p.CommandLine -like "*${escapedDir}*") { ` +
+            `    Stop-Process -Id $p.ProcessId -Force -ErrorAction SilentlyContinue; ` +
+            `    $count++ ` +
+            `  } ` +
+            `}; ` +
+            `Get-ChildItem "$env:LOCALAPPDATA\\Microsoft\\Edge\\Singleton*" -ErrorAction SilentlyContinue | Remove-Item -Force; ` +
+            `Write-Output $count`;
+          fs.writeFileSync(ps1Path, ps1Content);
+          const result = execSync(
+            `powershell.exe -ExecutionPolicy Bypass -File "${ps1Path}"`
+          ).toString().trim();
+          fs.unlinkSync(ps1Path);
+          command = 'exit 0';
+        } catch {
+          command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
+        }
+      } else {
+        command = 'taskkill /F /IM msedge.exe 2>nul || exit 0';
+      }
+    } else {
       if (targetDir) {
         const escapedDir = targetDir.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
         command = `ps aux | grep msedge | grep -v Helper | grep -E -- '--user-data-dir=${escapedDir}($|[^A-Za-z0-9_])' | awk '{print $2}' | xargs -r kill -9 2>/dev/null; true`;
@@ -192,3 +218,20 @@ export async function ensureBrowserReady(options = {}) {
   const browser = await chromium.connectOverCDP(`http://127.0.0.1:${port}`);
   return browser;
 }
+
+export async function switchAccount(oldAccount, newAccount) {
+  console.error(`\n[账户切换] 从端口 ${oldAccount.port} -> ${newAccount.port}`);
+
+  await killEdgeProcesses(oldAccount.userDataDir);
+  await new Promise(r => setTimeout(r, 3000));
+
+  const newCdpOptions = {};
+  newCdpOptions.port = newAccount.port;
+  newCdpOptions.userDataDir = newAccount.userDataDir;
+
+  const browser = await ensureBrowserReady(newCdpOptions);
+
+  await new Promise(r => setTimeout(r, 10000));
+
+  return browser;
+}

package/src/lib/browser/health-checker.js

@@ -0,0 +1,54 @@
+import os from 'os';
+import path from 'path';
+
+const TOTAL_ACCOUNTS = 10;
+const BASE_PORT = 9222;
+const MEMORY_THRESHOLD = 0.9;
+const ROTATE_INTERVAL_MS = 2 * 60 * 60 * 1000;
+
+class HealthChecker {
+  constructor() {
+    this.accounts = [];
+    for (let i = 0; i < TOTAL_ACCOUNTS; i++) {
+      const port = BASE_PORT + i;
+      const profile = `p${port}`;
+      this.accounts.push({
+        port,
+        profile,
+        userDataDir: path.join(
+          os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${profile}`
+        ),
+      });
+    }
+    this.currentIndex = 0;
+    this.startTime = Date.now();
+  }
+
+  getCurrentAccount() {
+    return this.accounts[this.currentIndex];
+  }
+
+  getNextAccount() {
+    this.currentIndex = (this.currentIndex + 1) % TOTAL_ACCOUNTS;
+    return this.accounts[this.currentIndex];
+  }
+
+  check() {
+    const memUsage = (1 - os.freemem() / os.totalmem());
+    const memPercent = (memUsage * 100).toFixed(1);
+
+    if (memUsage >= MEMORY_THRESHOLD) {
+      return { shouldSwitch: true, reason: `系统内存 ${memPercent}%` };
+    }
+
+    const elapsed = Date.now() - this.startTime;
+    if (elapsed >= ROTATE_INTERVAL_MS) {
+      const mins = Math.round(elapsed / 60000);
+      return { shouldSwitch: true, reason: `运行 ${mins} 分钟` };
+    }
+
+    return { shouldSwitch: false };
+  }
+}
+
+export { HealthChecker };

package/src/lib/constants.js

@@ -136,6 +136,13 @@ const HELP_TEXT = [
   '    -s, --server <URL>     服务端地址（默认: http://127.0.0.1:3001）',
   '    示例: tt-help attach -p 5 -i 10',
   '',
+  '  tt-help open <端口号>',
+  '    打开指定端口的浏览器，用于配置 TikTok 登录账户',
+  '    端口范围: 9222 - 9231（对应 explore 的 10 个内置账户）',
+  '    --list                  列出所有端口和配置',
+  '    示例: tt-help open 9222',
+  '          tt-help open --list',
+  '',
   '  config  [show|set|reset]',
   '    config                    查看当前配置',
     '    config set <key> <value>  设置配置（key: proxy, server, browser, userId, maxFollowing, maxFollowers, maxVideos, maxComments）',

package/src/main.js

@@ -5,6 +5,7 @@ import { handleExplore } from './cli/explore.js';
 import { handleAttach } from './cli/attach.js';
 import { handleWatch } from './cli/watch.js';
 import { handleConfig, showConfig, showUsage, version } from './cli/config.js';
+import { handleOpen } from './cli/open.js';
 
 async function main() {
   const parsed = parseArgs();
@@ -14,6 +15,7 @@ async function main() {
     case 'info':    return handleInfo(parsed);
     case 'attach':  return handleAttach(parsed);
     case 'watch':   return handleWatch(parsed);
+    case 'open':    return handleOpen(parsed);
   }
 
   const { urls, outputFile, outputFormat, exploreCount, showConfig: showCfg, showHelp, showVersion, customProxy, configAction, configKey, configValue } = parsed;

package/src/scraper/explore-core.js

@@ -65,29 +65,18 @@ async function processExplore(page, username, options, log) {
     if (videoArray.length <= 0) {
       result.processed = true;
       result.noVideo = true;
-      const hasErrorPage = await page.waitForFunction(
-        (keywords) => {
-          const text = document.body.innerText;
-          return keywords.some(k => text.includes(k));
-        },
-        ["出错了", "很抱歉"],
-        { timeout: 5000 }
-      ).then(() => true).catch(() => false);
-
-      if (hasErrorPage) {
-        const pageError = await detectPageError(page);
-        if (pageError === 'service_error') {
-          result.error = `被封: ${username}`;
-          result.errorStack = '';
-          result.processed = false;
-          result.noVideo = false;
-          log(`  @${username} 服务异常（service_error），标记错误`);
-        } else if (pageError) {
-          result.restricted = true;
-          log(`  @${username} 页面受限（${pageError}），标记跳过`);
-        } else {
-          log(`  @${username} 没有视频，标记已处理`);
-        }
+      const pageError = await detectPageError(page);
+      if (pageError === 'service_error') {
+        result.error = `被封: ${username}`;
+        result.errorStack = '';
+        result.processed = false;
+        result.noVideo = false;
+        log(`  @${username} 服务异常（service_error），标记被封`);
+      } else if (pageError) {
+        result.restricted = true;
+        result.processed = true;
+        result.noVideo = true;
+        log(`  @${username} 页面受限（${pageError}），标记跳过`);
       } else {
         log(`  @${username} 没有视频，标记已处理`);
       }
@@ -181,6 +170,26 @@ async function processExplore(page, username, options, log) {
     result.error = e.message;
     result.errorStack = e.stack || "";
     log(`  [错误] ${e.message}`);
+
+    // API 拦截失败时，复用 videoArray.length <= 0 的被封检测逻辑
+    if (e.message.includes('API拦截')) {
+      log(`  [被封检测] 检查页面状态...`);
+      const hasErrorPage = await page.waitForFunction(
+        (keywords) => {
+          const text = document.body.innerText;
+          return keywords.some(k => text.includes(k));
+        },
+        ["出错了", "很抱歉"],
+        { timeout: 5000 }
+      ).then(() => true).catch(() => false);
+
+      if (hasErrorPage) {
+        result.error = `被封: ${username}`;
+        result.processed = false;
+        result.noVideo = false;
+        log(`  @${username} API 拦截失败且页面异常，认定为被封`);
+      }
+    }
   }
 
   return result;