tt-help-cli-ycl 1.3.20 → 1.3.21

package/scripts/run-explore.sh

@@ -1,73 +1,73 @@
-#!/bin/bash
-
-PACKAGENAME="tt-help-cli-ycl"
-TARGET_SERVER="http://117.71.53.99:17301"
-CONFIG_PATH="$HOME/.tt-help.json"
-
-echo "========================================"
-echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
-echo "========================================"
-
-# ---------- 1. 检查/安装最新版本 ----------
-LATEST_VERSION=$(npm view "$PACKAGENAME" version 2>/dev/null)
-
-if [ -z "$LATEST_VERSION" ]; then
-  echo "[错误] 无法从 npm 获取最新版本信息"
-  exit 1
-fi
-
-INSTALLED_VERSION=$(npm list -g "$PACKAGENAME" --depth=0 2>/dev/null | grep "$PACKAGENAME@" | head -1 | sed 's/.*@//' | sed 's/[) ].*//')
-
-if [ -z "$INSTALLED_VERSION" ]; then
-  echo "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
-  npm install -g "$PACKAGENAME"
-  if [ $? -eq 0 ]; then
-    echo "[OK] 安装完成: $LATEST_VERSION"
-  else
-    echo "[错误] 安装失败，请手动执行: npm install -g $PACKAGENAME"
-    exit 1
-  fi
-elif [ "$INSTALLED_VERSION" = "$LATEST_VERSION" ]; then
-  echo "[OK] tt-help-cli-ycl 已是最新版本: $LATEST_VERSION"
-else
-  echo "[提示] 当前版本: $INSTALLED_VERSION, 最新版本: $LATEST_VERSION"
-  echo "[执行] 正在升级最新版本..."
-  npm install -g "$PACKAGENAME" 2>/dev/null
-  if [ $? -eq 0 ]; then
-    echo "[OK] 安装完成: $LATEST_VERSION"
-  else
-    echo "[警告] 自动安装失败，尝试手动更新..."
-    npm update -g "$PACKAGENAME"
-  fi
-fi
-
-# ---------- 2. 检查/设置 server 配置 ----------
-CURRENT_SERVER=""
-if [ -f "$CONFIG_PATH" ]; then
-  CURRENT_SERVER=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.server||'')}catch(e){}" 2>/dev/null)
-fi
-
-if [ "$CURRENT_SERVER" = "$TARGET_SERVER" ]; then
-  echo "[OK] Server 配置正确: $TARGET_SERVER"
-else
-  echo "[提示] 当前 server: ${CURRENT_SERVER:-未设置}, 目标: $TARGET_SERVER"
-  echo "[执行] 正在设置 server 配置..."
-  node -e "
-const fs = require('fs');
-const path = require('path');
-const configPath = path.join(require('os').homedir(), '.tt-help.json');
-let cfg = {};
-try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
-cfg.server = '$TARGET_SERVER';
-fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
-console.log('  已写入: ' + configPath);
-"
-  echo "[OK] Server 配置已设置"
-fi
-
-# ---------- 3. 启动 tt-help explore ----------
-echo ""
-echo "========================================"
-echo "  启动 tt-help explore"
-echo "========================================"
-tt-help explore
+#!/bin/bash
+
+PACKAGENAME="tt-help-cli-ycl"
+TARGET_SERVER="http://117.71.53.99:17301"
+CONFIG_PATH="$HOME/.tt-help.json"
+
+echo "========================================"
+echo "  tt-help-cli-ycl 一键启动脚本 (macOS)"
+echo "========================================"
+
+# ---------- 1. 检查/安装最新版本 ----------
+LATEST_VERSION=$(npm view "$PACKAGENAME" version 2>/dev/null)
+
+if [ -z "$LATEST_VERSION" ]; then
+  echo "[错误] 无法从 npm 获取最新版本信息"
+  exit 1
+fi
+
+INSTALLED_VERSION=$(npm list -g "$PACKAGENAME" --depth=0 2>/dev/null | grep "$PACKAGENAME@" | head -1 | sed 's/.*@//' | sed 's/[) ].*//')
+
+if [ -z "$INSTALLED_VERSION" ]; then
+  echo "[提示] tt-help-cli-ycl 未安装，正在安装最新版本..."
+  npm install -g "$PACKAGENAME"
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[错误] 安装失败，请手动执行: npm install -g $PACKAGENAME"
+    exit 1
+  fi
+elif [ "$INSTALLED_VERSION" = "$LATEST_VERSION" ]; then
+  echo "[OK] tt-help-cli-ycl 已是最新版本: $LATEST_VERSION"
+else
+  echo "[提示] 当前版本: $INSTALLED_VERSION, 最新版本: $LATEST_VERSION"
+  echo "[执行] 正在升级最新版本..."
+  npm install -g "$PACKAGENAME" 2>/dev/null
+  if [ $? -eq 0 ]; then
+    echo "[OK] 安装完成: $LATEST_VERSION"
+  else
+    echo "[警告] 自动安装失败，尝试手动更新..."
+    npm update -g "$PACKAGENAME"
+  fi
+fi
+
+# ---------- 2. 检查/设置 server 配置 ----------
+CURRENT_SERVER=""
+if [ -f "$CONFIG_PATH" ]; then
+  CURRENT_SERVER=$(node -e "try{const c=JSON.parse(require('fs').readFileSync('$CONFIG_PATH','utf-8'));console.log(c.server||'')}catch(e){}" 2>/dev/null)
+fi
+
+if [ "$CURRENT_SERVER" = "$TARGET_SERVER" ]; then
+  echo "[OK] Server 配置正确: $TARGET_SERVER"
+else
+  echo "[提示] 当前 server: ${CURRENT_SERVER:-未设置}, 目标: $TARGET_SERVER"
+  echo "[执行] 正在设置 server 配置..."
+  node -e "
+const fs = require('fs');
+const path = require('path');
+const configPath = path.join(require('os').homedir(), '.tt-help.json');
+let cfg = {};
+try { cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8')); } catch(e) {}
+cfg.server = '$TARGET_SERVER';
+fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2), 'utf-8');
+console.log('  已写入: ' + configPath);
+"
+  echo "[OK] Server 配置已设置"
+fi
+
+# ---------- 3. 启动 tt-help explore ----------
+echo ""
+echo "========================================"
+echo "  启动 tt-help explore"
+echo "========================================"
+tt-help explore

package/src/cli/attach.js

@@ -1,180 +1,180 @@
-import { TikTokScraper } from '../lib/tiktok-scraper.mjs';
-
-const MAX_RETRY_WAIT = 5 * 60 * 1000;
-
-async function withRetry(label, fn) {
-  let backoff = 1000;
-  while (true) {
-    try {
-      return await fn();
-    } catch (err) {
-      console.error(`[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`);
-      await new Promise(r => setTimeout(r, backoff));
-      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
-    }
-  }
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    return res.json();
-  });
-}
-
-
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-    });
-    return res.json();
-  });
-}
-
-function isBrowserClosedError(err) {
-  if (!err) return false;
-  const msg = err.message || err.toString() || '';
-  return msg.includes('Target page, context or browser has been closed') ||
-         msg.includes('browser has been closed') ||
-         msg.includes('browserContext.newPage') ||
-         msg.includes('Protocol error');
-}
-
-export async function handleAttach(options) {
-  const { attachParallel, attachInterval, serverUrl, showHelp } = options;
-
-  if (showHelp) {
-    console.error('用法: tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址]');
-    console.error('');
-    console.error('参数:');
-    console.error('  -p, --parallel <N>     并行抓取数（默认: 1）');
-    console.error('  -i, --interval <N>     无任务时轮询间隔，单位秒（默认: 10）');
-    console.error('  -s, --server <URL>     服务端地址（默认: http://127.0.0.1:3001）');
-    console.error('');
-    console.error('说明:');
-    console.error('  后台轮询服务端 /api/user-update-tasks 接口，自动抓取 TikTok 用户信息');
-    console.error('  抓取完成后通过 PUT /api/user-update-result/{uniqueId} 回传结果');
-    console.error('  浏览器崩溃时自动重启，支持长时间无人值守运行');
-    console.error('');
-    console.error('示例:');
-    console.error('  tt-help attach');
-    console.error('  tt-help attach -p 5 -i 10');
-    console.error('  tt-help attach -p 3 -i 5 -s http://127.0.0.1:3001');
-    return;
-  }
-
-  console.error(`[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}`);
-
-  const scraper = new TikTokScraper();
-
-  try {
-    await scraper.init();
-    console.error('[Attach] 浏览器初始化完成，开始循环接收任务...');
-
-    let loopCount = 0;
-    let browserRestartCount = 0;
-
-    while (true) {
-      loopCount++;
-
-      // 检查浏览器是否存活，不存活则重启
-      if (!scraper.isAlive()) {
-        console.error(`[Attach] 浏览器已关闭，正在重启 (${++browserRestartCount})...`);
-        await scraper.restart();
-        console.error('[Attach] 浏览器重启完成');
-      }
-
-      const { total, tasks } = await apiGet(`${serverUrl}/api/user-update-tasks?limit=${attachParallel}`);
-
-      if (!tasks || tasks.length === 0) {
-        if (loopCount === 1) {
-          console.error(`[Attach] 当前无待更新任务，${attachInterval}秒后重试...`);
-        }
-        await new Promise(r => setTimeout(r, attachInterval * 1000));
-        continue;
-      }
-
-      console.error(`\n[Attach] 获取到 ${tasks.length} 个待更新任务...`);
-
-      const results = await Promise.allSettled(
-        tasks.map(async (task) => {
-          const uniqueId = task.uniqueId;
-          console.error(`  → 获取 @${uniqueId} 的用户信息...`);
-          try {
-            const info = await scraper.getUserInfo(uniqueId);
-            return { uniqueId, info, error: null };
-          } catch (err) {
-            return { uniqueId, info: null, error: err };
-          }
-        })
-      );
-
-       let successCount = 0;
-       let failCount = 0;
-       let needRestart = false;
-
-       // 收集抓取成功的任务，记录抓取失败的
-       const successTasks = [];
-       for (const result of results) {
-         if (result.status === 'fulfilled') {
-           const { uniqueId, info, error } = result.value;
-           if (error) {
-             if (isBrowserClosedError(error)) {
-               needRestart = true;
-             }
-             console.error(`  ✗ @${uniqueId} 获取失败: ${error.message || '未知错误'}`);
-             failCount++;
-           } else if (info) {
-             successTasks.push({ uniqueId, info });
-           } else {
-             console.error(`  ✗ @${uniqueId} 未获取到用户信息`);
-             failCount++;
-           }
-         } else {
-           console.error(`  ✗ 任务执行异常: ${result.reason?.message || '未知错误'}`);
-           failCount++;
-         }
-       }
-
-       // 批量提交成功的结果
-       if (successTasks.length > 0) {
-         try {
-           const batchRet = await apiPost(`${serverUrl}/api/user-info-batch`, { updates: successTasks });
-           if (batchRet && batchRet.results) {
-             for (const r of batchRet.results) {
-               if (r.ok) {
-                 successCount++;
-                 console.error(`  ✓ @${r.uniqueId} 已提交更新`);
-               } else {
-                 failCount++;
-                 console.error(`  ✗ @${r.uniqueId} 提交失败: ${r.error}`);
-               }
-             }
-           } else {
-             successCount = successTasks.length;
-             console.error(`  ✓ 批量提交完成 (${successTasks.length} 条)`);
-           }
-         } catch (err) {
-           failCount += successTasks.length;
-           console.error(`  ✗ 批量提交失败: ${err.message}`);
-         }
-       }
-
-      console.error(`  本批结果: ${successCount} 成功, ${failCount} 失败\n`);
-
-      if (needRestart) {
-        console.error('[Attach] 检测到浏览器异常，将在下一轮重启...');
-      }
-
-      await new Promise(r => setTimeout(r, 500));
-    }
-  } catch (err) {
-    console.error(`[Attach] 运行异常: ${err.message}`);
-    throw err;
-  } finally {
-    await scraper.close();
-  }
-}
+import { TikTokScraper } from '../lib/tiktok-scraper.mjs';
+
+const MAX_RETRY_WAIT = 5 * 60 * 1000;
+
+async function withRetry(label, fn) {
+  let backoff = 1000;
+  while (true) {
+    try {
+      return await fn();
+    } catch (err) {
+      console.error(`[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`);
+      await new Promise(r => setTimeout(r, backoff));
+      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
+    }
+  }
+}
+
+async function apiGet(url) {
+  return withRetry(`GET ${url}`, async () => {
+    const res = await fetch(url);
+    return res.json();
+  });
+}
+
+
+async function apiPost(url, body) {
+  return withRetry(`POST ${url}`, async () => {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),
+    });
+    return res.json();
+  });
+}
+
+function isBrowserClosedError(err) {
+  if (!err) return false;
+  const msg = err.message || err.toString() || '';
+  return msg.includes('Target page, context or browser has been closed') ||
+         msg.includes('browser has been closed') ||
+         msg.includes('browserContext.newPage') ||
+         msg.includes('Protocol error');
+}
+
+export async function handleAttach(options) {
+  const { attachParallel, attachInterval, serverUrl, showHelp } = options;
+
+  if (showHelp) {
+    console.error('用法: tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址]');
+    console.error('');
+    console.error('参数:');
+    console.error('  -p, --parallel <N>     并行抓取数（默认: 1）');
+    console.error('  -i, --interval <N>     无任务时轮询间隔，单位秒（默认: 10）');
+    console.error('  -s, --server <URL>     服务端地址（默认: http://127.0.0.1:3001）');
+    console.error('');
+    console.error('说明:');
+    console.error('  后台轮询服务端 /api/user-update-tasks 接口，自动抓取 TikTok 用户信息');
+    console.error('  抓取完成后通过 PUT /api/user-update-result/{uniqueId} 回传结果');
+    console.error('  浏览器崩溃时自动重启，支持长时间无人值守运行');
+    console.error('');
+    console.error('示例:');
+    console.error('  tt-help attach');
+    console.error('  tt-help attach -p 5 -i 10');
+    console.error('  tt-help attach -p 3 -i 5 -s http://127.0.0.1:3001');
+    return;
+  }
+
+  console.error(`[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}`);
+
+  const scraper = new TikTokScraper();
+
+  try {
+    await scraper.init();
+    console.error('[Attach] 浏览器初始化完成，开始循环接收任务...');
+
+    let loopCount = 0;
+    let browserRestartCount = 0;
+
+    while (true) {
+      loopCount++;
+
+      // 检查浏览器是否存活，不存活则重启
+      if (!scraper.isAlive()) {
+        console.error(`[Attach] 浏览器已关闭，正在重启 (${++browserRestartCount})...`);
+        await scraper.restart();
+        console.error('[Attach] 浏览器重启完成');
+      }
+
+      const { total, tasks } = await apiGet(`${serverUrl}/api/user-update-tasks?limit=${attachParallel}`);
+
+      if (!tasks || tasks.length === 0) {
+        if (loopCount === 1) {
+          console.error(`[Attach] 当前无待更新任务，${attachInterval}秒后重试...`);
+        }
+        await new Promise(r => setTimeout(r, attachInterval * 1000));
+        continue;
+      }
+
+      console.error(`\n[Attach] 获取到 ${tasks.length} 个待更新任务...`);
+
+      const results = await Promise.allSettled(
+        tasks.map(async (task) => {
+          const uniqueId = task.uniqueId;
+          console.error(`  → 获取 @${uniqueId} 的用户信息...`);
+          try {
+            const info = await scraper.getUserInfo(uniqueId);
+            return { uniqueId, info, error: null };
+          } catch (err) {
+            return { uniqueId, info: null, error: err };
+          }
+        })
+      );
+
+       let successCount = 0;
+       let failCount = 0;
+       let needRestart = false;
+
+       // 收集抓取成功的任务，记录抓取失败的
+       const successTasks = [];
+       for (const result of results) {
+         if (result.status === 'fulfilled') {
+           const { uniqueId, info, error } = result.value;
+           if (error) {
+             if (isBrowserClosedError(error)) {
+               needRestart = true;
+             }
+             console.error(`  ✗ @${uniqueId} 获取失败: ${error.message || '未知错误'}`);
+             failCount++;
+           } else if (info) {
+             successTasks.push({ uniqueId, info });
+           } else {
+             console.error(`  ✗ @${uniqueId} 未获取到用户信息`);
+             failCount++;
+           }
+         } else {
+           console.error(`  ✗ 任务执行异常: ${result.reason?.message || '未知错误'}`);
+           failCount++;
+         }
+       }
+
+       // 批量提交成功的结果
+       if (successTasks.length > 0) {
+         try {
+           const batchRet = await apiPost(`${serverUrl}/api/user-info-batch`, { updates: successTasks });
+           if (batchRet && batchRet.results) {
+             for (const r of batchRet.results) {
+               if (r.ok) {
+                 successCount++;
+                 console.error(`  ✓ @${r.uniqueId} 已提交更新`);
+               } else {
+                 failCount++;
+                 console.error(`  ✗ @${r.uniqueId} 提交失败: ${r.error}`);
+               }
+             }
+           } else {
+             successCount = successTasks.length;
+             console.error(`  ✓ 批量提交完成 (${successTasks.length} 条)`);
+           }
+         } catch (err) {
+           failCount += successTasks.length;
+           console.error(`  ✗ 批量提交失败: ${err.message}`);
+         }
+       }
+
+      console.error(`  本批结果: ${successCount} 成功, ${failCount} 失败\n`);
+
+      if (needRestart) {
+        console.error('[Attach] 检测到浏览器异常，将在下一轮重启...');
+      }
+
+      await new Promise(r => setTimeout(r, 500));
+    }
+  } catch (err) {
+    console.error(`[Attach] 运行异常: ${err.message}`);
+    throw err;
+  } finally {
+    await scraper.close();
+  }
+}