@aiyiran/myclaw 1.0.12 → 1.0.13

package/package.json

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

package/wsl2.js

@@ -5,13 +5,11 @@
  * MyClaw WSL2 一键安装器
  * ============================================================================
  *
- * 使用方式:
- *   myclaw wsl2                          # 在线安装（从 CDN 下载）
- *   myclaw wsl2 --offline D:\myclaw_pkg  # 离线安装（从指定目录读取文件）
+ * 使用方式: myclaw wsl2
  *
- * 离线模式所需文件（放到同一目录下）:
- *   - wsl_full.msi          → Phase 1 用（WSL 完整安装包）
- *   - openclaw-rootfs.tar   → Phase 2 用（预制 Linux 环境）
+ * 安装过程中会提示：
+ *   - 有本地文件？拖拽到窗口 + 回车
+ *   - 没有？直接回车，从 CDN 下载
  *
  * 自动检测安装状态，分两阶段完成：
  *   Phase 1: 启用底层 Windows 功能 + 安装 WSL → 需要重启
@@ -21,16 +19,13 @@
 
 const { execSync } = require('child_process');
 const os = require('os');
-const path = require('path');
 
 // ============================================================================
 // 配置
 // ============================================================================
 
 const WSL_CDN = {
-  // 新版 WSL 完整安装包（243MB）
   wsl: 'https://cdn.yiranlaoshi.com/software/myclaw/wsl.2.7.1.0.x64.msi',
-  // 预制 rootfs tar 包（内含 Node.js + OpenClaw）
   // TODO: 替换为你自己的 CDN 地址
   rootfs: 'https://openclaw.ai/wsl/openclaw-rootfs.tar',
 };
@@ -41,32 +36,6 @@ const C = isWindows
   ? { r: '', g: '', y: '', b: '', nc: '' }
   : { r: '\x1b[31m', g: '\x1b[32m', y: '\x1b[33m', b: '\x1b[34m', nc: '\x1b[0m' };
 
-// ============================================================================
-// 解析 --offline 参数
-// ============================================================================
-
-function parseOfflineDir() {
-  const args = process.argv.slice(2);
-  const idx = args.indexOf('--offline');
-  if (idx === -1) return null;
-  const dir = args[idx + 1];
-  if (!dir) {
-    console.error('[' + C.r + '错误' + C.nc + '] --offline 后面需要指定目录路径');
-    console.log('');
-    console.log('用法: myclaw wsl2 --offline <目录路径>');
-    console.log('');
-    console.log('示例:');
-    console.log('  myclaw wsl2 --offline D:\\');
-    console.log('  myclaw wsl2 --offline E:\\myclaw_pkg');
-    console.log('');
-    console.log('目录下应包含:');
-    console.log('  wsl_full.msi          (Phase 1: WSL 安装包)');
-    console.log('  openclaw-rootfs.tar   (Phase 2: Linux 环境)');
-    process.exit(1);
-  }
-  return dir;
-}
-
 // ============================================================================
 // 工具函数
 // ============================================================================
@@ -86,6 +55,56 @@ function launchElevatedPS(script) {
   }
 }
 
+/**
+ * 生成「拖拽或回车」的 PowerShell 交互代码片段
+ * @param {string} prompt   提示文字
+ * @param {string} destVar  目标文件变量名（如 $msi, $tarPath）
+ * @param {string} cdnUrl   CDN 下载地址
+ * @param {string} desc     文件描述（如 "WSL 安装包"）
+ */
+function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc) {
+  return `
+Write-Host ''
+Write-Host '  ┌─────────────────────────────────────────┐'
+Write-Host '  │  如有 ${desc} 的本地文件：              │'
+Write-Host '  │  请将文件拖拽到此窗口，然后按回车       │'
+Write-Host '  │                                         │'
+Write-Host '  │  没有？直接按回车，自动从网络下载       │'
+Write-Host '  └─────────────────────────────────────────┘'
+Write-Host ''
+$userInput = Read-Host '  拖拽文件或直接回车'
+$userInput = $userInput.Trim().Trim('"')
+
+if ($userInput -and (Test-Path $userInput)) {
+    Write-Host "      使用本地文件: $userInput"
+    Copy-Item $userInput ${destVar} -Force
+    Write-Host '      [OK]'
+} elseif ($userInput) {
+    Write-Host "      [警告] 文件不存在: $userInput"
+    Write-Host '      将改为从网络下载...'
+    $userInput = ''
+}
+
+if (-Not $userInput) {
+    if (-Not (Test-Path ${destVar})) {
+        Write-Host '      正在从网络下载...'
+        try {
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            Invoke-WebRequest -Uri '${cdnUrl}' -OutFile ${destVar} -UseBasicParsing
+            Write-Host '      下载完成!'
+        } catch {
+            Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
+            Write-Host ''; Write-Host '按任意键关闭...'
+            $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+            exit 1
+        }
+    } else {
+        Write-Host '      使用上次缓存的文件'
+    }
+}
+`;
+}
+
 // ============================================================================
 // 状态检测
 // ============================================================================
@@ -108,56 +127,24 @@ function detectState() {
 // Phase 1: 启用功能 + 安装 WSL
 // ============================================================================
 
-function runPhase1(offlineDir) {
+function runPhase1() {
   console.log('');
   console.log('[当前进度] WSL 功能 ' + C.r + '[未启用]' + C.nc);
   console.log('           WSL 组件 ' + C.r + '[未安装]' + C.nc);
   console.log('           Linux    ' + C.r + '[未安装]' + C.nc);
   console.log('');
-  if (offlineDir) {
-    console.log('[离线模式] 从 ' + C.y + offlineDir + C.nc + ' 读取安装包');
-  }
   console.log('阶段 1/2: 启用底层功能 + 安装 WSL');
   console.log('  完成后需要 ' + C.y + '重启电脑' + C.nc);
   console.log('');
   console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
   console.log('');
 
-  // 构造文件获取逻辑
-  let msiSource;
-  if (offlineDir) {
-    const localPath = path.join(offlineDir, 'wsl_full.msi').replace(/\\/g, '\\\\');
-    msiSource = `
-$localMsi = '${localPath}'
-if (Test-Path $localMsi) {
-    Write-Host "      从离线目录复制: $localMsi"
-    Copy-Item $localMsi $msi -Force
-    Write-Host '      [OK]'
-} else {
-    Write-Host "      [失败] 文件不存在: $localMsi"
-    Write-Host ''; Write-Host '按任意键关闭...'
-    $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-    exit 1
-}`;
-  } else {
-    msiSource = `
-if (-Not (Test-Path $msi)) {
-    Write-Host '      正在从 CDN 下载 (约 243MB)...'
-    try {
-        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        Invoke-WebRequest -Uri '${WSL_CDN.wsl}' -OutFile $msi -UseBasicParsing
-        Write-Host '      下载完成!'
-    } catch {
-        Write-Host '      [失败] 下载失败'
-        Write-Host '      提示: 可用 myclaw wsl2 --offline <目录> 指定本地文件'
-        Write-Host ''; Write-Host '按任意键关闭...'
-        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-        exit 1
-    }
-} else {
-    Write-Host '      使用上次缓存的文件'
-}`;
-  }
+  const askMsi = makeAskLocalOrCDN(
+    '拖拽 WSL 安装包或回车下载',
+    '$msi',
+    WSL_CDN.wsl,
+    'WSL 安装包 (wsl_full.msi)'
+  );
 
   const ps = `
 $ErrorActionPreference = 'Continue'
@@ -201,7 +188,7 @@ if ($wslInstalled) {
     Write-Host '      WSL 已安装，跳过'
     Write-Host '      [OK]'
 } else {
-${msiSource}
+${askMsi}
 
     Write-Host ''
     Write-Host '[4/4] 安装 WSL...'
@@ -241,54 +228,22 @@ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
 // Phase 2: 导入预制 Linux 环境
 // ============================================================================
 
-function runPhase2(offlineDir) {
+function runPhase2() {
   console.log('');
   console.log('[当前进度] WSL 功能 ' + C.g + '[OK]' + C.nc);
   console.log('           WSL 组件 ' + C.g + '[OK]' + C.nc);
   console.log('           Linux    ' + C.y + '[待安装]' + C.nc);
   console.log('');
-  if (offlineDir) {
-    console.log('[离线模式] 从 ' + C.y + offlineDir + C.nc + ' 读取安装包');
-  }
   console.log('即将导入预制 Linux 环境...');
   console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
   console.log('');
 
-  // 构造 tar 获取逻辑
-  let tarSource;
-  if (offlineDir) {
-    const localPath = path.join(offlineDir, 'openclaw-rootfs.tar').replace(/\\/g, '\\\\');
-    tarSource = `
-$localTar = '${localPath}'
-if (Test-Path $localTar) {
-    Write-Host "      从离线目录复制: $localTar"
-    Copy-Item $localTar $tarPath -Force
-    Write-Host '      [OK]'
-} else {
-    Write-Host "      [失败] 文件不存在: $localTar"
-    Write-Host ''; Write-Host '按任意键关闭...'
-    $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-    exit 1
-}`;
-  } else {
-    tarSource = `
-if (-Not (Test-Path $tarPath)) {
-    Write-Host '      正在从 CDN 下载...'
-    try {
-        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        Invoke-WebRequest -Uri '${WSL_CDN.rootfs}' -OutFile $tarPath -UseBasicParsing
-        Write-Host '      下载完成!'
-    } catch {
-        Write-Host '      [失败] 下载失败'
-        Write-Host '      提示: 可用 myclaw wsl2 --offline <目录> 指定本地文件'
-        Write-Host ''; Write-Host '按任意键关闭...'
-        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-        exit 1
-    }
-} else {
-    Write-Host '      使用上次缓存的文件'
-}`;
-  }
+  const askTar = makeAskLocalOrCDN(
+    '拖拽 tar 包或回车下载',
+    '$tarPath',
+    WSL_CDN.rootfs,
+    'Linux 环境包 (openclaw-rootfs.tar)'
+  );
 
   const ps = `
 $ErrorActionPreference = 'Continue'
@@ -297,7 +252,7 @@ Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 2/2'
 Write-Host '  导入预制 Linux 环境'
-Write-Host '========================================'
+Write-Host '========================================' 
 Write-Host ''
 
 $dir = "$env:LOCALAPPDATA\\myclaw"
@@ -308,13 +263,13 @@ try { wsl --set-default-version 2 2>$null } catch {}
 Write-Host '      [OK]'
 Write-Host ''
 
-Write-Host '[2/3] 获取并导入预制 Linux 环境...'
+Write-Host '[2/3] 获取预制 Linux 环境...'
 $tarPath = "$dir\\openclaw-rootfs.tar"
 $distroName = 'OpenClaw'
 $installDir = "$dir\\OpenClaw"
 $installed = $false
 
-${tarSource}
+${askTar}
 
 Write-Host '      正在导入 (可能需要几分钟)...'
 try {
@@ -372,7 +327,6 @@ function run() {
     process.exit(0);
   }
 
-  const offlineDir = parseOfflineDir();
   const bar = '========================================';
   const state = detectState();
 
@@ -397,9 +351,9 @@ function run() {
   }
 
   if (state === 'needs-setup') {
-    runPhase2(offlineDir);
+    runPhase2();
   } else {
-    runPhase1(offlineDir);
+    runPhase1();
   }
 }