@youhaozhao/cninfo-mcp 1.0.6 → 1.0.7

package/bin/cninfo-mcp.js

@@ -5,22 +5,45 @@
  * 自动检测 Python 并安装依赖，然后启动 Python MCP 服务器。
  */
 
-const { spawn } = require('child_process');
-const path = require('path');
-const fs = require('fs');
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
 
 // 配置路径
-const PYTHON_SCRIPT = path.join(__dirname, '..', 'python', 'mcp_server.py');
-const PYTHON_REQUIREMENTS = path.join(__dirname, '..', 'python', 'requirements.txt');
+const PYTHON_SCRIPT = path.join(__dirname, "..", "python", "mcp_server.py");
+const PYTHON_REQUIREMENTS = path.join(
+  __dirname,
+  "..",
+  "python",
+  "requirements.txt",
+);
+
+// 虚拟环境目录，放在用户目录下保证跨 npx 调用持久化
+const VENV_DIR = path.join(os.homedir(), ".cninfo-mcp", "venv");
+
+// 获取虚拟环境中的 Python 可执行文件路径
+function getVenvPython() {
+  if (process.platform === "win32") {
+    return path.join(VENV_DIR, "Scripts", "python.exe");
+  }
+  return path.join(VENV_DIR, "bin", "python3");
+}
 
-// 查找可用的 Python 可执行文件
+// 查找可用的系统 Python 可执行文件（仅用于创建 venv）
 async function findPython() {
-  const pythonCommands = ['python3', 'python', 'python3.12', 'python3.11', 'python3.10'];
+  const pythonCommands = [
+    "python3",
+    "python",
+    "python3.12",
+    "python3.11",
+    "python3.10",
+  ];
 
   for (const cmd of pythonCommands) {
     try {
-      const result = await spawnAsync(cmd, ['--version']);
-      if (result.stdout && result.stdout.includes('Python')) {
+      const result = await spawnAsync(cmd, ["--version"]);
+      if (result.stdout && result.stdout.includes("Python")) {
         return cmd;
       }
     } catch (error) {
@@ -29,38 +52,57 @@ async function findPython() {
   }
 
   throw new Error(
-    'Python not found. Please install Python 3.10+ from https://python.org\n' +
-    'After installation, restart your terminal and try again.'
+    "Python not found. Please install Python 3.10+ from https://python.org\n" +
+      "After installation, restart your terminal and try again.",
   );
 }
 
-// 检查并安装 Python 依赖
-async function ensureDependencies(pythonCmd) {
+// 创建虚拟环境（如果不存在）
+async function ensureVenv(systemPythonCmd) {
+  const venvPython = getVenvPython();
+  if (fs.existsSync(venvPython)) {
+    return venvPython;
+  }
+
+  console.error("Creating Python virtual environment...");
+  fs.mkdirSync(path.dirname(VENV_DIR), { recursive: true });
+  await spawnAsync(systemPythonCmd, ["-m", "venv", VENV_DIR], {
+    stdio: "inherit",
+  });
+  console.error("Virtual environment created\n");
+  return venvPython;
+}
+
+// 检查并安装 Python 依赖（使用 venv 中的 python）
+async function ensureDependencies(venvPython) {
   const requirementsPath = PYTHON_REQUIREMENTS;
 
   if (!fs.existsSync(requirementsPath)) {
-    console.error('Error: requirements.txt not found at', requirementsPath);
+    console.error("Error: requirements.txt not found at", requirementsPath);
     process.exit(1);
   }
 
   try {
     // 检查 mcp 包是否已安装
-    const checkResult = await spawnAsync(pythonCmd, ['-c', 'import mcp']);
+    await spawnAsync(venvPython, ["-c", "import mcp"]);
   } catch (error) {
     // 未安装，执行安装
-    console.error('Installing Python dependencies...');
-    const installResult = await spawnAsync(pythonCmd, ['-m', 'pip', 'install', '-r', requirementsPath], {
-      stdio: 'inherit'
-    });
-
-    if (installResult.code !== 0) {
-      console.error('\n❌ Failed to install Python dependencies');
-      console.error('Please run manually:');
-      console.error(`  ${pythonCmd} -m pip install -r ${requirementsPath}`);
+    console.error("Installing Python dependencies...");
+    try {
+      await spawnAsync(
+        venvPython,
+        ["-m", "pip", "install", "-r", requirementsPath],
+        {
+          stdio: "inherit",
+        },
+      );
+      console.error("Python dependencies installed successfully\n");
+    } catch (installError) {
+      console.error("\n❌ Failed to install Python dependencies");
+      console.error("Please run manually:");
+      console.error(`  ${venvPython} -m pip install -r ${requirementsPath}`);
       process.exit(1);
     }
-
-    console.error('✅ Python dependencies installed successfully\n');
   }
 }
 
@@ -68,28 +110,28 @@ async function ensureDependencies(pythonCmd) {
 function spawnAsync(command, args, options = {}) {
   return new Promise((resolve, reject) => {
     const child = spawn(command, args, {
-      stdio: options.stdio || 'pipe',
-      shell: process.platform === 'win32',
-      ...options
+      stdio: options.stdio || "pipe",
+      shell: process.platform === "win32",
+      ...options,
     });
 
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
     let code = null;
 
     if (child.stdout) {
-      child.stdout.on('data', (data) => {
+      child.stdout.on("data", (data) => {
         stdout += data.toString();
       });
     }
 
     if (child.stderr) {
-      child.stderr.on('data', (data) => {
+      child.stderr.on("data", (data) => {
         stderr += data.toString();
       });
     }
 
-    child.on('close', (exitCode) => {
+    child.on("close", (exitCode) => {
       code = exitCode;
       if (code === 0) {
         resolve({ stdout, stderr, code });
@@ -102,7 +144,7 @@ function spawnAsync(command, args, options = {}) {
       }
     });
 
-    child.on('error', (error) => {
+    child.on("error", (error) => {
       reject(error);
     });
   });
@@ -112,36 +154,36 @@ async function main() {
   try {
     // 检查 Python 脚本是否存在
     if (!fs.existsSync(PYTHON_SCRIPT)) {
-      console.error('Error: mcp_server.py not found at', PYTHON_SCRIPT);
+      console.error("Error: mcp_server.py not found at", PYTHON_SCRIPT);
       process.exit(1);
     }
 
-    const pythonCmd = await findPython();
-    await ensureDependencies(pythonCmd);
+    const systemPython = await findPython();
+    const venvPython = await ensureVenv(systemPython);
+    await ensureDependencies(venvPython);
 
     // 启动 MCP 服务器
-    console.error('巨潮资讯 MCP 服务器已启动，等待连接...');
-    const child = spawn(pythonCmd, [PYTHON_SCRIPT], {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
+    console.error("巨潮资讯 MCP 服务器已启动，等待连接...");
+    const child = spawn(venvPython, [PYTHON_SCRIPT], {
+      stdio: "inherit",
+      shell: process.platform === "win32",
       env: {
         ...process.env,
-        PYTHONPATH: path.join(__dirname, '..', 'python')
-      }
+        PYTHONPATH: path.join(__dirname, "..", "python"),
+      },
     });
 
     // 处理子进程退出
-    child.on('error', (error) => {
-      console.error('Failed to start MCP Server:', error.message);
+    child.on("error", (error) => {
+      console.error("Failed to start MCP Server:", error.message);
       process.exit(1);
     });
 
-    child.on('exit', (code) => {
+    child.on("exit", (code) => {
       process.exit(code || 0);
     });
-
   } catch (error) {
-    console.error('Error:', error.message);
+    console.error("Error:", error.message);
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youhaozhao/cninfo-mcp",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "MCP Server for querying and downloading Chinese listed companies' annual reports from CNINFO (巨潮资讯网)",
   "keywords": [
     "mcp",
@@ -50,4 +50,4 @@
     "README.md",
     "LICENSE"
   ]
-}
+}

package/scripts/install-python-deps.js

@@ -7,6 +7,7 @@
 const { spawn } = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const os = require("os");
 
 const REQUIREMENTS_FILE = path.join(
   __dirname,
@@ -15,6 +16,15 @@ const REQUIREMENTS_FILE = path.join(
   "requirements.txt",
 );
 
+const VENV_DIR = path.join(os.homedir(), ".cninfo-mcp", "venv");
+
+function getVenvPython() {
+  if (process.platform === "win32") {
+    return path.join(VENV_DIR, "Scripts", "python.exe");
+  }
+  return path.join(VENV_DIR, "bin", "python3");
+}
+
 async function findPython() {
   const pythonCommands = [
     "python3",
@@ -75,16 +85,31 @@ async function main() {
     return;
   }
 
+  // 创建虚拟环境（如果不存在）
+  const venvPython = getVenvPython();
+  if (!fs.existsSync(venvPython)) {
+    console.log("Creating Python virtual environment...");
+    try {
+      fs.mkdirSync(path.dirname(VENV_DIR), { recursive: true });
+      await spawnCommand(pythonCmd, ["-m", "venv", VENV_DIR]);
+      console.log("Virtual environment created");
+    } catch (venvError) {
+      console.warn("  Failed to create virtual environment during npm install");
+      console.warn("  It will be created automatically on first run");
+      return;
+    }
+  }
+
   try {
-    // 检查 mcp 是否已安装
-    await spawnCommand(pythonCmd, ["-c", "import mcp"]);
+    // 检查 mcp 是否已安装（用 venv 的 python）
+    await spawnCommand(venvPython, ["-c", "import mcp"]);
     console.log("✅ Python dependencies already installed");
   } catch (error) {
-    // 执行安装
+    // 执行安装（用 venv 的 pip）
     console.log("📦 Installing Python dependencies...");
     try {
       await spawnCommand(
-        pythonCmd,
+        venvPython,
         ["-m", "pip", "install", "-r", REQUIREMENTS_FILE],
         {
           stdio: "inherit",