tt-help-cli-ycl 1.3.73 → 1.3.74

package/package.json

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

package/src/cli/open.js

@@ -2,12 +2,14 @@ import { ensureBrowserReady, killEdgeProcesses } from "../lib/browser/cdp.js";
 import { getOrCreatePage } from "../lib/browser/page.js";
 import path from "path";
 import os from "os";
+import http from "http";
+import readline from "readline";
 
 const BASE_PORT = 9222;
 const TOTAL_ACCOUNTS = 10;
 
 export async function handleOpen(parsed) {
-  const { openPort, openList } = parsed;
+  const { openPort, openList, openProxy } = parsed;
 
   if (openList) {
     console.error("内置浏览器配置:");
@@ -31,8 +33,9 @@ export async function handleOpen(parsed) {
   }
 
   if (!openPort) {
-    console.error("用法: tt-help open <端口>");
+    console.error("用法: tt-help open <端口> [--proxy <代理地址>]");
     console.error("示例: tt-help open 9222");
+    console.error("      tt-help open 9222 --proxy http://127.0.0.1:7890");
     console.error("");
     console.error('运行 "tt-help open --list" 查看内置浏览器配置');
     process.exit(1);
@@ -52,7 +55,22 @@ export async function handleOpen(parsed) {
     `Microsoft Edge For Testing_${profile}`,
   );
 
-  console.error(`正在启动浏览器... 端口: ${port}, profile: ${profile}`);
+  // 检查端口是否已被占用
+  const portInUse = await checkCDPPort(port);
+  if (portInUse) {
+    console.error(`⚠ 端口 ${port} 已有浏览器在运行中`);
+    const answer = await askQuestion("是否要继续连接到该浏览器？(y/N) ");
+    if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
+      console.error("已取消");
+      process.exit(0);
+    }
+    console.error(`正在连接到端口 ${port} 的浏览器...`);
+  } else {
+    console.error(
+      `正在启动浏览器... 端口: ${port}, profile: ${profile}${openProxy ? ", 代理: " + openProxy : ""}`,
+    );
+  }
+
   console.error(`userDataDir: ${userDataDir}`);
   console.error("");
   console.error("启动后请在浏览器中登录 TikTok 账户");
@@ -66,6 +84,9 @@ export async function handleOpen(parsed) {
     const cdpOptions = {};
     cdpOptions.port = port;
     cdpOptions.userDataDir = userDataDir;
+    if (openProxy) {
+      cdpOptions.proxyServer = openProxy;
+    }
 
     browser = await ensureBrowserReady(cdpOptions);
 
@@ -108,3 +129,30 @@ export async function handleOpen(parsed) {
     process.exit(1);
   }
 }
+
+function checkCDPPort(port) {
+  return new Promise((resolve) => {
+    const req = http.get(`http://127.0.0.1:${port}/json`, (res) => {
+      res.on("data", () => {});
+      res.on("end", () => resolve(res.statusCode === 200));
+    });
+    req.on("error", () => resolve(false));
+    req.setTimeout(3000, () => {
+      resolve(false);
+      req.destroy();
+    });
+  });
+}
+
+function askQuestion(question) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stderr,
+    });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer);
+    });
+  });
+}

package/src/lib/args.js

@@ -575,11 +575,14 @@ function parseAttachArgs(args) {
 function parseOpenArgs(args) {
   let openPort = null;
   let openList = false;
+  let openProxy = null;
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--list") {
       openList = true;
+    } else if (arg === "--proxy") {
+      openProxy = args[++i];
     } else if (!arg.startsWith("-")) {
       openPort = arg;
     }
@@ -589,6 +592,7 @@ function parseOpenArgs(args) {
     subcommand: "open",
     openPort,
     openList,
+    openProxy,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,