@uofx/cli 1.0.2 → 1.1.0

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

@@ -50,9 +50,9 @@ const tsyringe_1 = require("tsyringe");
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const tokens_1 = require("../../../../di/tokens");
-const command_builder_1 = require("../../../execution/command-builder");
+const command_builder_util_1 = require("../../../execution/command-builder.util");
 const index_1 = require("../../../../constants/index");
-const errors_1 = require("../../../errors");
+const errors_1 = require("../../../../domain/errors");
 const input_validator_util_1 = require("../../../utils/input-validator.util");
 /**
  * WSL 實例生命週期服務
@@ -161,10 +161,10 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
     async deleteInstance(instanceName) {
         (0, input_validator_util_1.requireValidInstanceName)(instanceName);
         this.appLogger?.info('Deleting WSL instance', { instanceName });
-        const builder = command_builder_1.CommandBuilder.create('wsl')
+        const builder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
             .arg('--unregister')
             .arg(instanceName);
-        await builder.exec(this.commandExecutor);
+        await builder.exec();
     }
     /**
      * 匯入 WSL 實例
@@ -174,12 +174,12 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
         if (!fs.existsSync(installPath)) {
             fs.mkdirSync(installPath, { recursive: true });
         }
-        const builder = command_builder_1.CommandBuilder.create('wsl')
+        const builder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
             .arg('--import')
             .arg(instanceName)
             .arg(installPath)
             .arg(rootfsPath);
-        await builder.exec(this.commandExecutor, () => { }, (stderr) => {
+        await builder.exec(() => { }, (stderr) => {
             if (stderr.trim()) {
                 output?.error(`${stderr.trim()}`).flush();
             }
@@ -195,21 +195,19 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
         output?.item('arrow', 'Initializing D-Bus session...').flush();
         await this.initDBusSession(instanceName, output);
         await new Promise((resolve) => setTimeout(resolve, index_1.TIMEOUTS.WSL_STARTUP_DELAY));
+        // 偵測並修補舊實例（disable wait-online + enable-linger）
+        await this.ensureBootPatch(instanceName, output);
         output?.item('arrow', 'Starting MicroK8s services...').flush();
         try {
+            await this.microK8sService.cleanStaleState(instanceName);
             await this.microK8sService.start(instanceName);
-            await new Promise((resolve) => setTimeout(resolve, index_1.TIMEOUTS.WSL_FULL_STARTUP));
-            await this.microK8sService.restartContainerd(instanceName);
         }
         catch (error) {
             // MicroK8s start 失敗不應阻止整個啟動流程
             this.appLogger?.warn('MicroK8s start warning, continuing...', { error });
         }
-        // output?.item('arrow', 'Waiting for MicroK8s to initialize...').flush();
-        // await new Promise((resolve) => setTimeout(resolve, TIMEOUTS.WSL_FULL_STARTUP));
         output?.item('arrow', 'Waiting for MicroK8s to be ready...').flush();
         try {
-            // await this.microK8sService.restartContainerd(instanceName);
             const isReady = await this.microK8sService.waitForReady(instanceName);
             if (!isReady) {
                 throw new errors_1.AppError('MicroK8s did not become ready within timeout', { exitCode: errors_1.EXIT_CODES.SYSTEM_ERROR, context: { instanceName } });
@@ -251,14 +249,14 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
         }
         output?.item('arrow', 'Shutting down WSL instance...').flush();
         try {
-            const terminateBuilder = command_builder_1.CommandBuilder.create('wsl')
+            const terminateBuilder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
                 .arg('--terminate')
                 .arg(instanceName);
-            await terminateBuilder.exec(this.commandExecutor);
+            await terminateBuilder.exec();
             await new Promise((resolve) => setTimeout(resolve, index_1.TIMEOUTS.WSL_STARTUP_DELAY));
             const status = await this.inspectionService.getInstanceStatus(instanceName);
             if (status.running) {
-                await terminateBuilder.exec(this.commandExecutor);
+                await terminateBuilder.exec();
                 await new Promise((resolve) => setTimeout(resolve, index_1.TIMEOUTS.WSL_STARTUP_DELAY));
                 const retryStatus = await this.inspectionService.getInstanceStatus(instanceName);
                 if (retryStatus.running) {
@@ -284,19 +282,72 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
     async initDBusSession(fullInstanceName, output) {
         (0, input_validator_util_1.requireValidInstanceName)(fullInstanceName);
         try {
-            const builder = command_builder_1.CommandBuilder.create('wsl')
+            const builder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
                 .arg('-d')
                 .arg(fullInstanceName)
                 .arg('--exec')
                 .arg('dbus-launch')
                 .arg('true');
-            await builder.exec(this.commandExecutor);
+            await builder.exec();
         }
         catch (error) {
             this.appLogger?.warn('D-Bus initialization warning', { error });
             output?.warning(`D-Bus initialization warning: ${error}`).flush();
         }
     }
+    /**
+     * 偵測並修補舊版 WSL 實例的開機問題
+     *
+     * 舊實例缺少以下設定，會導致 stop → start 後 microk8s 啟動失敗：
+     * - systemd-networkd-wait-online.service 在 WSL 中無作用但阻塞開機 2 分鐘
+     * - 缺少 loginctl enable-linger，user@1000.service 不會在開機時啟動，
+     *   /run/user/1000 (XDG_RUNTIME_DIR) 無法建立，snap/microk8s 啟動失敗
+     *
+     * 以 /var/lib/systemd/linger/ubuntu 作為「已補丁」標記，幂等執行。
+     */
+    async ensureBootPatch(instanceName, output) {
+        try {
+            // 檢查是否已補丁（linger 檔存在即為已補丁）
+            const checkBuilder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
+                .arg('-d')
+                .arg(instanceName)
+                .arg('--exec')
+                .arg('test')
+                .arg('-f')
+                .arg('/var/lib/systemd/linger/ubuntu');
+            const checkResult = await checkBuilder.exec();
+            if (checkResult.exitCode === 0) {
+                return; // 已補丁，直接返回
+            }
+            // 未補丁，執行修補
+            this.appLogger?.info('Applying WSL boot patch for instance', { instanceName });
+            output?.item('arrow', 'Applying boot patch for legacy instance...').flush();
+            const patchCommands = [
+                // 停用並立即停止 systemd-networkd-wait-online（解除當前開機阻塞）
+                ['sudo', 'systemctl', 'disable', '--now', 'systemd-networkd-wait-online.service'],
+                // 啟用 linger（觸發 user@1000.service 啟動，建立 /run/user/1000）
+                ['sudo', 'loginctl', 'enable-linger', 'ubuntu'],
+                // 清理舊版 logind.conf（不再需要）
+                ['sudo', 'rm', '-f', '/etc/systemd/logind.conf.d/99-uofx.conf'],
+            ];
+            for (const cmd of patchCommands) {
+                const builder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
+                    .arg('-d')
+                    .arg(instanceName)
+                    .arg('--exec');
+                for (const a of cmd) {
+                    builder.arg(a);
+                }
+                await builder.exec();
+            }
+            // 等待 systemd 完成 boot chain（disable --now 解除阻塞後需要時間收斂）
+            await new Promise((resolve) => setTimeout(resolve, index_1.TIMEOUTS.WSL_STARTUP_DELAY * 2));
+            output?.success('Boot patch applied').flush();
+        }
+        catch (error) {
+            this.appLogger?.warn('Failed to apply boot patch', { error });
+        }
+    }
     /**
      * 等待 Kubernetes Pods 就緒
      */
@@ -357,11 +408,14 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
      */
     async getDirectorySize(dirPath) {
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            // 使用 -EncodedCommand 防止 PowerShell 子表達式注入
+            const psCommand = `(Get-ChildItem -Path '${dirPath.replace(/'/g, "''")}' -Recurse -ErrorAction SilentlyContinue | Measure-Object -Property Length -Sum).Sum`;
+            const encodedCommand = Buffer.from(psCommand, 'utf16le').toString('base64');
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .arg('-NoProfile')
-                .arg('-Command')
-                .arg(`(Get-ChildItem -Path '${dirPath.replace(/'/g, "''")}' -Recurse -ErrorAction SilentlyContinue | Measure-Object -Property Length -Sum).Sum`);
-            const result = await builder.exec(this.commandExecutor);
+                .arg('-EncodedCommand')
+                .arg(encodedCommand);
+            const result = await builder.exec();
             if (result.exitCode !== 0)
                 return 0;
             const size = parseInt(result.stdout.trim(), 10);
@@ -411,9 +465,9 @@ let WslInstanceLifecycleService = class WslInstanceLifecycleService {
         const homeDir = os.homedir();
         const driveLetter = homeDir.charAt(0);
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .powershell(`(Get-PSDrive ${driveLetter}).Free`);
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             const freeSpaceBytes = parseInt(result.stdout.trim(), 10);
             if (isNaN(freeSpaceBytes)) {
                 return true;

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

@@ -15,9 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WslUpdaterService = void 0;
 const tsyringe_1 = require("tsyringe");
 const tokens_1 = require("../../../../di/tokens");
-const errors_1 = require("../../../errors");
-const command_builder_1 = require("../../../execution/command-builder");
-const error_formatter_util_1 = require("../../../utils/error-formatter.util");
+const errors_1 = require("../../../../domain/errors");
+const command_builder_util_1 = require("../../../execution/command-builder.util");
+const errors_2 = require("../../../../domain/errors");
 /**
  * WSL 更新服務
  *
@@ -108,9 +108,9 @@ let WslUpdaterService = class WslUpdaterService {
      */
     async checkAdmin() {
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .powershell("([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] 'Administrator')");
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             return result.stdout.trim() === 'True';
         }
         catch {
@@ -148,14 +148,14 @@ let WslUpdaterService = class WslUpdaterService {
                 // install: 使用 wsl --install --no-distribution（首次安裝）
                 // update: 使用 wsl --update（更新現有安裝）
                 const builder = action === 'install'
-                    ? command_builder_1.CommandBuilder.create('wsl')
+                    ? command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
                         .arg('--install')
                         .arg('--no-distribution')
                         .inheritStdio()
-                    : command_builder_1.CommandBuilder.create('wsl')
+                    : command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
                         .wslCmd('--update')
                         .inheritStdio();
-                const result = await builder.exec(this.commandExecutor);
+                const result = await builder.exec();
                 const cmdOutput = result.stdout + result.stderr;
                 if (result.exitCode !== 0) {
                     // 即使命令 "失敗"，也可能已經成功但需要重新啟動
@@ -164,7 +164,9 @@ let WslUpdaterService = class WslUpdaterService {
                         output?.success(`WSL ${actionDescription} completed (restart required).`).flush();
                         return { needsRestart: true };
                     }
-                    throw new Error('Command failed');
+                    throw new errors_1.AppError('Command failed', {
+                        exitCode: errors_1.EXIT_CODES.SYSTEM_ERROR,
+                    });
                 }
                 // 根據輸出檢查是否需要重新啟動
                 const needsRestart = this.checkNeedsRestart(cmdOutput);
@@ -179,7 +181,7 @@ let WslUpdaterService = class WslUpdaterService {
             }
             catch (error) {
                 // 檢查錯誤訊息中是否包含重啟提示
-                const errorMessage = (0, error_formatter_util_1.formatErrorMessage)(error);
+                const errorMessage = (0, errors_2.formatErrorMessage)(error);
                 if (this.checkNeedsRestart(errorMessage)) {
                     output?.success(`WSL ${actionDescription} completed (restart required).`).flush();
                     return { needsRestart: true };
@@ -227,12 +229,15 @@ let WslUpdaterService = class WslUpdaterService {
         try {
             output?.info('Setting WSL 2 as default version...').flush();
             this.appLogger?.debug('Running wsl --set-default-version 2');
-            const builder = command_builder_1.CommandBuilder.create('wsl')
+            const builder = command_builder_util_1.CommandBuilder.create('wsl', this.commandExecutor)
                 .arg('--set-default-version')
                 .arg('2');
-            const result = await builder.exec(this.commandExecutor, (data) => output?.info(`${data.trim()}`).flush(), (data) => output?.info(`${data.trim()}`).flush());
+            const result = await builder.exec((data) => output?.info(`${data.trim()}`).flush(), (data) => output?.info(`${data.trim()}`).flush());
             if (result.exitCode !== 0) {
-                throw new Error(result.stderr || 'Command failed');
+                this.appLogger?.debug('Failed to set default WSL version', { stderr: result.stderr });
+                throw new errors_1.AppError('Failed to set default WSL version', {
+                    exitCode: errors_1.EXIT_CODES.SYSTEM_ERROR,
+                });
             }
             output?.success('WSL 2 set as default version').flush();
         }
@@ -269,7 +274,7 @@ let WslUpdaterService = class WslUpdaterService {
             lines.push('  wsl --set-default-version 2');
         }
         lines.push('');
-        lines.push("Then run 'uofx setup' again");
+        lines.push("Then run 'uofx env setup' again");
         lines.push('');
         lines.push('For more information: https://docs.microsoft.com/en-us/windows/wsl/');
         return lines.join('\n');
@@ -284,7 +289,7 @@ let WslUpdaterService = class WslUpdaterService {
         output?.info(this.formatSetupCancelledError(requirement)).flush();
         throw new errors_1.AppError('Setup cancelled: WSL 2 is required for Kubernetes', {
             exitCode: errors_1.EXIT_CODES.BUSINESS_ERROR,
-            solution: 'Install WSL 2 to continue. Run: uofx setup',
+            solution: 'Install WSL 2 to continue. Run: uofx env setup',
         });
     }
 };

package/dist/infrastructure/platforms/windows/services/wslconfig-parser.service.js

@@ -51,7 +51,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const tokens_1 = require("../../../../di/tokens");
-const command_builder_1 = require("../../../execution/command-builder");
+const command_builder_util_1 = require("../../../execution/command-builder.util");
 /**
  * WSL 配置檔案解析服務
  *
@@ -174,11 +174,11 @@ let WslConfigParserService = class WslConfigParserService {
      */
     async getWslCurrentMemoryUsageGB() {
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .arg('-NoProfile')
                 .arg('-Command')
                 .arg('(Get-Process vmmemWSL -ErrorAction SilentlyContinue).WorkingSet64');
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             const bytes = parseInt(result.stdout.trim(), 10);
             if (isNaN(bytes))
                 return 0;

package/dist/infrastructure/platforms/windows/wsl-instance-manager.adapter.js

@@ -16,6 +16,7 @@ exports.WslInstanceManagerAdapter = void 0;
 const tsyringe_1 = require("tsyringe");
 const tokens_1 = require("../../../di/tokens");
 const instance_status_entity_1 = require("../../../domain/entities/instance-status.entity");
+const errors_1 = require("../../../domain/errors");
 /**
  * WSL Instance Manager Adapter
  *
@@ -126,13 +127,17 @@ let WslInstanceManagerAdapter = class WslInstanceManagerAdapter {
     async requireExists(name) {
         const exists = await this.exists(name);
         if (!exists) {
-            throw new Error(`Instance "${name.toString()}" not found`);
+            throw new errors_1.AppError(`Instance "${name.toString()}" not found`, {
+                exitCode: errors_1.EXIT_CODES.BUSINESS_ERROR,
+            });
         }
     }
     async requireNotExists(name) {
         const exists = await this.exists(name);
         if (exists) {
-            throw new Error(`Instance "${name.toString()}" already exists`);
+            throw new errors_1.AppError(`Instance "${name.toString()}" already exists`, {
+                exitCode: errors_1.EXIT_CODES.BUSINESS_ERROR,
+            });
         }
     }
 };
@@ -142,7 +147,7 @@ exports.WslInstanceManagerAdapter = WslInstanceManagerAdapter = __decorate([
     __param(0, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.IWslInstanceNaming)),
     __param(1, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.IWslInstanceLifecycle)),
     __param(2, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.IWslInstanceInspection)),
-    __param(3, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslConfigService)),
+    __param(3, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.IWslConfig)),
     __param(4, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.ScriptExecutorService)),
     __param(5, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.IExecutionEnvironmentFactory)),
     __metadata("design:paramtypes", [Object, Object, Object, Object, Object, Object])

package/dist/infrastructure/platforms/windows/wsl-setup.adapter.js

@@ -0,0 +1,100 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WslSetupAdapter = void 0;
+const tsyringe_1 = require("tsyringe");
+const tokens_1 = require("../../../di/tokens");
+/**
+ * WSL 設定 Adapter
+ *
+ * 實作 IWslSetupPort，封裝 WSL 狀態檢查與互動式設定流程
+ * 協調 WslInfoService 與 WslUpdaterService 完成 WSL 相關操作
+ */
+let WslSetupAdapter = class WslSetupAdapter {
+    constructor(wslInfo, wslUpdater) {
+        this.wslInfo = wslInfo;
+        this.wslUpdater = wslUpdater;
+    }
+    /**
+     * 取得 WSL 設定狀態
+     * @returns WSL 設定狀態
+     */
+    async getWslStatus() {
+        const versionInfo = await this.wslInfo.getWslVersionInfo();
+        if (!versionInfo.installed) {
+            return {
+                isInstalled: false,
+                needsUpdate: false,
+                needsDefaultVersion: false,
+            };
+        }
+        const updateReq = this.wslInfo.checkWslUpdateRequirement(versionInfo);
+        return {
+            isInstalled: true,
+            needsUpdate: updateReq.needsUpdate,
+            needsDefaultVersion: updateReq.needsDefaultVersion,
+            currentVersion: updateReq.currentVersion,
+            currentDefaultVersion: updateReq.currentDefaultVersion,
+        };
+    }
+    /**
+     * 互動式 WSL 設定
+     * @param status - WSL 設定狀態
+     * @param output - 可選的輸出介面
+     * @returns WSL 設定結果
+     */
+    async promptAndSetupWsl(status, output) {
+        // WSL 未安裝 → 詢問是否安裝
+        if (!status.isInstalled) {
+            const shouldInstall = await this.wslUpdater.promptWslInstall(output);
+            if (!shouldInstall) {
+                return { action: 'cancelled', needsRestart: false };
+            }
+            const { needsRestart } = await this.wslUpdater.installWsl('install', output);
+            return { action: 'installed', needsRestart };
+        }
+        // WSL 已安裝但需要更新或設定預設版本
+        if (status.needsUpdate || status.needsDefaultVersion) {
+            const versionInfo = await this.wslInfo.getWslVersionInfo();
+            const updateReq = this.wslInfo.checkWslUpdateRequirement(versionInfo);
+            const shouldSetup = await this.wslUpdater.promptWslSetup(updateReq, output);
+            if (!shouldSetup) {
+                // 使用者取消 — handleSetupCancelled 會拋出例外
+                this.wslUpdater.handleSetupCancelled(updateReq, output);
+                return { action: 'cancelled', needsRestart: false };
+            }
+            // 執行更新
+            if (status.needsUpdate) {
+                const { needsRestart } = await this.wslUpdater.installWsl('update', output);
+                if (needsRestart) {
+                    return { action: 'updated', needsRestart: true };
+                }
+            }
+            // 設定預設版本
+            if (status.needsDefaultVersion) {
+                await this.wslUpdater.setDefaultVersion(output);
+            }
+            return { action: 'updated', needsRestart: false };
+        }
+        return { action: 'none', needsRestart: false };
+    }
+};
+exports.WslSetupAdapter = WslSetupAdapter;
+exports.WslSetupAdapter = WslSetupAdapter = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslInfoService)),
+    __param(1, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.WslUpdaterService)),
+    __metadata("design:paramtypes", [Object, Object])
+], WslSetupAdapter);
+//# sourceMappingURL=wsl-setup.adapter.js.map

package/dist/infrastructure/schematics/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchematicsRunnerAdapter = exports.ProjectScaffolderAdapter = void 0;
+/**
+ * Infrastructure Schematics 模組匯出
+ */
+var project_scaffolder_adapter_1 = require("./project-scaffolder.adapter");
+Object.defineProperty(exports, "ProjectScaffolderAdapter", { enumerable: true, get: function () { return project_scaffolder_adapter_1.ProjectScaffolderAdapter; } });
+var schematics_runner_adapter_1 = require("./schematics-runner.adapter");
+Object.defineProperty(exports, "SchematicsRunnerAdapter", { enumerable: true, get: function () { return schematics_runner_adapter_1.SchematicsRunnerAdapter; } });
+//# sourceMappingURL=index.js.map