computer_mcp 1.0.1 → 1.0.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "computer_mcp",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "MCP Streamable HTTP Server with file and command execution tools",
   "main": "server.js",
   "type": "module",
   "bin": {
-    "computer-mcp": "./server.js"
+    "computer-mcp": "server.js"
   },
   "files": [
     "server.js",

package/server.js

@@ -2,7 +2,6 @@
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/index.js";
 import express from "express";
 import { randomUUID } from 'node:crypto';
 import { registerBashTool } from './tools/bash.js';
@@ -10,27 +9,25 @@ import { registerFileTools } from './tools/file.js';
 import { registerInteractiveBashTool } from './tools/interactive.js';
 import { loadSkills, getSkillDetails } from './tools/skills.js';
 
-// 创建 MCP 服务器
-const server = new McpServer(
-    {
-        name: 'computer-mcp-server',
-        version: '1.0.0'
-    },
-    {
-        capabilities: {
-            logging: {},
-            tools: {}
+/** 每个 Streamable HTTP 会话需要独立的 McpServer（协议层与 transport 一对一） */
+function createComputerMcpServer() {
+    const server = new McpServer(
+        {
+            name: 'computer-mcp-server',
+            version: '1.0.0'
+        },
+        {
+            capabilities: {
+                logging: {},
+                tools: {}
+            }
         }
-    }
-);
+    );
+    registerInteractiveBashTool(server);
+    registerFileTools(server);
+    return server;
+}
 
-// 注册工具
-registerInteractiveBashTool(server);
-// registerBashTool(server);
-registerFileTools(server);
-
-// // 创建 Express 应用
-// const app = createMcpExpressApp();
 const app = express();
 
 // 健康检查端点
@@ -109,26 +106,40 @@ app.get('/skills/:name', async (req, res) => {
     }
 });
 
-// 管理传输层的 Map
-const transports = new Map();
+// sessionId -> { transport, mcpServer }
+const sessions = new Map();
 
 // MCP 端点处理
 app.all('/mcp', async (req, res) => {
     try {
-        // 重用现有传输层或创建新的
-        const sessionId = req.headers['mcp-session-id'];
-        let transport = sessionId ? transports.get(sessionId) : undefined;
+        const rawSessionId = req.headers['mcp-session-id'];
+        const sessionId = Array.isArray(rawSessionId)
+            ? rawSessionId[rawSessionId.length - 1]
+            : rawSessionId;
+
+        let entry = sessionId ? sessions.get(sessionId) : undefined;
+        let transport = entry?.transport;
+        let mcpServer = entry?.mcpServer;
 
         if (!transport) {
+            mcpServer = createComputerMcpServer();
             transport = new StreamableHTTPServerTransport({
                 sessionIdGenerator: () => randomUUID(),
                 retryInterval: 2000, // 默认重试间隔用于 priming events
                 onsessioninitialized: id => {
                     console.log(`[${id}] Session initialized`);
-                    transports.set(id, transport);
+                    sessions.set(id, { transport, mcpServer });
+                },
+                onsessionclosed: async id => {
+                    sessions.delete(id);
+                    try {
+                        await mcpServer.close();
+                    } catch (e) {
+                        console.error('Error closing MCP server:', e);
+                    }
                 }
             });
-            await server.connect(transport);
+            await mcpServer.connect(transport);
         }
 
         await transport.handleRequest(req, res, req.body);
@@ -163,6 +174,19 @@ app.listen(PORT, error => {
 // 处理服务器关闭
 process.on('SIGINT', async () => {
     console.log('Shutting down server...');
+    for (const [, { transport, mcpServer }] of sessions) {
+        try {
+            await mcpServer.close();
+        } catch (e) {
+            console.error(e);
+        }
+        try {
+            await transport.close();
+        } catch (e) {
+            console.error(e);
+        }
+    }
+    sessions.clear();
     process.exit(0);
 });