tt-help-cli-ycl 1.4.119 → 1.4.121

package/package.json

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

package/src/cli/explore.js

@@ -27,7 +27,6 @@ import { showResourceUsage } from "../utils/index.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
 import { createApiClient } from "../lib/api-client.js";
 import { createCDNHandler } from "../lib/cdn-handler.js";
-import { requireClashOrExit } from "../clash/checker.js";
 import path from "path";
 import os from "os";
 
@@ -141,24 +140,17 @@ export async function handleExplore(options) {
       cdpOptions.userDataDir = currentAccount.userDataDir;
     }
 
-    const effectiveProxy = exploreProxy || configuredProxy;
-    if (effectiveProxy) {
-      // 如果配置了本地代理，自动发现端口并确保 Clash 可用
-      if (
-        effectiveProxy.includes("127.0.0.1") ||
-        effectiveProxy.includes("localhost")
-      ) {
-        const detected = await requireClashOrExit("Explore");
-        cdpOptions.proxyServer = detected;
-        console.error(`代理: ${detected} (自动发现)`);
-      } else {
-        cdpOptions.proxyServer = effectiveProxy;
-        console.error(
-          `代理: ${effectiveProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
-        );
-      }
+    // 配置了什么代理就用什么代理（--proxy > ~/.tt-help.json 的 proxy）；
+    // 未配置则不注入 proxyServer，浏览器走系统默认代理。
+    // 本地地址不再自动解析/强制 requireClashOrExit（与 refresh-mini 一致）。
+    const resolvedProxy = exploreProxy || configuredProxy || null;
+    if (resolvedProxy) {
+      cdpOptions.proxyServer = resolvedProxy;
+      console.error(
+        `代理: ${resolvedProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
+      );
     } else {
-      console.error(`代理: 未配置`);
+      console.error(`代理: 未配置（浏览器走系统默认代理）`);
     }
 
     console.error(`CDP 端口: ${cdpOptions.port}, 用户编号: ${userId}`);

package/src/cli/refresh.js

@@ -26,7 +26,6 @@ import {
 import { HealthChecker } from "../lib/browser/health-checker.js";
 import { createApiClient } from "../lib/api-client.js";
 import { createCDNHandler } from "../lib/cdn-handler.js";
-import { requireClashOrExit } from "../clash/checker.js";
 import path from "path";
 import os from "os";
 
@@ -77,15 +76,10 @@ export async function handleRefresh(options) {
   // 跳过用户信息、国家采样、关注/粉丝提取（最大耗时项）和商品详情抓取（由独立商品程序异步补抓），大幅提速。
   const followEnabled = !exploreMini && exploreEnableFollow !== false;
   const skipProduct = exploreMini || !!exploreNoProduct;
+  // 配置了什么代理就用什么代理（--proxy > ~/.tt-help.json 的 proxy）；
+  // 未配置则不注入 proxyServer，浏览器走系统默认代理。
   const effectiveProxy = exploreProxy || configuredProxy;
-  let resolvedProxy = effectiveProxy;
-  if (
-    effectiveProxy &&
-    (effectiveProxy.includes("127.0.0.1") ||
-      effectiveProxy.includes("localhost"))
-  ) {
-    resolvedProxy = await requireClashOrExit("Refresh");
-  }
+  const resolvedProxy = effectiveProxy || null;
 
   let userId = exploreUserId || configuredUserId;
   let browser = null;
@@ -138,7 +132,7 @@ export async function handleRefresh(options) {
     console.error(`空闲间隔: ${exploreInterval || 30} 秒`);
     if (resolvedProxy) {
       console.error(
-        `代理: ${resolvedProxy}${effectiveProxy !== resolvedProxy ? " (自动发现)" : exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
+        `代理: ${resolvedProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
       );
     }
     if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);

package/src/cli/search.js

@@ -40,7 +40,6 @@ import {
 } from "../scraper/modules/captcha-handler.js";
 import { createApiClient } from "../lib/api-client.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
-import { requireClashOrExit } from "../clash/checker.js";
 import {
   server as cfgServer,
   proxy as configuredProxy,
@@ -80,15 +79,9 @@ export async function handleSearch(parsed) {
     proxy: cliProxy,
   } = searchOpts || {};
 
-  const effectiveProxy = cliProxy || configuredProxy;
-  let resolvedProxy = effectiveProxy;
-  if (
-    effectiveProxy &&
-    (effectiveProxy.includes("127.0.0.1") ||
-      effectiveProxy.includes("localhost"))
-  ) {
-    resolvedProxy = await requireClashOrExit("Search");
-  }
+  // 配置了什么代理就用什么代理（--proxy > ~/.tt-help.json 的 proxy）；
+  // 未配置则不注入 proxyServer，浏览器走系统默认代理。
+  const resolvedProxy = cliProxy || configuredProxy || null;
 
   const log = (...args) => process.stderr.write(args.join(" ") + "\n");
 

package/src/watchdog/agent.js

@@ -30,6 +30,7 @@ import { fileURLToPath } from "url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const homeDir = homedir() || process.env.HOME || process.env.USERPROFILE || "";
 const TT_HELP_CONFIG = join(homeDir, ".tt-help.json");
+const IS_WIN = process.platform === "win32";
 
 // ── 业务日志错误统计 → 触发节点切换 ──
 // 识别采集程序日志里已有的错误分类标签（explore 等已打标），连续错误达标则切换出口节点
@@ -612,9 +613,17 @@ export class WatchdogAgent {
       if (cfg.proxy) args.push("--proxy", cfg.proxy);
 
       const { stdout, stderr, code } = await new Promise((resolve) => {
-        const child = spawn(cmd, args, {
-          stdio: ["ignore", "pipe", "pipe"],
-        });
+        // Windows 下 tt-help 是 .cmd 包装，必须 shell:true 才能被 cmd.exe 解析
+        // （与 process-manager.startCommand 的 Windows 处理保持一致）
+        const child = IS_WIN
+          ? spawn([cmd, ...args].join(" "), {
+              stdio: ["ignore", "pipe", "pipe"],
+              shell: true,
+              windowsHide: true,
+            })
+          : spawn(cmd, args, {
+              stdio: ["ignore", "pipe", "pipe"],
+            });
         let out = "",
           err = "";
         child.stdout.on("data", (d) => (out += d));