maolike-cli 1.0.7 → 2.0.1

package/dist/src/utils/RemoteServer.js

@@ -1,35 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteServer = void 0;
-exports.createRemoteConnection = createRemoteConnection;
+exports.quoteShellValue = quoteShellValue;
 const tslib_1 = require("tslib");
 const node_ssh_1 = require("node-ssh");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const ora_1 = tslib_1.__importDefault(require("ora"));
-/**
- * 远程服务器交互包装类
- * 基于 node-ssh 封装，提供带状态提示的指令执行与文件上传功能。
- */
+const child_process_1 = require("child_process");
+function quoteShellValue(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+/** 基于 node-ssh 的远程服务器交互包装。 */
 class RemoteServer {
     constructor(config) {
-        this.ssh = new node_ssh_1.NodeSSH();
         this.config = config;
+        this.ssh = new node_ssh_1.NodeSSH();
     }
-    /**
-     * 建立 SSH 连接
-     * @throws {Error} 连接失败时抛出错误
-     */
     connect() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.ssh.connect({
-                    host: this.config.host,
-                    port: this.config.port || 22,
-                    username: this.config.user,
-                    password: this.config.password,
-                    keepaliveInterval: 10000,
-                });
-                return true;
+                const agentForwardConfig = this.config.agentForward && process.env.SSH_AUTH_SOCK ? { agent: process.env.SSH_AUTH_SOCK, agentForward: true } : {};
+                yield this.ssh.connect(Object.assign(Object.assign({ host: this.config.host, port: this.config.port || 22, username: this.config.username, password: this.config.password || undefined, privateKeyPath: this.config.sshPrivateKey || undefined }, agentForwardConfig), { keepaliveInterval: 10000 }));
             }
             catch (error) {
                 throw new Error(`SSH 连接失败 [${this.config.host}]: ${error.message}`);
@@ -37,26 +28,73 @@ class RemoteServer {
         });
     }
     /**
-     * 执行远程 Shell 命令，并同步显示 ora 进度
-     * @param command 命令字符串
-     * @param cwd 远程执行目录
-     * @param taskName 任务描述文案
+     * 在当前终端打开远程交互式 Shell。
+     *
+     * 连接配置仍由 node-ssh 管理，密码和私钥不会经过命令行参数或日志。
      */
+    openInteractiveShell() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (!process.stdin.isTTY || !process.stdout.isTTY) {
+                throw new Error("`ml connect` 需要在交互式终端中运行");
+            }
+            yield this.connect();
+            const shell = yield this.ssh.requestShell({
+                term: process.env.TERM || "xterm-256color",
+                cols: process.stdout.columns || 80,
+                rows: process.stdout.rows || 24,
+            });
+            const stdinWasPaused = process.stdin.isPaused();
+            const stdinWasRaw = process.stdin.isRaw;
+            const resize = () => {
+                shell.setWindow(process.stdout.rows || 24, process.stdout.columns || 80, 0, 0);
+            };
+            (_b = (_a = process.stdin).setRawMode) === null || _b === void 0 ? void 0 : _b.call(_a, true);
+            process.stdin.resume();
+            process.stdin.pipe(shell);
+            shell.pipe(process.stdout);
+            shell.stderr.pipe(process.stderr);
+            process.stdout.on("resize", resize);
+            try {
+                yield new Promise((resolve, reject) => {
+                    shell.once("close", resolve);
+                    shell.once("error", reject);
+                });
+            }
+            finally {
+                process.stdout.removeListener("resize", resize);
+                process.stdin.unpipe(shell);
+                shell.unpipe(process.stdout);
+                shell.stderr.unpipe(process.stderr);
+                if (process.stdin.setRawMode)
+                    process.stdin.setRawMode(stdinWasRaw !== null && stdinWasRaw !== void 0 ? stdinWasRaw : false);
+                if (stdinWasPaused)
+                    process.stdin.pause();
+                shell.destroy();
+            }
+        });
+    }
     exec(command_1, cwd_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (command, cwd, taskName = "Task") {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (command, cwd, taskName = "Task", options = {}) {
+            var _a;
             const spinner = (0, ora_1.default)(`${taskName} (Remote: ${this.config.host})`).start();
             try {
-                const cmd = cwd ? `cd ${cwd} && ${command}` : command;
-                const result = yield this.ssh.execCommand(cmd);
+                const remoteCommand = cwd ? `cd ${quoteShellValue(cwd)} && ${command}` : command;
+                let result = yield this.ssh.execCommand(remoteCommand);
+                let stderr = result.stderr || result.stdout || "";
+                if (result.code !== 0 && options.retryAfterAgentReload && this.isGitAuthError(stderr) && (yield this.reloadSshAgentIfEmpty())) {
+                    spinner.text = `${taskName}: SSH 密钥已重载，正在重试...`;
+                    result = yield this.ssh.execCommand(remoteCommand);
+                    stderr = result.stderr || result.stdout || "";
+                }
                 if (result.code !== 0) {
                     spinner.fail(`${taskName} 失败`);
-                    console.error(chalk_1.default.red(`\n[Remote Stderr]:\n${result.stderr || result.stdout}`));
-                    throw new Error(`远程命令执行出错 (Exit Code: ${result.code})`);
+                    console.error(chalk_1.default.red(`\n[Remote Stderr]:\n${stderr}`));
+                    throw new Error(this.formatExecError(stderr, (_a = result.code) !== null && _a !== void 0 ? _a : -1));
                 }
                 spinner.succeed(`${taskName} 完成`);
-                if (result.stdout) {
+                if (result.stdout)
                     console.log(chalk_1.default.gray(`[Remote Output]:\n${result.stdout.trim()}`));
-                }
                 return result.stdout;
             }
             catch (error) {
@@ -66,63 +104,66 @@ class RemoteServer {
             }
         });
     }
-    /**
-     * 上传单个文件到服务器
-     * @param localPath 本地绝对路径
-     * @param remotePath 远程绝对目标路径
-     */
     uploadFile(localPath, remotePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return this.ssh.putFile(localPath, remotePath);
         });
     }
-    /**
-     * 递归上传整个目录
-     * @param localPath 本地源目录
-     * @param remotePath 远程目标目录
-     */
     uploadDirectory(localPath, remotePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this.ssh.putDirectory(localPath, remotePath, {
-                recursive: true,
-                concurrency: 10,
-            });
+            return this.ssh.putDirectory(localPath, remotePath, { recursive: true, concurrency: 10 });
         });
     }
-    /**
-     * 生成带身份验证信息的 Git Pull 命令
-     * 优先从 SSH 配置中读取凭据并注入到 git-c 辅助程序中
-     * @returns 拼接好的命令行字符串
-     */
     getGitPullCommand() {
-        const { gitUser, gitPassword } = this.config;
-        if (gitUser && gitPassword) {
-            // 使用 git -c 注入临时凭据辅助程序，避免修改远程 URL 或全局配置
-            return `git -c credential.helper='!f() { echo "username=${gitUser}"; echo "password=${gitPassword}"; }; f' pull`;
-        }
-        return "git pull";
+        var _a;
+        const username = (_a = this.config.gitUsername) === null || _a === void 0 ? void 0 : _a.trim();
+        const password = this.config.gitPassword || "";
+        const gitPrefix = `GIT_TERMINAL_PROMPT=0 GIT_SSH_COMMAND=${quoteShellValue("ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new")}`;
+        if (!username)
+            return `${gitPrefix} git pull`;
+        const helper = `!f() { echo "username=${username}"; echo "password=${password}"; }; f`;
+        return `${gitPrefix} git -c credential.helper=${quoteShellValue(helper)} pull`;
     }
-    /**
-     * 断开 SSH 链接释放资源
-     */
     disconnect() {
         this.ssh.dispose();
     }
+    reloadSshAgentIfEmpty() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!this.config.agentForward || !process.env.SSH_AUTH_SOCK)
+                return false;
+            if ((yield runSshAdd(["-l"], "ignore")) !== 1)
+                return false;
+            console.log(chalk_1.default.yellow("本机 SSH Agent 没有已加载的密钥，正在自动重载..."));
+            const args = process.platform === "darwin" ? ["--apple-load-keychain"] : [];
+            yield runSshAdd(args, "inherit");
+            if ((yield runSshAdd(["-l"], "ignore")) === 0) {
+                console.log(chalk_1.default.green("SSH Agent 密钥重载成功，将重新尝试远程 Git Pull。"));
+                return true;
+            }
+            console.warn(chalk_1.default.yellow("SSH Agent 自动重载失败或重载后仍没有密钥，保留原始 Git 错误。"));
+            return false;
+        });
+    }
+    isGitAuthError(stderr) {
+        return /Permission denied \(publickey\)/i.test(stderr) || /Could not read from remote repository/i.test(stderr);
+    }
+    formatExecError(stderr, code) {
+        if (this.isGitAuthError(stderr)) {
+            const hint = this.config.agentForward
+                ? process.env.SSH_AUTH_SOCK
+                    ? "请确认本机 SSH Agent 已加载对应私钥，并且仓库成员权限正常。"
+                    : "已配置 agentForward，但当前终端没有 SSH_AUTH_SOCK。"
+                : "可开启服务器的 agentForward，或在服务器上配置 deploy key。";
+            return `远程 Git 认证失败 (SSH publickey)。${hint}`;
+        }
+        return `远程命令执行出错 (Exit Code: ${code})`;
+    }
 }
 exports.RemoteServer = RemoteServer;
-/**
- * 工厂函数：合并全局与项目级配置，返回可用的连接实例
- * @param globalSsh 全局 SSH 配置
- * @param itemSsh 项目特定的覆盖配置
- */
-function createRemoteConnection(globalSsh, itemSsh) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const merged = Object.assign(Object.assign(Object.assign({}, globalSsh), itemSsh), { host: (itemSsh === null || itemSsh === void 0 ? void 0 : itemSsh.host) || (globalSsh === null || globalSsh === void 0 ? void 0 : globalSsh.host) || "", port: (itemSsh === null || itemSsh === void 0 ? void 0 : itemSsh.port) || (globalSsh === null || globalSsh === void 0 ? void 0 : globalSsh.port) || 22, user: (itemSsh === null || itemSsh === void 0 ? void 0 : itemSsh.user) || (globalSsh === null || globalSsh === void 0 ? void 0 : globalSsh.user) || "" });
-        if (!merged.host || !merged.user) {
-            throw new Error("无效的 SSH 配置: 缺少 host 或 user");
-        }
-        const server = new RemoteServer(merged);
-        yield server.connect();
-        return server;
+function runSshAdd(args, stdio) {
+    return new Promise((resolve) => {
+        const child = (0, child_process_1.spawn)("ssh-add", args, { stdio });
+        child.once("error", () => resolve(-1));
+        child.once("close", (code) => resolve(code !== null && code !== void 0 ? code : -1));
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maolike-cli",
-  "version": "1.0.7",
+  "version": "2.0.1",
   "description": "自动化构建、测试同步与远程部署的 CLI 工具",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/dist/src/commands/system/MenuCommand.js

@@ -1,182 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const BaseCommand_1 = tslib_1.__importDefault(require("../../utils/BaseCommand"));
-const ConfigManager_1 = require("../../services/ConfigManager");
-const InitWizard_1 = tslib_1.__importDefault(require("../../ui/InitWizard"));
-const Scanner_1 = require("../../utils/Scanner");
-const GitProcessor_1 = tslib_1.__importDefault(require("../../core/GitProcessor"));
-const PipelineExecutor_1 = tslib_1.__importDefault(require("../../core/PipelineExecutor"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const path_1 = tslib_1.__importDefault(require("path"));
-/**
- * 仪表盘菜单命令
- * 提供可视化交互界面，集成初始化、扫描、配置运行等多种功能
- */
-class MenuCommand extends BaseCommand_1.default {
-    init() {
-        this.program.command("menu").description("打开交互式操作菜单").action(this.action.bind(this));
-    }
-    action() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            while (true) {
-                // 每次循环重新读取配置状态，确保 init 后能刷新菜单项
-                const config = ConfigManager_1.ConfigManager.config;
-                const hasConfig = ConfigManager_1.ConfigManager.existsOnDisk();
-                const choices = [
-                    { name: "📂 扫描本地目录 (Scan Local)", value: "scan" },
-                    { name: "✨ 初始化配置 (Init)", value: "init" },
-                ];
-                if (hasConfig) {
-                    choices.unshift({
-                        name: "🚀 从配置已保存项目运行 (Run from Config)",
-                        value: "run_config",
-                    });
-                }
-                choices.push(new inquirer_1.default.Separator());
-                choices.push({ name: "🚪 退出 (Exit)", value: "exit" });
-                console.log(""); // 增加一点空行间距
-                const { mode } = yield inquirer_1.default.prompt([
-                    {
-                        type: "list",
-                        name: "mode",
-                        message: "请选择操作模式:",
-                        choices,
-                        pageSize: 10,
-                    },
-                ]);
-                if (mode === "exit") {
-                    console.log(chalk_1.default.gray("👋 再见!"));
-                    process.exit(0);
-                }
-                try {
-                    yield this.handleMenuSelection(mode, config);
-                    // 操作完成后暂停一下可能更好？或者直接换行
-                    console.log(chalk_1.default.dim("\n----------------------------------------\n"));
-                }
-                catch (e) {
-                    console.error(chalk_1.default.red(`\n❌ 操作执行出错: ${e.message}\n`));
-                }
-            }
-        });
-    }
-    /**
-     * 处理主菜单项的选择分发
-     * @param mode 选择的模式标识
-     * @param config 当前全局配置对象
-     * @private
-     */
-    handleMenuSelection(mode, config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (mode === "init") {
-                yield new InitWizard_1.default().run();
-            }
-            else if (mode === "run_config") {
-                yield this.handleRunConfig(config);
-            }
-            else {
-                yield this.handleScanMode();
-            }
-        });
-    }
-    /**
-     * 处理“从配置运行”模式
-     * 列出所有已保存的项目并开启流水线
-     * @param config 全局配置对象
-     * @private
-     */
-    handleRunConfig(config) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!config || !config["git-list"] || config["git-list"].length === 0) {
-                console.log(chalk_1.default.yellow("暂无配置项目"));
-                return;
-            }
-            const { selected } = yield inquirer_1.default.prompt([
-                {
-                    type: "list",
-                    name: "selected",
-                    message: "选择要在测试环境更新的项目:",
-                    choices: config["git-list"].map((i) => ({
-                        name: i.name,
-                        value: i.name,
-                    })),
-                },
-            ]);
-            console.log(chalk_1.default.blue(`开始同步 ${selected}...`));
-            yield this.runPipeline(selected);
-        });
-    }
-    /**
-     * 处理“扫描本地模式”
-     * 扫描指定父目录下的 Git 仓库并执行自动化同步（按需读取局部配置）
-     * @private
-     */
-    handleScanMode() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { targetPath } = yield inquirer_1.default.prompt([
-                {
-                    type: "input",
-                    name: "targetPath",
-                    message: "📂 请拖入或输入包含 Git 项目的父文件夹路径:",
-                    filter: (i) => i.trim(),
-                },
-            ]);
-            const repos = yield (0, Scanner_1.scanForGitRepos)(targetPath);
-            if (repos.length === 0) {
-                console.log(chalk_1.default.yellow("未找到 Git 仓库"));
-                return;
-            }
-            const { selectedRepos } = yield inquirer_1.default.prompt([
-                {
-                    type: "checkbox",
-                    name: "selectedRepos",
-                    message: "请勾选要处理的项目:",
-                    choices: repos.map((r) => ({ name: r.name, value: r })),
-                },
-            ]);
-            for (const repo of selectedRepos) {
-                const localConfigPath = path_1.default.join(repo.path, ".maolike", "config.json");
-                if (fs_extra_1.default.existsSync(localConfigPath)) {
-                    try {
-                        const localConfig = yield fs_extra_1.default.readJson(localConfigPath);
-                        yield new PipelineExecutor_1.default(repo.path, repo.name, localConfig).run();
-                    }
-                    catch (e) {
-                        yield new GitProcessor_1.default(repo.path, repo.name).execute();
-                    }
-                }
-                else {
-                    yield new GitProcessor_1.default(repo.path, repo.name).execute();
-                }
-            }
-        });
-    }
-    /**
-     * 为指定项目启动流水线执行器
-     * @param name 项目名称
-     * @private
-     */
-    runPipeline(name) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!ConfigManager_1.ConfigManager.existsOnDisk()) {
-                console.log(chalk_1.default.red("请先 init"));
-                return;
-            }
-            const config = ConfigManager_1.ConfigManager.config;
-            const task = config["git-list"].find((item) => item.name === name);
-            if (!task) {
-                console.log(chalk_1.default.red(`未找到项目: ${name}`));
-                return;
-            }
-            console.log(chalk_1.default.magenta(`🚀 正在启动 [${name}] 测试环境同步流程...`));
-            yield new PipelineExecutor_1.default(task.path, name, {
-                version: "2.0",
-                ssh: config.ssh,
-                "git-list": [task],
-            }).run();
-        });
-    }
-}
-exports.default = MenuCommand;