fix:修复rag服务无法重启的bug

yefansky · yefansky · commit f0457ee8a979 · 2025-04-27T15:07:44.000+08:00
diff --git a/src/chatPanel.ts b/src/chatPanel.ts
@@ -146,7 +146,7 @@ export class ChatPanel {
                         <button id="stop" style="display:none;">Stop</button>
                         <div class="web-search">
                             <input type="checkbox" id="web-search">
-                            <label for="web-search">联网搜索</label>
+                            <label for="web-search">Agent模式(可联网)</label>
                         </div>
                     </div>
                 </div>
diff --git a/src/ragService.ts b/src/ragService.ts
@@ -1,5 +1,5 @@
 ﻿// src/ragService.ts
-import { ChildProcess, execSync, spawn } from 'child_process';
+import { ChildProcess, execSync, exec, spawn } from 'child_process';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import * as fs from 'fs/promises';
@@ -10,24 +10,23 @@ import * as os from 'os';
 let EXTENSION_PATH: string = '';
 
 const isDevMode = __dirname.includes('dist');
-// 动态设置 Python 脚本或 EXE 路径
+// Dynamically set Python script or EXE path
 const getPythonScriptPath = (extensionPath: string) => {
   if (isDevMode) {
-    return path.join(extensionPath, 'src', 'python', 'rag.py'); // 开发模式：直接运行 Python 脚本
+    return path.join(extensionPath, 'src', 'python', 'rag.py'); // Development mode: run Python script directly
   } else {
-    return path.join(extensionPath, 'dist', 'rag.exe'); // 发布模式：运行 EXE
+    return path.join(extensionPath, 'dist', 'rag.exe'); // Production mode: run EXE
   }
 };
 
-// 配置常量 (use a function to resolve paths dynamically)
+// Configuration constants (use a function to resolve paths dynamically)
 export const CONFIG = {
     STORAGE_PATH: path.join(os.homedir(), 'CodeReDesignMemory', 'rag_storage'),
     PORT: 7111,
-    LOCK_FILE: 'rag.lock',
-    PYTHON_SCRIPT: getPythonScriptPath(EXTENSION_PATH)
-  };
+    LOCK_FILE: 'rag.lock'
+};
 
-// 类型定义
+// Type definitions
 type ServerStatus = 'stopped' | 'starting' | 'running' | 'error';
 
 interface ServerState {
@@ -53,7 +52,7 @@ class RagService {
 
   private initializeStorage(): void {
     fs.mkdir(CONFIG.STORAGE_PATH, { recursive: true }).catch(err => {
-      vscode.window.showErrorMessage(`创建存储目录失败: ${err}`);
+      vscode.window.showErrorMessage(`Failed to create storage directory: ${err}`);
     });
   }
 
@@ -71,7 +70,7 @@ class RagService {
       await this.waitForStartup();
 
     } catch (err) {
-      await this.cleanup(`启动失败: ${err}`);
+      await this.cleanup(`Startup failed: ${err}`);
     }
   }
 
@@ -91,74 +90,176 @@ class RagService {
       this.state.lockFileHandle = handle;
     } catch (err) {
       if ((err as NodeJS.ErrnoException).code === 'EEXIST') {
-        throw new Error('已有服务进程在运行');
+        throw new Error('Another service process is already running');
       }
       throw err;
     }
   }
 
-  private async ensurePortAvailable(): Promise<void> {
+  private async checkPortInUse(port: number): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      const server = net.createServer();
-      server.unref();
-
-      server.on('error', (err: NodeJS.ErrnoException) => {
-        if (err.code === 'EADDRINUSE') {
-          this.killProcessOnPort(CONFIG.PORT)
-            .then(resolve)
-            .catch(reject);
-        } else {
-          reject(err);
+        try {
+            let command: string;
+            let shell: string;
+
+            if (process.platform === 'win32') {
+                // 使用 netstat 检查端口，查找 LISTENING 状态
+                command = `netstat -aon | findstr /R "^.*:${port}\\s.*LISTENING.*$"`;
+                shell = 'cmd.exe';
+            } else {
+                command = `lsof -i :${port} -t`;
+                shell = '/bin/sh';
+            }
+
+            exec(command, { shell, encoding: 'utf8' }, (error, stdout) => {
+                if (error && !stdout) {
+                    console.log(`Port ${port} is not in use (command check)`);
+                    resolve(false);
+                } else if (stdout.trim()) {
+                    console.log(`Port ${port} is in use (command check): ${stdout.trim()}`);
+                    resolve(true);
+                } else {
+                    resolve(false);
+                }
+            });
+        } catch (err) {
+            console.error(`Failed to check port ${port}: ${(err as Error).message}`);
+            reject(new Error(`Failed to check port ${port}: ${(err as Error).message}`));
         }
-      });
+    });
+  }
 
-      server.listen(CONFIG.PORT, () => {
-        server.close(() => resolve());
-      });
+  private async ensurePortAvailable(): Promise<void> {
+    console.log(`Checking if port ${CONFIG.PORT} is available...`);
+
+    // 主动检查端口是否被占用
+    const isPortInUse = await this.checkPortInUse(CONFIG.PORT);
+    if (isPortInUse) {
+        console.log(`Port ${CONFIG.PORT} is in use, attempting to free it...`);
+        await this.killProcessOnPort(CONFIG.PORT);
+    }
+
+    // 使用 net.createServer 进行二次验证
+    return new Promise((resolve, reject) => {
+        const server = net.createServer();
+        server.unref();
+
+        server.on('error', (err: NodeJS.ErrnoException) => {
+            console.log(`net.createServer error: ${err.message}`);
+            if (err.code === 'EADDRINUSE') {
+                console.log(`Port ${CONFIG.PORT} is still in use, attempting to free it again...`);
+                this.killProcessOnPort(CONFIG.PORT)
+                    .then(resolve)
+                    .catch(reject);
+            } else {
+                reject(new Error(`Failed to check port ${CONFIG.PORT}: ${err.message}`));
+            }
+        });
+
+        server.listen(CONFIG.PORT, '0.0.0.0', () => {
+            console.log(`Port ${CONFIG.PORT} is available via net.createServer`);
+            server.close(() => resolve());
+        });
     });
   }
 
   private killProcessOnPort(port: number): Promise<void> {
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        throw new Error(`Invalid port number: ${port}`);
+    }
+
     return new Promise((resolve, reject) => {
-      try {
-        const command = process.platform === 'win32' 
-          ? `netstat -ano | findstr :${port} && FOR /F "tokens=5" %p IN ('netstat -ano ^| findstr :${port}') DO taskkill /F /PID %p`
-          : `lsof -i :${port} -t | xargs kill -9`;
-  
-        // 修复类型错误
-        execSync(command, { 
-          shell: process.platform === 'win32' ? 'cmd.exe' : '/bin/sh',
-          encoding: 'utf-8' 
-        });
-        
-        setTimeout(resolve, 2000);
-      } catch (err) {
-        reject(new Error(`无法释放端口 ${port}`));
-      }
+        try {
+            let command: string;
+            let shell: string;
+
+            if (process.platform === 'win32') {
+                command = `netstat -aon | findstr /R "TCP.*:${port}.*LISTENING"`;
+                shell = 'cmd.exe';
+            } else {
+                command = `lsof -i :${port} -t`;
+                shell = '/bin/sh';
+            }
+
+            exec(command, { shell, encoding: 'utf8' }, (error, stdout) => {
+                if (error && !stdout) {
+                    console.log(`No process found on port ${port}`);
+                    return resolve();
+                }
+
+                const pids = stdout
+                    .trim()
+                    .split('\n')
+                    .map(line => {
+                        const parts = line.trim().split(/\s+/);
+                        return parts[parts.length - 1]; // PID 在最后一列
+                    })
+                    .filter(pid => pid && /^\d+$/.test(pid)); // 确保是数字
+
+                if (pids.length === 0) {
+                    console.log(`No valid PIDs found on port ${port}`);
+                    return resolve();
+                }
+
+                console.log(`Terminating PIDs on port ${port}: ${pids.join(', ')}`);
+                const killCommand = process.platform === 'win32'
+                    ? `taskkill /F /PID ${pids.join(' ')}`
+                    : `kill -TERM ${pids.join(' ')}`;
+
+                exec(killCommand, { shell }, (killError) => {
+                    if (killError) {
+                        console.error(`Failed to terminate processes: ${killError.message}`);
+                        return reject(new Error(`Failed to terminate processes on port ${port}: ${killError.message}`));
+                    }
+
+                    // 重试检查端口是否释放
+                    let retries = 3;
+                    const checkPort = () => {
+                        exec(command, { shell, encoding: 'utf8' }, (checkError, checkStdout) => {
+                            if (checkStdout.trim()) {
+                                console.log(`Port ${port} still in use, retries left: ${retries}`);
+                                if (--retries > 0) {
+                                    setTimeout(checkPort, 1000);
+                                } else {
+                                    reject(new Error(`Port ${port} still in use after termination`));
+                                }
+                            } else {
+                                console.log(`Port ${port} successfully released`);
+                                resolve();
+                            }
+                        });
+                    };
+                    setTimeout(checkPort, 1000);
+                });
+            });
+        } catch (err) {
+            console.error(`Error freeing port ${port}: ${(err as Error).message}`);
+            reject(new Error(`Failed to free port ${port}: ${(err as Error).message}`));
+        }
     });
   }
 
   private findWindowsPython(): string {
     try {
-      // 获取所有Python路径并解析
+      // Get all Python paths and parse
       const output = execSync('where python', { 
         shell: 'cmd.exe',
         encoding: 'utf-8'
       });
   
-      // 清洗并分割路径
+      // Clean and split paths
       const paths = output
-        .replace(/\r/g, '')  // 去除回车符
+        .replace(/\r/g, '')  // Remove carriage returns
         .split('\n')
         .map(p => p.trim())
         .filter(p => p.length > 0);
   
-      // 验证第一个有效路径
+      // Verify the first valid path
       if (paths.length === 0) {
-        throw new Error('未找到Python路径');
+        throw new Error('No Python path found');
       }
   
-      // 优先选择带空格的路径用双引号包裹
+      // Prefer paths with spaces wrapped in quotes
       const validPath = paths.find(p => {
         try {
           fs.access(p, fs.constants.X_OK);
@@ -169,26 +270,26 @@ class RagService {
       });
   
       return validPath 
-        ? `"${validPath}"`  // 处理路径中的空格
-        : paths[0];         // 最后兜底方案
+        ? `"${validPath}"`  // Handle spaces in path
+        : paths[0];         // Fallback
   
     } catch (error) {
-      // 回退方案
-      vscode.window.showWarningMessage('Python自动检测失败，使用默认路径');
+      // Fallback scheme
+      vscode.window.showWarningMessage('Python detection failed, using default path');
       return 'python.exe';
     }
   }
   
   private startPythonProcess(): ChildProcess {
-    const scriptPath = CONFIG.PYTHON_SCRIPT;
+    const scriptPath = getPythonScriptPath(EXTENSION_PATH);
     const isExe = scriptPath.endsWith('.exe');
 
     if (!fs.access(scriptPath)) {
-      throw new Error(`未找到脚本或可执行文件: ${scriptPath}`);
+      throw new Error(`Script or executable not found: ${scriptPath}`);
     }
   
     if (isExe) {
-      // 直接运行 EXE
+      // Run EXE directly
       return spawn(scriptPath, [
         `--port=${CONFIG.PORT}`,
         `--storage_path=${CONFIG.STORAGE_PATH}`
@@ -198,7 +299,7 @@ class RagService {
         shell: true
       });
     } else {
-      // 运行 Python 脚本
+      // Run Python script
       const pythonPath = process.platform === 'win32' 
         ? this.findWindowsPython()
         : this.findUnixPython();
@@ -217,7 +318,7 @@ class RagService {
   
   private findUnixPython(): string {
     try {
-      // 精确获取python3路径
+      // Precisely get python3 path
       return execSync('which python3', { 
         shell: '/bin/sh',
         encoding: 'utf-8'
@@ -234,26 +335,25 @@ class RagService {
     process.stderr?.on('data', (data: Buffer) => {
       if (data.includes('Uvicorn running')) {
         this.state.status = 'running';
-        vscode.window.showInformationMessage('RAG 服务已启动');
+        vscode.window.showInformationMessage('RAG service started');
       }
     });
 
     process.stderr?.on('data', (data: Buffer) => {
-      //this.state.status = 'error';
       console.error(`[Python Error] ${data}`);
     });
 
     process.on('exit', code => {
       if (code !== 0) {
-        this.cleanup(`服务异常退出，代码: ${code}`);
+        this.cleanup(`Service exited abnormally with code: ${code}`);
       }
     });
   }
 
   private async waitForStartup(): Promise<void> {
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
-        reject(new Error('服务启动超时'));
+        reject(new Error('Service startup timed out'));
       }, 15000);
 
       const checkInterval = setInterval(() => {
@@ -281,7 +381,7 @@ class RagService {
   }
 }
 
-// 插件集成
+// Plugin integration
 export const ragService = RagService.getInstance();
 
 export async function activate(context: vscode.ExtensionContext) {
