tt-help-cli-ycl 1.3.11 → 1.3.13

package/src/lib/output.js

@@ -1,80 +1,80 @@
-export function deduplicate(results) {
-  const seen = new Set();
-  return results.filter(r => {
-    if (r.id) {
-      const key = r.id;
-      if (seen.has(key)) return false;
-      seen.add(key);
-      return true;
-    }
-    const key = r.secUid || r.uniqueId;
-    if (seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-}
-
-export function formatTable(data) {
-  if (data.length === 0) return '';
-
-  if (data.length === 1) {
-    const lines = [];
-    for (const [key, val] of Object.entries(data[0])) {
-      if (typeof val === 'string' && val.length > 80) {
-        lines.push(`  ${key}: ${val.substring(0, 80)}...`);
-      } else {
-        lines.push(`  ${key}: ${val}`);
-      }
-    }
-    return lines.join('\n');
-  }
-
-  const cols = [
-    { key: 'uniqueId', label: '用户名', width: 20 },
-    { key: 'locationCreated', label: '地区', width: 6 },
-    { key: 'nickname', label: '昵称', width: 20 },
-    { key: 'ttSeller', label: 'TT卖家', width: 8 },
-    { key: 'verified', label: '已认证', width: 8 },
-    { key: 'followerCount', label: '粉丝', width: 10 },
-    { key: 'videoCount', label: '视频', width: 8 },
-  ];
-
-  for (const row of data) {
-    for (const col of cols) {
-      const val = String(row[col.key] ?? '-');
-      col.width = Math.max(col.width, val.length, col.label.length);
-    }
-  }
-
-  const sep = (w) => '-'.repeat(w);
-  const pad = (s, w) => s.padEnd(w);
-
-  const header = cols.map(c => pad(c.label, c.width)).join(' │ ');
-  const divider = cols.map(c => sep(c.width)).join('-+-');
-  const rows = data.map(r =>
-    cols.map(c => pad(String(r[c.key] ?? '-'), c.width)).join(' │ ')
-  );
-
-  return [header, divider, ...rows].join('\n');
-}
-
-export function formatOutput(data, format) {
-  if (format === 'table') return formatTable(data);
-
-  if (format === 'raw') {
-    if (Array.isArray(data) && data.length > 0 && 'url' in data[0]) {
-      return data.map(d => d.url).join('\n');
-    }
-    if (Array.isArray(data) && data.length > 0 && 'uniqueId' in data[0]) {
-      return data.map(d => `https://www.tiktok.com/@${d.uniqueId}`).join('\n');
-    }
-    return JSON.stringify(data, null, 2);
-  }
-
-  // Default JSON output, but for explore results (url-only) output pure text
-  if (Array.isArray(data) && data.length > 0 && 'url' in data[0]) {
-    return data.map(d => d.url).join('\n');
-  }
-
-  return JSON.stringify(data, null, 2);
-}
+export function deduplicate(results) {
+  const seen = new Set();
+  return results.filter(r => {
+    if (r.id) {
+      const key = r.id;
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    }
+    const key = r.secUid || r.uniqueId;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+
+export function formatTable(data) {
+  if (data.length === 0) return '';
+
+  if (data.length === 1) {
+    const lines = [];
+    for (const [key, val] of Object.entries(data[0])) {
+      if (typeof val === 'string' && val.length > 80) {
+        lines.push(`  ${key}: ${val.substring(0, 80)}...`);
+      } else {
+        lines.push(`  ${key}: ${val}`);
+      }
+    }
+    return lines.join('\n');
+  }
+
+  const cols = [
+    { key: 'uniqueId', label: '用户名', width: 20 },
+    { key: 'locationCreated', label: '地区', width: 6 },
+    { key: 'nickname', label: '昵称', width: 20 },
+    { key: 'ttSeller', label: 'TT卖家', width: 8 },
+    { key: 'verified', label: '已认证', width: 8 },
+    { key: 'followerCount', label: '粉丝', width: 10 },
+    { key: 'videoCount', label: '视频', width: 8 },
+  ];
+
+  for (const row of data) {
+    for (const col of cols) {
+      const val = String(row[col.key] ?? '-');
+      col.width = Math.max(col.width, val.length, col.label.length);
+    }
+  }
+
+  const sep = (w) => '-'.repeat(w);
+  const pad = (s, w) => s.padEnd(w);
+
+  const header = cols.map(c => pad(c.label, c.width)).join(' │ ');
+  const divider = cols.map(c => sep(c.width)).join('-+-');
+  const rows = data.map(r =>
+    cols.map(c => pad(String(r[c.key] ?? '-'), c.width)).join(' │ ')
+  );
+
+  return [header, divider, ...rows].join('\n');
+}
+
+export function formatOutput(data, format) {
+  if (format === 'table') return formatTable(data);
+
+  if (format === 'raw') {
+    if (Array.isArray(data) && data.length > 0 && 'url' in data[0]) {
+      return data.map(d => d.url).join('\n');
+    }
+    if (Array.isArray(data) && data.length > 0 && 'uniqueId' in data[0]) {
+      return data.map(d => `https://www.tiktok.com/@${d.uniqueId}`).join('\n');
+    }
+    return JSON.stringify(data, null, 2);
+  }
+
+  // Default JSON output, but for explore results (url-only) output pure text
+  if (Array.isArray(data) && data.length > 0 && 'url' in data[0]) {
+    return data.map(d => d.url).join('\n');
+  }
+
+  return JSON.stringify(data, null, 2);
+}

package/src/{scraper/modules/page-error-detector.mjs → lib/page-error-detector.js}

@@ -1,70 +1,70 @@
-const PATTERNS = {
-  login_required: [
-    "登录 TikTok",
-    "登录后查看",
-    "查看需登录",
-    "Log in to TikTok",
-    "Login to TikTok",
-    "观众管理功能",
-    "Viewer management",
-    "私密账号",
-    "私密状态",
-  ],
-  captcha: [
-    "captcha",
-    "verify",
-    "验证码",
-    "点击下一步",
-    "Press and hold",
-    "slide to verify",
-    "滑动验证",
-    "人机验证",
-    "安全验证",
-  ],
-  rate_limited: [
-    "访问过于频繁",
-    "操作过于频繁",
-    "too many requests",
-    "rate limit",
-    "稍后再试",
-    "try again later",
-    "请稍后再来",
-  ],
-  region_blocked: [
-    "地区限制",
-    "not available in your",
-    "此内容不可用",
-    "content not available",
-    "currently unavailable",
-    "抱歉，此内容",
-    "此页面不可用",
-  ],
-  not_found: [
-    "页面不存在",
-    "page not found",
-    "找不到",
-    "Couldn't find this",
-    "nothing here",
-    "此页面不存在",
-    "没有内容",
-    "发起对话",
-    "0 条评论",
-  ],
-};
-
-export async function detectPageError(page) {
-  return page.evaluate((patterns) => {
-    const bodyText = document.body.innerText;
-    const lower = bodyText.toLowerCase();
-
-    for (const [type, phrases] of Object.entries(patterns)) {
-      for (const phrase of phrases) {
-        if (lower.includes(phrase.toLowerCase())) {
-          return type;
-        }
-      }
-    }
-
-    return null;
-  }, PATTERNS);
-}
+const PATTERNS = {
+  login_required: [
+    "登录 TikTok",
+    "登录后查看",
+    "查看需登录",
+    "Log in to TikTok",
+    "Login to TikTok",
+    "观众管理功能",
+    "Viewer management",
+    "私密账号",
+    "私密状态",
+  ],
+  captcha: [
+    "captcha",
+    "verify",
+    "验证码",
+    "点击下一步",
+    "Press and hold",
+    "slide to verify",
+    "滑动验证",
+    "人机验证",
+    "安全验证",
+  ],
+  rate_limited: [
+    "访问过于频繁",
+    "操作过于频繁",
+    "too many requests",
+    "rate limit",
+    "稍后再试",
+    "try again later",
+    "请稍后再来",
+  ],
+  region_blocked: [
+    "地区限制",
+    "not available in your",
+    "此内容不可用",
+    "content not available",
+    "currently unavailable",
+    "抱歉，此内容",
+    "此页面不可用",
+  ],
+  not_found: [
+    "页面不存在",
+    "page not found",
+    "找不到",
+    "Couldn't find this",
+    "nothing here",
+    "此页面不存在",
+    "没有内容",
+    "发起对话",
+    "0 条评论",
+  ],
+};
+
+export async function detectPageError(page) {
+  return page.evaluate((patterns) => {
+    const bodyText = document.body.innerText;
+    const lower = bodyText.toLowerCase();
+
+    for (const [type, phrases] of Object.entries(patterns)) {
+      for (const phrase of phrases) {
+        if (lower.includes(phrase.toLowerCase())) {
+          return type;
+        }
+      }
+    }
+
+    return null;
+  }, PATTERNS);
+}

package/src/lib/parser.js

@@ -1,47 +1,47 @@
-export const USER_SECTION_SIZE = 12000;
-
-export function extractUserSection(html) {
-  const idx = html.indexOf('"uniqueId"');
-  if (idx < 0) return null;
-  return html.substring(idx, idx + USER_SECTION_SIZE);
-}
-
-export function parseUserSection(section) {
-  const data = {};
-
-  for (const key of ['uniqueId', 'uid', 'secUid']) {
-    const m = section.match(new RegExp(`"${key}":"([^"]*)`));
-    if (m) data[key] = m[1];
-  }
-
-  for (const key of ['nickname', 'signature']) {
-    const m = section.match(new RegExp(`"${key}":"((?:[^"\\\\]|\\\\.)*)"`, 'g'));
-    if (m) {
-      const raw = m[0].replace(`"${key}":"`, '').replace(/"$/, '');
-      data[key] = raw.replace(/\\n/g, '\n').replace(/\\\\/g, '\\');
-    }
-  }
-
-  for (const key of ['ttSeller', 'verified']) {
-    const m = section.match(new RegExp(`"${key}":\\s*(true|false)`));
-    data[key] = m ? m[1] === 'true' : undefined;
-  }
-
-  for (const key of ['followerCount', 'followingCount', 'heartCount', 'videoCount', 'diggCount']) {
-    const m = section.match(new RegExp(`"${key}":(\\d+)`));
-    if (m) data[key] = parseInt(m[1], 10);
-  }
-
-  const mt = section.match(/"createTime":(\d+)/);
-  if (mt) data.createTime = parseInt(mt[1], 10);
-
-  const ma = section.match(/"avatarLarger":"([^"]*)/);
-  if (ma) data.avatarLarger = ma[1].replace(/\\u002F/g, '/');
-
-  return data;
-}
-
-export function extractLocationCreated(html) {
-  const m = html.match(/"locationCreated":"([^"]*)/);
-  return m ? m[1] : null;
-}
+export const USER_SECTION_SIZE = 12000;
+
+export function extractUserSection(html) {
+  const idx = html.indexOf('"uniqueId"');
+  if (idx < 0) return null;
+  return html.substring(idx, idx + USER_SECTION_SIZE);
+}
+
+export function parseUserSection(section) {
+  const data = {};
+
+  for (const key of ['uniqueId', 'uid', 'secUid']) {
+    const m = section.match(new RegExp(`"${key}":"([^"]*)`));
+    if (m) data[key] = m[1];
+  }
+
+  for (const key of ['nickname', 'signature']) {
+    const m = section.match(new RegExp(`"${key}":"((?:[^"\\\\]|\\\\.)*)"`, 'g'));
+    if (m) {
+      const raw = m[0].replace(`"${key}":"`, '').replace(/"$/, '');
+      data[key] = raw.replace(/\\n/g, '\n').replace(/\\\\/g, '\\');
+    }
+  }
+
+  for (const key of ['ttSeller', 'verified']) {
+    const m = section.match(new RegExp(`"${key}":\\s*(true|false)`));
+    data[key] = m ? m[1] === 'true' : undefined;
+  }
+
+  for (const key of ['followerCount', 'followingCount', 'heartCount', 'videoCount', 'diggCount']) {
+    const m = section.match(new RegExp(`"${key}":(\\d+)`));
+    if (m) data[key] = parseInt(m[1], 10);
+  }
+
+  const mt = section.match(/"createTime":(\d+)/);
+  if (mt) data.createTime = parseInt(mt[1], 10);
+
+  const ma = section.match(/"avatarLarger":"([^"]*)/);
+  if (ma) data.avatarLarger = ma[1].replace(/\\u002F/g, '/');
+
+  return data;
+}
+
+export function extractLocationCreated(html) {
+  const m = html.match(/"locationCreated":"([^"]*)/);
+  return m ? m[1] : null;
+}

package/src/lib/retry.js

@@ -1,45 +1,45 @@
-import { delay } from './delay.js';
-
-const RETRYABLE_PATTERNS = [
-  'interrupted',
-  'Navigation.*interrupted',
-  'net::',
-  'ECONN',
-  'ETIMEDOUT',
-  'ENOTFOUND',
-  'EAI_AGAIN',
-  'ESOCKETRESET',
-  'connection.*refused',
-  'connection.*reset',
-  'failed.*navigate',
-  'target.*closed',
-  'crash',
-  '代理错误',
-];
-
-export function isRetryableError(error) {
-  if (!error) return false;
-  const msg = error.message || error.toString() || '';
-  return RETRYABLE_PATTERNS.some(p => new RegExp(p, 'i').test(msg));
-}
-
-export async function retryWithBackoff(fn, { maxRetries = 3, baseDelay = 3000, log } = {}) {
-  let lastError;
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (error) {
-      lastError = error;
-      if (attempt >= maxRetries || !isRetryableError(error)) {
-        throw error;
-      }
-      const jitter = Math.random() * 2000;
-      const waitTime = baseDelay * Math.pow(2, attempt) + jitter;
-      if (log) {
-        log(`  [重试] ${attempt + 1}/${maxRetries}，${Math.round(waitTime / 1000)}s 后重试...`);
-      }
-      await delay(Math.round(waitTime), Math.round(waitTime));
-    }
-  }
-  throw lastError;
-}
+import { delay } from './delay.js';
+
+const RETRYABLE_PATTERNS = [
+  'interrupted',
+  'Navigation.*interrupted',
+  'net::',
+  'ECONN',
+  'ETIMEDOUT',
+  'ENOTFOUND',
+  'EAI_AGAIN',
+  'ESOCKETRESET',
+  'connection.*refused',
+  'connection.*reset',
+  'failed.*navigate',
+  'target.*closed',
+  'crash',
+  '代理错误',
+];
+
+export function isRetryableError(error) {
+  if (!error) return false;
+  const msg = error.message || error.toString() || '';
+  return RETRYABLE_PATTERNS.some(p => new RegExp(p, 'i').test(msg));
+}
+
+export async function retryWithBackoff(fn, { maxRetries = 3, baseDelay = 3000, log } = {}) {
+  let lastError;
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error;
+      if (attempt >= maxRetries || !isRetryableError(error)) {
+        throw error;
+      }
+      const jitter = Math.random() * 2000;
+      const waitTime = baseDelay * Math.pow(2, attempt) + jitter;
+      if (log) {
+        log(`  [重试] ${attempt + 1}/${maxRetries}，${Math.round(waitTime / 1000)}s 后重试...`);
+      }
+      await delay(Math.round(waitTime), Math.round(waitTime));
+    }
+  }
+  throw lastError;
+}

package/src/lib/scrape.js

@@ -1,40 +1,40 @@
-import { extractUserSection, parseUserSection, extractLocationCreated } from './parser.js';
-import { fetchHtml, isProfileUrl } from './fetcher.js';
-import { toProfileUrl, isVideoUrl, extractUniqueId } from './url.js';
-
-export async function extractUserData(profileUrl, proxyUrl) {
-  const profileHtml = await fetchHtml(profileUrl, proxyUrl);
-  const section = extractUserSection(profileHtml);
-  if (!section) throw new Error('无法解析用户信息');
-  const data = parseUserSection(section);
-  data.locationCreated = extractLocationCreated(profileHtml);
-  return data;
-}
-
-export async function extractVideoLocation(videoUrl, proxyUrl) {
-  const videoHtml = await fetchHtml(videoUrl, proxyUrl);
-  return extractLocationCreated(videoHtml);
-}
-
-export async function processUrl(url, proxyUrl) {
-  if (isProfileUrl(url)) {
-    const profileUrl = toProfileUrl(url);
-    const profileData = await extractUserData(profileUrl, proxyUrl);
-    return [profileData];
-  }
-
-  if (isVideoUrl(url)) {
-    const profileHandle = extractUniqueId(url);
-    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
-
-    const profileUrl = toProfileUrl(profileHandle);
-    const [profileData, locationCreated] = await Promise.all([
-      extractUserData(profileUrl, proxyUrl),
-      extractVideoLocation(url, proxyUrl),
-    ]);
-
-    return [{ ...profileData, locationCreated }];
-  }
-
-  return [];
-}
+import { extractUserSection, parseUserSection, extractLocationCreated } from './parser.js';
+import { fetchHtml, isProfileUrl } from './fetcher.js';
+import { toProfileUrl, isVideoUrl, extractUniqueId } from './url.js';
+
+export async function extractUserData(profileUrl, proxyUrl) {
+  const profileHtml = await fetchHtml(profileUrl, proxyUrl);
+  const section = extractUserSection(profileHtml);
+  if (!section) throw new Error('无法解析用户信息');
+  const data = parseUserSection(section);
+  data.locationCreated = extractLocationCreated(profileHtml);
+  return data;
+}
+
+export async function extractVideoLocation(videoUrl, proxyUrl) {
+  const videoHtml = await fetchHtml(videoUrl, proxyUrl);
+  return extractLocationCreated(videoHtml);
+}
+
+export async function processUrl(url, proxyUrl) {
+  if (isProfileUrl(url)) {
+    const profileUrl = toProfileUrl(url);
+    const profileData = await extractUserData(profileUrl, proxyUrl);
+    return [profileData];
+  }
+
+  if (isVideoUrl(url)) {
+    const profileHandle = extractUniqueId(url);
+    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
+
+    const profileUrl = toProfileUrl(profileHandle);
+    const [profileData, locationCreated] = await Promise.all([
+      extractUserData(profileUrl, proxyUrl),
+      extractVideoLocation(url, proxyUrl),
+    ]);
+
+    return [{ ...profileData, locationCreated }];
+  }
+
+  return [];
+}