tt-help-cli-ycl 1.0.2 → 1.0.4

package/README.md

@@ -1,17 +1,17 @@
-# tt-help
-
-TikTok user & video data scraper — extract ttSeller, verified, locationCreated from HTML source.
-
-## Install
-
-```bash
-npm i -g tt-help
-```
-
-## Usage
-
-```bash
-tt-help [options] <urls...>
-```
-
-示例、代理配置、和更多用法请查看仓库或 `src/main.mjs` 中的帮助文本。
+# tt-help
+
+TikTok user & video data scraper — extract ttSeller, verified, locationCreated from HTML source.
+
+## Install
+
+```bash
+npm i -g tt-help
+```
+
+## Usage
+
+```bash
+tt-help [options] <urls...>
+```
+
+示例、代理配置、和更多用法请查看仓库或 `src/main.mjs` 中的帮助文本。

package/cli.js

@@ -1,9 +1,9 @@
-#!/usr/bin/env node
-import { fileURLToPath } from 'url';
-import { dirname, resolve } from 'path';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const mainPath = resolve(__dirname, 'src', 'main.mjs');
-await import(`file://${mainPath}`);
+#!/usr/bin/env node
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const mainPath = resolve(__dirname, 'src', 'main.mjs');
+await import(`file://${mainPath}`);

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "tt-help-cli-ycl",
-  "version": "1.0.2",
-  "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
-  "type": "module",
-  "bin": {
-    "tt-help": "cli.js"
-  },
-  "main": "src/main.mjs",
-  "files": [
-    "cli.js",
-    "src/"
-  ],
-  "scripts": {
-    "start": "node src/main.mjs"
-  },
-  "keywords": [
-    "tiktok",
-    "scraper",
-    "cli",
-    "seller",
-    "ttSeller"
-  ],
-  "author": "jsjhycl",
-  "license": "ISC",
-  "engines": {
-    "node": ">=18"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jsjhycl/tt-help-cli.git"
-  },
-  "bugs": {
-    "url": "https://github.com/jsjhycl/tt-help-cli/issues"
-  },
-  "homepage": "https://github.com/jsjhycl/tt-help-cli#readme",
-  "dependencies": {
-    "playwright": "^1.59.1",
-    "undici": "^8.1.0"
-  }
-}
+{
+  "name": "tt-help-cli-ycl",
+  "version": "1.0.4",
+  "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
+  "type": "module",
+  "bin": {
+    "tt-help": "cli.js"
+  },
+  "main": "src/main.mjs",
+  "files": [
+    "cli.js",
+    "src/"
+  ],
+  "scripts": {
+    "start": "node src/main.mjs"
+  },
+  "keywords": [
+    "tiktok",
+    "scraper",
+    "cli",
+    "seller",
+    "ttSeller"
+  ],
+  "author": "jsjhycl",
+  "license": "ISC",
+  "engines": {
+    "node": ">=18"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jsjhycl/tt-help-cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jsjhycl/tt-help-cli/issues"
+  },
+  "homepage": "https://github.com/jsjhycl/tt-help-cli#readme",
+  "dependencies": {
+    "playwright": "^1.59.1",
+    "undici": "^8.1.0"
+  }
+}

package/src/lib/args.js

@@ -1,59 +1,62 @@
-import { readFileSync } from 'fs';
-import { proxy } from './constants.js';
-
-export function parseArgs() {
-  const args = process.argv.slice(2);
-  const urls = [];
-  let inputFile = null;
-  let outputFile = null;
-  let outputFormat = 'json';
-  let exploreCount = 0;
-  let showConfig = false;
-  let showHelp = false;
-  let customProxy = null;
-  let configAction = null;
-  let configValue = null;
-  let pipeMode = false;
-
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-
-    if (arg === '--explore') {
-      exploreCount = args[i + 1] && !args[i + 1].startsWith('http')
-        ? parseInt(args[++i], 10)
-        : 100;
-    } else if (arg === '--proxy') {
-      customProxy = args[++i];
-    } else if (arg === 'config') {
-      configAction = args[i + 1];
-      if (configAction === 'set' || configAction === 'set-proxy') {
-        configValue = args[i + 2];
-        i += 2;
-      } else {
-        i++;
-      }
-    } else if (arg === '--pipe') {
-      pipeMode = true;
-    } else if (arg === '-i' || arg === '--input') {
-      inputFile = args[++i];
-    } else if (arg === '-o' || arg === '--output') {
-      outputFile = args[++i];
-    } else if (arg === '-f' || arg === '--format') {
-      outputFormat = args[++i];
-    } else if (arg === '-c' || arg === '--config') {
-      showConfig = true;
-    } else if (arg === '-h' || arg === '--help') {
-      showHelp = true;
-    } else if (arg.startsWith('http')) {
-      urls.push(arg);
-    }
-  }
-
-  if (inputFile) {
-    const content = readFileSync(inputFile, 'utf-8');
-    const lines = content.split(/\r?\n/).map(l => l.trim()).filter(l => l.startsWith('http'));
-    urls.push(...lines);
-  }
-
-  return { urls, outputFile, outputFormat, exploreCount, showConfig, showHelp, customProxy, configAction, configValue, pipeMode };
-}
+import { readFileSync } from 'fs';
+import { proxy } from './constants.js';
+
+export function parseArgs() {
+  const args = process.argv.slice(2);
+  const urls = [];
+  let inputFile = null;
+  let outputFile = null;
+  let outputFormat = 'json';
+  let exploreCount = 0;
+  let showConfig = false;
+  let showHelp = false;
+  let customProxy = null;
+  let configAction = null;
+  let configValue = null;
+  let pipeMode = false;
+  let filterStr = null;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+
+    if (arg === '--explore') {
+      exploreCount = args[i + 1] && !args[i + 1].startsWith('http')
+        ? parseInt(args[++i], 10)
+        : 100;
+    } else if (arg === '--proxy') {
+      customProxy = args[++i];
+    } else if (arg === '--filter') {
+      filterStr = args[++i];
+    } else if (arg === 'config') {
+      configAction = args[i + 1];
+      if (configAction === 'set' || configAction === 'set-proxy' || configAction === 'set-browser') {
+        configValue = args[i + 2];
+        i += 2;
+      } else {
+        i++;
+      }
+    } else if (arg === '--pipe') {
+      pipeMode = true;
+    } else if (arg === '-i' || arg === '--input') {
+      inputFile = args[++i];
+    } else if (arg === '-o' || arg === '--output') {
+      outputFile = args[++i];
+    } else if (arg === '-f' || arg === '--format') {
+      outputFormat = args[++i];
+    } else if (arg === '-c' || arg === '--config') {
+      showConfig = true;
+    } else if (arg === '-h' || arg === '--help') {
+      showHelp = true;
+    } else if (arg.startsWith('http')) {
+      urls.push(arg);
+    }
+  }
+
+  if (inputFile) {
+    const content = readFileSync(inputFile, 'utf-8');
+    const lines = content.split(/\r?\n/).map(l => l.trim()).filter(l => l.startsWith('http'));
+    urls.push(...lines);
+  }
+
+  return { urls, outputFile, outputFormat, exploreCount, showConfig, showHelp, customProxy, configAction, configValue, pipeMode, filterStr };
+}

package/src/lib/constants.js

@@ -1,76 +1,102 @@
-import { join, dirname } from 'path';
-import { readFileSync, writeFileSync, existsSync } from 'fs';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const homeDir = process.env.HOME || process.env.USERPROFILE || '';
-const configPath = join(homeDir, '.tt-help.json');
-
-const DEFAULT_PROXY = 'http://127.0.0.1:7897';
-const DEFAULT_OUTPUT = 'tiktok_data.json';
-const USER_SECTION_SIZE = 12000;
-
-let proxy = DEFAULT_PROXY;
-let configFile = null;
-
-try {
-  if (existsSync(configPath)) {
-    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
-    if (cfg.proxy) {
-      proxy = cfg.proxy;
-      configFile = configPath;
-    }
-  }
-} catch {
-  // no config file
-}
-
-const HELP_TEXT = [
-  '用法: tt-help [选项]',
-  '',
-  '参数:',
-  '  --explore [count]      从 Explore 页面获取视频列表（默认: 100）',
-  '  --pipe                 将 Explore 结果自动传给 URL 爬取',
-  '  --proxy <地址>          临时指定代理地址',
-  '  -i, --input <file>     从文件读取 URL 列表（每行一个）',
-  '  -o, --output <file>    指定输出文件（默认: tiktok_data.json）',
-  '  -f, --format <fmt>     输出格式: json（默认）, table, raw',
-  '  -c, --config           显示当前配置',
-  '  -h, --help             显示帮助',
-  '',
-  '配置代理:',
-  '  tt-help config set http://127.0.0.1:7890  设置代理',
-  '  tt-help config show                        查看配置',
-  '  tt-help config reset                       恢复默认',
-  '',
-  '示例:',
-  '  tt-help --explore 200                    # 先预览 Explore 结果',
-  '  tt-help --explore 50 --pipe -o result.json  # 自动抓取用户数据',
-  '  tt-help --explore -f raw                 # 仅输出 URL 列表',
-  '  tt-help --explore -f raw -o urls.txt     # 保存 URL 到文件',
-  '  tt-help -i urls.txt -o result.json       # 再爬取这些 URL',
-  '  tt-help config set http://127.0.0.1:7890',
-  '  tt-help https://www.tiktok.com/@username',
-];
-
-const CONFIG_TEXT = [
-  'tt-help v1.0.1',
-  '',
-  '配置:',
-  `  代理: ${proxy}`,
-  `  输出格式: json`,
-  `  默认输出: ${DEFAULT_OUTPUT}`,
-  `  配置文件: ${configFile || '无（使用默认值）'}`,
-];
-
-export {
-  proxy,
-  configFile,
-  configPath,
-  DEFAULT_PROXY,
-  DEFAULT_OUTPUT,
-  USER_SECTION_SIZE,
-  HELP_TEXT,
-  CONFIG_TEXT,
-};
+import { join, dirname } from 'path';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const homeDir = process.env.HOME || process.env.USERPROFILE || '';
+const configPath = join(homeDir, '.tt-help.json');
+
+const DEFAULT_PROXY = 'http://127.0.0.1:7897';
+const DEFAULT_OUTPUT = 'tiktok_data.json';
+const USER_SECTION_SIZE = 12000;
+
+let proxy = DEFAULT_PROXY;
+let configFile = null;
+let browser = null;
+
+try {
+  if (existsSync(configPath)) {
+    const cfg = JSON.parse(readFileSync(configPath, 'utf-8'));
+    if (cfg.proxy) {
+      proxy = cfg.proxy;
+    }
+    if (cfg.browser) {
+      browser = cfg.browser;
+    }
+    configFile = configPath;
+  }
+} catch {
+  // no config file
+}
+
+function saveBrowser(path) {
+  const cfg = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf-8')) : {};
+  cfg.browser = path;
+  writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+  browser = path;
+  configFile = configPath;
+}
+
+const HELP_TEXT = [
+  '用法: tt-help [选项]',
+  '',
+  '参数:',
+  '  --explore [count]      从 Explore 页面获取视频列表（默认: 100）',
+  '  --pipe                 将 Explore 结果自动传给 URL 爬取',
+  '  --proxy <地址>          临时指定代理地址',
+  '  --filter <条件>         过滤结果（格式: key=value&key2=value2）',
+  '  -i, --input <file>     从文件读取 URL 列表（每行一个）',
+  '  -o, --output <file>    指定输出文件（默认: tiktok_data.json）',
+  '  -f, --format <fmt>     输出格式: json（默认）, table, raw',
+  '  -c, --config           显示当前配置',
+  '  -h, --help             显示帮助',
+  '',
+  '过滤示例:',
+  '  --filter "ttSeller=true&verified=false"           过滤卖家且未认证',
+  '  --filter "locationCreated=DE,ES"                  过滤指定地区',
+  '  --filter "ttSeller=true&locationCreated=US"       组合条件',
+  '',
+  '配置代理:',
+  '  tt-help config set http://127.0.0.1:7890  设置代理',
+  '  tt-help config show                        查看配置',
+  '  tt-help config reset                       恢复默认',
+  '',
+  '配置浏览器:',
+  '  tt-help config set-browser /path/to/chrome  手动指定浏览器路径',
+  '  tt-help config set-browser auto             自动探测浏览器',
+  '',
+  '示例:',
+  '  tt-help --explore 200                    # 先预览 Explore 结果',
+  '  tt-help --explore 50 --pipe -o result.json  # 自动抓取用户数据',
+  '  tt-help --explore -f raw                 # 仅输出 URL 列表',
+  '  tt-help --explore -f raw -o urls.txt     # 保存 URL 到文件',
+  '  tt-help -i urls.txt -o result.json       # 再爬取这些 URL',
+  '  tt-help config set http://127.0.0.1:7890',
+  '  tt-help https://www.tiktok.com/@username',
+  '  tt-help https://... --filter "ttSeller=true&locationCreated=DE"',
+];
+
+const CONFIG_TEXT = [
+  'tt-help v1.0.1',
+  '',
+  '配置:',
+  `  代理: ${proxy}`,
+  `  浏览器: ${browser || '未配置（将自动探测或回退）'}`,
+  `  输出格式: json`,
+  `  默认输出: ${DEFAULT_OUTPUT}`,
+  `  配置文件: ${configFile || '无（使用默认值）'}`,
+];
+
+export {
+  proxy,
+  configFile,
+  configPath,
+  DEFAULT_PROXY,
+  DEFAULT_OUTPUT,
+  USER_SECTION_SIZE,
+  HELP_TEXT,
+  CONFIG_TEXT,
+  browser,
+  saveBrowser,
+};