@aiyiran/myclaw 1.0.11 → 1.0.12

package/package.json

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

package/wsl2.js

@@ -5,46 +5,72 @@
  * MyClaw WSL2 一键安装器
  * ============================================================================
  *
- * 使用方式: myclaw wsl2
+ * 使用方式:
+ *   myclaw wsl2                          # 在线安装（从 CDN 下载）
+ *   myclaw wsl2 --offline D:\myclaw_pkg  # 离线安装（从指定目录读取文件）
  *
- * 自动检测当前 WSL2 安装状态，分两个阶段完成安装：
- *   Phase 1: 启用底层 Windows 功能 + 安装 WSL 完整包 → 需要重启
- *   Phase 2: 导入预制 Linux 环境（tar 包） → 完成
+ * 离线模式所需文件（放到同一目录下）:
+ *   - wsl_full.msi          → Phase 1 用（WSL 完整安装包）
+ *   - openclaw-rootfs.tar   → Phase 2 用（预制 Linux 环境）
  *
- * 用户只需反复运行 myclaw wsl2，脚本会自动接续上次的进度。
+ * 自动检测安装状态，分两阶段完成：
+ *   Phase 1: 启用底层 Windows 功能 + 安装 WSL → 需要重启
+ *   Phase 2: 导入预制 Linux 环境 → 完成
  * ============================================================================
  */
 
 const { execSync } = require('child_process');
 const os = require('os');
+const path = require('path');
 
 // ============================================================================
-// 配置 - 所有下载地址集中在这里，方便统一替换
+// 配置
 // ============================================================================
 
 const WSL_CDN = {
-  // ★ 新版 WSL 完整安装包（243MB，含内核，替代老的 wsl_update_x64.msi 和 wsl --update）
+  // 新版 WSL 完整安装包（243MB）
   wsl: 'https://cdn.yiranlaoshi.com/software/myclaw/wsl.2.7.1.0.x64.msi',
-  // ★ 预制 rootfs tar 包（内含 Node.js + OpenClaw，用户开箱即用）
-  // TODO: 替换为你自己的 CDN 地址，制作方法见 README
+  // 预制 rootfs tar 包（内含 Node.js + OpenClaw）
+  // TODO: 替换为你自己的 CDN 地址
   rootfs: 'https://openclaw.ai/wsl/openclaw-rootfs.tar',
 };
 
 const isWindows = os.platform() === 'win32';
 
-// 颜色（Windows 下禁用避免乱码）
 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;
+}
+
 // ============================================================================
 // 工具函数
 // ============================================================================
 
-/**
- * 以管理员权限启动 PowerShell 脚本
- * 利用 UTF-16LE Base64 编码避免引号转义地狱
- */
 function launchElevatedPS(script) {
   const b64 = Buffer.from(script, 'utf16le').toString('base64');
   try {
@@ -64,51 +90,81 @@ function launchElevatedPS(script) {
 // 状态检测
 // ============================================================================
 
-/**
- * 自动检测当前 WSL2 安装状态
- * @returns {'ready'|'needs-setup'|'needs-features'}
- */
 function detectState() {
-  // 1. WSL 已完全可用（有发行版能跑命令）
   try {
     execSync('wsl echo ok', { stdio: 'pipe', timeout: 15000 });
     return 'ready';
   } catch {}
 
-  // 2. WSL 命令可用但没有发行版（功能已启用，重启后的状态）
   try {
     execSync('wsl --status', { stdio: 'pipe', timeout: 5000 });
     return 'needs-setup';
   } catch {}
 
-  // 3. WSL 功能未启用
   return 'needs-features';
 }
 
 // ============================================================================
-// Phase 1: 启用功能 + 安装 WSL 完整包
+// Phase 1: 启用功能 + 安装 WSL
 // ============================================================================
 
-function runPhase1() {
+function runPhase1(offlineDir) {
   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('');
-  console.log('本次执行 阶段 1/2: 启用底层功能 + 安装 WSL 完整包');
+  if (offlineDir) {
+    console.log('[离线模式] 从 ' + C.y + offlineDir + C.nc + ' 读取安装包');
+  }
+  console.log('阶段 1/2: 启用底层功能 + 安装 WSL');
   console.log('  完成后需要 ' + C.y + '重启电脑' + C.nc);
-  console.log('  重启后再运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 自动进入阶段 2');
   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 ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
-Write-Host '  启用底层功能 + 安装 WSL 完整包'
 Write-Host '========================================'
 Write-Host ''
 
@@ -124,7 +180,7 @@ try {
 }
 Write-Host ''
 
-Write-Host '[2/4] 启用虚拟机平台 (VirtualMachinePlatform)...'
+Write-Host '[2/4] 启用虚拟机平台...'
 try {
     dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart | Out-Null
     Write-Host '      [OK]'
@@ -133,7 +189,8 @@ try {
 }
 Write-Host ''
 
-Write-Host '[3/4] 检查并安装 WSL 完整包...'
+Write-Host '[3/4] 获取 WSL 安装包...'
+$msi = "$dir\\wsl_full.msi"
 $wslInstalled = $false
 try {
     $ver = wsl --version 2>&1 | Out-String
@@ -141,33 +198,18 @@ try {
 } catch {}
 
 if ($wslInstalled) {
-    Write-Host '      WSL 组件已安装，跳过下载 (节省 243MB)'
+    Write-Host '      WSL 已安装，跳过'
     Write-Host '      [OK]'
 } else {
-    Write-Host '      WSL 未安装，正在下载完整安装包 (约 243MB)...'
-    $msi = "$dir\\wsl_full.msi"
-    if (-Not (Test-Path $msi)) {
-        try {
-            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-            Invoke-WebRequest -Uri '${WSL_CDN.wsl}' -OutFile $msi -UseBasicParsing
-            Write-Host '      下载完成!'
-        } catch {
-            Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
-            Write-Host ''; Write-Host '按任意键关闭...'
-            $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-            exit 1
-        }
-    } else {
-        Write-Host '      使用上次缓存的文件'
-    }
+${msiSource}
 
     Write-Host ''
-    Write-Host '[4/4] 安装 WSL 完整包...'
+    Write-Host '[4/4] 安装 WSL...'
     try {
         Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
-        Write-Host '      [OK] 安装成功!'
+        Write-Host '      [OK]'
     } catch {
-        Write-Host '      [失败] 安装出错'
+        Write-Host '      [失败]'
         Write-Host ''; Write-Host '按任意键关闭...'
         $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
         exit 1
@@ -181,7 +223,6 @@ Write-Host ''
 Write-Host '  >>> 请立即 [重启电脑] <<<'
 Write-Host ''
 Write-Host '  重启后运行: myclaw wsl2'
-Write-Host '  将自动进入阶段 2 完成安装'
 Write-Host '========================================'
 Write-Host ''
 Write-Host '按任意键关闭此窗口...'
@@ -200,16 +241,55 @@ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
 // Phase 2: 导入预制 Linux 环境
 // ============================================================================
 
-function runPhase2() {
+function runPhase2(offlineDir) {
   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('');
-  console.log('即将导入预制 Linux 环境（需要管理员权限）...');
+  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 ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
@@ -228,27 +308,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
 
-if (-Not (Test-Path $tarPath)) {
-    Write-Host '      正在下载预制环境包...'
-    try {
-        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-        Invoke-WebRequest -Uri '${WSL_CDN.rootfs}' -OutFile $tarPath -UseBasicParsing
-        Write-Host '      下载完成!'
-    } catch {
-        Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
-        Write-Host ''; Write-Host '按任意键关闭...'
-        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-        exit 1
-    }
-} else {
-    Write-Host '      使用上次缓存的文件'
-}
+${tarSource}
 
 Write-Host '      正在导入 (可能需要几分钟)...'
 try {
@@ -279,10 +345,8 @@ if ($installed) {
     Write-Host '  [OK] WSL2 + OpenClaw Linux 安装完成!'
     Write-Host ''
     Write-Host '  输入 wsl 即可进入 Linux 环境'
-    Write-Host '  OpenClaw 已预装就绪'
 } else {
-    Write-Host '  [失败] 导入未成功，请检查网络后重试'
-    Write-Host '  运行: myclaw wsl2'
+    Write-Host '  [失败] 请检查后重试: myclaw wsl2'
 }
 Write-Host '========================================'
 Write-Host ''
@@ -294,7 +358,6 @@ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
     console.log('[' + C.g + '已启动' + C.nc + '] 请查看新弹出的蓝色窗口');
     console.log('');
     console.log('安装完成后，输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux');
-    console.log('可随时运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 检查状态');
     console.log('');
   }
 }
@@ -309,6 +372,7 @@ function run() {
     process.exit(0);
   }
 
+  const offlineDir = parseOfflineDir();
   const bar = '========================================';
   const state = detectState();
 
@@ -333,9 +397,9 @@ function run() {
   }
 
   if (state === 'needs-setup') {
-    runPhase2();
+    runPhase2(offlineDir);
   } else {
-    runPhase1();
+    runPhase1(offlineDir);
   }
 }