@atlisp/mcp 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {
@@ -16,7 +16,8 @@
     ],
     "scripts": {
         "start": "node src/index.js",
-        "test": "echo \"No tests yet\" && exit 0"
+        "test": "vitest run",
+        "test:watch": "vitest"
     },
     "keywords": [
         "mcp",
@@ -37,10 +38,13 @@
     },
     "dependencies": {
         "@modelcontextprotocol/sdk": "^1.0.0",
-        "edge-js": "^25.0.1"
+        "edge-js": "^25.0.1",
+        "express": "^5.2.1"
     },
     "engines": {
         "node": ">=18.0.0"
+    },
+    "devDependencies": {
+        "vitest": "^4.1.5"
     }
-
 }

package/src/cad.js

@@ -20,7 +20,14 @@ let worker = null;
 let _platform = null;
 let _version = null;
 
-function getWorker() {
+export function resetWorker() {
+  if (worker) {
+    worker.kill();
+    worker = null;
+  }
+}
+
+export function getWorker() {
   if (!worker || !worker.connected) {
     worker = spawn('node', [workerPath], {
       stdio: ['pipe', 'pipe', 'pipe']
@@ -36,7 +43,7 @@ function getWorker() {
   return worker;
 }
 
-function sendMessage(msg) {
+export function sendMessage(msg) {
   return new Promise((resolve, reject) => {
     const w = getWorker();
     let responded = false;
@@ -177,6 +184,17 @@ class CadConnection {
       worker = null;
     }
   }
+
+  _reset() {
+    this.connected = false;
+    this.version = null;
+    this.product = null;
+    _platform = null;
+    if (worker) {
+      worker.kill();
+      worker = null;
+    }
+  }
 }
 
 export const cad = new CadConnection();

package/src/index.js

@@ -20,15 +20,19 @@ log('Server starting, cad loaded: ' + typeof cad);
 const PORT = process.env.PORT || 8110;
 const HOST = process.env.HOST || '0.0.0.0';
 const TRANSPORT = process.env.TRANSPORT || 'http';
+const API_KEY = process.env.MCP_API_KEY || '';
+if (API_KEY) {
+  log('API Key authentication enabled');
+}
 
-const CAD_PLATFORMS = ['AutoCAD', 'ZWCAD', 'GStarCAD', 'BricsCAD'];
-const FILE_EXTENSIONS = {
+export const CAD_PLATFORMS = ['AutoCAD', 'ZWCAD', 'GStarCAD', 'BricsCAD'];
+export const FILE_EXTENSIONS = {
   'AutoCAD': ['.fas', '.vlx'],
   'ZWCAD': ['.zelx', '.vls'],
   'BricsCAD': ['.des']
 };
 
-const MOCK_PACKAGES = [
+export const MOCK_PACKAGES = [
   { name: 'base', description: '基础函数库', version: '1.0.0' },
   { name: 'at-pm', description: '工程项目管理', version: '2.1.0' },
   { name: 'network', description: '网络功能模块', version: '1.5.0' },
@@ -40,7 +44,7 @@ const MOCK_PACKAGES = [
   { name: 'function', description: '函数库', version: '3.0.0' }
 ];
 
-const tools = [
+export const tools = [
   {
     name: 'connect_cad',
     description: '连接到 CAD (AutoCAD/ZWCAD/GStarCAD/BricsCAD)',
@@ -132,7 +136,7 @@ const tools = [
   }
 ];
 
-async function handleToolCall(name, args) {
+export async function handleToolCall(name, args) {
   switch (name) {
     case 'connect_cad':
       log('connect_cad called, cad.connected before: ' + cad.connected);
@@ -198,8 +202,8 @@ async function handleToolCall(name, args) {
 
     case 'at_command':
       if (!cad.connected) return { content: [{ type: 'text', text: '请先连接 CAD' }], isError: true };
-      await cad.sendCommand(`@${args.command}\n`);
-      return { content: [{ type: 'text', text: `已发送命令: @${args.command}` }] };
+      await cad.sendCommand(`${args.command}\n`);
+      return { content: [{ type: 'text', text: `已发送命令: ${args.command}` }] };
 
     case 'new_document':
       if (!cad.connected) { await cad.connect(); }
@@ -218,7 +222,7 @@ async function handleToolCall(name, args) {
       return { content: [{ type: 'text', text: '已发送 @lisp 安装代码到 CAD' }] };
 
     default:
-      throw new Error(`Unknown tool: ${name}`);
+      return { content: [{ type: 'text', text: `未知工具: ${name}` }], isError: true };
   }
 }
 
@@ -237,9 +241,9 @@ async function initCadConnection() {
   }
 }
 
-function createMcpServer() {
+export function createMcpServer() {
   const server = new Server(
-    { name: 'atlisp-mcp-server', version: '1.0.8' },
+    { name: 'atlisp-mcp-server', version: '1.0.10' },
     { capabilities: { tools: {} } }
   );
 
@@ -253,89 +257,123 @@ function createMcpServer() {
   return server;
 }
 
-if (TRANSPORT === 'stdio') {
-  await initCadConnection();
-  const mcpServer = createMcpServer();
-  const transport = new StdioServerTransport();
-  await mcpServer.connect(transport);
-  console.error('@lisp MCP Server 运行在 stdio 模式');
-} else {
-  const app = express();
-  app.use(express.json({ type: ['application/json', 'application/json-rpc'] }));
-
-  app.get('/health', (req, res) => {
-    return res.json({ status: 'ok', cad: cad.connected ? 'connected' : 'disconnected' });
-  });
-
-  let mcpServer = null;
-  const sessionId = crypto.randomUUID();
-
-  app.post('/mcp', async (req, res) => {
-    if (!mcpServer) {
-      mcpServer = createMcpServer();
+export async function startServer() {
+  if (TRANSPORT === 'stdio') {
+    await initCadConnection();
+    const mcpServer = createMcpServer();
+    const transport = new StdioServerTransport();
+    await mcpServer.connect(transport);
+    console.error('@lisp MCP Server 运行在 stdio 模式');
+  } else {
+    const app = express();
+    app.use(express.json({ type: ['application/json', 'application/json-rpc'] }));
+
+    if (API_KEY) {
+      app.use((req, res, next) => {
+        if (req.path === '/health') return next();
+        const auth = req.get('Authorization');
+        if (auth === `Bearer ${API_KEY}`) return next();
+        res.status(401).json({ error: 'Unauthorized' });
+      });
     }
 
-    const { method, params, id } = req.body || {};
+    app.get('/health', (req, res) => {
+      res.json({ status: 'ok', cad: cad.connected ? 'connected' : 'disconnected' });
+    });
 
-    res.setHeader('Content-Type', 'application/json');
-    res.setHeader('mcp-session-id', sessionId);
+    let mcpServer = null;
+    const sessionId = crypto.randomUUID();
 
-    if (!id) {
-      return res.status(204).end();
-    }
-
-    try {
-      if (method === 'initialize') {
-        return res.json({
-          jsonrpc: '2.0',
-          id,
-          result: {
-            protocolVersion: '2024-11-05',
-            capabilities: { tools: {} },
-            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.8' }
-          }
-        });
+    app.post('/mcp', async (req, res) => {
+      if (!mcpServer) {
+        mcpServer = createMcpServer();
       }
 
-      if (method === 'tools/list') {
-        return res.json({
-          jsonrpc: '2.0',
-          id,
-          result: { tools }
-        });
+      const body = req.body || {};
+      const method = body.method;
+      const params = body.params;
+      const id = body.id;
+      const accept = req.get('Accept') || '';
+      log('accept: "' + accept + '", wantsSSE: ' + accept.includes('text/event-stream'));
+
+      res.setHeader('mcp-session-id', sessionId);
+
+      const sendResponse = (data) => {
+        const json = JSON.stringify(data);
+        if (accept.includes('text/event-stream')) {
+          res.setHeader('Content-Type', 'text/event-stream');
+          return res.end('data: ' + json + '\n\n');
+        } else {
+          res.setHeader('Content-Type', 'application/json');
+          return res.end(json);
+        }
+      };
+
+      if (!id) {
+        return res.status(204).end();
       }
 
-      if (method === 'tools/call') {
-        const toolName = params?.name;
-        if (!toolName) {
-          return res.json({
+      try {
+        if (method === 'initialize') {
+          sendResponse({
+            jsonrpc: '2.0',
+            id,
+            result: {
+              protocolVersion: '2024-11-05',
+              capabilities: { tools: {} },
+              serverInfo: { name: 'atlisp-mcp-server', version: '1.0.10' }
+            }
+          });
+          return;
+        }
+
+        if (method === 'tools/list') {
+          sendResponse({
             jsonrpc: '2.0',
             id,
-            error: { code: -32602, message: 'Invalid params: missing tool name' }
+            result: { tools }
           });
+          return;
+        }
+
+        if (method === 'tools/call') {
+          const toolName = params?.name;
+          if (!toolName) {
+            sendResponse({
+              jsonrpc: '2.0',
+              id,
+              error: { code: -32602, message: 'Invalid params: missing tool name' }
+            });
+            return;
+          }
+          const toolArgs = params?.arguments || {};
+          const result = await handleToolCall(toolName, toolArgs);
+          sendResponse({ jsonrpc: '2.0', id, result });
+          return;
         }
-        const toolArgs = params?.arguments || {};
-        const result = await handleToolCall(toolName, toolArgs);
-        return res.json({ jsonrpc: '2.0', id, result });
+
+        sendResponse({
+          jsonrpc: '2.0',
+          id,
+          error: { code: -32601, message: 'Method not found' }
+        });
+      } catch (e) {
+        log('MCP error: ' + e.message);
+        return res.status(500).json({
+          jsonrpc: '2.0',
+          id,
+          error: { code: -32603, message: e.message }
+        });
       }
+    });
 
-      return res.json({
-        jsonrpc: '2.0',
-        id,
-        error: { code: -32601, message: 'Method not found' }
-      });
-    } catch (e) {
-      log('MCP error: ' + e.message);
-      return res.status(500).json({
-        jsonrpc: '2.0',
-        id,
-        error: { code: -32603, message: e.message }
-      });
-    }
-  });
+    app.listen(PORT, HOST, async () => {
+      await initCadConnection();
+      console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - Streamable HTTP`);
+    });
+  }
+}
 
-  app.listen(PORT, HOST, async () => {
-    await initCadConnection();
-    console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - Streamable HTTP`);
-  });
+if (!process.env.VITEST) {
+  await startServer();
 }