openclawsetup 1.0.2 → 1.0.4

package/bin/cli.mjs

@@ -195,27 +195,95 @@ function detectExistingInstall() {
   return { installed: false };
 }
 
+// 带进度动画的命令执行
+function execWithProgress(cmd, message, options = {}) {
+  return new Promise((resolve) => {
+    const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+    let frameIndex = 0;
+    let seconds = 0;
+
+    // 显示进度动画
+    const spinner = setInterval(() => {
+      process.stdout.write(`\r${colors.cyan(frames[frameIndex])} ${message} ${colors.gray(`(${seconds}s)`)}`);
+      frameIndex = (frameIndex + 1) % frames.length;
+    }, 100);
+
+    // 计时器
+    const timer = setInterval(() => {
+      seconds++;
+    }, 1000);
+
+    // 执行命令
+    const child = spawn('sh', ['-c', cmd], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      ...options,
+    });
+
+    let stdout = '';
+    let stderr = '';
+
+    child.stdout?.on('data', (data) => {
+      stdout += data.toString();
+    });
+
+    child.stderr?.on('data', (data) => {
+      stderr += data.toString();
+    });
+
+    child.on('close', (code) => {
+      clearInterval(spinner);
+      clearInterval(timer);
+      // 清除当前行
+      process.stdout.write('\r' + ' '.repeat(60) + '\r');
+
+      if (code === 0) {
+        resolve({ ok: true, output: stdout.trim(), seconds });
+      } else {
+        resolve({ ok: false, error: stderr || stdout, stderr, stdout, seconds });
+      }
+    });
+
+    child.on('error', (err) => {
+      clearInterval(spinner);
+      clearInterval(timer);
+      process.stdout.write('\r' + ' '.repeat(60) + '\r');
+      resolve({ ok: false, error: err.message, seconds });
+    });
+  });
+}
+
 // 安装 OpenClaw CLI
-function installOpenClaw() {
+async function installOpenClaw() {
   log.step(1, '安装 OpenClaw CLI...');
+  log.detail('正在从 npm 下载，请稍候...');
+
+  const result = await execWithProgress(
+    'npm install -g openclaw@latest',
+    '正在安装 openclaw...',
+    { timeout: 300000 }
+  );
 
-  const result = safeExec('npm install -g openclaw@latest', { timeout: 300000 });
   if (!result.ok) {
     // 尝试 clawdbot 作为备选
     log.warn('openclaw 安装失败，尝试 clawdbot...');
-    const fallback = safeExec('npm install -g clawdbot@latest', { timeout: 300000 });
+    const fallback = await execWithProgress(
+      'npm install -g clawdbot@latest',
+      '正在安装 clawdbot...',
+      { timeout: 300000 }
+    );
     if (!fallback.ok) {
-      exitWithError('NPM_INSTALL_FAILED', result.stderr || result.error, [
+      exitWithError('NPM_INSTALL_FAILED', result.error || result.stderr, [
         '检查网络连接',
         '尝试使用代理: npm config set proxy http://proxy:port',
         '手动安装: npm install -g openclaw@latest',
         '检查 npm 权限，可能需要 sudo (Linux/macOS)',
       ]);
     }
+    log.success(`clawdbot 安装完成 (${fallback.seconds}s)`);
     return 'clawdbot';
   }
 
-  log.success('OpenClaw CLI 安装完成');
+  log.success(`OpenClaw CLI 安装完成 (${result.seconds}s)`);
   return 'openclaw';
 }
 
@@ -480,7 +548,7 @@ async function main() {
   }
 
   // 安装 CLI
-  const cliName = installOpenClaw();
+  const cliName = await installOpenClaw();
 
   // 创建配置
   const config = createConfig(options);

package/install.bat

@@ -0,0 +1,20 @@
+@echo off
+chcp 65001 >nul 2>&1
+echo.
+echo ========================================
+echo   OpenClaw 安装提示
+echo ========================================
+echo.
+echo Windows CMD 不支持一键安装脚本。
+echo.
+echo 请使用 Windows PowerShell 运行以下命令：
+echo.
+echo   irm https://unpkg.com/openclawsetup/install.ps1 ^| iex
+echo.
+echo 打开 PowerShell 的方法：
+echo   1. 按 Win+X，选择 "Windows PowerShell"
+echo   2. 或在开始菜单搜索 "PowerShell"
+echo.
+echo ========================================
+echo.
+pause

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "一键安装 OpenClaw - 自动完成基础部署，无需交互",
   "type": "module",
   "bin": {
@@ -13,6 +13,7 @@
     "bin/",
     "install.sh",
     "install.ps1",
+    "install.bat",
     "README.md",
     "使用说明.md"
   ],