openclawsetup 1.0.13 → 1.0.15

package/bin/cli.mjs

@@ -170,6 +170,128 @@ function safeExec(cmd, options = {}) {
   }
 }
 
+const ETA_SAMPLE_BYTES = 256 * 1024;
+const ETA_FACTOR = 2.0;
+const ETA_OVERHEAD = 8;
+
+async function fetchText(url, timeoutMs = 2000) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(url, { signal: controller.signal });
+    if (!res.ok) return '';
+    return (await res.text()).trim();
+  } catch {
+    return '';
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+function extractIPv4(text) {
+  const match = text.match(/\b(\d{1,3}\.){3}\d{1,3}\b/);
+  return match ? match[0] : '';
+}
+
+async function getPublicIP() {
+  const services = ['https://ifconfig.me/ip', 'https://icanhazip.com', 'https://ipinfo.io/ip'];
+  for (const url of services) {
+    const text = await fetchText(url);
+    const ip = extractIPv4(text);
+    if (ip && !ip.startsWith('127.')) return ip;
+  }
+
+  const result = safeExec('hostname -I 2>/dev/null || hostname -i 2>/dev/null');
+  if (result.ok && result.output) {
+    const ip = extractIPv4(result.output);
+    if (ip && !ip.startsWith('127.')) return ip;
+  }
+  return '';
+}
+
+function getNpmDistInfo(pkgName) {
+  const tarballResult = safeExec(`npm view ${pkgName}@latest dist.tarball`);
+  const sizeResult = safeExec(`npm view ${pkgName}@latest dist.size`);
+  const tarball = tarballResult.ok ? tarballResult.output.trim() : '';
+  const size = sizeResult.ok ? parseInt(sizeResult.output.trim(), 10) : 0;
+  return { tarball, size: Number.isFinite(size) ? size : 0 };
+}
+
+async function fetchContentLength(url, timeoutMs = 4000) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(url, { method: 'HEAD', signal: controller.signal });
+    const len = res.headers.get('content-length');
+    const size = len ? parseInt(len, 10) : 0;
+    return Number.isFinite(size) ? size : 0;
+  } catch {
+    return 0;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function measureDownloadSpeed(url, sampleBytes = ETA_SAMPLE_BYTES, timeoutMs = 5000) {
+  let received = 0;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const start = Date.now();
+
+  try {
+    const res = await fetch(url, {
+      headers: { Range: `bytes=0-${sampleBytes - 1}` },
+      signal: controller.signal,
+    });
+
+    if (!res.ok && res.status !== 206 && res.status !== 200) {
+      return 0;
+    }
+
+    const reader = res.body?.getReader();
+    if (!reader) return 0;
+
+    while (received < sampleBytes) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      received += value.length;
+      if (received >= sampleBytes) {
+        controller.abort();
+        break;
+      }
+    }
+  } catch {
+    // ignore
+  } finally {
+    clearTimeout(timer);
+  }
+
+  const seconds = (Date.now() - start) / 1000;
+  if (seconds <= 0 || received <= 0) return 0;
+  return received / seconds;
+}
+
+async function estimateInstallEta(pkgName) {
+  try {
+    const { tarball, size: distSize } = getNpmDistInfo(pkgName);
+    if (!tarball) return null;
+
+    let size = distSize;
+    if (!size) {
+      size = await fetchContentLength(tarball);
+    }
+    if (!size) return null;
+
+    const speed = await measureDownloadSpeed(tarball);
+    if (!speed) return null;
+
+    const estimate = Math.round((size * ETA_FACTOR) / speed + ETA_OVERHEAD);
+    return Math.max(5, estimate);
+  } catch {
+    return null;
+  }
+}
+
 // 检查 Node.js 版本
 function checkNodeVersion() {
   const version = process.version;
@@ -236,10 +358,11 @@ async function checkAndUpdate(cliName) {
 
   // 更新到最新版本
   log.info('正在更新到最新版本...');
+  const etaSeconds = await estimateInstallEta(cliName);
   const updateResult = await execWithProgress(
     `npm install -g ${cliName}@latest`,
     `正在更新 ${cliName}...`,
-    { timeout: 300000 }
+    { timeout: 300000, etaSeconds }
   );
 
   if (updateResult.ok) {
@@ -388,10 +511,15 @@ function execWithProgress(cmd, message, options = {}) {
     const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let frameIndex = 0;
     let seconds = 0;
+    const { etaSeconds, ...spawnOptions } = options;
+    const totalSeconds = Number.isFinite(etaSeconds) ? Math.max(1, Math.floor(etaSeconds)) : null;
 
     // 显示进度动画
     const spinner = setInterval(() => {
-      process.stdout.write(`\r${colors.cyan(frames[frameIndex])} ${message} ${colors.gray(`(${seconds}s)`)}`);
+      const remaining = totalSeconds !== null ? Math.max(0, totalSeconds - seconds) : null;
+      const etaText =
+        totalSeconds !== null ? colors.gray(`(剩余约${remaining}s)`) : colors.gray(`(${seconds}s)`);
+      process.stdout.write(`\r${colors.cyan(frames[frameIndex])} ${message} ${etaText}`);
       frameIndex = (frameIndex + 1) % frames.length;
     }, 100);
 
@@ -403,7 +531,7 @@ function execWithProgress(cmd, message, options = {}) {
     // 执行命令
     const child = spawn('sh', ['-c', cmd], {
       stdio: ['ignore', 'pipe', 'pipe'],
-      ...options,
+      ...spawnOptions,
     });
 
     let stdout = '';
@@ -444,19 +572,21 @@ async function installOpenClaw() {
   log.step(1, '安装 OpenClaw CLI...');
   log.detail('正在从 npm 下载，请稍候...');
 
+  const etaSeconds = await estimateInstallEta('openclaw');
   const result = await execWithProgress(
     'npm install -g openclaw@latest',
     '正在安装 openclaw...',
-    { timeout: 300000 }
+    { timeout: 300000, etaSeconds }
   );
 
   if (!result.ok) {
     // 尝试 clawdbot 作为备选
     log.warn('openclaw 安装失败，尝试 clawdbot...');
+    const fallbackEta = await estimateInstallEta('clawdbot');
     const fallback = await execWithProgress(
       'npm install -g clawdbot@latest',
       '正在安装 clawdbot...',
-      { timeout: 300000 }
+      { timeout: 300000, etaSeconds: fallbackEta }
     );
     if (!fallback.ok) {
       exitWithError('NPM_INSTALL_FAILED', result.error || result.stderr, [
@@ -707,7 +837,7 @@ function startService(cliName) {
 }
 
 // 显示安装完成信息
-function showCompletionInfo(cliName, config, isVPS) {
+function showCompletionInfo(cliName, config, isVPS, serverIP = '') {
   console.log(colors.bold(colors.green('\n========================================')));
   console.log(colors.bold(colors.green('✅ OpenClaw 安装完成！')));
   console.log(colors.bold(colors.green('========================================')));
@@ -719,12 +849,13 @@ function showCompletionInfo(cliName, config, isVPS) {
 
   // 根据环境显示不同的访问说明
   if (isVPS) {
+    const ipDisplay = serverIP || '<服务器IP>';
     console.log(colors.cyan('\n📡 Dashboard 访问 (云服务器):'));
     console.log(colors.gray('  Gateway 默认绑定 127.0.0.1，外部无法直接访问（安全设计）'));
     console.log('');
     console.log(colors.yellow('  方式一：SSH 隧道（推荐，安全）'));
     console.log(colors.gray('  在本地电脑执行以下命令，保持终端窗口打开：'));
-    console.log(`    ssh -N -L ${config.port}:127.0.0.1:${config.port} root@<服务器IP>`);
+    console.log(`    ssh -N -L ${config.port}:127.0.0.1:${config.port} root@${ipDisplay}`);
     console.log(colors.gray('  然后在本地浏览器访问：'));
     console.log(`    ${colors.green(`http://127.0.0.1:${config.port}/?token=${config.token}`)}`);
     console.log('');
@@ -735,7 +866,7 @@ function showCompletionInfo(cliName, config, isVPS) {
     console.log(colors.gray('     - 腾讯云：安全组 → 入站规则 → 添加 TCP ' + config.port));
     console.log(colors.gray('     - 阿里云：安全组 → 配置规则 → 添加 TCP ' + config.port));
     console.log(colors.gray('  3. 重启 Gateway：' + cliName + ' gateway restart'));
-    console.log(colors.gray('  4. 访问：http://<服务器IP>:' + config.port + '/?token=...'));
+    console.log(colors.gray('  4. 访问：http://' + ipDisplay + ':' + config.port + '/?token=...'));
   } else {
     console.log(colors.cyan('\nDashboard 访问:'));
     console.log(`  ${colors.yellow(`http://127.0.0.1:${config.port}/?token=${config.token}`)}`);
@@ -808,8 +939,10 @@ async function main() {
 
     // 检测是否在 VPS 上
     const isVPS = detectVPS();
+    const serverIP = isVPS ? await getPublicIP() : '';
     const port = existing.port || 18789;
     const token = existing.token || '<你的token>';
+    const ipDisplay = serverIP || '<服务器IP>';
 
     // 显示访问说明
     if (isVPS) {
@@ -818,7 +951,7 @@ async function main() {
       console.log('');
       console.log(colors.yellow('  方式一：SSH 隧道（推荐，安全）'));
       console.log(colors.gray('  在本地电脑执行以下命令，保持终端窗口打开：'));
-      console.log(`    ssh -N -L ${port}:127.0.0.1:${port} root@<服务器IP>`);
+      console.log(`    ssh -N -L ${port}:127.0.0.1:${port} root@${ipDisplay}`);
       console.log(colors.gray('  然后在本地浏览器访问：'));
       console.log(`    ${colors.green(`http://127.0.0.1:${port}/?token=${token}`)}`);
       console.log('');
@@ -829,7 +962,7 @@ async function main() {
       console.log(colors.gray('     - 腾讯云：安全组 → 入站规则 → 添加 TCP ' + port));
       console.log(colors.gray('     - 阿里云：安全组 → 配置规则 → 添加 TCP ' + port));
       console.log(colors.gray('  3. 重启 Gateway：' + existing.name + ' gateway restart'));
-      console.log(colors.gray('  4. 访问：http://<服务器IP>:' + port + '/?token=...'));
+      console.log(colors.gray('  4. 访问：http://' + ipDisplay + ':' + port + '/?token=...'));
     } else {
       console.log(colors.cyan('\nDashboard 访问:'));
       console.log(`  ${colors.yellow(`http://127.0.0.1:${port}/?token=${token}`)}`);
@@ -857,7 +990,7 @@ async function main() {
 
     if (options.reinstall) {
       const result = await uninstallAndReinstall(existing, options);
-      showCompletionInfo(result.cliName, result.config, isVPS);
+      showCompletionInfo(result.cliName, result.config, isVPS, serverIP);
       process.exit(0);
     }
 
@@ -873,7 +1006,7 @@ async function main() {
       process.exit(0);
     } else if (choice === 'reinstall') {
       const result = await uninstallAndReinstall(existing, options);
-      showCompletionInfo(result.cliName, result.config, isVPS);
+      showCompletionInfo(result.cliName, result.config, isVPS, serverIP);
       process.exit(0);
     } else {
       console.log(colors.gray('\n已退出'));
@@ -903,7 +1036,8 @@ async function main() {
 
   // 检测是否在 VPS 上并显示完成信息
   const isVPS = detectVPS();
-  showCompletionInfo(cliName, config, isVPS);
+  const serverIP = isVPS ? await getPublicIP() : '';
+  showCompletionInfo(cliName, config, isVPS, serverIP);
 }
 
 main().catch((e) => {

package/install.sh

@@ -16,6 +16,115 @@ log_success() { echo -e "${GREEN}✓ $1${NC}"; }
 log_warn() { echo -e "${YELLOW}⚠ $1${NC}"; }
 log_error() { echo -e "${RED}✗ $1${NC}"; }
 
+run_with_progress() {
+    local cmd="$1"
+    local message="$2"
+    local eta_total="$3"
+    local tty="/dev/tty"
+    local tmp=""
+
+    tmp=$(mktemp 2>/dev/null || mktemp -t openclawsetup 2>/dev/null || echo "/tmp/openclawsetup.$$")
+
+    local frames=('|' '/' '-' '\\')
+    local i=0
+    local start
+    start=$(date +%s)
+
+    bash -c "$cmd" >"$tmp" 2>&1 &
+    local pid=$!
+
+    while kill -0 "$pid" 2>/dev/null; do
+        local now
+        now=$(date +%s)
+        local seconds=$((now - start))
+        local frame="${frames[$i]}"
+        local suffix=""
+
+        if [[ "$eta_total" =~ ^[0-9]+$ ]] && [ "$eta_total" -gt 0 ]; then
+            local remaining=$((eta_total - seconds))
+            if [ "$remaining" -lt 0 ]; then
+                remaining=0
+            fi
+            suffix="(剩余约${remaining}s)"
+        else
+            suffix="(${seconds}s)"
+        fi
+
+        if [ -w "$tty" ]; then
+            printf "\r%s %s %s" "$frame" "$message" "$suffix" > "$tty"
+        else
+            printf "\r%s %s %s" "$frame" "$message" "$suffix" >&2
+        fi
+
+        i=$(( (i + 1) % 4 ))
+        sleep 0.1
+    done
+
+    local status
+    set +e
+    wait "$pid"
+    status=$?
+    set -e
+
+    if [ -w "$tty" ]; then
+        printf "\r%s\r" "$(printf '%*s' 80 '')" > "$tty"
+    else
+        printf "\r%s\r" "$(printf '%*s' 80 '')" >&2
+    fi
+
+    if [ $status -ne 0 ]; then
+        log_error "执行失败: $cmd"
+        if [ -s "$tmp" ]; then
+            echo -e "${YELLOW}---- 错误输出 (最后 20 行) ----${NC}" >&2
+            tail -n 20 "$tmp" >&2
+        fi
+    fi
+
+    rm -f "$tmp"
+    return $status
+}
+
+estimate_npm_eta() {
+    local pkg="$1"
+    local tarball=""
+    local size=""
+    local speed=""
+    local eta=""
+    local factor="2.0"
+    local overhead="8"
+
+    tarball=$(npm view "$pkg" dist.tarball 2>/dev/null | tail -n 1 || true)
+    size=$(npm view "$pkg" dist.size 2>/dev/null | tail -n 1 | tr -d '\r' || true)
+
+    if ! [[ "$size" =~ ^[0-9]+$ ]]; then
+        if [ -n "$tarball" ]; then
+            size=$(curl -sIL --connect-timeout 2 --max-time 4 "$tarball" 2>/dev/null \
+                | awk 'tolower($1)=="content-length:" {print $2}' \
+                | tail -n 1 | tr -d '\r' || true)
+        fi
+    fi
+
+    if ! [[ "$size" =~ ^[0-9]+$ ]]; then
+        return 1
+    fi
+
+    if [ -z "$tarball" ]; then
+        return 1
+    fi
+
+    speed=$(curl -L --range 0-262143 -o /dev/null -s -w '%{speed_download}' \
+        --connect-timeout 2 --max-time 6 "$tarball" || true)
+    speed=${speed%.*}
+
+    if ! [[ "$speed" =~ ^[0-9]+$ ]] || [ "$speed" -le 0 ]; then
+        return 1
+    fi
+
+    eta=$(awk -v size="$size" -v speed="$speed" -v factor="$factor" -v overhead="$overhead" \
+        'BEGIN { est=(size*factor)/speed + overhead; if (est<5) est=5; printf "%d", est }')
+    echo "$eta"
+}
+
 echo ""
 echo -e "${CYAN}🦞 OpenClaw 一键安装${NC}"
 echo ""
@@ -267,22 +376,54 @@ show_installed_info() {
 
 # 显示菜单并获取选择
 show_menu() {
-    echo -e "${CYAN}\n请选择操作:${NC}"
-    echo -e "  ${YELLOW}1${NC}. 检查并更新 OpenClaw"
-    echo -e "  ${YELLOW}2${NC}. 卸载后重新安装（会清除配置）"
-    echo -e "  ${YELLOW}0${NC}. 退出"
-    echo ""
-
-    # 从 /dev/tty 读取，支持管道环境
-    if [ -t 0 ]; then
-        # 标准输入是终端
-        read -p "请输入选项编号: " choice
+    local choice=""
+    local tty="/dev/tty"
+
+    # 菜单输出到交互终端，避免被 $() 捕获或被管道吞掉
+    if [ -w "$tty" ]; then
+        printf "%b\n" "${CYAN}\n请选择操作:${NC}" > "$tty"
+        printf "  %b1%b. 检查并更新 OpenClaw\n" "${YELLOW}" "${NC}" > "$tty"
+        printf "  %b2%b. 卸载后重新安装（会清除配置）\n" "${YELLOW}" "${NC}" > "$tty"
+        printf "  %b0%b. 退出\n\n" "${YELLOW}" "${NC}" > "$tty"
+        printf "请输入选项编号: " > "$tty"
+        read -r choice < "$tty" || true
     else
-        # 管道环境，从 /dev/tty 读取
-        echo -n "请输入选项编号: "
-        read choice < /dev/tty
+        # 无交互终端时，输出到 stderr 并尝试从 stdin 读取
+        echo -e "${CYAN}\n请选择操作:${NC}" >&2
+        echo -e "  ${YELLOW}1${NC}. 检查并更新 OpenClaw" >&2
+        echo -e "  ${YELLOW}2${NC}. 卸载后重新安装（会清除配置）" >&2
+        echo -e "  ${YELLOW}0${NC}. 退出" >&2
+        echo "" >&2
+        echo -n "请输入选项编号: " >&2
+        read -r choice || true
     fi
-    echo "$choice"
+
+    MENU_CHOICE="$choice"
+}
+
+# 已安装场景：展示信息 + 菜单
+installed_flow() {
+    while true; do
+        show_installed_info
+        show_menu
+
+        case "$MENU_CHOICE" in
+            1)
+                update_openclaw
+                ;;
+            2)
+                uninstall_openclaw
+                echo ""
+                echo -e "${GREEN}✓ 卸载完成，开始重新安装...${NC}"
+                echo ""
+                install_openclaw
+                ;;
+            *)
+                echo -e "\033[90m\n已退出\033[0m"
+                return 0
+                ;;
+        esac
+    done
 }
 
 # 更新 OpenClaw
@@ -295,7 +436,13 @@ update_openclaw() {
     echo "  当前版本: $current_version"
 
     log_info "正在更新到最新版本..."
-    npm install -g ${cli_name}@latest
+    local eta=""
+    eta=$(estimate_npm_eta "${cli_name}@latest" || true)
+    if ! run_with_progress "npm install -g ${cli_name}@latest" "正在更新 ${cli_name}..." "$eta"; then
+        log_error "更新失败"
+        log_warn "可手动更新: npm install -g ${cli_name}@latest"
+        return 1
+    fi
 
     local new_version=$($cli_name --version 2>/dev/null || echo "未知")
     if [ "$new_version" != "$current_version" ]; then
@@ -324,7 +471,9 @@ uninstall_openclaw() {
 
     # 卸载 npm 包
     log_info "卸载 npm 包..."
-    npm uninstall -g $cli_name 2>/dev/null || true
+    if ! run_with_progress "npm uninstall -g $cli_name" "正在卸载 ${cli_name}..."; then
+        log_warn "npm 卸载可能未完成"
+    fi
     log_success "npm 包已卸载"
 
     # 删除配置目录
@@ -393,26 +542,7 @@ main() {
     # 3. 检测 OpenClaw 安装状态
     if check_openclaw; then
         # 已安装：显示信息和菜单
-        show_installed_info
-
-        choice=$(show_menu)
-
-        case "$choice" in
-            1)
-                update_openclaw
-                ;;
-            2)
-                uninstall_openclaw
-                echo ""
-                echo -e "${GREEN}✓ 卸载完成，开始重新安装...${NC}"
-                echo ""
-                install_openclaw
-                ;;
-            *)
-                echo -e "\033[90m\n已退出\033[0m"
-                exit 0
-                ;;
-        esac
+        installed_flow
     else
         # 未安装：直接安装
         install_openclaw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "一键安装 OpenClaw - 自动完成基础部署，无需交互",
   "type": "module",
   "bin": {