tt-help-cli-ycl 1.3.21 → 1.3.22

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/lib/page-error-detector.js

@@ -50,6 +50,7 @@ const PATTERNS = {
     "发起对话",
     "0 条评论",
   ],
+  service_error: ["出错了", "很抱歉"],
 };
 
 export async function detectPageError(page) {

package/src/lib/parse-ssr.mjs

@@ -1,69 +1,69 @@
-function parseSSR(rawHtml) {
-  if (!rawHtml.includes('__UNIVERSAL_DATA_FOR_REHYDRATION__')) return null;
-  const dataStart = rawHtml.indexOf('__UNIVERSAL_DATA_FOR_REHYDRATION__');
-  // 从该字符串后面找 <script 标签的 >，确保找到的是正确行的 >
-  const scriptStart = rawHtml.lastIndexOf('<script', dataStart);
-  const sIdx = (scriptStart >= 0 ? rawHtml.indexOf('>', scriptStart) : rawHtml.indexOf('>', dataStart)) + 1;
-  const eIdx = rawHtml.indexOf('</script>', sIdx);
-  if (sIdx < 0 || eIdx < 0) return null;
-  const jsonStr = rawHtml.substring(sIdx, eIdx);
-  return JSON.parse(jsonStr);
-}
-
-export function parseUserInfo(rawHtml) {
-  const data = parseSSR(rawHtml);
-  if (!data) return null;
-  const ud = data.__DEFAULT_SCOPE__['webapp.user-detail'];
-  if (!ud || !ud.userInfo) return null;
-  const u = ud.userInfo.user;
-  const s = ud.userInfo.stats;
-  return {
-    uniqueId: u.uniqueId,
-    nickname: u.nickname,
-    id: u.id,
-    verified: u.verified,
-    privateAccount: u.privateAccount,
-    language: u.language,
-    bio: u.signature || '',
-    avatar: u.avatarLarger || u.avatarMedium || u.avatarThumb || '',
-    followerCount: s.followerCount,
-    followingCount: s.followingCount,
-    heartCount: s.heartCount,
-    videoCount: s.videoCount,
-    diggCount: s.diggCount,
-    friendCount: s.friendCount,
-    secUid: u.secUid,
-    ttSeller: u.ttSeller || false,
-    locationCreated: u.locationCreated || null,
-  };
-}
-
-export function parseVideoInfo(rawHtml) {
-  const data = parseSSR(rawHtml);
-  if (!data) return null;
-  const vd = data.__DEFAULT_SCOPE__['webapp.video-detail'];
-  if (!vd || !vd.itemInfo || !vd.itemInfo.itemStruct) return null;
-  const item = vd.itemInfo.itemStruct;
-  const author = item.author || {};
-  const stats = item.stats || {};
-  return {
-    id: item.id,
-    desc: item.desc || '',
-    createTime: item.createTime || null,
-    locationCreated: item.locationCreated || null,
-    author: {
-      uniqueId: author.uniqueId,
-      nickname: author.nickname,
-      id: author.id,
-      verified: author.verified,
-      secUid: author.secUid,
-    },
-    stats: {
-      playCount: stats.playCount,
-      diggCount: stats.diggCount,
-      commentCount: stats.commentCount,
-      shareCount: stats.shareCount,
-      collectCount: stats.collectCount,
-    },
-  };
-}
+function parseSSR(rawHtml) {
+  if (!rawHtml.includes('__UNIVERSAL_DATA_FOR_REHYDRATION__')) return null;
+  const dataStart = rawHtml.indexOf('__UNIVERSAL_DATA_FOR_REHYDRATION__');
+  // 从该字符串后面找 <script 标签的 >，确保找到的是正确行的 >
+  const scriptStart = rawHtml.lastIndexOf('<script', dataStart);
+  const sIdx = (scriptStart >= 0 ? rawHtml.indexOf('>', scriptStart) : rawHtml.indexOf('>', dataStart)) + 1;
+  const eIdx = rawHtml.indexOf('</script>', sIdx);
+  if (sIdx < 0 || eIdx < 0) return null;
+  const jsonStr = rawHtml.substring(sIdx, eIdx);
+  return JSON.parse(jsonStr);
+}
+
+export function parseUserInfo(rawHtml) {
+  const data = parseSSR(rawHtml);
+  if (!data) return null;
+  const ud = data.__DEFAULT_SCOPE__['webapp.user-detail'];
+  if (!ud || !ud.userInfo) return null;
+  const u = ud.userInfo.user;
+  const s = ud.userInfo.stats;
+  return {
+    uniqueId: u.uniqueId,
+    nickname: u.nickname,
+    id: u.id,
+    verified: u.verified,
+    privateAccount: u.privateAccount,
+    language: u.language,
+    bio: u.signature || '',
+    avatar: u.avatarLarger || u.avatarMedium || u.avatarThumb || '',
+    followerCount: s.followerCount,
+    followingCount: s.followingCount,
+    heartCount: s.heartCount,
+    videoCount: s.videoCount,
+    diggCount: s.diggCount,
+    friendCount: s.friendCount,
+    secUid: u.secUid,
+    ttSeller: u.ttSeller || false,
+    locationCreated: u.locationCreated || null,
+  };
+}
+
+export function parseVideoInfo(rawHtml) {
+  const data = parseSSR(rawHtml);
+  if (!data) return null;
+  const vd = data.__DEFAULT_SCOPE__['webapp.video-detail'];
+  if (!vd || !vd.itemInfo || !vd.itemInfo.itemStruct) return null;
+  const item = vd.itemInfo.itemStruct;
+  const author = item.author || {};
+  const stats = item.stats || {};
+  return {
+    id: item.id,
+    desc: item.desc || '',
+    createTime: item.createTime || null,
+    locationCreated: item.locationCreated || null,
+    author: {
+      uniqueId: author.uniqueId,
+      nickname: author.nickname,
+      id: author.id,
+      verified: author.verified,
+      secUid: author.secUid,
+    },
+    stats: {
+      playCount: stats.playCount,
+      diggCount: stats.diggCount,
+      commentCount: stats.commentCount,
+      shareCount: stats.shareCount,
+      collectCount: stats.collectCount,
+    },
+  };
+}

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,89 +1,89 @@
-import { TikTokScraper } from './tiktok-scraper.mjs';
-import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from './url.js';
-
-// Lazy singleton for TikTokScraper
-let scraperInstance = null;
-let scraperInitPromise = null;
-
-async function getScraper() {
-  if (scraperInstance) return scraperInstance;
-  if (scraperInitPromise) return scraperInitPromise;
-  scraperInitPromise = (async () => {
-    const scraper = new TikTokScraper();
-    await scraper.init();
-    scraperInstance = scraper;
-    scraperInitPromise = null;
-    return scraper;
-  })();
-  return scraperInitPromise;
-}
-
-export async function closeScraper() {
-  if (scraperInstance) {
-    await scraperInstance.close();
-    scraperInstance = null;
-  }
-}
-
-// Map parseUserInfo output to legacy parser.js format
-function mapUserInfo(user) {
-  if (!user) return null;
-  return {
-    uniqueId: user.uniqueId,
-    uid: user.id,
-    secUid: user.secUid,
-    nickname: user.nickname,
-    signature: user.bio,
-    ttSeller: user.ttSeller,
-    verified: user.verified,
-    followerCount: user.followerCount,
-    followingCount: user.followingCount,
-    heartCount: user.heartCount,
-    videoCount: user.videoCount,
-    diggCount: user.diggCount,
-    avatarLarger: user.avatar,
-    locationCreated: user.locationCreated,
-  };
-}
-
-// Map parseVideoInfo output to legacy format
-function mapVideoLocation(video) {
-  if (!video) return null;
-  return video.locationCreated;
-}
-
-export async function extractUserData(url) {
-  const scraper = await getScraper();
-  const uniqueId = extractUniqueId(url);
-  if (!uniqueId) throw new Error(`无法从URL提取用户名: ${url}`);
-  const user = await scraper.getUserInfo(normalizeUsername(uniqueId));
-  if (!user) throw new Error('无法解析用户信息');
-  return mapUserInfo(user);
-}
-
-export async function extractVideoLocation(videoUrl) {
-  const scraper = await getScraper();
-  const video = await scraper.getVideoInfo(videoUrl);
-  return mapVideoLocation(video);
-}
-
-export async function processUrl(url) {
-  if (isProfileUrl(url)) {
-    const profileData = await extractUserData(url);
-    return [profileData];
-  }
-
-  if (isVideoUrl(url)) {
-    const profileHandle = extractUniqueId(url);
-    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
-
-    const [profileData, locationCreated] = await Promise.all([
-      extractUserData(url),
-      extractVideoLocation(url),
-    ]);
-
-    return [{ ...profileData, locationCreated }];
-  }
-
-  return [];
-}
+import { TikTokScraper } from './tiktok-scraper.mjs';
+import { isProfileUrl, isVideoUrl, extractUniqueId, normalizeUsername } from './url.js';
+
+// Lazy singleton for TikTokScraper
+let scraperInstance = null;
+let scraperInitPromise = null;
+
+async function getScraper() {
+  if (scraperInstance) return scraperInstance;
+  if (scraperInitPromise) return scraperInitPromise;
+  scraperInitPromise = (async () => {
+    const scraper = new TikTokScraper();
+    await scraper.init();
+    scraperInstance = scraper;
+    scraperInitPromise = null;
+    return scraper;
+  })();
+  return scraperInitPromise;
+}
+
+export async function closeScraper() {
+  if (scraperInstance) {
+    await scraperInstance.close();
+    scraperInstance = null;
+  }
+}
+
+// Map parseUserInfo output to legacy parser.js format
+function mapUserInfo(user) {
+  if (!user) return null;
+  return {
+    uniqueId: user.uniqueId,
+    uid: user.id,
+    secUid: user.secUid,
+    nickname: user.nickname,
+    signature: user.bio,
+    ttSeller: user.ttSeller,
+    verified: user.verified,
+    followerCount: user.followerCount,
+    followingCount: user.followingCount,
+    heartCount: user.heartCount,
+    videoCount: user.videoCount,
+    diggCount: user.diggCount,
+    avatarLarger: user.avatar,
+    locationCreated: user.locationCreated,
+  };
+}
+
+// Map parseVideoInfo output to legacy format
+function mapVideoLocation(video) {
+  if (!video) return null;
+  return video.locationCreated;
+}
+
+export async function extractUserData(url) {
+  const scraper = await getScraper();
+  const uniqueId = extractUniqueId(url);
+  if (!uniqueId) throw new Error(`无法从URL提取用户名: ${url}`);
+  const user = await scraper.getUserInfo(normalizeUsername(uniqueId));
+  if (!user) throw new Error('无法解析用户信息');
+  return mapUserInfo(user);
+}
+
+export async function extractVideoLocation(videoUrl) {
+  const scraper = await getScraper();
+  const video = await scraper.getVideoInfo(videoUrl);
+  return mapVideoLocation(video);
+}
+
+export async function processUrl(url) {
+  if (isProfileUrl(url)) {
+    const profileData = await extractUserData(url);
+    return [profileData];
+  }
+
+  if (isVideoUrl(url)) {
+    const profileHandle = extractUniqueId(url);
+    if (!profileHandle) throw new Error(`无法从视频URL提取用户主页: ${url}`);
+
+    const [profileData, locationCreated] = await Promise.all([
+      extractUserData(url),
+      extractVideoLocation(url),
+    ]);
+
+    return [{ ...profileData, locationCreated }];
+  }
+
+  return [];
+}