@pyrokine/mcp-ssh 1.1.0 → 1.1.2

package/dist/session-manager.js

@@ -7,12 +7,12 @@
  * - 自动重连
  * - 会话持久化
  */
-import { Client } from 'ssh2';
+import xterm from '@xterm/headless';
 import * as fs from 'fs';
+import * as net from 'net';
 import * as path from 'path';
-import xterm from '@xterm/headless';
+import { Client } from 'ssh2';
 const Terminal = xterm.Terminal;
-import * as net from 'net';
 export class SessionManager {
     sessions = new Map();
     ptySessions = new Map();
@@ -29,18 +29,6 @@ export class SessionManager {
         this.persistPath = persistPath || path.join(process.env.HOME || '/tmp', '.ssh-mcp-pro', 'sessions.json');
         this.ensurePersistDir();
     }
-    ensurePersistDir() {
-        const dir = path.dirname(this.persistPath);
-        if (!fs.existsSync(dir)) {
-            fs.mkdirSync(dir, { recursive: true });
-        }
-    }
-    /**
-     * 生成连接别名
-     */
-    generateAlias(config) {
-        return config.alias || `${config.username}@${config.host}:${config.port}`;
-    }
     /**
      * 建立 SSH 连接
      */
@@ -114,7 +102,8 @@ export class SessionManager {
                     if (session.reconnectAttempts < this.maxReconnectAttempts) {
                         session.reconnectAttempts++;
                         setTimeout(() => {
-                            this.reconnect(alias).catch(() => { });
+                            this.reconnect(alias).catch(() => {
+                            });
                         }, 5000); // 5 秒后重连
                     }
                 }
@@ -122,25 +111,6 @@ export class SessionManager {
             client.connect(connectConfig);
         });
     }
-    /**
-     * 通过跳板机转发连接
-     */
-    forwardConnection(jumpClient, targetHost, targetPort) {
-        return new Promise((resolve, reject) => {
-            jumpClient.forwardOut('127.0.0.1', 0, targetHost, targetPort, (err, stream) => {
-                if (err)
-                    reject(err);
-                else
-                    resolve(stream);
-            });
-        });
-    }
-    /**
-     * 检查连接是否存活
-     */
-    isAlive(session) {
-        return session.connected;
-    }
     /**
      * 重新连接
      */
@@ -152,7 +122,8 @@ export class SessionManager {
         try {
             session.client.end();
         }
-        catch { }
+        catch {
+        }
         await this.connect(session.config);
     }
     /**
@@ -164,7 +135,8 @@ export class SessionManager {
             try {
                 session.client.end();
             }
-            catch { }
+            catch {
+            }
             this.sessions.delete(alias);
             this.persistSessions();
             return true;
@@ -212,12 +184,6 @@ export class SessionManager {
         }
         return result;
     }
-    /**
-     * 转义 shell 参数（使用单引号方式）
-     */
-    escapeShellArg(s) {
-        return `'${s.replace(/'/g, "'\\''")}'`;
-    }
     /**
      * 执行命令
      */
@@ -274,8 +240,9 @@ export class SessionManager {
                     reject(new Error(`Command timed out after ${timeout}ms`));
                 }, timeout);
                 stream.on('close', (code) => {
-                    if (timeoutId)
+                    if (timeoutId) {
                         clearTimeout(timeoutId);
+                    }
                     resolve({
                         success: code === 0,
                         stdout: stdoutTruncated ? stdout + '\n... [truncated]' : stdout,
@@ -311,28 +278,24 @@ export class SessionManager {
             });
         });
     }
-    /**
-     * 校验用户名（只允许字母、数字、下划线、连字符）
-     */
-    isValidUsername(username) {
-        return /^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(username);
-    }
-    /**
-     * 校验环境变量名（只允许字母、数字、下划线，不能以数字开头）
-     */
-    isValidEnvKey(key) {
-        return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key);
-    }
     /**
      * 以其他用户身份执行命令
+     * @param loadProfile 是否加载用户的 shell 配置（默认 true）。
+     *   su -c 创建非交互式 shell，不会自动执行 rc 文件，
+     *   但大多数用户的环境变量设置在 rc 文件中，因此默认加载。
+     *   支持 bash(.bashrc)、zsh(.zshrc) 及其他 shell(.profile)。
      */
     async execAsUser(alias, command, targetUser, options = {}) {
         // 校验用户名防止注入
         if (!this.isValidUsername(targetUser)) {
             throw new Error(`Invalid username: ${targetUser}`);
         }
-        const suCommand = `su - ${targetUser} -c ${this.escapeShellArg(command)}`;
-        return this.exec(alias, suCommand, options);
+        const { loadProfile = true, ...execOpts } = options;
+        const wrappedCommand = loadProfile
+            ? `${this.getLoadProfileCommand()}${command}`
+            : command;
+        const suCommand = `su - ${targetUser} -c ${this.escapeShellArg(wrappedCommand)}`;
+        return this.exec(alias, suCommand, execOpts);
     }
     /**
      * 使用 sudo 执行命令
@@ -355,36 +318,15 @@ export class SessionManager {
         const session = this.getSession(alias);
         return new Promise((resolve, reject) => {
             session.client.sftp((err, sftp) => {
-                if (err)
+                if (err) {
                     reject(err);
-                else
+                }
+                else {
                     resolve(sftp);
+                }
             });
         });
     }
-    /**
-     * 持久化会话信息
-     */
-    persistSessions() {
-        const data = [];
-        for (const [alias, session] of this.sessions) {
-            // 不保存敏感信息（密码、密钥）
-            data.push({
-                alias,
-                host: session.config.host,
-                port: session.config.port || 22,
-                username: session.config.username,
-                connectedAt: session.connectedAt,
-                env: session.config.env,
-            });
-        }
-        try {
-            fs.writeFileSync(this.persistPath, JSON.stringify(data, null, 2));
-        }
-        catch (e) {
-            // 忽略写入错误
-        }
-    }
     /**
      * 加载持久化的会话信息（仅用于显示，不自动重连）
      */
@@ -394,16 +336,10 @@ export class SessionManager {
                 return JSON.parse(fs.readFileSync(this.persistPath, 'utf-8'));
             }
         }
-        catch { }
+        catch {
+        }
         return [];
     }
-    // ========== PTY 会话管理 ==========
-    /**
-     * 生成 PTY 会话 ID
-     */
-    generatePtyId() {
-        return `pty_${++this.ptyIdCounter}_${Date.now()}`;
-    }
     /**
      * 启动持久化 PTY 会话
      */
@@ -456,8 +392,9 @@ export class SessionManager {
                 };
                 // 监听输出数据
                 stream.on('data', (data) => {
-                    if (!ptySession.active)
+                    if (!ptySession.active) {
                         return;
+                    }
                     const chunk = data.toString('utf-8');
                     // 写入终端仿真器（解析 ANSI 序列）
                     terminal.write(chunk);
@@ -492,24 +429,6 @@ export class SessionManager {
         }
         return ptySession.stream.write(data);
     }
-    /**
-     * 从终端仿真器获取当前屏幕内容
-     */
-    getScreenContent(terminal) {
-        const buffer = terminal.buffer.active;
-        const lines = [];
-        for (let i = 0; i < terminal.rows; i++) {
-            const line = buffer.getLine(i);
-            if (line) {
-                lines.push(line.translateToString(true));
-            }
-        }
-        // 移除尾部空行
-        while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
-            lines.pop();
-        }
-        return lines.join('\n');
-    }
     /**
      * 读取 PTY 输出
      * @param mode 'screen' 返回当前屏幕内容，'raw' 返回原始 ANSI 流
@@ -571,11 +490,13 @@ export class SessionManager {
         try {
             ptySession.stream.close();
         }
-        catch { }
+        catch {
+        }
         try {
             ptySession.terminal.dispose();
         }
-        catch { }
+        catch {
+        }
         ptySession.active = false;
         this.ptySessions.delete(ptyId);
         return true;
@@ -612,13 +533,6 @@ export class SessionManager {
         }
         return count;
     }
-    // ========== 端口转发 ==========
-    /**
-     * 生成端口转发 ID
-     */
-    generateForwardId() {
-        return `fwd_${++this.forwardIdCounter}_${Date.now()}`;
-    }
     /**
      * 创建本地端口转发
      * 本地监听 localHost:localPort，转发到远程 remoteHost:remotePort
@@ -688,6 +602,174 @@ export class SessionManager {
             });
         });
     }
+    // ========== PTY 会话管理 ==========
+    /**
+     * 关闭端口转发
+     */
+    forwardClose(forwardId) {
+        const fwdSession = this.forwardSessions.get(forwardId);
+        if (!fwdSession) {
+            return false;
+        }
+        fwdSession.active = false;
+        if (fwdSession.type === 'local' && fwdSession.server) {
+            try {
+                fwdSession.server.close();
+            }
+            catch {
+            }
+        }
+        else if (fwdSession.type === 'remote') {
+            const session = this.sessions.get(fwdSession.alias);
+            if (session) {
+                try {
+                    session.client.unforwardIn(fwdSession.remoteHost, fwdSession.remotePort);
+                }
+                catch {
+                }
+                // 检查是否需要移除共享 dispatcher
+                this.removeTcpDispatcherIfEmpty(session, fwdSession.alias);
+            }
+        }
+        this.forwardSessions.delete(forwardId);
+        return true;
+    }
+    /**
+     * 列出所有端口转发
+     */
+    forwardList() {
+        const result = [];
+        for (const [id, fwd] of this.forwardSessions) {
+            result.push({
+                id,
+                alias: fwd.alias,
+                type: fwd.type,
+                localHost: fwd.localHost,
+                localPort: fwd.localPort,
+                remoteHost: fwd.remoteHost,
+                remotePort: fwd.remotePort,
+                createdAt: fwd.createdAt,
+                active: fwd.active,
+            });
+        }
+        return result;
+    }
+    ensurePersistDir() {
+        const dir = path.dirname(this.persistPath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+    }
+    /**
+     * 生成连接别名
+     */
+    generateAlias(config) {
+        return config.alias || `${config.username}@${config.host}:${config.port}`;
+    }
+    /**
+     * 通过跳板机转发连接
+     */
+    forwardConnection(jumpClient, targetHost, targetPort) {
+        return new Promise((resolve, reject) => {
+            jumpClient.forwardOut('127.0.0.1', 0, targetHost, targetPort, (err, stream) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(stream);
+                }
+            });
+        });
+    }
+    /**
+     * 检查连接是否存活
+     */
+    isAlive(session) {
+        return session.connected;
+    }
+    /**
+     * 转义 shell 参数（使用单引号方式）
+     */
+    escapeShellArg(s) {
+        return `'${s.replace(/'/g, '\'\\\'\'')}'`;
+    }
+    /**
+     * 校验用户名（只允许字母、数字、下划线、连字符）
+     */
+    isValidUsername(username) {
+        return /^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(username);
+    }
+    /**
+     * 校验环境变量名（只允许字母、数字、下划线，不能以数字开头）
+     */
+    isValidEnvKey(key) {
+        return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key);
+    }
+    // ========== 端口转发 ==========
+    /**
+     * 根据用户 shell 类型生成加载配置文件的命令
+     * bash → .bashrc, zsh → .zshrc, 其他 → .profile
+     */
+    getLoadProfileCommand() {
+        return 'case "$(basename "$SHELL" 2>/dev/null)" in ' +
+            'bash) [ -f ~/.bashrc ] && . ~/.bashrc ;; ' +
+            'zsh) [ -f ~/.zshrc ] && . ~/.zshrc ;; ' +
+            '*) [ -f ~/.profile ] && . ~/.profile ;; ' +
+            'esac 2>/dev/null; ';
+    }
+    /**
+     * 持久化会话信息
+     */
+    persistSessions() {
+        const data = [];
+        for (const [alias, session] of this.sessions) {
+            // 不保存敏感信息（密码、密钥）
+            data.push({
+                alias,
+                host: session.config.host,
+                port: session.config.port || 22,
+                username: session.config.username,
+                connectedAt: session.connectedAt,
+                env: session.config.env,
+            });
+        }
+        try {
+            fs.writeFileSync(this.persistPath, JSON.stringify(data, null, 2));
+        }
+        catch (e) {
+            // 忽略写入错误
+        }
+    }
+    /**
+     * 生成 PTY 会话 ID
+     */
+    generatePtyId() {
+        return `pty_${++this.ptyIdCounter}_${Date.now()}`;
+    }
+    /**
+     * 从终端仿真器获取当前屏幕内容
+     */
+    getScreenContent(terminal) {
+        const buffer = terminal.buffer.active;
+        const lines = [];
+        for (let i = 0; i < terminal.rows; i++) {
+            const line = buffer.getLine(i);
+            if (line) {
+                lines.push(line.translateToString(true));
+            }
+        }
+        // 移除尾部空行
+        while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
+            lines.pop();
+        }
+        return lines.join('\n');
+    }
+    /**
+     * 生成端口转发 ID
+     */
+    generateForwardId() {
+        return `fwd_${++this.forwardIdCounter}_${Date.now()}`;
+    }
     /**
      * 确保 SSH session 有共享的 tcp connection dispatcher
      * 所有 remote forward 共用一个 dispatcher，根据 destIP/destPort 路由
@@ -738,55 +820,6 @@ export class SessionManager {
         session.client.removeListener('tcp connection', session.tcpDispatcher);
         session.tcpDispatcher = undefined;
     }
-    /**
-     * 关闭端口转发
-     */
-    forwardClose(forwardId) {
-        const fwdSession = this.forwardSessions.get(forwardId);
-        if (!fwdSession) {
-            return false;
-        }
-        fwdSession.active = false;
-        if (fwdSession.type === 'local' && fwdSession.server) {
-            try {
-                fwdSession.server.close();
-            }
-            catch { }
-        }
-        else if (fwdSession.type === 'remote') {
-            const session = this.sessions.get(fwdSession.alias);
-            if (session) {
-                try {
-                    session.client.unforwardIn(fwdSession.remoteHost, fwdSession.remotePort);
-                }
-                catch { }
-                // 检查是否需要移除共享 dispatcher
-                this.removeTcpDispatcherIfEmpty(session, fwdSession.alias);
-            }
-        }
-        this.forwardSessions.delete(forwardId);
-        return true;
-    }
-    /**
-     * 列出所有端口转发
-     */
-    forwardList() {
-        const result = [];
-        for (const [id, fwd] of this.forwardSessions) {
-            result.push({
-                id,
-                alias: fwd.alias,
-                type: fwd.type,
-                localHost: fwd.localHost,
-                localPort: fwd.localPort,
-                remoteHost: fwd.remoteHost,
-                remotePort: fwd.remotePort,
-                createdAt: fwd.createdAt,
-                active: fwd.active,
-            });
-        }
-        return result;
-    }
 }
 // 全局单例
 export const sessionManager = new SessionManager();

package/dist/ssh-config.js

@@ -8,8 +8,8 @@
  * - ProxyJump 解析（支持 user@host:port 格式）
  */
 import * as fs from 'fs';
-import * as path from 'path';
 import * as os from 'os';
+import * as path from 'path';
 /**
  * 解析 host:port 或 [ipv6]:port
  * 返回 { host, port }，host 不含方括号
@@ -92,7 +92,7 @@ function stripInlineComment(value) {
     let quoteChar = '';
     for (let i = 0; i < value.length; i++) {
         const ch = value[i];
-        if (!inQuote && (ch === '"' || ch === "'")) {
+        if (!inQuote && (ch === '"' || ch === '\'')) {
             inQuote = true;
             quoteChar = ch;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyrokine/mcp-ssh",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A comprehensive SSH MCP Server for Claude Code",
   "type": "module",
   "main": "dist/index.js",