@becrafter/prompt-manager 0.1.22 → 0.2.2

package/packages/server/services/TerminalService.js

@@ -1,6 +1,6 @@
 /**
  * TerminalService - 终端服务管理类
- * 
+ *
  * 提供跨平台终端会话管理，支持PTY（伪终端）和实时交互
  * 支持Windows、macOS和Linux系统的原生终端命令
  */
@@ -39,8 +39,6 @@ async function tryLoadNodePty() {
     // 尝试自动修复
     try {
       const { spawn } = await import('child_process');
-      const { promisify } = await import('util');
-      const exec = promisify(spawn);
 
       logger.info('正在重新编译 node-pty...');
       const rebuildProcess = spawn('npm', ['rebuild', 'node-pty'], {
@@ -49,7 +47,7 @@ async function tryLoadNodePty() {
       });
 
       await new Promise((resolve, reject) => {
-        rebuildProcess.on('close', (code) => {
+        rebuildProcess.on('close', code => {
           if (code === 0) {
             resolve();
           } else {
@@ -98,7 +96,7 @@ class TerminalSession {
     this.environment = options.environment || process.env;
     this.isActive = true;
     this.isFallback = options.isFallback || false; // 标记是否使用回退方案
-    
+
     // 绑定PTY事件
     this.setupPtyEvents();
   }
@@ -125,7 +123,7 @@ class TerminalSession {
   setupPtyEvents() {
     if (!this.pty) return;
 
-    this.pty.on('data', (data) => {
+    this.pty.on('data', data => {
       this.lastActivity = new Date();
       this.emit('data', data);
     });
@@ -228,18 +226,18 @@ export class TerminalService {
       maxSessions: 10, // 最大会话数
       ...options
     };
-    
+
     // 定期清理非活跃会话
     this.cleanupInterval = setInterval(() => {
       this.cleanupInactiveSessions();
     }, 60000); // 每分钟检查一次
-    
+
     logger.info('TerminalService initialized');
-    
+
     // 修复 node-pty 二进制文件权限
     this.fixNodePtyPermissions();
   }
-  
+
   /**
    * 修复 node-pty 二进制文件权限
    * 这是解决 posix_spawnp failed 错误的关键
@@ -248,38 +246,54 @@ export class TerminalService {
     try {
       const { execSync } = await import('child_process');
       const platform = process.platform;
-      
+
       // 只在 Unix-like 系统上修复权限（macOS, Linux）
       if (platform !== 'win32') {
         logger.info('🔧 检查并修复 node-pty 二进制文件权限...');
-        
+
         // 尝试多个可能的 node-pty 路径
         const possiblePaths = [
           // 路径1: 在包的 node_modules 中（开发环境）
-          path.join(path.dirname(path.dirname(new URL(import.meta.url).pathname)), 'node_modules', 'node-pty', 'prebuilds'),
+          path.join(
+            path.dirname(path.dirname(new URL(import.meta.url).pathname)),
+            'node_modules',
+            'node-pty',
+            'prebuilds'
+          ),
           // 路径2: 在根 node_modules 中（npm 安装环境）
           path.join(process.cwd(), 'node_modules', 'node-pty', 'prebuilds'),
           // 路径3: 相对于当前工作目录
-          path.join(process.cwd(), 'node_modules', '@becrafter', 'prompt-manager', 'node_modules', 'node-pty', 'prebuilds')
+          path.join(
+            process.cwd(),
+            'node_modules',
+            '@becrafter',
+            'prompt-manager',
+            'node_modules',
+            'node-pty',
+            'prebuilds'
+          )
         ];
-        
+
         let ptyPath = null;
         const fs = await import('fs');
-        
+
         for (const possiblePath of possiblePaths) {
           if (fs.existsSync(possiblePath)) {
             ptyPath = possiblePath;
             break;
           }
         }
-        
+
         if (ptyPath) {
           try {
             // 添加执行权限 - 使用 find 命令来处理所有平台
-            execSync(`find ${ptyPath} -type f -name "*.node" -o -name "spawn-helper" | xargs chmod +x 2>/dev/null || true`, {
-              stdio: 'pipe',
-              timeout: 5000
-            });
+            execSync(
+              `find ${ptyPath} -type f -name "*.node" -o -name "spawn-helper" | xargs chmod +x 2>/dev/null || true`,
+              {
+                stdio: 'pipe',
+                timeout: 5000
+              }
+            );
             logger.info('✅ node-pty 权限修复完成');
           } catch (error) {
             // 静默失败，不影响服务启动
@@ -306,12 +320,14 @@ export class TerminalService {
 
     // 检查PTY是否可用
     if (!PTY_AVAILABLE) {
-      throw new Error('Terminal functionality is disabled - node-pty module is not available. Run "npm rebuild node-pty" to fix this.');
+      throw new Error(
+        'Terminal functionality is disabled - node-pty module is not available. Run "npm rebuild node-pty" to fix this.'
+      );
     }
 
     const sessionId = options.id || randomUUID();
     const sessionOptions = { ...this.defaultOptions, ...options };
-    
+
     // 检查会话数限制
     if (this.sessions.size >= sessionOptions.maxSessions) {
       throw new Error(`Maximum sessions limit reached: ${sessionOptions.maxSessions}`);
@@ -325,19 +341,19 @@ export class TerminalService {
     try {
       const ptyProcess = await this.createPtyProcess(sessionOptions);
       const session = new TerminalSession(sessionId, ptyProcess, sessionOptions);
-      
+
       // 添加事件监听
-      session.on('data', (data) => {
+      session.on('data', data => {
         this.handleSessionData(sessionId, data);
       });
-      
-      session.on('exit', (info) => {
+
+      session.on('exit', info => {
         this.handleSessionExit(sessionId, info);
       });
-      
+
       // 存储会话
       this.sessions.set(sessionId, session);
-      
+
       logger.info(`Terminal session created: ${sessionId}`);
       return session;
     } catch (error) {
@@ -354,6 +370,74 @@ export class TerminalService {
     const args = this.getShellArgs(shell);
     const cwd = options.workingDirectory || os.homedir();
 
+    // 构建优化的 PATH 环境变量
+    const buildOptimizedPath = () => {
+      const platform = process.platform;
+      const existingPaths = process.env.PATH ? process.env.PATH.split(':') : [];
+      const pathSet = new Set(existingPaths);
+
+      // 添加常见的系统工具路径（按优先级排序）
+      const systemPaths = [];
+
+      if (platform === 'darwin') {
+        // macOS 特定路径
+        systemPaths.push(
+          '/opt/homebrew/bin', // Apple Silicon Homebrew
+          '/opt/homebrew/sbin',
+          '/usr/local/bin', // Intel Homebrew
+          '/usr/local/sbin',
+          '/usr/bin',
+          '/usr/sbin',
+          '/bin',
+          '/sbin',
+          '/Library/Apple/usr/bin', // Apple 系统工具
+          '/usr/local/MacGPG2/bin', // GPG 工具
+          '~/.opencode/bin',
+          '~/.local/bin', // 用户本地工具
+          '~/bin' // 用户 bin 目录
+        );
+      } else if (platform === 'linux') {
+        // Linux 特定路径
+        systemPaths.push(
+          '/usr/local/bin',
+          '/usr/local/sbin',
+          '/usr/bin',
+          '/usr/sbin',
+          '/bin',
+          '/sbin',
+          '/snap/bin', // Snap 应用
+          '~/.local/bin',
+          '~/bin'
+        );
+      } else if (platform === 'win32') {
+        // Windows 特定路径（使用分号分隔）
+        const winPaths = [
+          `${process.env.ProgramFiles}\\Git\\bin`,
+          `${process.env.ProgramFiles}\\Git\\usr\\bin`,
+          `${process.env.ProgramFiles}\\nodejs`,
+          `${process.env['ProgramFiles(x86)']}\\Git\\bin`,
+          `${process.env['ProgramFiles(x86)']}\\Git\\usr\\bin`,
+          `${process.env['ProgramFiles(x86)']}\\nodejs`,
+          `${process.env.LOCALAPPDATA}\\Programs\\Git\\bin`,
+          `${process.env.APPDATA}\\npm`,
+          `${process.env.LOCALAPPDATA}\\Programs\\Microsoft VS Code\\bin`,
+          `${process.env.ProgramFiles}\\Microsoft VS Code\\bin`
+        ].filter(Boolean);
+        return `${winPaths.join(';')};${process.env.PATH || ''}`;
+      }
+
+      // 添加路径到集合（保持优先级顺序）
+      systemPaths.forEach(path => {
+        if (!pathSet.has(path)) {
+          pathSet.add(path);
+        }
+      });
+
+      // 合并所有路径，保持原有 PATH 的顺序，但优先添加系统路径
+      const optimizedPaths = [...pathSet];
+      return optimizedPaths.join(':');
+    };
+
     // 确保环境变量正确，特别是 PATH
     const env = {
       ...process.env,
@@ -365,11 +449,14 @@ export class TerminalService {
       LC_ALL: process.env.LC_ALL || process.env.LANG || 'en_US.UTF-8',
       LC_CTYPE: process.env.LC_CTYPE || process.env.LANG || 'en_US.UTF-8',
       // 确保 TERM 变量设置
-      TERM: process.env.TERM || 'xterm-256color'
+      TERM: process.env.TERM || 'xterm-256color',
+      // 设置优化的 PATH
+      PATH: buildOptimizedPath()
     };
 
     logger.info(`🔧 创建终端会话 - Shell: ${shell}, Args: [${args.join(', ')}], CWD: ${cwd}`);
     logger.info(`🔧 环境变量 - SHELL: ${env.SHELL}, TERM: ${env.TERM}, LANG: ${env.LANG}`);
+    logger.info(`🔧 PATH 已优化，包含 ${env.PATH.split(':').length} 个路径`);
     logger.info(`🔧 Shell 可执行性检查: ${shell} ${args.join(' ')}`);
 
     // 检查 shell 是否可执行
@@ -390,27 +477,27 @@ export class TerminalService {
 
       logger.info(`✅ Shell 验证通过: ${shell}`);
     } catch (error) {
-      logger.error(`❌ Shell 验证失败:`, error.message);
+      logger.error('❌ Shell 验证失败:', error.message);
       throw error;
     }
 
     // 创建 PTY 进程 - 使用多级回退机制
-    logger.info(`🔧 尝试创建 PTY 进程...`);
+    logger.info('🔧 尝试创建 PTY 进程...');
 
     // 定义尝试策略的优先级
     const strategies = [
       // 策略 1: 使用用户指定的 shell 和 xterm-256color
       {
         name: 'User shell with xterm-256color',
-        shell: shell,
-        args: args,
+        shell,
+        args,
         term: 'xterm-256color'
       },
       // 策略 2: 使用用户指定的 shell 和 xterm
       {
         name: 'User shell with xterm',
-        shell: shell,
-        args: args,
+        shell,
+        args,
         term: 'xterm'
       },
       // 策略 3: 使用 /bin/sh 和 xterm-256color
@@ -440,15 +527,15 @@ export class TerminalService {
 
     for (let i = 0; i < strategies.length; i++) {
       const strategy = strategies[i];
-      
+
       try {
         logger.info(`🔄 尝试策略 ${i + 1}/${strategies.length}: ${strategy.name}`);
-        
+
         const ptyProcess = pty.default.spawn(strategy.shell, strategy.args, {
           name: strategy.term,
           cols: options.size.cols,
           rows: options.size.rows,
-          cwd: cwd,
+          cwd,
           env: {
             ...env,
             TERM: strategy.term,
@@ -458,23 +545,22 @@ export class TerminalService {
 
         logger.info(`✅ PTY 进程创建成功，PID: ${ptyProcess.pid}`);
         logger.info(`✅ 使用策略: ${strategy.name}`);
-        
+
         // 更新会话选项以反映实际使用的 shell
         options.shell = strategy.shell;
-        
-        return ptyProcess;
 
+        return ptyProcess;
       } catch (error) {
         lastError = error;
         logger.warn(`❌ 策略 ${i + 1} 失败: ${error.message}`);
-        
+
         // 继续尝试下一个策略
         continue;
       }
     }
 
     // 所有策略都失败了
-    logger.error(`❌ 所有 PTY 创建策略都失败了`);
+    logger.error('❌ 所有 PTY 创建策略都失败了');
     logger.error(`❌ 最后一个错误: ${lastError?.message}`);
     logger.error(`❌ 系统信息 - 平台: ${process.platform}, Node: ${process.version}`);
     logger.error(`❌ 环境信息 - SHELL: ${env.SHELL}, TERM: ${env.TERM}`);
@@ -483,14 +569,14 @@ export class TerminalService {
 
     // 提供用户友好的错误信息
     const error = new Error(
-      `终端创建失败：所有 PTY 创建策略都失败了。\n` +
-      `最后一个错误: ${lastError?.message}\n` +
-      `建议解决方案:\n` +
-      `1. 运行: npm rebuild node-pty\n` +
-      `2. 检查系统权限和 macOS 安全设置\n` +
-      `3. 确认 shell 路径正确: ${shell}\n` +
-      `4. 重启系统后再试\n` +
-      `5. 检查是否有其他进程占用了 PTY 资源`
+      '终端创建失败：所有 PTY 创建策略都失败了。\n' +
+        `最后一个错误: ${lastError?.message}\n` +
+        '建议解决方案:\n' +
+        '1. 运行: npm rebuild node-pty\n' +
+        '2. 检查系统权限和 macOS 安全设置\n' +
+        `3. 确认 shell 路径正确: ${shell}\n` +
+        '4. 重启系统后再试\n' +
+        '5. 检查是否有其他进程占用了 PTY 资源'
     );
     error.code = 'TERMINAL_CREATION_FAILED';
     error.originalError = lastError;
@@ -585,11 +671,11 @@ export class TerminalService {
   cleanupInactiveSessions() {
     const now = new Date();
     const timeoutMs = this.defaultOptions.timeout;
-    
-    for (const [sessionId, session] of this.sessions) {
-      if (!session.isActive || (now - session.lastActivity) > timeoutMs) {
-        logger.info(`Cleaning up inactive session: ${sessionId}`);
-        this.removeSession(sessionId);
+
+    for (const session of this.sessions.values()) {
+      if (!session.isActive || now - session.lastActivity > timeoutMs) {
+        logger.info(`Cleaning up inactive session: ${session.sessionId}`);
+        this.removeSession(session.sessionId);
       }
     }
   }
@@ -602,9 +688,9 @@ export class TerminalService {
       const shell = this.getDefaultShellForPlatform();
       const args = process.platform === 'win32' ? ['/c', command] : ['-c', command];
       const cwd = options.workingDirectory || this.defaultOptions.workingDirectory;
-      
+
       const child = spawn(shell, args, {
-        cwd: cwd,
+        cwd,
         env: { ...process.env, ...options.environment },
         stdio: ['pipe', 'pipe', 'pipe']
       });
@@ -612,23 +698,23 @@ export class TerminalService {
       let stdout = '';
       let stderr = '';
 
-      child.stdout?.on('data', (data) => {
+      child.stdout?.on('data', data => {
         stdout += data.toString();
       });
 
-      child.stderr?.on('data', (data) => {
+      child.stderr?.on('data', data => {
         stderr += data.toString();
       });
 
-      child.on('close', (code) => {
+      child.on('close', code => {
         resolve({
           exitCode: code,
-          stdout: stdout,
-          stderr: stderr
+          stdout,
+          stderr
         });
       });
 
-      child.on('error', (error) => {
+      child.on('error', error => {
         reject(error);
       });
 
@@ -650,7 +736,7 @@ export class TerminalService {
     if (session) {
       return session.workingDirectory;
     }
-    
+
     // 如果没有会话，返回默认工作目录
     return this.defaultOptions.workingDirectory;
   }
@@ -689,16 +775,16 @@ export class TerminalService {
    */
   async shutdown() {
     // 清理所有会话
-    for (const [sessionId, session] of this.sessions) {
+    for (const session of this.sessions.values()) {
       session.terminate();
     }
     this.sessions.clear();
-    
+
     // 清理定时器
     if (this.cleanupInterval) {
       clearInterval(this.cleanupInterval);
     }
-    
+
     logger.info('TerminalService shutdown');
   }
 }
@@ -729,4 +815,4 @@ export async function reloadPty() {
 export const terminalService = new TerminalService();
 
 // 导出类型定义
-export { TerminalSession };
+export { TerminalSession };

package/packages/server/services/WebSocketService.js

@@ -1,6 +1,6 @@
 /**
  * WebSocketService - WebSocket服务管理类
- * 
+ *
  * 提供实时双向通信服务，支持终端会话的实时数据传输
  * 处理客户端连接、消息路由和会话管理
  */
@@ -22,7 +22,7 @@ class WebSocketConnection {
     this.sessionId = null;
     this.isAuthenticated = false;
     this.userInfo = null;
-    
+
     this.setupWebSocketEvents();
   }
 
@@ -30,7 +30,7 @@ class WebSocketConnection {
    * 设置WebSocket事件监听
    */
   setupWebSocketEvents() {
-    this.ws.on('message', (data) => {
+    this.ws.on('message', data => {
       this.handleMessage(data);
     });
 
@@ -38,7 +38,7 @@ class WebSocketConnection {
       this.handleClose(code, reason);
     });
 
-    this.ws.on('error', (error) => {
+    this.ws.on('error', error => {
       this.handleError(error);
     });
 
@@ -54,9 +54,9 @@ class WebSocketConnection {
     try {
       this.lastActivity = new Date();
       const message = JSON.parse(data.toString());
-      
+
       logger.debug(`Received message from client ${this.clientId}:`, message.type);
-      
+
       // 根据消息类型处理
       switch (message.type) {
         case 'terminal.create':
@@ -100,14 +100,14 @@ class WebSocketConnection {
       this.sessionId = session.id;
 
       // 监听会话数据
-      session.on('data', (data) => {
+      session.on('data', data => {
         this.send('terminal.data', {
           sessionId: session.id,
-          data: data
+          data
         });
       });
 
-      session.on('exit', (info) => {
+      session.on('exit', info => {
         this.send('terminal.exit', {
           sessionId: session.id,
           exitCode: info.exitCode,
@@ -175,7 +175,7 @@ class WebSocketConnection {
   /**
    * 处理终端关闭
    */
-  async handleTerminalClose(message) {
+  async handleTerminalClose(_message) {
     if (this.sessionId) {
       try {
         await terminalService.removeSession(this.sessionId);
@@ -192,7 +192,7 @@ class WebSocketConnection {
   /**
    * 处理ping
    */
-  handlePing(message) {
+  handlePing(_message) {
     this.send('pong', {
       timestamp: Date.now(),
       clientId: this.clientId
@@ -204,7 +204,7 @@ class WebSocketConnection {
    */
   handleClose(code, reason) {
     logger.info(`Client ${this.clientId} disconnected: ${code} - ${reason}`);
-    
+
     // 清理关联的终端会话
     if (this.sessionId) {
       terminalService.removeSession(this.sessionId);
@@ -224,12 +224,12 @@ class WebSocketConnection {
   send(type, data) {
     if (this.ws.readyState === this.ws.OPEN) {
       const message = {
-        type: type,
+        type,
         timestamp: Date.now(),
         clientId: this.clientId,
         ...data
       };
-      
+
       this.ws.send(JSON.stringify(message));
     }
   }
@@ -239,8 +239,8 @@ class WebSocketConnection {
    */
   sendError(message, details = null) {
     this.send('error', {
-      message: message,
-      details: details
+      message,
+      details
     });
   }
 
@@ -274,33 +274,38 @@ class WebSocketConnection {
 export class WebSocketService {
   constructor(options = {}) {
     this.options = {
-      port: options.port || 0, // 0 表示让系统自动分配端口，或使用外部指定的端口
+      port: options.port !== undefined ? options.port : 0, // 0 表示让系统自动分配端口
       host: '0.0.0.0',
       maxConnections: 100,
       heartbeatInterval: 30000, // 30秒心跳
       connectionTimeout: 300000, // 5分钟超时
       ...options
     };
-    
+
     this.wss = null;
     this.connections = new Map();
     this.isRunning = false;
-    
+
     logger.info('WebSocketService initialized');
   }
 
   /**
    * 启动WebSocket服务
+   * @param {Object} options - 可选配置
+   * @param {number} options.port - WebSocket 端口（会覆盖构造函数中的配置）
    */
-  async start() {
+  async start(options = {}) {
     if (this.isRunning) {
       throw new Error('WebSocket service is already running');
     }
 
+    // 合并传入的端口配置
+    const port = options.port || this.options.port;
+
     return new Promise((resolve, reject) => {
       try {
         this.wss = new WebSocketServer({
-          port: this.options.port,
+          port,
           host: this.options.host,
           maxConnections: this.options.maxConnections
         });
@@ -309,7 +314,7 @@ export class WebSocketService {
           this.handleConnection(ws, request);
         });
 
-        this.wss.on('error', (error) => {
+        this.wss.on('error', error => {
           logger.error('WebSocket server error:', error);
           if (!this.isRunning) {
             reject(error);
@@ -328,7 +333,6 @@ export class WebSocketService {
 
           resolve();
         });
-
       } catch (error) {
         reject(error);
       }
@@ -344,7 +348,7 @@ export class WebSocketService {
     }
 
     // 关闭所有连接
-    for (const [clientId, connection] of this.connections) {
+    for (const connection of this.connections.values()) {
       connection.close(1001, 'Server shutdown');
     }
     this.connections.clear();
@@ -369,7 +373,7 @@ export class WebSocketService {
    */
   handleConnection(ws, request) {
     const clientId = this.generateClientId();
-    
+
     // 检查连接数限制
     if (this.connections.size >= this.options.maxConnections) {
       ws.close(1013, 'Server overload');
@@ -379,12 +383,12 @@ export class WebSocketService {
     try {
       const connection = new WebSocketConnection(ws, clientId);
       this.connections.set(clientId, connection);
-      
+
       logger.info(`New client connected: ${clientId} from ${request.socket.remoteAddress}`);
-      
+
       // 发送欢迎消息
       connection.send('welcome', {
-        clientId: clientId,
+        clientId,
         serverInfo: {
           version: '1.0.0',
           platform: process.platform,
@@ -396,7 +400,6 @@ export class WebSocketService {
       ws.on('close', () => {
         this.connections.delete(clientId);
       });
-
     } catch (error) {
       logger.error(`Failed to handle connection for client ${clientId}:`, error);
       ws.close(1011, 'Internal error');
@@ -416,7 +419,7 @@ export class WebSocketService {
   startHeartbeat() {
     this.heartbeatInterval = setInterval(() => {
       const now = Date.now();
-      
+
       for (const [clientId, connection] of this.connections) {
         // 检查连接超时
         if (now - connection.lastActivity > this.options.connectionTimeout) {
@@ -471,9 +474,7 @@ export class WebSocketService {
    * 获取服务状态
    */
   getStatus() {
-    const activeConnections = this.getAllConnections().filter(
-      conn => conn.ws.readyState === conn.ws.OPEN
-    );
+    const activeConnections = this.getAllConnections().filter(conn => conn.ws.readyState === conn.ws.OPEN);
 
     return {
       isRunning: this.isRunning,
@@ -491,4 +492,4 @@ export class WebSocketService {
 export const webSocketService = new WebSocketService();
 
 // 导出类型定义
-export { WebSocketConnection };
+export { WebSocketConnection };