tt-help-cli-ycl 1.3.45 → 1.3.47

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,90 @@
-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) return null;
+  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 ? [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),
+    ]);
+
+    if (!profileData) return [];
+    return [{ ...profileData, locationCreated }];
+  }
+
+  return [];
+}

package/src/lib/target-locations.js

@@ -1,61 +1,61 @@
-const DEFAULT_TARGET_LOCATIONS = [
-  "CZ",
-  "GR",
-  "HU",
-  "PT",
-  "ES",
-  "PL",
-  "NL",
-  "BE",
-  "DE",
-  "FR",
-  "IT",
-  "IE",
-  "AT",
-];
-
-const DEFAULT_TARGET_LOCATIONS_CSV = DEFAULT_TARGET_LOCATIONS.join(",");
-
-function normalizeLocation(location) {
-  if (location == null) return null;
-  const normalized = String(location).trim().toUpperCase();
-  return normalized || null;
-}
-
-function normalizeLocationList(locations, fallback = DEFAULT_TARGET_LOCATIONS) {
-  const source = Array.isArray(locations)
-    ? locations
-    : String(locations == null ? "" : locations).split(",");
-  const normalized = source
-    .map((location) => normalizeLocation(location))
-    .filter(Boolean);
-  return normalized.length > 0 ? [...new Set(normalized)] : [...fallback];
-}
-
-function isLocationInList(location, locations) {
-  const normalizedLocation = normalizeLocation(location);
-  if (!normalizedLocation) return false;
-  return normalizeLocationList(locations).includes(normalizedLocation);
-}
-
-function findFirstMatchingLocation(
-  locations,
-  targetLocations = DEFAULT_TARGET_LOCATIONS,
-) {
-  const normalizedTargetLocations = normalizeLocationList(targetLocations);
-  const normalizedLocations = normalizeLocationList(locations, []);
-  return (
-    normalizedLocations.find((location) =>
-      normalizedTargetLocations.includes(location),
-    ) || null
-  );
-}
-
-export {
-  DEFAULT_TARGET_LOCATIONS,
-  DEFAULT_TARGET_LOCATIONS_CSV,
-  findFirstMatchingLocation,
-  isLocationInList,
-  normalizeLocation,
-  normalizeLocationList,
-};
+const DEFAULT_TARGET_LOCATIONS = [
+  "CZ",
+  "GR",
+  "HU",
+  "PT",
+  "ES",
+  "PL",
+  "NL",
+  "BE",
+  "DE",
+  "FR",
+  "IT",
+  "IE",
+  "AT",
+];
+
+const DEFAULT_TARGET_LOCATIONS_CSV = DEFAULT_TARGET_LOCATIONS.join(",");
+
+function normalizeLocation(location) {
+  if (location == null) return null;
+  const normalized = String(location).trim().toUpperCase();
+  return normalized || null;
+}
+
+function normalizeLocationList(locations, fallback = DEFAULT_TARGET_LOCATIONS) {
+  const source = Array.isArray(locations)
+    ? locations
+    : String(locations == null ? "" : locations).split(",");
+  const normalized = source
+    .map((location) => normalizeLocation(location))
+    .filter(Boolean);
+  return normalized.length > 0 ? [...new Set(normalized)] : [...fallback];
+}
+
+function isLocationInList(location, locations) {
+  const normalizedLocation = normalizeLocation(location);
+  if (!normalizedLocation) return false;
+  return normalizeLocationList(locations).includes(normalizedLocation);
+}
+
+function findFirstMatchingLocation(
+  locations,
+  targetLocations = DEFAULT_TARGET_LOCATIONS,
+) {
+  const normalizedTargetLocations = normalizeLocationList(targetLocations);
+  const normalizedLocations = normalizeLocationList(locations, []);
+  return (
+    normalizedLocations.find((location) =>
+      normalizedTargetLocations.includes(location),
+    ) || null
+  );
+}
+
+export {
+  DEFAULT_TARGET_LOCATIONS,
+  DEFAULT_TARGET_LOCATIONS_CSV,
+  findFirstMatchingLocation,
+  isLocationInList,
+  normalizeLocation,
+  normalizeLocationList,
+};