@aiyiran/myclaw 1.0.32 → 1.0.34

package/index.js

@@ -265,7 +265,10 @@ function runWsl2() {
 
 function runPrepare() {
   const prepare = require('./prepare');
-  prepare.run();
+  prepare.run().catch((err) => {
+    console.error('[错误] ' + err.message);
+    process.exit(1);
+  });
 }
 
 // ============================================================================
@@ -300,8 +303,13 @@ echo   OpenClaw 智能启动器
 echo  ============================================
 echo.
 
-REM ---- Step 1: 检测 WSL 是否可用 ----
-echo [1/4] 检测 WSL 状态...
+REM ---- Step 1: 自动更新 MyClaw ----
+echo [1/5] 检查 MyClaw 更新...
+call npm update -g @aiyiran/myclaw >nul 2>&1
+echo       [OK]
+
+REM ---- Step 2: 检测 WSL 是否可用 ----
+echo [2/5] 检测 WSL 状态...
 wsl --version >nul 2>&1
 if errorlevel 1 (
     echo.
@@ -320,8 +328,8 @@ if errorlevel 1 (
 )
 echo       [OK] WSL 已安装
 
-REM ---- Step 2: 检测 OpenClaw 发行版 ----
-echo [2/4] 检测 OpenClaw Linux 环境...
+REM ---- Step 3: 检测 OpenClaw 发行版 ----
+echo [3/5] 检测 OpenClaw Linux 环境...
 wsl -l -q 2>nul | findstr /i "OpenClaw" >nul 2>&1
 if errorlevel 1 (
     echo.
@@ -337,40 +345,37 @@ if errorlevel 1 (
 )
 echo       [OK] OpenClaw Linux 环境已就绪
 
-REM ---- Step 3: 检测 Gateway 是否已运行 ----
-echo [3/4] 检测 OpenClaw Gateway...
-curl -s -o nul -w "%%{http_code}" http://127.0.0.1:18789 2>nul | findstr "200 301 302" >nul 2>&1
+REM ---- Step 4: 用 myclaw open 打开浏览器（带 token） ----
+echo [4/5] 打开浏览器（带 Token）...
+call myclaw open
+echo       [OK]
+
+REM ---- Step 5: 检测并启动 Gateway ----
+echo [5/5] 检测 OpenClaw Gateway...
+netstat -an | findstr "18789" | findstr "LISTENING" >nul 2>&1
 if not errorlevel 1 (
     echo       [OK] Gateway 已在运行中
     echo.
-    echo [4/4] 打开浏览器...
-    start http://127.0.0.1:18789
-    echo.
     echo  ============================================
     echo   OpenClaw 已在运行！浏览器已打开
-    echo   关闭此窗口不影响服务
     echo  ============================================
     echo.
-    timeout /t 5
+    wsl -d OpenClaw
     exit /b
 )
-echo       Gateway 未运行，准备启动...
 
-REM ---- Step 4: 启动 Gateway ----
-echo [4/4] 启动 OpenClaw Gateway...
+echo       Gateway 未运行，正在启动...
 echo.
 echo  ============================================
 echo   正在启动 OpenClaw 服务...
-echo   启动后浏览器会自动打开
 echo   关闭此窗口将停止服务
 echo  ============================================
 echo.
-
-start http://127.0.0.1:18789
 wsl -d OpenClaw -- openclaw gateway
 pause
 `;
 
+
   // 写入 bat 文件
   fs.writeFileSync(batPath, batContent, 'utf8');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "",
   "main": "index.js",
   "bin": {

package/prepare.js

@@ -284,87 +284,14 @@ function runPatchStep(env) {
 
 function createDesktopLauncher() {
   log('Step 5', '生成桌面启动器...');
-
+  console.log('');
   try {
-    // 直接调用 index.js 里的 bat 逻辑太耦合，这里独立实现
-    const fs = require('fs');
-    const myClawDir = path.join(process.env.LOCALAPPDATA || os.tmpdir(), 'myclaw');
-    try { fs.mkdirSync(myClawDir, { recursive: true }); } catch {}
-
-    const batPath = path.join(myClawDir, 'openclaw-launcher.bat');
-    const desktopPath = path.join(os.homedir(), 'Desktop');
-    const lnkPath = path.join(desktopPath, 'OpenClaw.lnk');
-
-    const batContent = `@echo off
-chcp 65001 >nul 2>&1
-title OpenClaw
-color 0A
-echo.
-echo  ============================================
-echo   OpenClaw 智能启动器
-echo  ============================================
-echo.
-
-echo [1/4] 检测 WSL...
-wsl --version >nul 2>&1
-if errorlevel 1 (
-    echo  [!] WSL 未安装，正在启动安装...
-    call myclaw wsl2
-    echo  请重启电脑后再次双击此图标
-    pause
-    exit /b
-)
-echo       [OK]
-
-echo [2/4] 检测 OpenClaw 环境...
-wsl -l -q 2>nul | findstr /i "OpenClaw" >nul 2>&1
-if errorlevel 1 (
-    echo  [!] OpenClaw 环境未导入，正在安装...
-    call myclaw wsl2
-    echo  请再次双击此图标启动
-    pause
-    exit /b
-)
-echo       [OK]
-
-echo [3/4] 检测 Gateway...
-curl -s -o nul -w "%%%%{http_code}" http://127.0.0.1:18789 2>nul | findstr "200 301 302" >nul 2>&1
-if not errorlevel 1 (
-    echo       [OK] 已在运行
-    echo [4/4] 打开浏览器...
-    start http://127.0.0.1:18789
-    timeout /t 3
-    exit /b
-)
-
-echo [4/4] 启动 OpenClaw...
-start http://127.0.0.1:18789
-wsl -d OpenClaw -- openclaw gateway
-pause
-`;
-
-    fs.writeFileSync(batPath, batContent, 'utf8');
-
-    // 创建带图标的快捷方式
-    const psCmd = [
-      "$ws = New-Object -ComObject WScript.Shell",
-      "$sc = $ws.CreateShortcut('" + lnkPath.replace(/\\/g, '\\\\') + "')",
-      "$sc.TargetPath = '" + batPath.replace(/\\/g, '\\\\') + "'",
-      "$sc.WorkingDirectory = '" + myClawDir.replace(/\\/g, '\\\\') + "'",
-      "$sc.WindowStyle = 1",
-      "$sc.IconLocation = '%SystemRoot%\\System32\\shell32.dll,176'",
-      "$sc.Description = 'OpenClaw'",
-      "$sc.Save()",
-    ].join('; ');
-
-    execSync('powershell -NoProfile -Command "' + psCmd.replace(/"/g, '\\"') + '"', {
-      stdio: 'pipe',
-    });
-
-    logOK('桌面快捷方式已创建: OpenClaw.lnk');
+    // 直接调用 myclaw bat，它是桌面启动器的唯一入口
+    execSync('node "' + path.join(__dirname, 'index.js') + '" bat', { stdio: 'inherit' });
     return true;
   } catch (err) {
-    logWarn('桌面快捷方式创建失败: ' + err.message);
+    logWarn('桌面启动器创建失败');
+    console.log('  你可以手动运行: ' + C.y + 'myclaw bat' + C.nc);
     return false;
   }
 }