tt-help-cli-ycl 1.3.34 → 1.3.35

package/src/lib/retry.js

@@ -1,45 +1,45 @@
-import { delay } from './delay.js';
-
-const RETRYABLE_PATTERNS = [
-  'interrupted',
-  'Navigation.*interrupted',
-  'net::',
-  'ECONN',
-  'ETIMEDOUT',
-  'ENOTFOUND',
-  'EAI_AGAIN',
-  'ESOCKETRESET',
-  'connection.*refused',
-  'connection.*reset',
-  'failed.*navigate',
-  'target.*closed',
-  'crash',
-  '代理错误',
-];
-
-export function isRetryableError(error) {
-  if (!error) return false;
-  const msg = error.message || error.toString() || '';
-  return RETRYABLE_PATTERNS.some(p => new RegExp(p, 'i').test(msg));
-}
-
-export async function retryWithBackoff(fn, { maxRetries = 3, baseDelay = 3000, log } = {}) {
-  let lastError;
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (error) {
-      lastError = error;
-      if (attempt >= maxRetries || !isRetryableError(error)) {
-        throw error;
-      }
-      const jitter = Math.random() * 2000;
-      const waitTime = baseDelay * Math.pow(2, attempt) + jitter;
-      if (log) {
-        log(`  [重试] ${attempt + 1}/${maxRetries}，${Math.round(waitTime / 1000)}s 后重试...`);
-      }
-      await delay(Math.round(waitTime), Math.round(waitTime));
-    }
-  }
-  throw lastError;
-}
+import { delay } from './delay.js';
+
+const RETRYABLE_PATTERNS = [
+  'interrupted',
+  'Navigation.*interrupted',
+  'net::',
+  'ECONN',
+  'ETIMEDOUT',
+  'ENOTFOUND',
+  'EAI_AGAIN',
+  'ESOCKETRESET',
+  'connection.*refused',
+  'connection.*reset',
+  'failed.*navigate',
+  'target.*closed',
+  'crash',
+  '代理错误',
+];
+
+export function isRetryableError(error) {
+  if (!error) return false;
+  const msg = error.message || error.toString() || '';
+  return RETRYABLE_PATTERNS.some(p => new RegExp(p, 'i').test(msg));
+}
+
+export async function retryWithBackoff(fn, { maxRetries = 3, baseDelay = 3000, log } = {}) {
+  let lastError;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error;
+      if (attempt >= maxRetries || !isRetryableError(error)) {
+        throw error;
+      }
+      const jitter = Math.random() * 2000;
+      const waitTime = baseDelay * Math.pow(2, attempt) + jitter;
+      if (log) {
+        log(`  [重试] ${attempt + 1}/${maxRetries}，${Math.round(waitTime / 1000)}s 后重试...`);
+      }
+      await delay(Math.round(waitTime), Math.round(waitTime));
+    }
+  }
+  throw lastError;
+}

package/src/lib/scrape.js

@@ -1,89 +1,89 @@
-import { TikTokScraper } from './tiktok-scraper.mjs';
-import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from './url.js';
-
-// Lazy singleton for TikTokScraper
-let scraperInstance = null;
-let scraperInitPromise = null;
-
-async function getScraper() {
-  if (scraperInstance) return scraperInstance;
-  if (scraperInitPromise) return scraperInitPromise;
-  scraperInitPromise = (async () => {
-    const scraper = new TikTokScraper();
-    await scraper.init();
-    scraperInstance = scraper;
-    scraperInitPromise = null;
-    return scraper;
-  })();
-  return scraperInitPromise;
-}
-
-export async function closeScraper() {
-  if (scraperInstance) {
-    await scraperInstance.close();
-    scraperInstance = null;
-  }
-}
-
-// Map parseUserInfo output to legacy parser.js format
-function mapUserInfo(user) {
-  if (!user) return null;
-  return {
-    uniqueId: user.uniqueId,
-    uid: user.id,
-    secUid: user.secUid,
-    nickname: user.nickname,
-    signature: user.bio,
-    ttSeller: user.ttSeller,
-    verified: user.verified,
-    followerCount: user.followerCount,
-    followingCount: user.followingCount,
-    heartCount: user.heartCount,
-    videoCount: user.videoCount,
-    diggCount: user.diggCount,
-    avatarLarger: user.avatar,
-    locationCreated: user.locationCreated,
-  };
-}
-
-// Map parseVideoInfo output to legacy format
-function mapVideoLocation(video) {
-  if (!video) return null;
-  return video.locationCreated;
-}
-
-export async function extractUserData(url) {
-  const scraper = await getScraper();
-  const uniqueId = extractUniqueId(url);
-  if (!uniqueId) throw new Error(`无法从URL提取用户名: ${url}`);
-  const user = await scraper.getUserInfo(normalizeUsername(uniqueId));
-  if (!user) throw new Error('无法解析用户信息');
-  return mapUserInfo(user);
-}
-
-export async function extractVideoLocation(videoUrl) {
-  const scraper = await getScraper();
-  const video = await scraper.getVideoInfo(videoUrl);
-  return mapVideoLocation(video);
-}
-
-export async function processUrl(url) {
-  if (isProfileUrl(url)) {
-    const profileData = await extractUserData(url);
-    return [profileData];
-  }
-
-  if (isVideoUrl(url)) {
-    const profileHandle = extractUniqueId(url);
-    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
-
-    const [profileData, locationCreated] = await Promise.all([
-      extractUserData(url),
-      extractVideoLocation(url),
-    ]);
-
-    return [{ ...profileData, locationCreated }];
-  }
-
-  return [];
-}
+import { TikTokScraper } from './tiktok-scraper.mjs';
+import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from './url.js';
+
+// Lazy singleton for TikTokScraper
+let scraperInstance = null;
+let scraperInitPromise = null;
+
+async function getScraper() {
+  if (scraperInstance) return scraperInstance;
+  if (scraperInitPromise) return scraperInitPromise;
+  scraperInitPromise = (async () => {
+    const scraper = new TikTokScraper();
+    await scraper.init();
+    scraperInstance = scraper;
+    scraperInitPromise = null;
+    return scraper;
+  })();
+  return scraperInitPromise;
+}
+
+export async function closeScraper() {
+  if (scraperInstance) {
+    await scraperInstance.close();
+    scraperInstance = null;
+  }
+}
+
+// Map parseUserInfo output to legacy parser.js format
+function mapUserInfo(user) {
+  if (!user) return null;
+  return {
+    uniqueId: user.uniqueId,
+    uid: user.id,
+    secUid: user.secUid,
+    nickname: user.nickname,
+    signature: user.bio,
+    ttSeller: user.ttSeller,
+    verified: user.verified,
+    followerCount: user.followerCount,
+    followingCount: user.followingCount,
+    heartCount: user.heartCount,
+    videoCount: user.videoCount,
+    diggCount: user.diggCount,
+    avatarLarger: user.avatar,
+    locationCreated: user.locationCreated,
+  };
+}
+
+// Map parseVideoInfo output to legacy format
+function mapVideoLocation(video) {
+  if (!video) return null;
+  return video.locationCreated;
+}
+
+export async function extractUserData(url) {
+  const scraper = await getScraper();
+  const uniqueId = extractUniqueId(url);
+  if (!uniqueId) throw new Error(`无法从URL提取用户名: ${url}`);
+  const user = await scraper.getUserInfo(normalizeUsername(uniqueId));
+  if (!user) throw new Error('无法解析用户信息');
+  return mapUserInfo(user);
+}
+
+export async function extractVideoLocation(videoUrl) {
+  const scraper = await getScraper();
+  const video = await scraper.getVideoInfo(videoUrl);
+  return mapVideoLocation(video);
+}
+
+export async function processUrl(url) {
+  if (isProfileUrl(url)) {
+    const profileData = await extractUserData(url);
+    return [profileData];
+  }
+
+  if (isVideoUrl(url)) {
+    const profileHandle = extractUniqueId(url);
+    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
+
+    const [profileData, locationCreated] = await Promise.all([
+      extractUserData(url),
+      extractVideoLocation(url),
+    ]);
+
+    return [{ ...profileData, locationCreated }];
+  }
+
+  return [];
+}

package/src/lib/tiktok-scraper.mjs

@@ -1,194 +1,194 @@
-import { chromium } from 'playwright';
-import { detectBrowser } from './browser/launch.js';
-import { parseUserInfo, parseVideoInfo } from './parse-ssr.mjs';
-
-const DEFAULT_POOL_SIZE = 3;
-const DEFAULT_WAF_TTL = 120000;
-const DEFAULT_WARM_URL = 'https://www.tiktok.com/@nike';
-
-function delay(ms) {
-  return new Promise(r => setTimeout(r, ms));
-}
-
-class PageSlot {
-  constructor(page) {
-    this.page = page;
-    this.lock = new PromiseQueue();
-  }
-}
-
-class PromiseQueue {
-  constructor() {
-    this._queue = [];
-    this._processing = false;
-  }
-  async run(task) {
-    return new Promise((resolve, reject) => {
-      this._queue.push({ task, resolve, reject });
-      this._process();
-    });
-  }
-  async _process() {
-    if (this._processing) return;
-    this._processing = true;
-    while (this._queue.length > 0) {
-      const { task, resolve, reject } = this._queue.shift();
-      try {
-        const result = await task();
-        resolve(result);
-      } catch (e) {
-        reject(e);
-      }
-    }
-    this._processing = false;
-  }
-}
-
-export class TikTokScraper {
-  constructor({ poolSize = DEFAULT_POOL_SIZE, wafTtl = DEFAULT_WAF_TTL, warmUrl = DEFAULT_WARM_URL } = {}) {
-    this.poolSize = poolSize;
-    this.wafTtl = wafTtl;
-    this.warmUrl = warmUrl;
-    this.browser = null;
-    this.context = null;
-    this.slots = [];
-    this.slotIdx = 0;
-    this.lastWarmTime = 0;
-    this.warmPromise = null;
-  }
-
-  async init() {
-    const executablePath = detectBrowser();
-    if (!executablePath) {
-      throw new Error('未找到本地浏览器（Chrome/Edge），请先安装浏览器或执行 npx playwright install');
-    }
-    this.browser = await chromium.launch({
-      headless: true,
-      executablePath,
-      args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
-    });
-    this.context = await this.browser.newContext();
-    for (let i = 0; i < this.poolSize; i++) {
-      this.slots.push(new PageSlot(await this.context.newPage()));
-    }
-    await this.warmWaf();
-  }
-
-  async close() {
-    if (this.browser) {
-      await this.browser.close();
-      this.browser = null;
-      this.context = null;
-      this.slots = [];
-    }
-  }
-
-  async restart() {
-    await this.close();
-    await this.init();
-  }
-
-  isAlive() {
-    try {
-      return !!(this.browser && this.browser.isConnected());
-    } catch {
-      return false;
-    }
-  }
-
-  async warmWaf() {
-    if (this.warmPromise) return this.warmPromise;
-    this.warmPromise = (async () => {
-      const page = await this.context.newPage();
-      try {
-        await page.goto(this.warmUrl, { waitUntil: 'domcontentloaded', timeout: 15000 });
-        await delay(1500);
-        this.lastWarmTime = Date.now();
-      } catch (e) {
-        console.error(`[warmWaf] failed: ${e.message}`);
-      } finally {
-        await page.close();
-        this.warmPromise = null;
-      }
-    })();
-    return this.warmPromise;
-  }
-
-  _needWarm() {
-    return Date.now() - this.lastWarmTime > this.wafTtl;
-  }
-
-  _pickSlot() {
-    const slot = this.slots[this.slotIdx % this.poolSize];
-    this.slotIdx++;
-    return slot;
-  }
-
-  async _ensurePage(slot) {
-    try {
-      if (!slot.page.isClosed()) return slot.page;
-    } catch {}
-    slot.page = await this.context.newPage();
-    return slot.page;
-  }
-
-  async _fetchViewSource(url, slot) {
-    const page = await this._ensurePage(slot);
-
-    await page.goto('view-source:' + url, {
-      waitUntil: 'domcontentloaded',
-      timeout: 15000,
-    });
-
-    return await page.evaluate(() => {
-      const rows = document.querySelectorAll('tr');
-      let content = '';
-      rows.forEach(r => {
-        const lc = r.querySelector('.line-content');
-        if (lc) content += lc.textContent + '\n';
-      });
-      return content;
-    });
-  }
-
-  async getUserInfo(uniqueId) {
-    const slot = this._pickSlot();
-    return slot.lock.run(async () => {
-      let rawHtml = await this._fetchViewSource(
-        `https://www.tiktok.com/@${uniqueId}`,
-        slot
-      );
-      let result = parseUserInfo(rawHtml);
-      if (!result) {
-        try { await this.warmWaf(); } catch {}
-        rawHtml = await this._fetchViewSource(
-          `https://www.tiktok.com/@${uniqueId}`,
-          slot
-        );
-        result = parseUserInfo(rawHtml);
-      }
-      return result || null;
-    });
-  }
-
-  async getVideoInfo(videoUrl) {
-    const slot = this._pickSlot();
-    return slot.lock.run(async () => {
-      let rawHtml = await this._fetchViewSource(videoUrl, slot);
-      let result = parseVideoInfo(rawHtml);
-      if (!result) {
-        try { await this.warmWaf(); } catch {}
-        rawHtml = await this._fetchViewSource(videoUrl, slot);
-        result = parseVideoInfo(rawHtml);
-      }
-      return result || null;
-    });
-  }
-
-  async getUserAndVideo(videoUrl) {
-    const video = await this.getVideoInfo(videoUrl);
-    if (!video) return null;
-    const user = await this.getUserInfo(video.author.uniqueId);
-    return { user, video };
-  }
-}
+import { chromium } from 'playwright';
+import { detectBrowser } from './browser/launch.js';
+import { parseUserInfo, parseVideoInfo } from './parse-ssr.mjs';
+
+const DEFAULT_POOL_SIZE = 3;
+const DEFAULT_WAF_TTL = 120000;
+const DEFAULT_WARM_URL = 'https://www.tiktok.com/@nike';
+
+function delay(ms) {
+  return new Promise(r => setTimeout(r, ms));
+}
+
+class PageSlot {
+  constructor(page) {
+    this.page = page;
+    this.lock = new PromiseQueue();
+  }
+}
+
+class PromiseQueue {
+  constructor() {
+    this._queue = [];
+    this._processing = false;
+  }
+  async run(task) {
+    return new Promise((resolve, reject) => {
+      this._queue.push({ task, resolve, reject });
+      this._process();
+    });
+  }
+  async _process() {
+    if (this._processing) return;
+    this._processing = true;
+    while (this._queue.length > 0) {
+      const { task, resolve, reject } = this._queue.shift();
+      try {
+        const result = await task();
+        resolve(result);
+      } catch (e) {
+        reject(e);
+      }
+    }
+    this._processing = false;
+  }
+}
+
+export class TikTokScraper {
+  constructor({ poolSize = DEFAULT_POOL_SIZE, wafTtl = DEFAULT_WAF_TTL, warmUrl = DEFAULT_WARM_URL } = {}) {
+    this.poolSize = poolSize;
+    this.wafTtl = wafTtl;
+    this.warmUrl = warmUrl;
+    this.browser = null;
+    this.context = null;
+    this.slots = [];
+    this.slotIdx = 0;
+    this.lastWarmTime = 0;
+    this.warmPromise = null;
+  }
+
+  async init() {
+    const executablePath = detectBrowser();
+    if (!executablePath) {
+      throw new Error('未找到本地浏览器（Chrome/Edge），请先安装浏览器或执行 npx playwright install');
+    }
+    this.browser = await chromium.launch({
+      headless: true,
+      executablePath,
+      args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
+    });
+    this.context = await this.browser.newContext();
+    for (let i = 0; i < this.poolSize; i++) {
+      this.slots.push(new PageSlot(await this.context.newPage()));
+    }
+    await this.warmWaf();
+  }
+
+  async close() {
+    if (this.browser) {
+      await this.browser.close();
+      this.browser = null;
+      this.context = null;
+      this.slots = [];
+    }
+  }
+
+  async restart() {
+    await this.close();
+    await this.init();
+  }
+
+  isAlive() {
+    try {
+      return !!(this.browser && this.browser.isConnected());
+    } catch {
+      return false;
+    }
+  }
+
+  async warmWaf() {
+    if (this.warmPromise) return this.warmPromise;
+    this.warmPromise = (async () => {
+      const page = await this.context.newPage();
+      try {
+        await page.goto(this.warmUrl, { waitUntil: 'domcontentloaded', timeout: 15000 });
+        await delay(1500);
+        this.lastWarmTime = Date.now();
+      } catch (e) {
+        console.error(`[warmWaf] failed: ${e.message}`);
+      } finally {
+        await page.close();
+        this.warmPromise = null;
+      }
+    })();
+    return this.warmPromise;
+  }
+
+  _needWarm() {
+    return Date.now() - this.lastWarmTime > this.wafTtl;
+  }
+
+  _pickSlot() {
+    const slot = this.slots[this.slotIdx % this.poolSize];
+    this.slotIdx++;
+    return slot;
+  }
+
+  async _ensurePage(slot) {
+    try {
+      if (!slot.page.isClosed()) return slot.page;
+    } catch {}
+    slot.page = await this.context.newPage();
+    return slot.page;
+  }
+
+  async _fetchViewSource(url, slot) {
+    const page = await this._ensurePage(slot);
+
+    await page.goto('view-source:' + url, {
+      waitUntil: 'domcontentloaded',
+      timeout: 15000,
+    });
+
+    return await page.evaluate(() => {
+      const rows = document.querySelectorAll('tr');
+      let content = '';
+      rows.forEach(r => {
+        const lc = r.querySelector('.line-content');
+        if (lc) content += lc.textContent + '\n';
+      });
+      return content;
+    });
+  }
+
+  async getUserInfo(uniqueId) {
+    const slot = this._pickSlot();
+    return slot.lock.run(async () => {
+      let rawHtml = await this._fetchViewSource(
+        `https://www.tiktok.com/@${uniqueId}`,
+        slot
+      );
+      let result = parseUserInfo(rawHtml);
+      if (!result) {
+        try { await this.warmWaf(); } catch {}
+        rawHtml = await this._fetchViewSource(
+          `https://www.tiktok.com/@${uniqueId}`,
+          slot
+        );
+        result = parseUserInfo(rawHtml);
+      }
+      return result || null;
+    });
+  }
+
+  async getVideoInfo(videoUrl) {
+    const slot = this._pickSlot();
+    return slot.lock.run(async () => {
+      let rawHtml = await this._fetchViewSource(videoUrl, slot);
+      let result = parseVideoInfo(rawHtml);
+      if (!result) {
+        try { await this.warmWaf(); } catch {}
+        rawHtml = await this._fetchViewSource(videoUrl, slot);
+        result = parseVideoInfo(rawHtml);
+      }
+      return result || null;
+    });
+  }
+
+  async getUserAndVideo(videoUrl) {
+    const video = await this.getVideoInfo(videoUrl);
+    if (!video) return null;
+    const user = await this.getUserInfo(video.author.uniqueId);
+    return { user, video };
+  }
+}