tt-help-cli-ycl 1.3.6 → 1.3.7

package/src/lib/filter.js

@@ -1,66 +1,66 @@
-export function parseFilter(filterStr) {
-  if (!filterStr) return null;
-
-  const filter = {};
-  const pairs = filterStr.split('&');
-
-  for (const pair of pairs) {
-    const [key, value] = pair.split('=');
-    if (!key || value === undefined) continue;
-
-    const trimmedKey = key.trim();
-    const trimmedValue = value.trim();
-
-    // 处理布尔值
-    if (trimmedValue === 'true') {
-      filter[trimmedKey] = true;
-    } else if (trimmedValue === 'false') {
-      filter[trimmedKey] = false;
-    } else {
-      // 支持逗号分隔的多个值（如 locationCreated=DE,ES）
-      filter[trimmedKey] = trimmedValue.split(',').map(v => v.trim());
-    }
-  }
-
-  return Object.keys(filter).length > 0 ? filter : null;
-}
-
-export function applyFilter(results, filter) {
-  if (!filter || results.length === 0) return results;
-
-  return results.filter(item => {
-    for (const [key, expectedValue] of Object.entries(filter)) {
-      const actualValue = item[key];
-
-      // 如果字段不存在，过滤掉
-      if (actualValue === undefined || actualValue === null) {
-        return false;
-      }
-
-      // 数组值匹配（如 locationCreated=DE,ES）
-      if (Array.isArray(expectedValue)) {
-        if (!expectedValue.includes(String(actualValue))) {
-          return false;
-        }
-      }
-      // 布尔值或精确匹配
-      else if (actualValue !== expectedValue) {
-        return false;
-      }
-    }
-    return true;
-  });
-}
-
-export function formatFilterDescription(filter) {
-  if (!filter) return '';
-
-  const parts = Object.entries(filter).map(([key, value]) => {
-    if (Array.isArray(value)) {
-      return `${key}=${value.join(',')}`;
-    }
-    return `${key}=${value}`;
-  });
-
-  return parts.join(' & ');
-}
+export function parseFilter(filterStr) {
+  if (!filterStr) return null;
+
+  const filter = {};
+  const pairs = filterStr.split('&');
+
+  for (const pair of pairs) {
+    const [key, value] = pair.split('=');
+    if (!key || value === undefined) continue;
+
+    const trimmedKey = key.trim();
+    const trimmedValue = value.trim();
+
+    // 处理布尔值
+    if (trimmedValue === 'true') {
+      filter[trimmedKey] = true;
+    } else if (trimmedValue === 'false') {
+      filter[trimmedKey] = false;
+    } else {
+      // 支持逗号分隔的多个值（如 locationCreated=DE,ES）
+      filter[trimmedKey] = trimmedValue.split(',').map(v => v.trim());
+    }
+  }
+
+  return Object.keys(filter).length > 0 ? filter : null;
+}
+
+export function applyFilter(results, filter) {
+  if (!filter || results.length === 0) return results;
+
+  return results.filter(item => {
+    for (const [key, expectedValue] of Object.entries(filter)) {
+      const actualValue = item[key];
+
+      // 如果字段不存在，过滤掉
+      if (actualValue === undefined || actualValue === null) {
+        return false;
+      }
+
+      // 数组值匹配（如 locationCreated=DE,ES）
+      if (Array.isArray(expectedValue)) {
+        if (!expectedValue.includes(String(actualValue))) {
+          return false;
+        }
+      }
+      // 布尔值或精确匹配
+      else if (actualValue !== expectedValue) {
+        return false;
+      }
+    }
+    return true;
+  });
+}
+
+export function formatFilterDescription(filter) {
+  if (!filter) return '';
+
+  const parts = Object.entries(filter).map(([key, value]) => {
+    if (Array.isArray(value)) {
+      return `${key}=${value.join(',')}`;
+    }
+    return `${key}=${value}`;
+  });
+
+  return parts.join(' & ');
+}

package/src/lib/io.js

@@ -1,54 +1,54 @@
-import { extractDisplayPath } from './url.js';
-
-let lastBarCount = 0;
-
-export function createProgressBar(current, total, maxWidth = 30) {
-  const filled = Math.round((current / total) * maxWidth);
-  return '█'.repeat(filled).padEnd(maxWidth);
-}
-
-export function calculateConcurrency(total) {
-  return Math.min(5, Math.max(1, Math.floor(total / 10)), total);
-}
-
-export function createMultiProgressBars(count) {
-  return Array.from({ length: count }, () => ({
-    current: 0,
-    total: 0,
-    status: 'pending',
-    url: '',
-  }));
-}
-
-export function renderMultiProgressBars(bars, maxWidth = 30) {
-  const activeBars = bars.filter(bar => bar.total > 0);
-
-  if (activeBars.length === 0) return;
-
-  const lines = activeBars.map((bar) => {
-    const prog = createProgressBar(bar.current, bar.total, maxWidth);
-    const icon = bar.status === 'done' ? '✓' :
-                 bar.status === 'error' ? '' : '⟳';
-    const urlDisplay = bar.url ? extractDisplayPath(bar.url) : '';
-    return `  [${prog}] ${bar.current}/${bar.total} ${icon} ${urlDisplay}`;
-  });
-
-  const output = lines.join('\n');
-
-  if (lastBarCount > 0) {
-    process.stdout.write(`\x1b[${lastBarCount}A`);
-  }
-
-  process.stdout.write('\x1b[0J');
-  process.stdout.write(output + '\n');
-
-  lastBarCount = activeBars.length;
-}
-
-export function clearProgressBars() {
-  if (lastBarCount > 0) {
-    process.stdout.write(`\x1b[${lastBarCount}A`);
-    process.stdout.write('\x1b[0J');
-    lastBarCount = 0;
-  }
-}
+import { extractDisplayPath } from './url.js';
+
+let lastBarCount = 0;
+
+export function createProgressBar(current, total, maxWidth = 30) {
+  const filled = Math.round((current / total) * maxWidth);
+  return '█'.repeat(filled).padEnd(maxWidth);
+}
+
+export function calculateConcurrency(total) {
+  return Math.min(5, Math.max(1, Math.floor(total / 10)), total);
+}
+
+export function createMultiProgressBars(count) {
+  return Array.from({ length: count }, () => ({
+    current: 0,
+    total: 0,
+    status: 'pending',
+    url: '',
+  }));
+}
+
+export function renderMultiProgressBars(bars, maxWidth = 30) {
+  const activeBars = bars.filter(bar => bar.total > 0);
+
+  if (activeBars.length === 0) return;
+
+  const lines = activeBars.map((bar) => {
+    const prog = createProgressBar(bar.current, bar.total, maxWidth);
+    const icon = bar.status === 'done' ? '✓' :
+                 bar.status === 'error' ? '' : '⟳';
+    const urlDisplay = bar.url ? extractDisplayPath(bar.url) : '';
+    return `  [${prog}] ${bar.current}/${bar.total} ${icon} ${urlDisplay}`;
+  });
+
+  const output = lines.join('\n');
+
+  if (lastBarCount > 0) {
+    process.stdout.write(`\x1b[${lastBarCount}A`);
+  }
+
+  process.stdout.write('\x1b[0J');
+  process.stdout.write(output + '\n');
+
+  lastBarCount = activeBars.length;
+}
+
+export function clearProgressBars() {
+  if (lastBarCount > 0) {
+    process.stdout.write(`\x1b[${lastBarCount}A`);
+    process.stdout.write('\x1b[0J');
+    lastBarCount = 0;
+  }
+}

package/src/lib/mac-or-uuid.js

@@ -0,0 +1,82 @@
+import { exec } from 'child_process';
+import { randomBytes } from 'crypto';
+import { promisify } from 'util';
+
+const execAsync = promisify(exec);
+
+/**
+ * Get MAC address of the first non-loopback network interface
+ * Falls back to UUID if MAC cannot be retrieved
+ * @returns {Promise<string>} MAC address or UUID
+ */
+export async function getMacOrUuid() {
+  try {
+    const mac = await getMacAddress();
+    if (mac) {
+      return mac.toLowerCase().replace(/:/g, '-');
+    }
+  } catch {
+    // Fallback to UUID
+  }
+  
+  return generateUuid();
+}
+
+/**
+ * Get MAC address based on OS
+ * @returns {Promise<string|null>} MAC address or null
+ */
+async function getMacAddress() {
+  const isWindows = process.platform === 'win32';
+  const isMac = process.platform === 'darwin';
+  const isLinux = process.platform === 'linux';
+  
+  try {
+    if (isWindows) {
+      // Windows: use ipconfig
+      const { stdout } = await execAsync('ipconfig /all');
+      const match = stdout.match(/Physical\s*Address[^:]*:\s*([0-9A-Fa-f]{2}-[0-9A-Fa-f]{2}-[0-9A-Fa-f]{2}-[0-9A-Fa-f]{2}-[0-9A-Fa-f]{2}-[0-9A-Fa-f]{2})/);
+      if (match && match[1]) {
+        return match[1];
+      }
+    } else if (isMac) {
+      // macOS: use ifconfig
+      const { stdout } = await execAsync('ifconfig');
+      const match = stdout.match(/ether\s+([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})/);
+      if (match && match[1]) {
+        return match[1];
+      }
+    } else if (isLinux) {
+      // Linux: use ip command
+      const { stdout } = await execAsync('ip link show');
+      const match = stdout.match(/link\/ether\s+([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})/);
+      if (match && match[1]) {
+        return match[1];
+      }
+    }
+  } catch {
+    return null;
+  }
+  
+  return null;
+}
+
+/**
+ * Generate a UUID v4
+ * @returns {string} UUID string
+ */
+function generateUuid() {
+  const bytes = randomBytes(16);
+  bytes[6] = (bytes[6] & 0x0f) | 0x40; // version 4
+  bytes[8] = (bytes[8] & 0x3f) | 0x80; // variant RFC4122
+  
+  const hex = bytes.reduce((acc, byte, i) => {
+    const h = byte.toString(16).padStart(2, '0');
+    if ([7, 11, 15, 19].includes(i)) {
+      return acc + '-' + h;
+    }
+    return acc + h;
+  }, '');
+  
+  return hex;
+}

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/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,44 +1,44 @@
-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() || '').toLowerCase();
-  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() || '').toLowerCase();
+  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;
+}