@uofx/cli 1.0.1 → 1.0.2

package/dist/infrastructure/platforms/windows/services/wsl-updater.service.js

@@ -117,13 +117,23 @@ let WslUpdaterService = class WslUpdaterService {
             return false;
         }
     }
+    /**
+     * 檢查輸出是否指示需要重新啟動
+     * @param output - 命令輸出或錯誤訊息
+     * @returns 是否需要重新啟動
+     */
+    checkNeedsRestart(output) {
+        return /restart|reboot|重新啟動|重启|再起動|rebooted/i.test(output);
+    }
     /**
      * 安裝或更新 WSL
-     * 統一使用 wsl --update 命令，適用於所有 Windows 版本
+     * - install: 使用 wsl --install --no-distribution（首次安裝 WSL）
+     * - update: 使用 wsl --update（更新現有 WSL 安裝）
+     *
      * 如果以管理員身分執行，則在當前控制台中執行
      * 否則，提示用戶以管理員身份重新執行
      *
-     * @param action 'install' 或 'update'（統一執行 --update）
+     * @param action 'install' 或 'update'
      * @param output - 輸出介面
      * @returns 物件指示是否需要重新啟動
      */
@@ -134,23 +144,30 @@ let WslUpdaterService = class WslUpdaterService {
         if (isAdmin) {
             output?.info(`Running WSL ${actionDescription} in the current console...`).flush();
             try {
-                // 統一使用 --update，適用於所有 Windows 版本
-                const builder = command_builder_1.CommandBuilder.create('wsl')
-                    .wslCmd('--update')
-                    .inheritStdio();
+                // 根據 action 決定使用的命令
+                // install: 使用 wsl --install --no-distribution（首次安裝）
+                // update: 使用 wsl --update（更新現有安裝）
+                const builder = action === 'install'
+                    ? command_builder_1.CommandBuilder.create('wsl')
+                        .arg('--install')
+                        .arg('--no-distribution')
+                        .inheritStdio()
+                    : command_builder_1.CommandBuilder.create('wsl')
+                        .wslCmd('--update')
+                        .inheritStdio();
                 const result = await builder.exec(this.commandExecutor);
                 const cmdOutput = result.stdout + result.stderr;
                 if (result.exitCode !== 0) {
                     // 即使命令 "失敗"，也可能已經成功但需要重新啟動
                     // Windows 經常在需要重新啟動時返回非零退出碼
-                    if (/restart|reboot|重新啟動/i.test(cmdOutput)) {
+                    if (this.checkNeedsRestart(cmdOutput)) {
                         output?.success(`WSL ${actionDescription} completed (restart required).`).flush();
                         return { needsRestart: true };
                     }
                     throw new Error('Command failed');
                 }
                 // 根據輸出檢查是否需要重新啟動
-                const needsRestart = /restart|reboot|重新啟動/i.test(cmdOutput);
+                const needsRestart = this.checkNeedsRestart(cmdOutput);
                 if (needsRestart) {
                     output?.success(`WSL ${actionDescription} completed.`).flush();
                     output?.warning('A system restart is required.').flush();
@@ -163,7 +180,7 @@ let WslUpdaterService = class WslUpdaterService {
             catch (error) {
                 // 檢查錯誤訊息中是否包含重啟提示
                 const errorMessage = (0, error_formatter_util_1.formatErrorMessage)(error);
-                if (/restart|reboot|重新啟動/i.test(errorMessage)) {
+                if (this.checkNeedsRestart(errorMessage)) {
                     output?.success(`WSL ${actionDescription} completed (restart required).`).flush();
                     return { needsRestart: true };
                 }
@@ -174,7 +191,9 @@ let WslUpdaterService = class WslUpdaterService {
                 });
                 throw new errors_1.AppError(`Failed to execute WSL ${actionDescription}`, {
                     exitCode: errors_1.EXIT_CODES.SYSTEM_ERROR,
-                    solution: 'Try running the command as administrator or check Windows Event Viewer for details',
+                    solution: action === 'install'
+                        ? 'Try running: wsl --install --no-distribution'
+                        : 'Try running: wsl --update',
                 });
             }
         }
@@ -238,7 +257,13 @@ let WslUpdaterService = class WslUpdaterService {
         lines.push('');
         lines.push('To continue setup manually, please run:');
         if (requirement.needsUpdate) {
-            lines.push('  wsl --update');
+            // 根據是否有 currentVersion 判斷是安裝還是更新
+            if (!requirement.currentVersion) {
+                lines.push('  wsl --install --no-distribution');
+            }
+            else {
+                lines.push('  wsl --update');
+            }
         }
         if (requirement.needsDefaultVersion) {
             lines.push('  wsl --set-default-version 2');

package/dist/presentation/controllers/setup.controller.js

@@ -24,9 +24,10 @@ const error_formatter_util_1 = require("../../infrastructure/utils/error-formatt
  * 處理環境設定相關的 CLI 命令
  */
 let SetupController = class SetupController {
-    constructor(setupUseCase, output, wslUpdater, runtimeEnvironment) {
+    constructor(setupUseCase, output, wslInfo, wslUpdater, runtimeEnvironment) {
         this.setupUseCase = setupUseCase;
         this.output = output;
+        this.wslInfo = wslInfo;
         this.wslUpdater = wslUpdater;
         this.runtimeEnvironment = runtimeEnvironment;
     }
@@ -55,6 +56,40 @@ let SetupController = class SetupController {
                 .item('bullet', `Version: ${result.runtimeInfo.version}`);
             if (result.runtimeInfo.isInstalled) {
                 this.output.success('Runtime installed');
+                // 檢查是否需要更新
+                const versionInfo = await this.wslInfo.getWslVersionInfo();
+                const updateReq = this.wslInfo.checkWslUpdateRequirement(versionInfo);
+                if (updateReq.needsUpdate || updateReq.needsDefaultVersion) {
+                    this.output.newline().render();
+                    // 詢問使用者是否要更新
+                    const shouldSetup = await this.wslUpdater.promptWslSetup(updateReq, this.output);
+                    if (shouldSetup) {
+                        // 執行更新
+                        if (updateReq.needsUpdate) {
+                            const { needsRestart } = await this.wslUpdater.installWsl('update', this.output);
+                            if (needsRestart) {
+                                this.output
+                                    .newline()
+                                    .info('Please restart your computer and run "uofx env setup" again.')
+                                    .render();
+                                return;
+                            }
+                        }
+                        // 設定預設版本
+                        if (updateReq.needsDefaultVersion) {
+                            await this.wslUpdater.setDefaultVersion(this.output);
+                        }
+                        this.output
+                            .newline()
+                            .success('WSL setup completed.')
+                            .render();
+                        return;
+                    }
+                    else {
+                        // 使用者取消
+                        this.wslUpdater.handleSetupCancelled(updateReq, this.output);
+                    }
+                }
             }
             else {
                 this.output.error('Runtime not installed').newline().render();
@@ -168,8 +203,9 @@ exports.SetupController = SetupController = __decorate([
     (0, tsyringe_1.injectable)(),
     __param(0, (0, tsyringe_1.inject)(tokens_1.TOKENS.SetupEnvironmentUseCase)),
     __param(1, (0, tsyringe_1.inject)(tokens_1.TOKENS.IOutputPort)),
-    __param(2, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslUpdaterService)),
-    __param(3, (0, tsyringe_1.inject)(tokens_1.TOKENS.IRuntimeEnvironmentPort)),
-    __metadata("design:paramtypes", [setup_environment_use_case_1.SetupEnvironmentUseCase, Object, Object, Object])
+    __param(2, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslInfoService)),
+    __param(3, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslUpdaterService)),
+    __param(4, (0, tsyringe_1.inject)(tokens_1.TOKENS.IRuntimeEnvironmentPort)),
+    __metadata("design:paramtypes", [setup_environment_use_case_1.SetupEnvironmentUseCase, Object, Object, Object, Object])
 ], SetupController);
 //# sourceMappingURL=setup.controller.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uofx/cli",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "CLI tool for installing and managing the UOFX development environment on WSL",
   "main": "dist/index.js",
   "bin": {