tt-help-cli-ycl 1.3.11 → 1.3.12

package/cli.js

@@ -5,5 +5,5 @@ import { dirname, resolve } from 'path';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const mainPath = resolve(__dirname, 'src', 'main.mjs');
+const mainPath = resolve(__dirname, 'src', 'main.js');
 await import(`file://${mainPath}`);

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {
     "tt-help": "cli.js"
   },
-  "main": "src/main.mjs",
+  "main": "src/main.js",
   "files": [
     "cli.js",
     "src/",
-    "bat/"
+    "scripts/"
   ],
   "scripts": {
-    "start": "node src/main.mjs"
+    "start": "node src/main.js"
   },
   "keywords": [
     "tiktok",
@@ -40,7 +40,6 @@
   "homepage": "https://github.com/jsjhycl/tt-help-cli#readme",
   "dependencies": {
     "playwright": "^1.59.1",
-    "tt-help-cli-ycl": "^1.3.2",
     "undici": "^8.1.0"
   }
 }

package/src/cli/auto.js

@@ -70,7 +70,7 @@ export async function handleAuto(options) {
 
   console.error(`服务器: ${serverUrl}（断开会自动重连）`);
 
-  const { ensureBrowserReady, processUser } = await import('../scraper/auto-core.mjs');
+  const { ensureBrowserReady, processUser } = await import('../scraper/auto-core.js');
   const browser = await ensureBrowserReady();
 
   const page = await getOrCreatePage(browser);

package/src/cli/config.js

@@ -0,0 +1,116 @@
+import { HELP_TEXT, configPath, saveBrowser, saveUserId, getConfigText } from '../lib/constants.js';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkgPath = join(__dirname, '..', '..', 'package.json');
+const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+
+function showConfig(urls, outputFile) {
+  const configLines = getConfigText();
+  if (urls.length > 0) {
+    configLines.push(`\n  URL数量: ${urls.length}`);
+  }
+  if (outputFile) {
+    configLines.push(`  输出文件: ${outputFile}`);
+  }
+  console.error(configLines.join('\n'));
+}
+
+function showUsage() {
+  console.error(HELP_TEXT.join('\n'));
+  process.exit(0);
+}
+
+function handleConfig(action, key, value) {
+  switch (action) {
+    case 'show': {
+      const configLines = getConfigText();
+      console.error(configLines.join('\n'));
+      break;
+    }
+
+    case 'set': {
+      if (!key) {
+        console.error('用法: tt-help config set <key> <value>');
+        console.error('  可用 key: proxy, server, browser, userId');
+        return;
+      }
+
+      switch (key) {
+        case 'proxy':
+          if (!value) {
+            console.error('请提供 proxy 的值');
+            console.error('用法: tt-help config set proxy <代理地址>');
+            return;
+          }
+          saveProxy(value);
+          console.error(`代理已更新: ${value}`);
+          break;
+
+        case 'server':
+          if (!value) {
+            console.error('请提供 server 的值');
+            return;
+          }
+          saveServer(value);
+          console.error(`服务器已更新: ${value}`);
+          break;
+
+        case 'browser':
+          if (!value) {
+            console.error('请提供 browser 的值');
+            console.error('用法: tt-help config set browser <浏览器路径>');
+            console.error('  或: tt-help config set-browser <浏览器路径>');
+            return;
+          }
+          saveBrowser(value);
+          console.error(`浏览器路径已更新: ${value}`);
+          break;
+
+        case 'userId':
+          if (!value) {
+            console.error('请提供 userId 的值');
+            return;
+          }
+          saveUserId(value);
+          console.error(`用户号已更新: ${value}`);
+          break;
+
+        default:
+          console.error(`未知配置项: ${key}`);
+          console.error('  可用 key: proxy, server, browser, userId');
+      }
+      break;
+    }
+
+    case 'reset': {
+      if (existsSync(configPath)) {
+        writeFileSync(configPath, '{}', 'utf-8');
+        console.error('配置已重置为默认');
+      } else {
+        console.error('配置文件不存在或已是默认状态');
+      }
+      break;
+    }
+
+    default:
+      console.error(`未知配置命令: ${action}`);
+      console.error('用法: tt-help config [show|set|reset]');
+  }
+}
+
+function saveProxy(newProxy) {
+  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+  cfg.proxy = newProxy;
+  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+}
+
+function saveServer(newServer) {
+  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+  cfg.server = newServer;
+  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+}
+
+export { handleConfig, showConfig, showUsage, version };

package/src/cli/explore-default.js

@@ -0,0 +1,83 @@
+import { parseFilter, applyFilter, formatFilterDescription } from '../lib/filter.js';
+import { writeFileSync } from 'fs';
+import { processUrlsWithProgress } from './progress.js';
+import { cleanError } from './utils.js';
+
+async function runExploreDefault(exploreCount, urls, proxyUrl, outputFile, outputFormat, pipeMode, filter) {
+  const allResults = [];
+
+  if (exploreCount > 0) {
+    try {
+      const { fetchExplore } = await import('../lib/explore-fetch.js');
+      const exploreResults = await fetchExplore(exploreCount);
+
+      console.log(`  获取到 ${exploreResults.length} 个视频\n`);
+      if (pipeMode) {
+        const videoUrls = exploreResults.map(r => r.url).filter(Boolean);
+        if (videoUrls.length > 0) {
+          await runScrapeDefault(videoUrls, proxyUrl, outputFile, outputFormat, filter);
+          return;
+        }
+      }
+      allResults.push(...exploreResults);
+    } catch (err) {
+      console.error(`  Explore 获取失败: ${cleanError(err.message)}\n`);
+      console.error(`  请确保代理 ${proxyUrl} 正常运行\n`);
+    }
+  }
+
+  if (urls.length > 0) {
+    const { processUrl } = await import('../lib/scrape.js');
+    await processUrlsWithProgress({
+      urls,
+      proxyUrl,
+      outputFile,
+      outputFormat,
+      filter,
+      processFn: (url, px) => processUrl(url, px),
+      label: '数据',
+      log: console.log,
+    });
+    return;
+  }
+
+  const { deduplicate, formatOutput } = await import('../lib/output.js');
+  const uniqueResults = deduplicate(allResults);
+  const filteredResults = applyFilter(uniqueResults, filter);
+
+  if (filteredResults.length === 0) {
+    console.log('\n未获取到数据');
+    if (outputFile) writeFileSync(outputFile, '[]', 'utf-8');
+    return;
+  }
+
+  const output = formatOutput(filteredResults, outputFormat);
+  if (outputFile) {
+    writeFileSync(outputFile, output, 'utf-8');
+    console.log(`\n结果已写入: ${outputFile}`);
+  } else {
+    console.log(output);
+  }
+
+  if (filter) {
+    console.log(`\n共 ${uniqueResults.length} 个数据，过滤后 ${filteredResults.length} 个（过滤条件: ${formatFilterDescription(filter)}）`);
+  } else {
+    console.log(`\n共 ${filteredResults.length} 个数据`);
+  }
+}
+
+async function runScrapeDefault(urls, proxyUrl, outputFile, outputFormat, filter) {
+  const { processUrl } = await import('../lib/scrape.js');
+  await processUrlsWithProgress({
+    urls,
+    proxyUrl,
+    outputFile,
+    outputFormat,
+    filter,
+    processFn: (url, px) => processUrl(url, px),
+    label: '用户的数据',
+    log: console.log,
+  });
+}
+
+export { runExploreDefault, runScrapeDefault };

package/src/cli/explore.js

@@ -1,7 +1,10 @@
 import { getOrCreatePage } from '../lib/browser/page.js';
-import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-helpers.mjs';
+import { delay, getDelayConfig, setDelayConfig } from '../scraper/modules/page-helpers.js';
 import { userId as configuredUserId, saveUserId } from '../lib/constants.js';
 import { getMacOrUuid } from '../lib/mac-or-uuid.js';
+import { ensureBrowserReady as ensureBrowserReadyCDP } from '../lib/browser/cdp.js';
+import path from 'path';
+import os from 'os';
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
 
@@ -41,9 +44,10 @@ export async function handleExplore(options) {
     exploreUsernames, explorePreset, exploreMaxComments, exploreMaxGuess,
     exploreEnableFollow, exploreMaxFollowing, exploreMaxFollowers,
     exploreLocation, exploreMaxUsers, serverUrl,
+    explorePort, exploreProfile, exploreUserId,
   } = options;
 
-  let userId = configuredUserId;
+  let userId = exploreUserId || configuredUserId;
   if (!userId) {
     userId = await getMacOrUuid();
     saveUserId(userId);
@@ -64,9 +68,17 @@ export async function handleExplore(options) {
   console.error(`关注/粉丝: ${exploreEnableFollow ? '启用' : '禁用'}`);
   console.error(`服务器: ${serverUrl}（断开会自动重连）`);
   if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
+  console.error(`CDP 端口: ${explorePort || 9222}, 用户编号: ${userId}`);
+  if (exploreProfile) console.error(`浏览器配置: ${exploreProfile}`);
 
-  const { ensureBrowserReady, processExplore } = await import('../scraper/explore-core.mjs');
-  const browser = await ensureBrowserReady();
+  const cdpOptions = {};
+  if (explorePort) cdpOptions.port = explorePort;
+  if (exploreProfile) {
+    cdpOptions.userDataDir = path.join(os.homedir(), 'Library', 'Application Support', `Microsoft Edge For Testing_${exploreProfile}`);
+  }
+
+  const browser = await ensureBrowserReadyCDP(cdpOptions);
+  const { processExplore } = await import('../scraper/explore-core.js');
 
   const page = await getOrCreatePage(browser);
 

package/src/cli/scrape.js

@@ -12,7 +12,7 @@ export async function handleScrape(options) {
     process.exit(1);
   }
 
-  const { runScrape } = await import('../scraper/core.mjs');
+  const { runScrape } = await import('../scraper/core.js');
 
   let browser;
   try {

package/src/cli/videos.js

@@ -12,7 +12,7 @@ export async function handleVideos(options) {
     process.exit(1);
   }
 
-  const { runGetUserVideos } = await import('../videos/core.mjs');
+  const { runGetUserVideos } = await import('../videos/core.js');
 
   let browser;
   try {

package/src/cli/watch.js

@@ -1,6 +1,6 @@
 import { existsSync } from 'fs';
-import { createStore } from '../watch/data-store.mjs';
-import { startWatchServer, openBrowser } from '../watch/server.mjs';
+import { createStore } from '../watch/data-store.js';
+import { startWatchServer, openBrowser } from '../watch/server.js';
 
 export async function handleWatch(options) {
   const { outputFile, watchPort } = options;
@@ -13,7 +13,7 @@ export async function handleWatch(options) {
   }
 
   if (!existsSync(outputFile)) {
-    console.error(`文件不存在: ${outputFile}`);
+    console.error(`文件不存�? ${outputFile}`);
     process.exit(1);
   }
 
@@ -27,5 +27,5 @@ export async function handleWatch(options) {
     process.exit(0);
   });
 
-  console.error('按 Ctrl+C 停止监控服务');
+  console.error('�?Ctrl+C 停止监控服务');
 }

package/src/lib/args.js

@@ -1,6 +1,5 @@
 import { readFileSync } from 'fs';
 import { server as defaultServer } from './constants.js';
-import { proxy } from './constants.js';
 
 const PRESETS = ['fast', 'normal', 'slow', 'stealth'];
 
@@ -162,6 +161,9 @@ function parseExploreArgs(args) {
   let exploreMaxFollowers = 5;
   let exploreLocation = 'ES';
   let exploreMaxUsers = 0;
+  let explorePort = null;
+  let exploreProfile = null;
+  let exploreUserId = null;
 
   const positional = [];
   const PRESETS = ['fast', 'normal', 'slow', 'stealth'];
@@ -186,6 +188,12 @@ function parseExploreArgs(args) {
       exploreMaxFollowers = parseInt(args[++i]) || 5;
     } else if (arg === '--max-users') {
       exploreMaxUsers = parseInt(args[++i]) || 0;
+    } else if (arg === '--port') {
+      explorePort = parseInt(args[++i]) || 9222;
+    } else if (arg === '--profile') {
+      exploreProfile = args[++i];
+    } else if (arg === '--user-id') {
+      exploreUserId = args[++i];
     } else {
       positional.push(arg);
     }
@@ -215,6 +223,9 @@ function parseExploreArgs(args) {
     exploreLocation,
     serverUrl,
     exploreMaxUsers,
+    explorePort,
+    exploreProfile,
+    exploreUserId,
     urls: [],
     outputFormat: 'json',
     exploreCount: 0,