tt-help-cli-ycl 1.3.48 → 1.3.50

package/src/cli/open.js

@@ -1,111 +1,109 @@
-import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
-import { getOrCreatePage } from "../lib/browser/page.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 page = await getOrCreatePage(browser);
-      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);
-  }
-}
+import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
+import { getOrCreatePage } from "../lib/browser/page.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('运行 "tt-help open --list" 查看所有内置配置');
+    process.exit(1);
+  }
+
+  const port = parseInt(openPort);
+  if (isNaN(port) || port < 1 || port > 65535) {
+    console.error(`端口 ${openPort} 无效，请输入 1-65535 之间的端口号`);
+    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 page = await getOrCreatePage(browser);
+      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/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}`);
+  }
+}