tt-help-cli-ycl 1.3.49 → 1.3.51

package/package.json

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

package/src/cli/open.js

@@ -33,15 +33,13 @@ export async function handleOpen(parsed) {
   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" 查看所有配置');
+    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)`);
+  if (isNaN(port) || port < 1 || port > 65535) {
+    console.error(`端口 ${openPort} 无效，请输入 1-65535 之间的端口号`);
     process.exit(1);
   }
 

package/src/lib/tiktok-scraper.mjs

@@ -1,5 +1,6 @@
 import os from "os";
 import path from "path";
+import fs from "fs";
 import { chromium } from "playwright";
 import { detectBrowser } from "./browser/launch.js";
 import { parseUserInfo, parseVideoInfo } from "./parse-ssr.mjs";
@@ -9,7 +10,7 @@ const DEFAULT_WAF_TTL = 120000;
 const DEFAULT_WARM_URL = "https://www.tiktok.com/@nike";
 const BROWSER_CLOSE_TIMEOUT = 5000;
 const DEFAULT_MAX_REQUESTS_PER_PAGE = 50;
-const FALLBACK_PROFILE_PORT = 9222;
+const FALLBACK_PROFILE_PORT = 9999;
 
 function delay(ms) {
   return new Promise((r) => setTimeout(r, ms));
@@ -120,10 +121,11 @@ export class TikTokScraper {
     this.slotIdx = 0;
     this.lastWarmTime = 0;
     this.warmPromise = null;
-    this._fallbackBrowser = null;
-    this._fallbackContext = null;
-    this._fallbackSlots = [];
-    this._fallbackSlotIdx = 0;
+    // 登录态 pool（init 时直接启动）
+    this.authBrowser = null;
+    this.authContext = null;
+    this.authSlots = [];
+    this.authSlotIdx = 0;
   }
 
   async init() {
@@ -141,23 +143,26 @@ export class TikTokScraper {
     this.browser = browser;
     this.context = context;
     this.slots = slots;
-    await this.warmWaf();
-  }
 
-  async _ensureFallback(executablePath) {
-    if (this._fallbackContext) return;
+    // 启动登录态 pool（1 个 slot）
+    // profile 不存在则跳过，不影响主流程
     const fallbackDir = getFallbackProfileDir();
-    console.error(
-      `[TikTokScraper] 无登录态获取失败，fallback 到登录态 profile: ${fallbackDir}`,
-    );
-    const { browser, context, slots } = await initContext(
-      executablePath,
-      1,
-      fallbackDir,
-    );
-    this._fallbackBrowser = browser;
-    this._fallbackContext = context;
-    this._fallbackSlots = slots;
+    if (fs.existsSync(fallbackDir)) {
+      const {
+        browser: authBrowser,
+        context: authContext,
+        slots: authSlots,
+      } = await initContext(executablePath, 1, fallbackDir);
+      this.authBrowser = authBrowser;
+      this.authContext = authContext;
+      this.authSlots = authSlots;
+    } else {
+      console.error(
+        `[TikTokScraper] 登录态 profile 不存在 (${fallbackDir})，跳过登录态 pool。请先运行 tt-help open 9999 登录 TikTok`,
+      );
+    }
+
+    await this.warmWaf();
   }
 
   async close() {
@@ -183,20 +188,20 @@ export class TikTokScraper {
       }
     };
 
-    // 无登录态的 browser 是 chromium.launch() 返回的，直接 close
+    // 无登录态的 browser
     await closeAll(this.browser);
-    // fallback 的 context 是 launchPersistentContext 返回的，直接 close
-    if (this._fallbackContext) {
+    // 登录态的 context（launchPersistentContext 返回的是 context 当 browser）
+    if (this.authContext) {
       try {
-        await this._fallbackContext.close();
+        await this.authContext.close();
       } catch {}
     }
     this.browser = null;
     this.context = null;
     this.slots = [];
-    this._fallbackBrowser = null;
-    this._fallbackContext = null;
-    this._fallbackSlots = [];
+    this.authBrowser = null;
+    this.authContext = null;
+    this.authSlots = [];
   }
 
   async restart() {
@@ -237,11 +242,6 @@ export class TikTokScraper {
     return Date.now() - this.lastWarmTime > this.wafTtl;
   }
 
-  _pickSlot(slots, idx, setIdx) {
-    const slot = slots[idx % slots.length];
-    return slot;
-  }
-
   async _ensurePage(slot, context) {
     try {
       if (
@@ -258,13 +258,11 @@ export class TikTokScraper {
   }
 
   async _fetchViewSource(url, ctx) {
-    const slots =
-      ctx === this._fallbackContext ? this._fallbackSlots : this.slots;
-    const slotIdx =
-      ctx === this._fallbackContext ? this._fallbackSlotIdx : this.slotIdx;
+    const slots = ctx === this.authContext ? this.authSlots : this.slots;
+    const slotIdx = ctx === this.authContext ? this.authSlotIdx : this.slotIdx;
     const slot = slots[slotIdx % slots.length];
-    if (ctx === this._fallbackContext) {
-      this._fallbackSlotIdx++;
+    if (ctx === this.authContext) {
+      this.authSlotIdx++;
     } else {
       this.slotIdx++;
     }
@@ -329,11 +327,9 @@ export class TikTokScraper {
       result = rawHtml ? parseUserInfo(rawHtml) : null;
     }
 
-    // 仍然失败：fallback 到登录态
-    if (!result) {
-      const executablePath = detectBrowser();
-      await this._ensureFallback(executablePath);
-      rawHtml = await this._fetchViewSource(url, this._fallbackContext);
+    // 仍然失败：使用登录态 pool
+    if (!result && this.authContext) {
+      rawHtml = await this._fetchViewSource(url, this.authContext);
       result = rawHtml ? parseUserInfo(rawHtml) : null;
     }
 
@@ -354,11 +350,9 @@ export class TikTokScraper {
       result = rawHtml ? parseVideoInfo(rawHtml) : null;
     }
 
-    // 仍然失败：fallback 到登录态
-    if (!result) {
-      const executablePath = detectBrowser();
-      await this._ensureFallback(executablePath);
-      rawHtml = await this._fetchViewSource(videoUrl, this._fallbackContext);
+    // 仍然失败：使用登录态 pool
+    if (!result && this.authContext) {
+      rawHtml = await this._fetchViewSource(videoUrl, this.authContext);
       result = rawHtml ? parseVideoInfo(rawHtml) : null;
     }