tt-help-cli-ycl 1.3.25 → 1.3.26

package/src/cli/info.js

@@ -1,88 +1,88 @@
-import { TikTokScraper } from '../lib/tiktok-scraper.mjs';
-import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from '../lib/url.js';
-
-async function handleInfo(options) {
-  const { infoUrls, infoOnlyVideo } = options;
-
-  if (!infoUrls || infoUrls.length === 0) {
-    console.error('用法: tt-help info <URL> [URL2 URL3...] [--onlyvideo]');
-    console.error('');
-    console.error('参数:');
-    console.error('  <URL>              TikTok 主页或视频 URL，支持多个 URL 同时查询');
-    console.error('  --onlyvideo        只返回视频信息（不返回用户信息）');
-    console.error('');
-    console.error('默认行为:');
-    console.error('  主页 URL           → 返回用户信息（bio、region、粉丝数等）');
-    console.error('  视频 URL           → 返回用户信息 + 视频信息');
-    console.error('  视频 URL + --onlyvideo → 只返回视频信息');
-    console.error('');
-    console.error('示例:');
-    console.error('  tt-help info https://www.tiktok.com/@nike');
-    console.error('  tt-help info https://www.tiktok.com/@nike/video/7234567890');
-    console.error('  tt-help info https://www.tiktok.com/@nike https://www.tiktok.com/@apple');
-    process.exit(1);
-  }
-
-  const scraper = new TikTokScraper({ poolSize: 1 });
-
-  try {
-    await scraper.init();
-    const result = {};
-
-    for (const url of infoUrls) {
-      if (isProfileUrl(url)) {
-        const uniqueId = extractUniqueId(url);
-        const normalized = normalizeUsername(uniqueId);
-        const user = await scraper.getUserInfo(normalized);
-        if (!user) {
-          console.error(`无法获取用户 @${uniqueId} 的信息`);
-          continue;
-        }
-        result[normalized] = { user };
-        console.error(`用户: @${user.uniqueId} (${user.nickname})`);
-      } else if (isVideoUrl(url)) {
-        const uniqueId = extractUniqueId(url);
-        const normalized = normalizeUsername(uniqueId);
-
-        if (infoOnlyVideo) {
-          const video = await scraper.getVideoInfo(url);
-          if (!video) {
-            console.error(`无法获取视频信息: ${url}`);
-            continue;
-          }
-          const key = normalized + '/video/' + video.id;
-          result[key] = { video };
-          console.error(`视频: ${video.id}`);
-        } else {
-          const [user, video] = await Promise.all([
-            scraper.getUserInfo(normalized),
-            scraper.getVideoInfo(url),
-          ]);
-          const entry = {};
-          if (user) {
-            entry.user = user;
-            console.error(`用户: @${user.uniqueId} (${user.nickname})`);
-          }
-          if (video) {
-            entry.video = video;
-            console.error(`视频: ${video.id}`);
-          }
-          if (!user && !video) {
-            console.error(`无法获取信息: ${url}`);
-            continue;
-          }
-          const key = normalized + '/video/' + (video ? video.id : 'unknown');
-          result[key] = entry;
-        }
-      } else {
-        console.error(`无法识别 URL: ${url}`);
-      }
-    }
-
-    console.log(JSON.stringify(result, null, 2));
-  } finally {
-    await scraper.close();
-  }
-}
-
-export { handleInfo };
+import { TikTokScraper } from '../lib/tiktok-scraper.mjs';
+import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from '../lib/url.js';
+
+async function handleInfo(options) {
+  const { infoUrls, infoOnlyVideo } = options;
+
+  if (!infoUrls || infoUrls.length === 0) {
+    console.error('用法: tt-help info <URL> [URL2 URL3...] [--onlyvideo]');
+    console.error('');
+    console.error('参数:');
+    console.error('  <URL>              TikTok 主页或视频 URL，支持多个 URL 同时查询');
+    console.error('  --onlyvideo        只返回视频信息（不返回用户信息）');
+    console.error('');
+    console.error('默认行为:');
+    console.error('  主页 URL           → 返回用户信息（bio、region、粉丝数等）');
+    console.error('  视频 URL           → 返回用户信息 + 视频信息');
+    console.error('  视频 URL + --onlyvideo → 只返回视频信息');
+    console.error('');
+    console.error('示例:');
+    console.error('  tt-help info https://www.tiktok.com/@nike');
+    console.error('  tt-help info https://www.tiktok.com/@nike/video/7234567890');
+    console.error('  tt-help info https://www.tiktok.com/@nike https://www.tiktok.com/@apple');
+    process.exit(1);
+  }
+
+  const scraper = new TikTokScraper({ poolSize: 1 });
+
+  try {
+    await scraper.init();
+    const result = {};
+
+    for (const url of infoUrls) {
+      if (isProfileUrl(url)) {
+        const uniqueId = extractUniqueId(url);
+        const normalized = normalizeUsername(uniqueId);
+        const user = await scraper.getUserInfo(normalized);
+        if (!user) {
+          console.error(`无法获取用户 @${uniqueId} 的信息`);
+          continue;
+        }
+        result[normalized] = { user };
+        console.error(`用户: @${user.uniqueId} (${user.nickname})`);
+      } else if (isVideoUrl(url)) {
+        const uniqueId = extractUniqueId(url);
+        const normalized = normalizeUsername(uniqueId);
+
+        if (infoOnlyVideo) {
+          const video = await scraper.getVideoInfo(url);
+          if (!video) {
+            console.error(`无法获取视频信息: ${url}`);
+            continue;
+          }
+          const key = normalized + '/video/' + video.id;
+          result[key] = { video };
+          console.error(`视频: ${video.id}`);
+        } else {
+          const [user, video] = await Promise.all([
+            scraper.getUserInfo(normalized),
+            scraper.getVideoInfo(url),
+          ]);
+          const entry = {};
+          if (user) {
+            entry.user = user;
+            console.error(`用户: @${user.uniqueId} (${user.nickname})`);
+          }
+          if (video) {
+            entry.video = video;
+            console.error(`视频: ${video.id}`);
+          }
+          if (!user && !video) {
+            console.error(`无法获取信息: ${url}`);
+            continue;
+          }
+          const key = normalized + '/video/' + (video ? video.id : 'unknown');
+          result[key] = entry;
+        }
+      } else {
+        console.error(`无法识别 URL: ${url}`);
+      }
+    }
+
+    console.log(JSON.stringify(result, null, 2));
+  } finally {
+    await scraper.close();
+  }
+}
+
+export { handleInfo };

package/src/cli/progress.js

@@ -1,111 +1,111 @@
-import { writeFileSync } from 'fs';
-import { formatOutput } from '../lib/output.js';
-import { deduplicate } from '../lib/output.js';
-import { applyFilter, formatFilterDescription } from '../lib/filter.js';
-import { calculateConcurrency, createMultiProgressBars, renderMultiProgressBars, clearProgressBars } from '../lib/io.js';
-import { randomDelay } from '../lib/delay.js';
-
-export async function processUrlsWithProgress({
-  urls,
-  proxyUrl,
-  outputFile,
-  outputFormat,
-  filter,
-  processFn,
-  label = '数据',
-}) {
-  const allResults = [];
-  const errors = [];
-
-  if (urls.length === 0) {
-    console.error('\n未获取到数据');
-    if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
-    return;
-  }
-
-  const concurrency = calculateConcurrency(urls.length);
-  const bars = createMultiProgressBars(concurrency);
-
-  const slots = Array.from({ length: concurrency }, () => []);
-  urls.forEach((url, i) => slots[i % concurrency].push(url));
-
-  bars.forEach((bar, i) => {
-    bar.total = slots[i].length;
-    bar.status = slots[i].length > 0 ? 'running' : 'done';
-  });
-
-  renderMultiProgressBars(bars);
-
-  const workers = slots.map(async (slotUrls, slotIndex) => {
-    for (const url of slotUrls) {
-      bars[slotIndex].url = url;
-      renderMultiProgressBars(bars);
-
-      await randomDelay();
-
-      try {
-        const results = await processFn(url, proxyUrl);
-        allResults.push(...results);
-        bars[slotIndex].current++;
-        bars[slotIndex].status = 'running';
-      } catch (err) {
-        errors.push({ url, message: err.message });
-        bars[slotIndex].current++;
-        bars[slotIndex].status = 'error';
-      }
-
-      renderMultiProgressBars(bars);
-    }
-    bars[slotIndex].status = bars[slotIndex].current === bars[slotIndex].total ? 'done' : 'error';
-    renderMultiProgressBars(bars);
-  });
-
-  await Promise.all(workers);
-  clearProgressBars();
-
-  const uniqueResults = deduplicate(allResults);
-  const filteredResults = applyFilter(uniqueResults, filter);
-
-  if (errors.length > 0) {
-    const firstMsg = errors[0].message;
-    const isProxyError = ['不可用', '连接被拒绝', '连接中断', '超时', '无法解析']
-      .some(kw => firstMsg.includes(kw));
-
-    if (filteredResults.length === 0) {
-      if (isProxyError) {
-        console.error(`  所有请求失败，请检查代理: ${proxyUrl}\n`);
-      } else {
-        const show = errors.slice(0, 5);
-        for (const e of show) console.error(`  ✗ ${e.url}: ${e.message}\n`);
-        if (errors.length > 5) console.error(`  ... 还有 ${errors.length - 5} 个失败\n`);
-      }
-      console.error('未获取到数据');
-      if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
-      return;
-    } else {
-      if (isProxyError) {
-        console.error(`  ${errors.length} 个请求失败，请检查代理: ${proxyUrl}\n`);
-      } else {
-        console.error(`  ${errors.length} 个失败:`);
-        const show = errors.slice(0, 5);
-        for (const e of show) console.error(`    ✗ ${e.url}: ${e.message}`);
-        if (errors.length > 5) console.error(`    ... 还有 ${errors.length - 5} 个`);
-      }
-    }
-  }
-
-  const output = formatOutput(filteredResults, outputFormat);
-
-  if (outputFile) {
-    writeFileSync(outputFile, output, 'utf-8');
-    console.log(`\n结果已写入: ${outputFile}`);
-  } else {
-    process.stdout.write(output + '\n');
-  }
-
-  if (filter) {
-    console.log(`\n共 ${uniqueResults.length} 个${label}，过滤后 ${filteredResults.length} 个（过滤条件: ${formatFilterDescription(filter)}）`);
-  } else {
-    console.log(`\n共 ${filteredResults.length} 个${label}`);
-  }
-}
+import { writeFileSync } from 'fs';
+import { formatOutput } from '../lib/output.js';
+import { deduplicate } from '../lib/output.js';
+import { applyFilter, formatFilterDescription } from '../lib/filter.js';
+import { calculateConcurrency, createMultiProgressBars, renderMultiProgressBars, clearProgressBars } from '../lib/io.js';
+import { randomDelay } from '../lib/delay.js';
+
+export async function processUrlsWithProgress({
+  urls,
+  proxyUrl,
+  outputFile,
+  outputFormat,
+  filter,
+  processFn,
+  label = '数据',
+}) {
+  const allResults = [];
+  const errors = [];
+
+  if (urls.length === 0) {
+    console.error('\n未获取到数据');
+    if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
+    return;
+  }
+
+  const concurrency = calculateConcurrency(urls.length);
+  const bars = createMultiProgressBars(concurrency);
+
+  const slots = Array.from({ length: concurrency }, () => []);
+  urls.forEach((url, i) => slots[i % concurrency].push(url));
+
+  bars.forEach((bar, i) => {
+    bar.total = slots[i].length;
+    bar.status = slots[i].length > 0 ? 'running' : 'done';
+  });
+
+  renderMultiProgressBars(bars);
+
+  const workers = slots.map(async (slotUrls, slotIndex) => {
+    for (const url of slotUrls) {
+      bars[slotIndex].url = url;
+      renderMultiProgressBars(bars);
+
+      await randomDelay();
+
+      try {
+        const results = await processFn(url, proxyUrl);
+        allResults.push(...results);
+        bars[slotIndex].current++;
+        bars[slotIndex].status = 'running';
+      } catch (err) {
+        errors.push({ url, message: err.message });
+        bars[slotIndex].current++;
+        bars[slotIndex].status = 'error';
+      }
+
+      renderMultiProgressBars(bars);
+    }
+    bars[slotIndex].status = bars[slotIndex].current === bars[slotIndex].total ? 'done' : 'error';
+    renderMultiProgressBars(bars);
+  });
+
+  await Promise.all(workers);
+  clearProgressBars();
+
+  const uniqueResults = deduplicate(allResults);
+  const filteredResults = applyFilter(uniqueResults, filter);
+
+  if (errors.length > 0) {
+    const firstMsg = errors[0].message;
+    const isProxyError = ['不可用', '连接被拒绝', '连接中断', '超时', '无法解析']
+      .some(kw => firstMsg.includes(kw));
+
+    if (filteredResults.length === 0) {
+      if (isProxyError) {
+        console.error(`  所有请求失败，请检查代理: ${proxyUrl}\n`);
+      } else {
+        const show = errors.slice(0, 5);
+        for (const e of show) console.error(`  ✗ ${e.url}: ${e.message}\n`);
+        if (errors.length > 5) console.error(`  ... 还有 ${errors.length - 5} 个失败\n`);
+      }
+      console.error('未获取到数据');
+      if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
+      return;
+    } else {
+      if (isProxyError) {
+        console.error(`  ${errors.length} 个请求失败，请检查代理: ${proxyUrl}\n`);
+      } else {
+        console.error(`  ${errors.length} 个失败:`);
+        const show = errors.slice(0, 5);
+        for (const e of show) console.error(`    ✗ ${e.url}: ${e.message}`);
+        if (errors.length > 5) console.error(`    ... 还有 ${errors.length - 5} 个`);
+      }
+    }
+  }
+
+  const output = formatOutput(filteredResults, outputFormat);
+
+  if (outputFile) {
+    writeFileSync(outputFile, output, 'utf-8');
+    console.log(`\n结果已写入: ${outputFile}`);
+  } else {
+    process.stdout.write(output + '\n');
+  }
+
+  if (filter) {
+    console.log(`\n共 ${uniqueResults.length} 个${label}，过滤后 ${filteredResults.length} 个（过滤条件: ${formatFilterDescription(filter)}）`);
+  } else {
+    console.log(`\n共 ${filteredResults.length} 个${label}`);
+  }
+}