@atlisp/mcp 1.0.6 → 1.0.8

package/README.md

@@ -123,6 +123,9 @@ atlisp-mcp
 | `TRANSPORT` | `http` | 传输模式：`http` 或 `stdio` |
 | `PORT` | `8110` | HTTP 模式监听端口 |
 | `HOST` | `0.0.0.0` | HTTP 模式监听地址 |
+| `MESSAGE_TIMEOUT` | `60000` | 消息超时（毫秒） |
+| `BUSY_RETRIES` | `10` | CAD 忙碌时重试次数 |
+| `BUSY_DELAY` | `500` | CAD 忙碌重试间隔（毫秒） |
 
 ## API
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {

package/src/cad-worker.js

@@ -2,6 +2,9 @@
 import edge from 'edge-js';
 import process from 'process';
 
+const BUSY_RETRIES = parseInt(process.env.BUSY_RETRIES || '10', 10);
+const BUSY_DELAY = parseInt(process.env.BUSY_DELAY || '500', 10);
+
 const cadConnect = edge.func(function() {/*
   async (input) => {
       // Try existing CAD instances
@@ -104,16 +107,6 @@ const cadSend = edge.func(function() {/*
           dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
           if (cad != null) {
               dynamic doc = cad.ActiveDocument;
-              if (doc == null || doc.Name == "") {
-                  string templatePath = @"C:\Users\Public\Documents\AutoCAD 2024\Sample\basics.dwg";
-                  if (System.IO.File.Exists(templatePath)) {
-                      cad.Documents.Open(templatePath, false);
-                  } else {
-                      cad.Documents.Add("");
-                  }
-                  System.Threading.Thread.Sleep(2000);
-              }
-              doc = cad.ActiveDocument;
               if (doc != null) {
                   doc.SendCommand(code);
                   return new { success = true };
@@ -122,7 +115,7 @@ const cadSend = edge.func(function() {/*
       } catch {}
       return new { success = false };
   }
-*/});
+ */});
 
 const cadSendWithResult = edge.func(function() {/*
   async (input) => {
@@ -134,22 +127,13 @@ const cadSendWithResult = edge.func(function() {/*
       string tempDir = System.IO.Path.GetTempPath();
       string tempFile = System.IO.Path.Combine(tempDir, "atlisp_result_" + System.Guid.NewGuid().ToString("N") + ".txt");
       
-      string lispCode = code + "\n(setq _atlisp_result (princ-to-string " + code + "))(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(write-line _atlisp_result f)(close f))\n";
+      // Use print to write result directly to file
+      string lispCode = "(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(print " + code + " f)(close f))";
       
       try {
           dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
           if (cad != null) {
               dynamic doc = cad.ActiveDocument;
-              if (doc == null || doc.Name == "") {
-                  string templatePath = @"C:\Users\Public\Documents\AutoCAD 2024\Sample\basics.dwg";
-                  if (System.IO.File.Exists(templatePath)) {
-                      cad.Documents.Open(templatePath, false);
-                  } else {
-                      cad.Documents.Add("");
-                  }
-                  System.Threading.Thread.Sleep(2000);
-              }
-              doc = cad.ActiveDocument;
               if (doc != null) {
                   doc.SendCommand(lispCode + "\n");
                   System.Threading.Thread.Sleep(500);
@@ -157,7 +141,11 @@ const cadSendWithResult = edge.func(function() {/*
                   if (System.IO.File.Exists(tempFile)) {
                       string result = System.IO.File.ReadAllText(tempFile).Trim();
                       try { System.IO.File.Delete(tempFile); } catch {}
-                      return new { success = true, result = result };
+                      if (!string.IsNullOrEmpty(result)) {
+                          return new { success = true, result = result };
+                      }
+                      // Try evaluate result directly if file is empty
+                      return new { success = true, result = "" };
                   }
                   return new { success = true, result = "" };
               }
@@ -169,7 +157,7 @@ const cadSendWithResult = edge.func(function() {/*
       try { if (System.IO.File.Exists(tempFile)) System.IO.File.Delete(tempFile); } catch {}
       return new { success = false };
   }
-*/});
+ */});
 
 process.stdin.setEncoding('utf8');
 
@@ -242,6 +230,22 @@ const cadNewDoc = edge.func(function() {/*
   }
  */});
 
+async function waitForIdle(platform) {
+  let retries = BUSY_RETRIES;
+  while (retries > 0) {
+    const checkResult = await new Promise((resolve, reject) => {
+      cadIsBusy(platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+    if (!checkResult.isBusy) return true;
+    retries--;
+    if (retries > 0) await new Promise(resolve => setTimeout(resolve, BUSY_DELAY));
+  }
+  return false;
+}
+
 async function handleMessage(msg) {
   if (msg.type === 'connect') {
     return new Promise((resolve, reject) => {
@@ -277,19 +281,7 @@ async function handleMessage(msg) {
     if (!docCheck.hasDoc) {
       return { success: false, error: 'No open document' };
     }
-    let retries = 10;
-    while (retries > 0) {
-      const checkResult = await new Promise((resolve, reject) => {
-        cadIsBusy(msg.platform || 'AutoCAD', (e, r) => {
-          if (e) reject(e);
-          else resolve(r);
-        });
-      });
-      if (!checkResult.isBusy) break;
-      retries--;
-      if (retries > 0) await new Promise(resolve => setTimeout(resolve, 500));
-    }
-    if (retries === 0) {
+    if (!(await waitForIdle(msg.platform))) {
       return { success: false, error: 'CAD is busy, timeout' };
     }
     return new Promise((resolve, reject) => {
@@ -309,19 +301,7 @@ async function handleMessage(msg) {
     if (!docCheck.hasDoc) {
       return { success: false, error: 'No open document' };
     }
-    let retries = 10;
-    while (retries > 0) {
-      const checkResult = await new Promise((resolve, reject) => {
-        cadIsBusy(msg.platform || 'AutoCAD', (e, r) => {
-          if (e) reject(e);
-          else resolve(r);
-        });
-      });
-      if (!checkResult.isBusy) break;
-      retries--;
-      if (retries > 0) await new Promise(resolve => setTimeout(resolve, 500));
-    }
-    if (retries === 0) {
+    if (!(await waitForIdle(msg.platform))) {
       return { success: false, error: 'CAD is busy, timeout' };
     }
     return new Promise((resolve, reject) => {

package/src/cad.js

@@ -11,6 +11,8 @@ const FILE_EXTENSIONS = {
   'BricsCAD': ['.des']
 };
 
+const MESSAGE_TIMEOUT = parseInt(process.env.MESSAGE_TIMEOUT || '60000', 10);
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const workerPath = path.join(__dirname, 'cad-worker.js');
 
@@ -44,7 +46,7 @@ function sendMessage(msg) {
         responded = true;
         reject(new Error('Timeout waiting for worker'));
       }
-    }, 60000);
+    }, MESSAGE_TIMEOUT);
     
     const handler = (data) => {
       try {

package/src/index.js

@@ -1,7 +1,6 @@
 import express from 'express';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import {
   ListToolsRequestSchema,
   CallToolRequestSchema,
@@ -9,6 +8,7 @@ import {
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
+import crypto from 'crypto';
 import { cad } from './cad.js';
 
 const DEBUG_FILE = path.join(os.tmpdir(), 'mcp-server-debug.log');
@@ -222,21 +222,6 @@ async function handleToolCall(name, args) {
   }
 }
 
-const mcpServer = new Server(
-  { name: 'atlisp-mcp-server', version: '1.0.0' },
-  { capabilities: { tools: {} } }
-);
-
-mcpServer.setRequestHandler(ListToolsRequestSchema, async () => {
-  return { tools };
-});
-
-mcpServer.setRequestHandler(CallToolRequestSchema, async (request) => {
-  console.error('setRequestHandler called, name:', request.params.name);
-  const { name, arguments: args } = request.params;
-  return await handleToolCall(name, args || {});
-});
-
 async function initCadConnection() {
   log('Attempting to connect to CAD on startup...');
   try {
@@ -252,8 +237,25 @@ async function initCadConnection() {
   }
 }
 
+function createMcpServer() {
+  const server = new Server(
+    { name: 'atlisp-mcp-server', version: '1.0.8' },
+    { capabilities: { tools: {} } }
+  );
+
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    return await handleToolCall(name, args || {});
+  });
+
+  return server;
+}
+
 if (TRANSPORT === 'stdio') {
   await initCadConnection();
+  const mcpServer = createMcpServer();
   const transport = new StdioServerTransport();
   await mcpServer.connect(transport);
   console.error('@lisp MCP Server 运行在 stdio 模式');
@@ -262,59 +264,71 @@ if (TRANSPORT === 'stdio') {
   app.use(express.json({ type: ['application/json', 'application/json-rpc'] }));
 
   app.get('/health', (req, res) => {
-    res.json({ status: 'ok', cad: cad.connected ? 'connected' : 'disconnected' });
+    return res.json({ status: 'ok', cad: cad.connected ? 'connected' : 'disconnected' });
   });
 
+  let mcpServer = null;
+  const sessionId = crypto.randomUUID();
+
   app.post('/mcp', async (req, res) => {
-    log('POST /mcp called, body: ' + JSON.stringify(req.body));
-    try {
-      const message = req.body;
-      const id = message.id;
+    if (!mcpServer) {
+      mcpServer = createMcpServer();
+    }
 
-      if (!id) {
-        log('No id, returning 204');
-        return res.status(204).end();
-      }
+    const { method, params, id } = req.body || {};
+
+    res.setHeader('Content-Type', 'application/json');
+    res.setHeader('mcp-session-id', sessionId);
 
-      if (message.method === 'initialize') {
+    if (!id) {
+      return res.status(204).end();
+    }
+
+    try {
+      if (method === 'initialize') {
         return res.json({
           jsonrpc: '2.0',
-          id: id,
+          id,
           result: {
             protocolVersion: '2024-11-05',
             capabilities: { tools: {} },
-            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.0' }
+            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.8' }
           }
         });
       }
 
-      if (message.method === 'tools/list') {
+      if (method === 'tools/list') {
         return res.json({
           jsonrpc: '2.0',
-          id: id,
+          id,
           result: { tools }
         });
       }
 
-      if (message.method === 'tools/call') {
-        log('tools/call called, name: ' + message.params.name);
-        const result = await handleToolCall(message.params.name, message.params.arguments || {});
-        log('tools/call result: ' + JSON.stringify(result));
-        return res.json({
-          jsonrpc: '2.0',
-          id: id,
-          result
-        });
+      if (method === 'tools/call') {
+        const toolName = params?.name;
+        if (!toolName) {
+          return res.json({
+            jsonrpc: '2.0',
+            id,
+            error: { code: -32602, message: 'Invalid params: missing tool name' }
+          });
+        }
+        const toolArgs = params?.arguments || {};
+        const result = await handleToolCall(toolName, toolArgs);
+        return res.json({ jsonrpc: '2.0', id, result });
       }
 
-      res.json({
+      return res.json({
         jsonrpc: '2.0',
-        id: id,
+        id,
         error: { code: -32601, message: 'Method not found' }
       });
     } catch (e) {
-      res.status(500).json({
+      log('MCP error: ' + e.message);
+      return res.status(500).json({
         jsonrpc: '2.0',
+        id,
         error: { code: -32603, message: e.message }
       });
     }
@@ -322,7 +336,6 @@ if (TRANSPORT === 'stdio') {
 
   app.listen(PORT, HOST, async () => {
     await initCadConnection();
-    const status = cad.connected ? '已连接 CAD' : '未连接 CAD';
-    console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - ${status}`);
+    console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - Streamable HTTP`);
   });
-}
+}