tt-help-cli-ycl 1.3.1 → 1.3.3

package/src/lib/url.js

@@ -1,52 +1,52 @@
-const BASE_URL = 'https://www.tiktok.com';
-
-export function extractUniqueId(url) {
-  const m = url.match(/\/@([^/]+)/);
-  return m ? m[1] : null;
-}
-
-export function extractVideoId(url) {
-  const m = url.match(/\/video\/(\d+)/);
-  return m ? m[1] : null;
-}
-
-export function normalizeUsername(input) {
-  return (input || '').replace(/^@/, '');
-}
-
-export function toProfileUrl(handle) {
-  const clean = normalizeUsername(handle);
-  return `${BASE_URL}/@${clean}`;
-}
-
-export function toVideoUrl(handle, videoId) {
-  const clean = normalizeUsername(handle);
-  return `${BASE_URL}/@${clean}/video/${videoId}`;
-}
-
-export function ensureAbsoluteUrl(href) {
-  if (href.startsWith('http')) return href;
-  return `${BASE_URL}${href}`;
-}
-
-export function isProfileUrl(url) {
-  return /\/@[\w-]+(?:$|[?#])/.test(url);
-}
-
-export function isVideoUrl(url) {
-  return /\/video\/\d+/.test(url);
-}
-
-export function extractDisplayPath(url) {
-  try {
-    const parts = new URL(url).pathname.split('/').filter(Boolean);
-    return parts.slice(-2).join('/');
-  } catch {
-    return url;
-  }
-}
-
-export function extractAuthorFromVideoUrl(url) {
-  const m = url.match(/@([^/]+)\/video/);
-  return m ? '@' + m[1] : null;
-}
+const BASE_URL = 'https://www.tiktok.com';
+
+export function extractUniqueId(url) {
+  const m = url.match(/\/@([^/]+)/);
+  return m ? m[1] : null;
+}
+
+export function extractVideoId(url) {
+  const m = url.match(/\/video\/(\d+)/);
+  return m ? m[1] : null;
+}
+
+export function normalizeUsername(input) {
+  return (input || '').replace(/^@/, '');
+}
+
+export function toProfileUrl(handle) {
+  const clean = normalizeUsername(handle);
+  return `${BASE_URL}/@${clean}`;
+}
+
+export function toVideoUrl(handle, videoId) {
+  const clean = normalizeUsername(handle);
+  return `${BASE_URL}/@${clean}/video/${videoId}`;
+}
+
+export function ensureAbsoluteUrl(href) {
+  if (href.startsWith('http')) return href;
+  return `${BASE_URL}${href}`;
+}
+
+export function isProfileUrl(url) {
+  return /\/@[\w-]+(?:$|[?#])/.test(url);
+}
+
+export function isVideoUrl(url) {
+  return /\/video\/\d+/.test(url);
+}
+
+export function extractDisplayPath(url) {
+  try {
+    const parts = new URL(url).pathname.split('/').filter(Boolean);
+    return parts.slice(-2).join('/');
+  } catch {
+    return url;
+  }
+}
+
+export function extractAuthorFromVideoUrl(url) {
+  const m = url.match(/@([^/]+)\/video/);
+  return m ? '@' + m[1] : null;
+}

package/src/main.mjs

@@ -1,200 +1,221 @@
-import { parseArgs } from './lib/args.js';
-import { HELP_TEXT, CONFIG_TEXT, proxy, configFile, configPath, DEFAULT_PROXY, saveBrowser } from './lib/constants.js';
-import { parseFilter, applyFilter, formatFilterDescription } from './lib/filter.js';
-import { writeFileSync, readFileSync, existsSync } from 'fs';
-import { handleScrape } from './cli/scrape.js';
-import { handleVideos } from './cli/videos.js';
-import { handleAuto } from './cli/auto.js';
-import { handleExplore } from './cli/explore.js';
-import { handleWatch } from './cli/watch.js';
-import { processUrlsWithProgress } from './cli/progress.js';
-import { cleanError } from './cli/utils.js';
-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 lines = [...CONFIG_TEXT];
-  if (outputFile) lines.push(`  输出文件: ${outputFile}`);
-  if (urls.length > 0) lines.push(`  待处理URL: ${urls.length}`);
-  lines.push('', '参数:', '  -c, --config   显示当前配置', '  -h, --help     显示帮助');
-  console.log(lines.join('\n'));
-}
-
-function showUsage() {
-  console.log(HELP_TEXT.join('\n'));
-  process.exit(0);
-}
-
-function handleConfig(action, value) {
-  if (action === 'show' || action === null) {
-    showConfig([], null);
-    return;
-  }
-  if (action === 'set' || action === 'set-proxy') {
-    if (!value) {
-      console.error('用法: tt-help config set <代理地址>');
-      process.exit(1);
-    }
-    const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
-    cfg.proxy = value;
-    writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-    console.log(`代理已设置为: ${value}`);
-    console.log(`配置文件: ${configPath}`);
-    return;
-  }
-  if (action === 'set-browser') {
-    if (!value) {
-      console.error('用法: tt-help config set-browser <浏览器路径 或 auto>');
-      process.exit(1);
-    }
-    if (value === 'auto') {
-      if (existsSync(configPath)) {
-        const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-        delete cfg.browser;
-        writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-      }
-      console.log('已切换为自动探测浏览器模式');
-    } else {
-      saveBrowser(value);
-      console.log(`浏览器已设置为: ${value}`);
-    }
-    console.log(`配置文件: ${configPath}`);
-    return;
-  }
-  if (action === 'reset') {
-    if (existsSync(configPath)) {
-      const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-      cfg.proxy = DEFAULT_PROXY;
-      writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-      console.log(`已恢复默认代理: ${DEFAULT_PROXY}`);
-      console.log(`配置文件: ${configPath}`);
-    } else {
-      console.log('当前使用默认代理，无需重置');
-    }
-    return;
-  }
-  console.error(`未知配置命令: ${action}`);
-  console.error('用法: tt-help config [show|set|set-browser|reset]');
-  process.exit(1);
-}
-
-async function runExploreDefault(exploreCount, urls, proxyUrl, outputFile, outputFormat, pipeMode, filter) {
-  console.log(`\n代理: ${proxyUrl}`);
-  console.log(`Explore 数量: ${exploreCount}`);
-  if (urls.length > 0) console.log(`额外 URL: ${urls.length}\n`);
-  else console.log('');
-
-  const allResults = [];
-
-  if (exploreCount > 0) {
-    try {
-      const { fetchExplore } = await import('./lib/explore.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,
-  });
-}
-
-async function main() {
-  const parsed = parseArgs();
-
-  switch (parsed.subcommand) {
-    case 'scrape': return handleScrape(parsed);
-    case 'videos': return handleVideos(parsed);
-    case 'auto':   return handleAuto(parsed);
-    case 'explore':return handleExplore(parsed);
-    case 'watch':  return handleWatch(parsed);
-  }
-
-  const { urls, outputFile, outputFormat, exploreCount, showConfig: showCfg, showHelp, showVersion, customProxy, configAction, configValue, pipeMode, filterStr } = parsed;
-  const proxyUrl = customProxy || proxy;
-  const filter = parseFilter(filterStr);
-
-  if (showVersion) {
-    console.log(version);
-    process.exit(0);
-  }
-  if (showHelp) return showUsage();
-  if (configAction) return handleConfig(configAction, configValue);
-  if (showCfg) return showConfig(urls, outputFile);
-  if (urls.length === 0 && exploreCount === 0) return showUsage();
-
-  if (exploreCount > 0) {
-    await runExploreDefault(exploreCount, urls, proxyUrl, outputFile, outputFormat, pipeMode, filter);
-  } else {
-    await runScrapeDefault(urls, proxyUrl, outputFile, outputFormat, filter);
-  }
-}
-
-main().catch(err => {
-  console.error(`错误: ${err.message}`);
-  process.exit(1);
-});
+import { parseArgs } from './lib/args.js';
+import { HELP_TEXT, CONFIG_TEXT, proxy, configFile, configPath, DEFAULT_PROXY, saveBrowser } from './lib/constants.js';
+import { parseFilter, applyFilter, formatFilterDescription } from './lib/filter.js';
+import { writeFileSync, readFileSync, existsSync } from 'fs';
+import { handleScrape } from './cli/scrape.js';
+import { handleVideos } from './cli/videos.js';
+import { handleAuto } from './cli/auto.js';
+import { handleExplore } from './cli/explore.js';
+import { handleWatch } from './cli/watch.js';
+import { processUrlsWithProgress } from './cli/progress.js';
+import { cleanError } from './cli/utils.js';
+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 lines = [...CONFIG_TEXT];
+  if (outputFile) lines.push(`  输出文件: ${outputFile}`);
+  if (urls.length > 0) lines.push(`  待处理URL: ${urls.length}`);
+  lines.push('', '参数:', '  -c, --config   显示当前配置', '  -h, --help     显示帮助');
+  console.log(lines.join('\n'));
+}
+
+function showUsage() {
+  console.log(HELP_TEXT.join('\n'));
+  process.exit(0);
+}
+
+function handleConfig(action, key, value) {
+  if (action === 'show' || action === null) {
+    showConfig([], null);
+    return;
+  }
+  if (action === 'set' || action === 'set-proxy') {
+    if (!key) {
+      console.error('用法: tt-help config set <key> <value>');
+      console.error('  可用 key: proxy, server, browser');
+      process.exit(1);
+    }
+    if (!value && key.startsWith('http://')) {
+      // 兼容旧用法: config set <代理地址>（key 实际是 value）
+      const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+      cfg.proxy = key;
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+      console.log(`代理已设置为: ${key}`);
+      console.log(`配置文件: ${configPath}`);
+      return;
+    }
+    if (!value) {
+      console.error(`请提供 ${key} 的值`);
+      process.exit(1);
+    }
+    const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+    if (key === 'proxy') cfg.proxy = value;
+    else if (key === 'server') cfg.server = value;
+    else if (key === 'browser') cfg.browser = value;
+    else {
+      console.error(`未知配置项: ${key}`);
+      console.error('  可用 key: proxy, server, browser');
+      process.exit(1);
+    }
+    writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+    console.log(`${key} 已设置为: ${value}`);
+    console.log(`配置文件: ${configPath}`);
+    return;
+  }
+  if (action === 'set-browser') {
+    if (!key) {
+      console.error('用法: tt-help config set-browser <浏览器路径 或 auto>');
+      process.exit(1);
+    }
+    if (key === 'auto') {
+      if (existsSync(configPath)) {
+        const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+        delete cfg.browser;
+        writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+      }
+      console.log('已切换为自动探测浏览器模式');
+    } else {
+      saveBrowser(key);
+      console.log(`浏览器已设置为: ${key}`);
+    }
+    console.log(`配置文件: ${configPath}`);
+    return;
+  }
+  if (action === 'reset') {
+    if (existsSync(configPath)) {
+      const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+      cfg.proxy = DEFAULT_PROXY;
+      writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+      console.log(`已恢复默认代理: ${DEFAULT_PROXY}`);
+      console.log(`配置文件: ${configPath}`);
+    } else {
+      console.log('当前使用默认代理，无需重置');
+    }
+    return;
+  }
+  console.error(`未知配置命令: ${action}`);
+  console.error('用法: tt-help config [show|set|set-browser|reset]');
+  process.exit(1);
+}
+
+async function runExploreDefault(exploreCount, urls, proxyUrl, outputFile, outputFormat, pipeMode, filter) {
+  console.log(`\n代理: ${proxyUrl}`);
+  console.log(`Explore 数量: ${exploreCount}`);
+  if (urls.length > 0) console.log(`额外 URL: ${urls.length}\n`);
+  else console.log('');
+
+  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,
+  });
+}
+
+async function main() {
+  const parsed = parseArgs();
+
+  switch (parsed.subcommand) {
+    case 'scrape': return handleScrape(parsed);
+    case 'videos': return handleVideos(parsed);
+    case 'auto':   return handleAuto(parsed);
+    case 'explore':return handleExplore(parsed);
+    case 'watch':  return handleWatch(parsed);
+  }
+
+  const { urls, outputFile, outputFormat, exploreCount, showConfig: showCfg, showHelp, showVersion, customProxy, configAction, configKey, configValue, pipeMode, filterStr } = parsed;
+  const proxyUrl = customProxy || proxy;
+  const filter = parseFilter(filterStr);
+
+  if (showVersion) {
+    console.log(version);
+    process.exit(0);
+  }
+  if (showHelp) return showUsage();
+  if (configAction) return handleConfig(configAction, configKey, configValue);
+  if (showCfg) return showConfig(urls, outputFile);
+  if (urls.length === 0 && exploreCount === 0) return showUsage();
+
+  if (exploreCount > 0) {
+    await runExploreDefault(exploreCount, urls, proxyUrl, outputFile, outputFormat, pipeMode, filter);
+  } else {
+    await runScrapeDefault(urls, proxyUrl, outputFile, outputFormat, filter);
+  }
+}
+
+main().catch(err => {
+  console.error(`错误: ${err.message}`);
+  process.exit(1);
+});

package/src/results/user-videos-bar.lar.lar.moeta.json

@@ -0,0 +1,37 @@
+{
+  "user": {
+    "uniqueId": "bar.lar.lar.moeta",
+    "secUid": "MS4wLjABAAAA3cgKTWvKfga0JAWeakAzx3zQ-aFAC8RuQvxD4HQFraKKsc_TbOIyMo3_ofVlXofV",
+    "nickname": "Bar Lar Lar Moetain",
+    "ttSeller": false,
+    "verified": false,
+    "followerCount": 24000,
+    "videoCount": 749,
+    "followingCount": 4293,
+    "heartCount": 254300,
+    "signature": ""
+  },
+  "totalVideos": 5,
+  "videos": [
+    {
+      "id": "7638231799084158228",
+      "url": "https://www.tiktok.com/@bar.lar.lar.moeta/video/7638231799084158228"
+    },
+    {
+      "id": "7638162444698914068",
+      "url": "https://www.tiktok.com/@bar.lar.lar.moeta/video/7638162444698914068"
+    },
+    {
+      "id": "7638116251767819541",
+      "url": "https://www.tiktok.com/@bar.lar.lar.moeta/video/7638116251767819541"
+    },
+    {
+      "id": "7638069637321690388",
+      "url": "https://www.tiktok.com/@bar.lar.lar.moeta/video/7638069637321690388"
+    },
+    {
+      "id": "7637927171025112341",
+      "url": "https://www.tiktok.com/@bar.lar.lar.moeta/video/7637927171025112341"
+    }
+  ]
+}