@atlisp/mcp 1.3.3 → 1.3.5

package/dist/atlisp-mcp.js

@@ -462,7 +462,7 @@ async function evalLisp(code, withResult = false, encoding = null) {
       }
       return { content: [{ type: "text", text: "\u6267\u884C\u5931\u8D25\u6216\u65E0\u8FD4\u56DE\u503C" }], isError: true };
     } else {
-      await cad.sendCommand("\x1B\x1B" + code + "\n");
+      await cad.sendCommand(code + "\n");
       return { content: [{ type: "text", text: `\u5DF2\u53D1\u9001\u547D\u4EE4: ${code}` }] };
     }
   } catch (e) {
@@ -479,7 +479,7 @@ async function getCadInfo() {
 }
 async function atCommand(command) {
   if (!cad.connected) return { content: [{ type: "text", text: "\u8BF7\u5148\u8FDE\u63A5 CAD" }], isError: true };
-  await cad.sendCommand("\x1B\x1B" + command + "\n");
+  await cad.sendCommand(command + "\n");
   return { content: [{ type: "text", text: `\u5DF2\u53D1\u9001\u547D\u4EE4: ${command}` }] };
 }
 async function newDocument() {
@@ -510,7 +510,7 @@ async function installAtlisp() {
   }
   if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const installCode = `(progn(vl-load-com)(setq s strcat h "http" o(vlax-create-object (s"win"h".win"h"request.5.1"))v vlax-invoke e eval r read)(v o'open "get" (s h"://atlisp.""cn/@"):vlax-true)(v o'send)(v o'WaitforResponse 1000)(e(r(vlax-get-property o'ResponseText))))`;
-  await cad.sendCommand("\x1B\x1B" + installCode + "\n");
+  await cad.sendCommand(installCode + "\n");
   return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u5B89\u88C5\u4EE3\u7801\u5230 CAD" }] };
 }
 async function listFunctionsInCad() {
@@ -540,7 +540,7 @@ async function initAtlisp() {
 		   (v o'WaitforResponse 1000)
 		   (e(r(vlax-get o'ResponseText)))))`;
   try {
-    await cad.sendCommand("\x1B\x1B" + code + "\n");
+    await cad.sendCommand(code + "\n");
     return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u51FD\u6570\u5E93\u52A0\u8F7D\u4EE3\u7801\u5230 CAD" }] };
   } catch (e) {
     return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };

package/dist/cad-worker.js

@@ -154,7 +154,7 @@ const cadSendWithResult = edge.func(function() {/*
               dynamic doc = cad.ActiveDocument;
               if (doc != null) {
                   // 加载 .lsp 文件执行
-                   doc.SendCommand("\x1b\x1b(load \"" + lispFile.Replace("\\", "\\\\") + "\")\n");
+                   doc.SendCommand("(load \"" + lispFile.Replace("\\", "\\\\") + "\")\n");
                   
                   int retries = 10;
                   string result = "";
@@ -440,21 +440,40 @@ async function handleMessage(msg) {
     if (!parenCheck.valid) {
       return { success: false, error: `括号错误: ${parenCheck.error} (位置 ${parenCheck.pos})` };
     }
-    if (!(await waitForIdle(msg.platform || 'AutoCAD'))) {
-      return { success: false, error: 'CAD is busy, timeout' };
+    if (msg.code.length > 255) {
+      log(`send (long code ${msg.code.length} chars, fallback to sendResult): ${msg.code.substring(0, 80)}...`);
+      const r = await new Promise((resolve, reject) => {
+        cadSendWithResult({ code: msg.code, platform: msg.platform || 'AutoCAD', encoding: '' }, (e, r) => {
+          if (e) reject(e);
+          else resolve(r);
+        });
+      });
+      log(`send result (long code): ${JSON.stringify(r)}`);
+      return r;
     }
-    log(`send: ${msg.code}`);
-    return new Promise((resolve, reject) => {
-      cadSend({ code: msg.code, platform: msg.platform }, (e, r) => {
-        if (e) {
-          log(`send error: ${e.message}`);
-          reject(e);
-        } else {
+    const maxRetries = 3;
+    let lastError = null;
+    for (let i = 0; i < maxRetries; i++) {
+      const isBusy = await waitForIdle(msg.platform || 'AutoCAD');
+      if (isBusy) {
+        log(`send: ${msg.code}`);
+        try {
+          const r = await new Promise((resolve, reject) => {
+            cadSend({ code: msg.code, platform: msg.platform }, (e, r) => {
+              if (e) reject(e);
+              else resolve(r);
+            });
+          });
           log(`send result: ${JSON.stringify(r)}`);
-          resolve(r);
+          return r;
+        } catch (e) {
+          log(`send error: ${e.message}`);
+          lastError = e;
         }
-      });
-    });
+      }
+      await new Promise(r => setTimeout(r, 500));
+    }
+    return { success: false, error: lastError?.message || '发送失败' };
   }
   if (msg.type === 'sendResult') {
     const docCheck = await new Promise((resolve, reject) => {
@@ -470,21 +489,29 @@ async function handleMessage(msg) {
     if (!parenCheck.valid) {
       return { success: false, error: `括号错误: ${parenCheck.error} (位置 ${parenCheck.pos})` };
     }
-    if (!(await waitForIdle(msg.platform))) {
-      return { success: false, error: 'CAD is busy, timeout' };
-    }
-    log(`sendResult: ${msg.code}`);
-    return new Promise((resolve, reject) => {
-      cadSendWithResult({ code: msg.code, platform: msg.platform, encoding: msg.encoding || '' }, (e, r) => {
-        if (e) {
-          log(`sendResult error: ${e.message}`);
-          reject(e);
-        } else {
+    const maxRetriesResult = 3;
+    let lastErrorResult = null;
+    for (let i = 0; i < maxRetriesResult; i++) {
+      const isBusy = await waitForIdle(msg.platform);
+      if (isBusy) {
+        log(`sendResult: ${msg.code}`);
+        try {
+          const r = await new Promise((resolve, reject) => {
+            cadSendWithResult({ code: msg.code, platform: msg.platform, encoding: msg.encoding || '' }, (e, r) => {
+              if (e) reject(e);
+              else resolve(r);
+            });
+          });
           log(`sendResult result: ${JSON.stringify(r)}`);
-          resolve(r);
+          return r;
+        } catch (e) {
+          log(`sendResult error: ${e.message}`);
+          lastErrorResult = e;
         }
-      });
-    });
+      }
+      await new Promise(r => setTimeout(r, 500));
+    }
+    return { success: false, error: lastErrorResult?.message || '发送失败' };
   }
   if (msg.type === 'isBusy') {
     return new Promise((resolve, reject) => {

package/package.json

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