ssh-mcp-devops 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh-mcp-devops",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "SSH MCP Server for AI-powered DevOps with Docker and System Monitoring",
   "type": "module",
   "main": "index-v2.js",

package/ssh-manager-v2.js

@@ -19,7 +19,7 @@ export class SSHManager {
         config.privateKey = await fs.readFile(config.privateKeyPath, 'utf-8');
       } catch (error) {
         throw new Error(`无法读取私钥文件: ${error.message}`);
-      }
+      } 
     }
     return this.connect(config);
   }
@@ -38,7 +38,8 @@ export class SSHManager {
         port: config.port || 22,
         username: config.username,
         readyTimeout: 30000, // 30秒连接超时
-        keepaliveInterval: 10000, // 10秒心跳
+        keepaliveInterval: 5000, // 5秒心跳（更频繁）
+        keepaliveCountMax: 10, // 最多10次心跳失败
       };
 
       if (config.password) {
@@ -70,6 +71,10 @@ export class SSHManager {
           this.connected = false;
           console.error('SSH连接已关闭');
         })
+        .on('end', () => {
+          this.connected = false;
+          console.error('SSH连接已结束');
+        })
         .connect(connectionConfig);
     });
   }
@@ -129,57 +134,114 @@ export class SSHManager {
     });
   }
 
-  async uploadFile(localPath, remotePath, options = {}) {
-    await this.ensureConnected();
-
-    // 检查本地文件是否存在
+  async uploadFile(localPath, remotePath, options = {}, retryCount = 0) {
+    const maxRetries = 3;
+    
     try {
-      await fs.access(localPath);
-    } catch (error) {
-      throw new Error(`本地文件不存在: ${localPath}`);
-    }
+      await this.ensureConnected();
 
-    // 获取文件大小
-    const stats = await fs.stat(localPath);
-    const fileSizeMB = (stats.size / 1024 / 1024).toFixed(2);
-    console.error(`开始上传文件: ${localPath} (${fileSizeMB} MB)`);
+      // 检查本地文件是否存在
+      try {
+        await fs.access(localPath);
+      } catch (error) {
+        throw new Error(`本地文件不存在: ${localPath}`);
+      }
 
-    return new Promise((resolve, reject) => {
-      // 根据文件大小设置超时（每 MB 10 秒，最少 60 秒）
-      const timeout = Math.max(60000, stats.size / 1024 / 1024 * 10000);
-      let uploadTimer;
+      // 获取文件大小
+      const stats = await fs.stat(localPath);
+      const fileSizeMB = (stats.size / 1024 / 1024).toFixed(2);
+      console.error(`开始上传文件: ${localPath} (${fileSizeMB} MB)${retryCount > 0 ? ` [重试 ${retryCount}/${maxRetries}]` : ''}`);
 
-      this.client.sftp((err, sftp) => {
-        if (err) return reject(err);
+      return await new Promise((resolve, reject) => {
+        // 根据文件大小设置超时（每 MB 20 秒，最少 180 秒）
+        const timeout = Math.max(180000, stats.size / 1024 / 1024 * 20000);
+        let uploadTimer;
+        let lastProgressTime = 0;
+        let lastProgressBytes = 0;
+        let startTime = Date.now();
 
-        // 设置超时
-        uploadTimer = setTimeout(() => {
-          sftp.end();
-          reject(new Error(`上传超时 (${(timeout / 1000).toFixed(0)}秒): 文件可能太大`));
-        }, timeout);
-
-        const transferOptions = {
-          concurrency: 64,
-          chunkSize: 32768,
-          step: (total, nb, fsize) => {
-            // 进度回调
-            const percent = ((nb / fsize) * 100).toFixed(1);
-            console.error(`上传进度: ${percent}% (${(nb / 1024 / 1024).toFixed(2)} MB / ${fileSizeMB} MB)`);
-            if (options.onProgress) {
-              options.onProgress(total, nb, fsize);
-            }
-          },
-        };
+        this.client.sftp((err, sftp) => {
+          if (err) {
+            return reject(err);
+          }
 
-        sftp.fastPut(localPath, remotePath, transferOptions, (err) => {
-          clearTimeout(uploadTimer);
-          sftp.end();
-          if (err) return reject(new Error(`上传失败: ${err.message}`));
-          console.error(`✅ 上传完成: ${fileSizeMB} MB`);
-          resolve(`✅ 文件上传成功: ${localPath} -> ${remotePath} (${fileSizeMB} MB)`);
+          // 设置超时
+          uploadTimer = setTimeout(() => {
+            sftp.end();
+            reject(new Error(`上传超时 (${(timeout / 1000).toFixed(0)}秒): 文件可能太大或网络太慢`));
+          }, timeout);
+
+          const transferOptions = {
+            concurrency: 64,
+            chunkSize: 32768,
+            step: (total_transferred, chunk, total) => {
+              const now = Date.now();
+              
+              // 每 2 秒输出一次进度（降低输出频率）
+              if (now - lastProgressTime >= 2000) {
+                const percent = ((total_transferred / total) * 100).toFixed(1);
+                const transferredMB = (total_transferred / 1024 / 1024).toFixed(2);
+                
+                // 计算速度
+                const timeDiff = (now - (lastProgressTime || startTime)) / 1000;
+                const bytesDiff = total_transferred - lastProgressBytes;
+                const speedMBps = timeDiff > 0 ? (bytesDiff / 1024 / 1024 / timeDiff).toFixed(2) : 0;
+                
+                // 估算剩余时间
+                const remainingBytes = total - total_transferred;
+                const eta = speedMBps > 0 ? (remainingBytes / 1024 / 1024 / speedMBps).toFixed(0) : '?';
+                
+                console.error(`上传进度: ${percent}% (${transferredMB}/${fileSizeMB} MB) 速度: ${speedMBps} MB/s ETA: ${eta}s`);
+                
+                lastProgressTime = now;
+                lastProgressBytes = total_transferred;
+              }
+              
+              if (options.onProgress) {
+                options.onProgress(total_transferred, chunk, total);
+              }
+            },
+          };
+
+          sftp.fastPut(localPath, remotePath, transferOptions, (err) => {
+            clearTimeout(uploadTimer);
+            sftp.end();
+            
+            if (err) {
+              return reject(new Error(`上传失败: ${err.message}`));
+            }
+            
+            const totalTime = ((Date.now() - startTime) / 1000).toFixed(1);
+            const avgSpeed = (stats.size / 1024 / 1024 / totalTime).toFixed(2);
+            console.error(`✅ 上传完成: ${fileSizeMB} MB，耗时 ${totalTime}s，平均速度 ${avgSpeed} MB/s`);
+            resolve(`✅ 文件上传成功: ${localPath} -> ${remotePath} (${fileSizeMB} MB, ${totalTime}s)`);
+          });
         });
       });
-    });
+    } catch (error) {
+      // 如果是连接错误且还有重试次数，尝试重连并重试
+      if (retryCount < maxRetries && (
+        error.message.includes('连接') || 
+        error.message.includes('Connection') ||
+        error.message.includes('ECONNRESET') ||
+        error.message.includes('超时')
+      )) {
+        console.error(`上传失败: ${error.message}`);
+        console.error(`尝试重新连接... (${retryCount + 1}/${maxRetries})`);
+        
+        // 重新连接
+        try {
+          await this.connect(this.config);
+          // 等待 2 秒后重试
+          await new Promise(resolve => setTimeout(resolve, 2000));
+          return this.uploadFile(localPath, remotePath, options, retryCount + 1);
+        } catch (reconnectError) {
+          throw new Error(`重连失败: ${reconnectError.message}`);
+        }
+      }
+      
+      throw error;
+    }
   }
 
   async downloadFile(remotePath, localPath, options = {}) {