@uofx/cli 1.0.2 → 1.1.0

package/dist/infrastructure/environment/services/hardware-info.service.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HardwareInfoService = void 0;
 const tsyringe_1 = require("tsyringe");
 const tokens_1 = require("../../../di/tokens");
-const command_builder_1 = require("../../execution/command-builder");
-const errors_1 = require("../../errors");
+const command_builder_util_1 = require("../../execution/command-builder.util");
+const errors_1 = require("../../../domain/errors");
 /**
  * 硬體資訊服務
  *
@@ -32,9 +32,9 @@ let HardwareInfoService = class HardwareInfoService {
      */
     async getTotalMemoryGB() {
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .powershell('(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory / 1GB');
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             const output = result.stdout.trim();
             const memoryGB = Math.round(parseFloat(output));
             if (isNaN(memoryGB) || memoryGB <= 0) {
@@ -67,9 +67,9 @@ let HardwareInfoService = class HardwareInfoService {
             // FreePhysicalMemory 單位是 KB
             // PowerShell 的 1MB = 1024 * 1024 = 1048576
             // KB / 1048576 = GB（因為 1GB = 1048576 KB）
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .powershell('(Get-CimInstance Win32_OperatingSystem).FreePhysicalMemory / 1MB');
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             const output = result.stdout.trim();
             const memoryGB = Math.round(parseFloat(output) * 100) / 100;
             if (isNaN(memoryGB) || memoryGB < 0) {
@@ -99,9 +99,9 @@ let HardwareInfoService = class HardwareInfoService {
      */
     async getAvailableDiskGB() {
         try {
-            const builder = command_builder_1.CommandBuilder.create('powershell')
+            const builder = command_builder_util_1.CommandBuilder.create('powershell', this.commandExecutor)
                 .powershell('(Get-PSDrive C).Free / 1GB');
-            const result = await builder.exec(this.commandExecutor);
+            const result = await builder.exec();
             const output = result.stdout.trim();
             const diskGB = Math.round(parseFloat(output));
             if (isNaN(diskGB) || diskGB < 0) {

package/dist/infrastructure/environment/services/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetworkCheckerService = exports.HardwareInfoService = void 0;
+/**
+ * Environment 模組服務匯出
+ */
+var hardware_info_service_1 = require("./hardware-info.service");
+Object.defineProperty(exports, "HardwareInfoService", { enumerable: true, get: function () { return hardware_info_service_1.HardwareInfoService; } });
+var network_checker_service_1 = require("./network-checker.service");
+Object.defineProperty(exports, "NetworkCheckerService", { enumerable: true, get: function () { return network_checker_service_1.NetworkCheckerService; } });
+//# sourceMappingURL=index.js.map

package/dist/infrastructure/errors/{error-handler.js → error-handler.adapter.js}

@@ -17,16 +17,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorHandler = void 0;
+exports.ErrorHandlerAdapter = void 0;
 const tsyringe_1 = require("tsyringe");
 const tokens_1 = require("../../di/tokens");
-const app_error_1 = require("./app-error");
-const exit_codes_1 = require("./exit-codes");
-const error_formatter_util_1 = require("../utils/error-formatter.util");
+const errors_1 = require("../../domain/errors");
 /**
  * 錯誤處理器實作
  */
-let ErrorHandler = class ErrorHandler {
+let ErrorHandlerAdapter = class ErrorHandlerAdapter {
     constructor(logger, process) {
         this.logger = logger;
         this.process = process;
@@ -48,7 +46,8 @@ let ErrorHandler = class ErrorHandler {
         }
         const debug = this.isDebugMode();
         // 顯示錯誤
-        console.error(this.formatError(appError, debug));
+        // 輸出錯誤訊息至 stderr
+        process.stderr.write(this.formatError(appError, debug) + '\n');
         // 記錄日誌
         this.logError(appError);
         // 退出
@@ -60,7 +59,8 @@ let ErrorHandler = class ErrorHandler {
     handleWarning(error, context) {
         const appError = this.normalizeError(error, context);
         const debug = this.isDebugMode();
-        console.error(this.formatError(appError, debug));
+        // 輸出警告訊息至 stderr
+        process.stderr.write(this.formatError(appError, debug) + '\n');
         this.logError(appError);
     }
     /**
@@ -105,7 +105,7 @@ let ErrorHandler = class ErrorHandler {
                         output?.success('Cleanup completed').flush();
                     }
                     catch (error) {
-                        output?.warning(`Cleanup failed: ${(0, error_formatter_util_1.formatErrorMessage)(error)}`).flush();
+                        output?.warning(`Cleanup failed: ${(0, errors_1.formatErrorMessage)(error)}`).flush();
                     }
                 }
                 output?.newline().success('Exiting...').newline().flush();
@@ -143,17 +143,17 @@ let ErrorHandler = class ErrorHandler {
      * 將未知錯誤轉換為 AppError
      */
     normalizeError(error, context) {
-        if (error instanceof app_error_1.AppError) {
+        if (error instanceof errors_1.AppError) {
             return error;
         }
         if (error instanceof Error) {
-            return new app_error_1.AppError(context ? `[${context}] ${error.message}` : error.message, {
+            return new errors_1.AppError(context ? `[${context}] ${error.message}` : error.message, {
                 cause: error,
-                exitCode: exit_codes_1.EXIT_CODES.UNKNOWN_ERROR,
+                exitCode: errors_1.EXIT_CODES.UNKNOWN_ERROR,
             });
         }
-        return new app_error_1.AppError(context ? `[${context}] ${String(error)}` : String(error), {
-            exitCode: exit_codes_1.EXIT_CODES.UNKNOWN_ERROR,
+        return new errors_1.AppError(context ? `[${context}] ${String(error)}` : String(error), {
+            exitCode: errors_1.EXIT_CODES.UNKNOWN_ERROR,
         });
     }
     /**
@@ -208,11 +208,11 @@ let ErrorHandler = class ErrorHandler {
             process.env.UOFX_LOG_LEVEL === 'debug');
     }
 };
-exports.ErrorHandler = ErrorHandler;
-exports.ErrorHandler = ErrorHandler = __decorate([
+exports.ErrorHandlerAdapter = ErrorHandlerAdapter;
+exports.ErrorHandlerAdapter = ErrorHandlerAdapter = __decorate([
     (0, tsyringe_1.injectable)(),
     __param(0, (0, tsyringe_1.inject)(tokens_1.TOKENS.ILoggerPort)),
     __param(1, (0, tsyringe_1.inject)(tokens_1.TOKENS.Internal.Process)),
     __metadata("design:paramtypes", [Object, Object])
-], ErrorHandler);
-//# sourceMappingURL=error-handler.js.map
+], ErrorHandlerAdapter);
+//# sourceMappingURL=error-handler.adapter.js.map

package/dist/infrastructure/errors/index.js

@@ -1,25 +1,9 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorHandlerAdapter = void 0;
 /**
- * 統一錯誤系統匯出
- *
- * 這是整個應用程式錯誤處理的單一匯出點
- * 使用方式:
- *
- * import {
- *   ErrorHandler,
- *   AppError,
- *   EXIT_CODES
- * } from '@/infrastructure/errors';
+ * Infrastructure 錯誤處理模組
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXIT_CODES = exports.ErrorHandler = exports.AppError = void 0;
-// 錯誤類別
-var app_error_1 = require("./app-error");
-Object.defineProperty(exports, "AppError", { enumerable: true, get: function () { return app_error_1.AppError; } });
-// 錯誤處理器
-var error_handler_1 = require("./error-handler");
-Object.defineProperty(exports, "ErrorHandler", { enumerable: true, get: function () { return error_handler_1.ErrorHandler; } });
-// 退出碼
-var exit_codes_1 = require("./exit-codes");
-Object.defineProperty(exports, "EXIT_CODES", { enumerable: true, get: function () { return exit_codes_1.EXIT_CODES; } });
+var error_handler_adapter_1 = require("./error-handler.adapter");
+Object.defineProperty(exports, "ErrorHandlerAdapter", { enumerable: true, get: function () { return error_handler_adapter_1.ErrorHandlerAdapter; } });
 //# sourceMappingURL=index.js.map

package/dist/infrastructure/execution/builders/base-command.builder.js

@@ -12,6 +12,7 @@ class BaseCommandBuilder {
         this.executable = '';
         this.commandArgs = [];
         this.isSensitiveInput = false;
+        this.extraOptions = {};
     }
     /**
      * 設定可執行檔名稱
@@ -53,23 +54,42 @@ class BaseCommandBuilder {
         this.isSensitiveInput = true;
         return this;
     }
+    /**
+     * 設定額外執行選項（如 timeout、cwd 等）
+     * @param options 部分命令執行選項
+     */
+    withOptions(options) {
+        this.extraOptions = { ...this.extraOptions, ...options };
+        return this;
+    }
     /**
      * 建構用於記錄的安全命令字串
      */
     buildSafe() {
-        let cmd = this.buildCommandString(true);
-        // 子類別可能會覆寫此方法來加入額外的包裝
-        cmd = this.wrapCommand(cmd, true);
+        const cmd = this.buildCommandString(true);
         if (this.isSensitiveInput) {
-            cmd += ' < [STDIN: ***REDACTED***]';
+            return cmd + ' < [STDIN: ***REDACTED***]';
         }
         return cmd;
     }
     /**
-     * 包裝命令（子類別可覆寫）
+     * 取得參數陣列（用於 spawnProcess 模式）
+     * @returns 參數值的扁平陣列
      */
-    wrapCommand(command, _maskSensitive) {
-        return command;
+    getArgsArray() {
+        const result = [];
+        for (const arg of this.commandArgs) {
+            if (arg.flag && arg.value !== undefined) {
+                result.push(arg.flag, arg.value);
+            }
+            else if (arg.flag) {
+                result.push(arg.flag);
+            }
+            else if (arg.value !== undefined) {
+                result.push(arg.value);
+            }
+        }
+        return result;
     }
     /**
      * 建構命令字串
@@ -105,17 +125,18 @@ class BaseCommandBuilder {
             options: {
                 shell: true,
                 ...(this.stdinInput && { input: this.stdinInput }),
+                ...this.extraOptions,
             },
             safeCommand: this.buildSafe(),
         };
     }
     execSync(showOutput = false, suppressStderr = false) {
-        const { command, options, safeCommand } = this.getExecutionOptions();
-        return this.commandExecutor.execSync(command, options, showOutput, suppressStderr, safeCommand);
+        const ctx = this.getExecutionOptions();
+        return this.commandExecutor.execSync(ctx, { showOutput, suppressStderr });
     }
     async exec(onStdout, onStderr) {
-        const { command, options, safeCommand } = this.getExecutionOptions();
-        return this.commandExecutor.exec(command, onStdout, onStderr, options, safeCommand);
+        const ctx = this.getExecutionOptions();
+        return this.commandExecutor.exec(ctx, { onStdout, onStderr });
     }
 }
 exports.BaseCommandBuilder = BaseCommandBuilder;

package/dist/infrastructure/execution/builders/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 命令建構器模組
+ *
+ * 匯出所有命令建構器，包含基礎建構器與各平台特定實作
+ */
+__exportStar(require("./base-command.builder"), exports);
+__exportStar(require("./host-command.builder"), exports);
+__exportStar(require("./windows-host-command.builder"), exports);
+__exportStar(require("./wsl-command.builder"), exports);
+//# sourceMappingURL=index.js.map

package/dist/infrastructure/execution/builders/wsl-command.builder.js

@@ -2,15 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WslCommandBuilder = void 0;
 const base_command_builder_1 = require("./base-command.builder");
+const errors_1 = require("../../../domain/errors");
+const value_objects_1 = require("../../../domain/value-objects");
 /**
  * WSL 命令建構器
  *
- * 自動將命令包裝為 `wsl -d <instanceName> -- <command>` 格式
+ * 自動將命令包裝為 `wsl -d <instanceName> -- <command>` 格式。
+ * 使用 spawnProcess 直接執行 wsl.exe（不經由 cmd.exe），
+ * 從根本消除 Windows shell 引號解析問題。
  */
 class WslCommandBuilder extends base_command_builder_1.BaseCommandBuilder {
     constructor(instanceName, commandExecutor) {
         super(commandExecutor);
         this.instanceName = instanceName;
+        // 防禦性驗證：防止命令注入
+        if (!value_objects_1.InstanceName.isValid(instanceName)) {
+            throw new errors_1.AppError(`Invalid WSL instance name: "${instanceName}". Name must contain only alphanumeric characters and hyphens.`, { exitCode: errors_1.EXIT_CODES.VALIDATION_ERROR });
+        }
     }
     buildActual() {
         const innerCmd = this.buildCommandString(false);
@@ -24,6 +32,36 @@ class WslCommandBuilder extends base_command_builder_1.BaseCommandBuilder {
         }
         return cmd;
     }
+    /**
+     * 取得 spawnProcess 的參數陣列
+     * @returns wsl.exe 的完整參數陣列
+     */
+    getSpawnArgs() {
+        return ['-d', this.instanceName, '--', this.executable, ...this.getArgsArray()];
+    }
+    /**
+     * 同步執行 WSL 命令（透過 spawnProcess，不經由 cmd.exe）
+     * @param showOutput - 是否顯示輸出
+     * @param suppressStderr - 是否隱藏 stderr
+     * @returns 命令執行結果
+     */
+    execSync(showOutput = false, suppressStderr = false) {
+        return this.commandExecutor.spawnProcessSync('wsl', this.getSpawnArgs(), {
+            showOutput,
+            suppressStderr,
+            options: this.stdinInput ? { input: this.stdinInput } : undefined,
+            safeCommand: this.buildSafe(),
+        });
+    }
+    /**
+     * 非同步執行 WSL 命令（透過 spawnProcess，不經由 cmd.exe）
+     * @param onStdout - stdout 回調函式
+     * @param onStderr - stderr 回調函式
+     * @returns 命令執行結果
+     */
+    async exec(onStdout, onStderr) {
+        return this.commandExecutor.spawnProcess('wsl', this.getSpawnArgs(), { onStdout, onStderr }, this.stdinInput ? { input: this.stdinInput } : undefined);
+    }
 }
 exports.WslCommandBuilder = WslCommandBuilder;
 //# sourceMappingURL=wsl-command.builder.js.map

package/dist/infrastructure/execution/command-builder.util.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommandBuilder = void 0;
+const host_command_builder_1 = require("./builders/host-command.builder");
+/**
+ * 命令建構器 - 支援安全的命令建構與執行
+ *
+ * 繼承 HostCommand，額外提供 PowerShell / WSL 管理命令 / inheritStdio 等輔助方法。
+ *
+ * 注意：此類別用於非 DI 場景（如環境檢查服務）。
+ * 對於 WSL 實例內的命令執行，請使用 IExecutionEnvironmentFactory。
+ *
+ * @example
+ * // 基本使用
+ * const result = await CommandBuilder
+ *   .create('wsl', this.commandExecutor)
+ *   .arg('--list')
+ *   .arg('--verbose')
+ *   .exec();
+ *
+ * @example
+ * // PowerShell 命令
+ * const result = await CommandBuilder
+ *   .create('powershell', this.commandExecutor)
+ *   .powershell('Get-Process')
+ *   .exec();
+ */
+class CommandBuilder extends host_command_builder_1.HostCommand {
+    constructor() {
+        super(...arguments);
+        this._inheritStdio = false;
+    }
+    // ========== 工廠方法 (Factory Methods) ==========
+    /**
+     * 建立一般命令
+     * @param executable 可執行檔名稱或路徑
+     * @param executor 命令執行器實例
+     * @returns CommandBuilder 實例
+     * @example CommandBuilder.create('wsl', this.commandExecutor).arg('--list').arg('--verbose')
+     */
+    static create(executable, executor) {
+        const builder = new CommandBuilder(executor);
+        builder.setExecutable(executable);
+        return builder;
+    }
+    // ========== 命令輔助方法 (Command Helper Methods) ==========
+    /**
+     * PowerShell 命令 (Windows 專用)
+     * @param command PowerShell 命令字串
+     * @returns this (支援方法鏈)
+     * @example CommandBuilder.create('powershell', executor).powershell('Get-Process')
+     */
+    powershell(command) {
+        this.setExecutable('powershell');
+        this.arg('-NoProfile');
+        this.arg('-NoLogo');
+        this.arg('-Command');
+        this.arg(command);
+        return this;
+    }
+    /**
+     * WSL 管理命令 (不包裝實例)
+     * @param subcommand WSL 子命令
+     * @returns this (支援方法鏈)
+     * @example CommandBuilder.create('wsl.exe', executor).wslCmd('--list').arg('--verbose')
+     */
+    wslCmd(subcommand) {
+        // 使用 wsl.exe 而非 wsl，因為當 WSL 未安裝時 wsl 只是 stub
+        this.setExecutable('wsl.exe');
+        this.arg(subcommand);
+        return this;
+    }
+    /**
+     * 設定直接繼承終端的 stdio
+     * 用於需要終端訪問的命令（如 WSL 安裝）
+     * @returns this (支援方法鏈)
+     */
+    inheritStdio() {
+        this._inheritStdio = true;
+        return this;
+    }
+    /**
+     * 取得執行選項（覆寫以支援 inheritStdio）
+     */
+    getExecutionOptions() {
+        const base = super.getExecutionOptions();
+        if (this._inheritStdio) {
+            base.options = { ...base.options, inheritStdio: true };
+        }
+        return base;
+    }
+}
+exports.CommandBuilder = CommandBuilder;
+//# sourceMappingURL=command-builder.util.js.map

package/dist/infrastructure/execution/environments/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 執行環境模組
+ *
+ * 匯出所有執行環境實作（如 WSL 執行環境）
+ */
+__exportStar(require("./wsl-execution.environment"), exports);
+//# sourceMappingURL=index.js.map

package/dist/infrastructure/execution/environments/wsl-execution.environment.js

@@ -16,15 +16,24 @@ class WslExecutionEnvironment {
         this.type = execution_environment_interface_1.EXECUTION_ENVIRONMENT_TYPES.WSL;
     }
     helm(subcommand) {
-        const builder = new wsl_command_builder_1.WslCommandBuilder(this.identifier, this.commandExecutor);
-        builder.setExecutable(paths_1.LINUX_PATHS.MICROK8S_HELM);
-        builder.arg(subcommand);
-        return builder;
+        return this.createMicrok8sCommand('helm3', subcommand);
     }
     kubectl(subcommand) {
+        return this.createMicrok8sCommand('kubectl', subcommand);
+    }
+    /**
+     * 建立 microk8s 命令建構器
+     * @param command - microk8s 子命令（如 'helm3', 'kubectl'）
+     * @param subcommand - 要執行的子命令字串
+     * @returns 命令建構器
+     */
+    createMicrok8sCommand(command, subcommand) {
         const builder = new wsl_command_builder_1.WslCommandBuilder(this.identifier, this.commandExecutor);
-        builder.setExecutable(paths_1.LINUX_PATHS.KUBECTL_BIN);
-        builder.arg(subcommand);
+        builder.setExecutable(paths_1.LINUX_PATHS.MICROK8S_BIN);
+        builder.arg(command);
+        for (const part of subcommand.split(' ')) {
+            builder.arg(part);
+        }
         return builder;
     }
     /**
@@ -41,6 +50,10 @@ class WslExecutionEnvironment {
     }
     /**
      * 執行 shell 腳本（支援重定向、管道等 shell 特性）
+     *
+     * WslCommandBuilder 使用 spawnProcess 直接執行 wsl.exe（不經由 cmd.exe），
+     * 每個 arg 是獨立的 OS 級參數，不需要引號包裹。
+     * sh -c 收到 bare script 後會正確解析 >、| 等 shell 特殊字元。
      * @param script 完整的 shell 腳本字串
      * @returns 命令建構器
      * @example env.shellScript('cat > /tmp/file').stdin(content)
@@ -50,7 +63,9 @@ class WslExecutionEnvironment {
         const builder = new wsl_command_builder_1.WslCommandBuilder(this.identifier, this.commandExecutor);
         builder.setExecutable('sh');
         builder.arg('-c');
-        builder.arg(`"${script}"`);
+        // spawnProcess 直接傳遞參數給 wsl.exe → sh，不經由任何 shell
+        // 不需要引號包裹：每個 arg 已是獨立的 OS 級參數，sh -c 會正確解析 shell 特殊字元
+        builder.arg(script);
         return builder;
     }
     async isAvailable() {

package/dist/infrastructure/execution/index.js

@@ -14,8 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./command-executor.service"), exports);
-__exportStar(require("./script-executor.service"), exports);
+__exportStar(require("./services"), exports);
 __exportStar(require("./execution-environment.factory"), exports);
 __exportStar(require("./builders/base-command.builder"), exports);
 __exportStar(require("./builders/host-command.builder"), exports);