maolike-cli 1.0.7 → 2.0.1

package/dist/src/utils/ConfigPrompter.js

@@ -2,113 +2,72 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigPrompter = void 0;
 const tslib_1 = require("tslib");
+const crypto_1 = require("crypto");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const ConfigManager_1 = require("../services/ConfigManager");
-/**
- * 配置交互工具类
- * 封装了 Create 和 Update 命令中通用的配置询问逻辑
- */
+const pathFilter = (input) => input.trim().replace(/^['"]|['"]$/g, "");
+/** Create 和 Update 共用的新结构配置询问逻辑。 */
 class ConfigPrompter {
-    /**
-     * 弹出构建配置输入
-     * @param def 可选的默认值 (用于 Update 场景)
-     */
     static promptBuildConfig(def) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const buildAnswers = yield inquirer_1.default.prompt([
+            var _a, _b, _c;
+            const build = yield inquirer_1.default.prompt([
                 {
                     type: "input",
-                    name: "buildCmd",
-                    message: "打包命令:",
-                    default: (def === null || def === void 0 ? void 0 : def.cmd) || "npm run build",
+                    name: "testCommand",
+                    message: "测试环境打包命令:",
+                    default: (def === null || def === void 0 ? void 0 : def.testCommand) || "npm run build",
                 },
                 {
                     type: "input",
                     name: "nodeVersion",
                     message: "Node 版本 (可选, 例如 18):",
-                    default: def === null || def === void 0 ? void 0 : def.nodeVersion,
+                    default: (def === null || def === void 0 ? void 0 : def.nodeVersion) || "",
                 },
-            ]);
-            // 判断默认产物类型
-            let defaultType = "dir";
-            if (def === null || def === void 0 ? void 0 : def.distFile) {
-                defaultType = "file";
-            }
-            const { type } = yield inquirer_1.default.prompt([
                 {
                     type: "list",
-                    name: "type",
+                    name: "artifactKind",
                     message: "构建产物类型:",
                     choices: [
-                        { name: "📂 文件夹 (例如 dist)", value: "dir" },
-                        { name: "📄 文件 (例如 bundle.js)", value: "file" },
+                        { name: "📂 文件夹内容 (例如 dist)", value: "directory" },
+                        { name: "📄 指定文件 (例如 dist/bundle.js)", value: "files" },
                     ],
-                    default: defaultType,
+                    default: ((_a = def === null || def === void 0 ? void 0 : def.artifact) === null || _a === void 0 ? void 0 : _a.kind) || "directory",
                 },
             ]);
-            let distName = "";
-            let distFile = undefined;
-            const pathFilter = (input) => input.trim().replace(/^['"]|['"]$/g, "");
-            if (type === "dir") {
-                const ans = yield inquirer_1.default.prompt([
-                    {
-                        type: "input",
-                        name: "distName",
-                        message: "文件夹名称:",
-                        default: (def === null || def === void 0 ? void 0 : def.distName) || "dist",
-                        filter: pathFilter,
-                    },
-                ]);
-                distName = ans.distName;
-            }
-            else {
-                const ans = yield inquirer_1.default.prompt([
-                    {
-                        type: "input",
-                        name: "distFile",
-                        message: "文件路径 (逗号分隔):",
-                        default: def === null || def === void 0 ? void 0 : def.distFile,
-                        filter: pathFilter,
-                    },
-                ]);
-                distFile = ans.distFile;
-            }
-            // dir 模式下 distFile 应为 undefined, 且我们需要返回 distName
-            // file 模式下 distName 可以为空或根据需求设置
+            const artifactKind = build.artifactKind;
+            const { artifactPaths } = yield inquirer_1.default.prompt([
+                {
+                    type: "input",
+                    name: "artifactPaths",
+                    message: artifactKind === "directory" ? "产物文件夹:" : "产物文件路径 (逗号分隔):",
+                    default: ((_c = (_b = def === null || def === void 0 ? void 0 : def.artifact) === null || _b === void 0 ? void 0 : _b.paths) === null || _c === void 0 ? void 0 : _c.join(", ")) || "dist",
+                    filter: pathFilter,
+                },
+            ]);
+            const paths = String(artifactPaths)
+                .split(",")
+                .map((value) => value.trim())
+                .filter(Boolean);
             return {
-                cmd: buildAnswers.buildCmd,
-                nodeVersion: buildAnswers.nodeVersion,
-                distName: type === "dir" ? distName : undefined,
-                distFile,
+                testCommand: String(build.testCommand).trim(),
+                productionCommand: (def === null || def === void 0 ? void 0 : def.productionCommand) || null,
+                nodeVersion: String(build.nodeVersion).trim() || null,
+                artifact: {
+                    kind: artifactKind,
+                    paths: paths.length > 0 ? paths : ["dist"],
+                },
             };
         });
     }
-    /**
-     * 弹出测试环境配置输入
-     * @param def 可选的默认值 (用于 Update 场景)
-     */
-    static promptTestConfig(def) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const pathFilter = (input) => input.trim().replace(/^['"]|['"]$/g, "");
-            // 如果有默认值且 path 不为空，说明之前配置过 test，默认选 true
-            const defaultHasTest = !!(def === null || def === void 0 ? void 0 : def.path);
-            const { hasTest } = yield inquirer_1.default.prompt([
-                {
-                    type: "confirm",
-                    name: "hasTest",
-                    message: "配置测试环境同步?",
-                    default: defaultHasTest,
-                },
-            ]);
-            if (!hasTest) {
-                return { path: "", branch: "" };
-            }
-            return inquirer_1.default.prompt([
+    static promptTestEnvironment(def_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (def, servers = ConfigManager_1.ConfigManager.servers) {
+            const environment = yield inquirer_1.default.prompt([
                 {
                     type: "input",
-                    name: "path",
-                    message: "测试项目路径:",
-                    default: def === null || def === void 0 ? void 0 : def.path,
+                    name: "workspacePath",
+                    message: "测试工作区路径:",
+                    default: def === null || def === void 0 ? void 0 : def.workspacePath,
                     filter: pathFilter,
                 },
                 {
@@ -117,173 +76,147 @@ class ConfigPrompter {
                     message: "测试分支:",
                     default: (def === null || def === void 0 ? void 0 : def.branch) || "dev",
                 },
+                {
+                    type: "input",
+                    name: "relativePath",
+                    message: "产物复制到工作区内的相对目录 (可选):",
+                    default: (def === null || def === void 0 ? void 0 : def.relativePath) || "",
+                    filter: pathFilter,
+                },
             ]);
+            const remote = yield this.promptRemoteConfig(def, servers, "测试");
+            return Object.assign({ workspacePath: environment.workspacePath, branch: String(environment.branch).trim(), relativePath: environment.relativePath || null }, remote);
         });
     }
-    /**
-     * 弹出服务器部署配置输入
-     * @param def 可选的默认值 (用于 Update 场景)
-     */
-    static promptServerConfig(def) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const pathFilter = (input) => input.trim().replace(/^['"]|['"]$/g, "");
-            // 1. 获取已有的唯一路径列表
-            const existingPaths = Array.from(new Set(ConfigManager_1.ConfigManager.config["git-list"].map((t) => { var _a; return (_a = t.server) === null || _a === void 0 ? void 0 : _a.remotePath; }).filter((p) => !!p && p.trim().length > 0)));
-            let finalPath = "";
-            const currentPath = def === null || def === void 0 ? void 0 : def.remotePath;
-            // 2. 如果存在已有路径，给予用户选择权
-            if (existingPaths.length > 0) {
-                const { mode } = yield inquirer_1.default.prompt([
-                    {
-                        type: "list",
-                        name: "mode",
-                        message: "服务器部署路径:",
-                        choices: [
-                            { name: "✨ 输入/编辑路径", value: "new" },
-                            { name: "📂 选择已有路径", value: "existing" },
-                        ],
-                    },
-                ]);
-                if (mode === "existing") {
-                    // 如果当前有默认值，尝试在列表中定位索引作为默认选中项
-                    let defaultIndex = 0;
-                    if (currentPath) {
-                        const idx = existingPaths.indexOf(currentPath);
-                        if (idx !== -1)
-                            defaultIndex = idx;
-                    }
-                    const result = yield inquirer_1.default.prompt([
-                        {
-                            type: "list",
-                            name: "selectedPath",
-                            message: "请选择已有路径:",
-                            choices: existingPaths,
-                            default: defaultIndex,
-                        },
-                    ]);
-                    finalPath = result.selectedPath;
-                }
-            }
-            // 3. 如果没选或者选择了新建，则手动输入
-            if (!finalPath) {
-                const result = yield inquirer_1.default.prompt([
-                    {
-                        type: "input",
-                        name: "remotePath",
-                        message: existingPaths.length > 0 ? "请输入/编辑服务器部署路径:" : "服务器部署路径:",
-                        default: currentPath,
-                        filter: pathFilter,
-                        validate: (input) => !!input || "路径不能为空",
-                    },
-                ]);
-                finalPath = result.remotePath;
-            }
-            // 4. 选择 SSH 配置模式
-            const servers = ConfigManager_1.ConfigManager.config.servers || [];
-            // 计算默认选中项
-            let defaultMode = "global";
-            if ((def === null || def === void 0 ? void 0 : def.serverName) && servers.some((s) => s.name === def.serverName)) {
-                defaultMode = `preset:${def.serverName}`;
-            }
-            else if (def === null || def === void 0 ? void 0 : def.host) {
-                defaultMode = "custom";
-            }
-            const { configMode } = yield inquirer_1.default.prompt([
+    static promptProductionConfig(def_1, testEnvironment_1, productionCommand_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (def, testEnvironment, productionCommand, servers = ConfigManager_1.ConfigManager.servers) {
+            const { enabled } = yield inquirer_1.default.prompt([
                 {
-                    type: "list",
-                    name: "configMode",
-                    message: "SSH 连接配置模式:",
-                    choices: [
-                        { name: "🌍 使用全局默认配置", value: "global" },
-                        ...(servers.length > 0
-                            ? [new inquirer_1.default.Separator("--- 预设服务器 ---"), ...servers.map((s) => ({ name: `🖥  ${s.name} (${s.host})`, value: `preset:${s.name}` }))]
-                            : []),
-                        new inquirer_1.default.Separator("--- 自定义 ---"),
-                        { name: "✏️  单独/新建配置 (Custom)", value: "custom" },
-                    ],
-                    default: defaultMode,
+                    type: "confirm",
+                    name: "enabled",
+                    message: "配置生产环境同步?",
+                    default: Boolean(def),
                 },
             ]);
-            if (configMode === "global") {
-                return { remotePath: finalPath };
-            }
-            if (configMode.startsWith("preset:")) {
-                const presetName = configMode.split(":")[1];
-                return { remotePath: finalPath, serverName: presetName };
-            }
-            // Custom Mode
-            const sshConfig = yield inquirer_1.default.prompt([
+            if (!enabled)
+                return { environment: null, productionCommand: null };
+            const production = yield inquirer_1.default.prompt([
                 {
                     type: "input",
-                    name: "host",
-                    message: "服务器地址 (Host):",
-                    default: def === null || def === void 0 ? void 0 : def.host,
-                    validate: (input) => !!input || "服务器地址不能为空",
-                },
-                {
-                    type: "number",
-                    name: "port",
-                    message: "端口 (Port):",
-                    default: (def === null || def === void 0 ? void 0 : def.port) || 22,
+                    name: "workspacePath",
+                    message: "生产工作区路径:",
+                    default: (def === null || def === void 0 ? void 0 : def.workspacePath) || (testEnvironment === null || testEnvironment === void 0 ? void 0 : testEnvironment.workspacePath),
+                    filter: pathFilter,
                 },
                 {
                     type: "input",
-                    name: "user",
-                    message: "用户名 (User):",
-                    default: (def === null || def === void 0 ? void 0 : def.user) || "root",
-                    validate: (input) => !!input || "用户名不能为空",
+                    name: "branch",
+                    message: "生产分支:",
+                    default: (def === null || def === void 0 ? void 0 : def.branch) || "master",
                 },
                 {
-                    type: "password",
-                    name: "password",
-                    message: "登录密码 (可选):",
-                    default: def === null || def === void 0 ? void 0 : def.password,
+                    type: "input",
+                    name: "relativePath",
+                    message: "产物复制到生产工作区内的相对目录 (可选):",
+                    default: (def === null || def === void 0 ? void 0 : def.relativePath) || (testEnvironment === null || testEnvironment === void 0 ? void 0 : testEnvironment.relativePath) || "",
+                    filter: pathFilter,
                 },
                 {
                     type: "input",
-                    name: "gitUser",
-                    message: "Git 用户名 (用于远程 Pull, 可选):",
-                    default: def === null || def === void 0 ? void 0 : def.gitUser,
+                    name: "productionCommand",
+                    message: "生产打包命令 (可选，留空则使用测试命令):",
+                    default: productionCommand || "",
                 },
+            ]);
+            const remote = yield this.promptRemoteConfig(def || undefined, servers, "生产");
+            return {
+                environment: Object.assign({ workspacePath: production.workspacePath, branch: String(production.branch).trim(), relativePath: production.relativePath || null }, remote),
+                productionCommand: String(production.productionCommand).trim() || null,
+            };
+        });
+    }
+    static promptRemoteConfig(def, servers, label) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const configuredServer = servers.find((server) => server.id === (def === null || def === void 0 ? void 0 : def.serverId));
+            const { mode } = yield inquirer_1.default.prompt([
                 {
-                    type: "password",
-                    name: "gitPassword",
-                    message: "Git 密码/Token (用于远程 Pull, 可选):",
-                    default: def === null || def === void 0 ? void 0 : def.gitPassword,
+                    type: "list",
+                    name: "mode",
+                    message: `${label}环境远程服务器:`,
+                    choices: [
+                        { name: "不执行远程拉取", value: "none" },
+                        ...servers.map((server) => ({
+                            name: `🖥  ${server.name} (${server.host})`,
+                            value: `server:${server.id}`,
+                        })),
+                        { name: "➕ 新建服务器预设", value: "create" },
+                    ],
+                    default: configuredServer ? `server:${configuredServer.id}` : "none",
                 },
             ]);
-            // 询问是否保存为预设
-            const { saveAsPreset } = yield inquirer_1.default.prompt([
+            if (mode === "none")
+                return { serverId: null, remotePath: null };
+            let serverId;
+            if (mode === "create") {
+                const server = yield this.promptNewServer(servers);
+                const shouldPersist = servers === ConfigManager_1.ConfigManager.servers;
+                if (shouldPersist)
+                    ConfigManager_1.ConfigManager.upsertServer(server);
+                else
+                    servers.push(server);
+                serverId = server.id;
+                console.log(`✅ 已保存服务器预设: ${server.name}`);
+            }
+            else {
+                serverId = String(mode).slice("server:".length);
+            }
+            const { remotePath } = yield inquirer_1.default.prompt([
                 {
-                    type: "confirm",
-                    name: "saveAsPreset",
-                    message: "是否将此配置保存为常用服务器预设?",
-                    default: false,
+                    type: "input",
+                    name: "remotePath",
+                    message: `${label}服务器上的项目目录:`,
+                    default: def === null || def === void 0 ? void 0 : def.remotePath,
+                    filter: pathFilter,
+                    validate: (input) => Boolean(input) || "远程目录不能为空",
                 },
             ]);
-            if (saveAsPreset) {
-                const { presetName } = yield inquirer_1.default.prompt([
-                    {
-                        type: "input",
-                        name: "presetName",
-                        message: "预设名称 (例如 Aliyun-Prod):",
-                        validate: (input) => {
-                            if (!input)
-                                return "名称不能为空";
-                            if (servers.some((s) => s.name === input))
-                                return "该名称已存在";
-                            return true;
-                        },
+            return { serverId, remotePath };
+        });
+    }
+    static promptNewServer(servers) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const server = yield inquirer_1.default.prompt([
+                {
+                    type: "input",
+                    name: "name",
+                    message: "服务器名称:",
+                    validate: (input) => {
+                        if (!input.trim())
+                            return "服务器名称不能为空";
+                        return servers.some((item) => item.name === input.trim()) ? "服务器名称已存在" : true;
                     },
-                ]);
-                // 保存到全局配置
-                if (!ConfigManager_1.ConfigManager.config.servers)
-                    ConfigManager_1.ConfigManager.config.servers = [];
-                ConfigManager_1.ConfigManager.config.servers.push(Object.assign({ name: presetName }, sshConfig));
-                console.log(`✅ 已保存服务器预设: ${presetName}`);
-                return { remotePath: finalPath, serverName: presetName };
-            }
-            return Object.assign({ remotePath: finalPath }, sshConfig);
+                },
+                { type: "input", name: "host", message: "服务器地址:", validate: (input) => Boolean(input) || "服务器地址不能为空" },
+                { type: "number", name: "port", message: "SSH 端口:", default: 22 },
+                { type: "input", name: "username", message: "SSH 用户名:", default: "root", validate: (input) => Boolean(input) || "用户名不能为空" },
+                { type: "password", name: "password", message: "SSH 密码 (可选):" },
+                { type: "input", name: "sshPrivateKey", message: "SSH 私钥路径 (可选):", filter: pathFilter },
+                { type: "confirm", name: "agentForward", message: "转发本机 SSH Agent (-A):", default: false },
+                { type: "input", name: "gitUsername", message: "远程 Git HTTPS 用户名 (可选):" },
+                { type: "password", name: "gitPassword", message: "远程 Git HTTPS 密码或 Token (可选):" },
+            ]);
+            return {
+                id: (0, crypto_1.randomUUID)(),
+                name: String(server.name).trim(),
+                host: String(server.host).trim(),
+                port: Number(server.port) || 22,
+                username: String(server.username).trim(),
+                password: server.password || null,
+                sshPrivateKey: server.sshPrivateKey || null,
+                agentForward: Boolean(server.agentForward),
+                gitUsername: String(server.gitUsername || "").trim() || null,
+                gitPassword: server.gitPassword || null,
+            };
         });
     }
 }

package/dist/src/utils/Executor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommand = runCommand;
+exports.runInteractiveCommand = runInteractiveCommand;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const util_1 = tslib_1.__importDefault(require("util"));
@@ -32,3 +33,20 @@ function runCommand(command, cwd, stepName) {
         }
     });
 }
+/** 执行需要直接使用当前终端输入输出的命令。 */
+function runInteractiveCommand(executable, args, cwd) {
+    return new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(executable, args, { cwd, stdio: "inherit" });
+        child.once("error", reject);
+        child.once("close", (code, signal) => {
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            const error = new Error(signal ? `${executable} 被信号 ${signal} 终止` : `${executable} 退出，状态码: ${code !== null && code !== void 0 ? code : 1}`);
+            error.code = code !== null && code !== void 0 ? code : 1;
+            error.signal = signal;
+            reject(error);
+        });
+    });
+}