diff --git a/SourceCode/Code2026/cad_mcp_frame/mcp_server.cpp b/SourceCode/Code2026/cad_mcp_frame/mcp_server.cpp index 5df85ce..c455de4 100644 --- a/SourceCode/Code2026/cad_mcp_frame/mcp_server.cpp +++ b/SourceCode/Code2026/cad_mcp_frame/mcp_server.cpp @@ -14,12 +14,17 @@ extern HINSTANCE _hdllInstance; #define MCP_SERVER_PORT 8080 #define MCP_SERVER_CONFIG _T("mcp_config.json") +#define MCP_SERVER_CONFIG_ALT _T("cad-mcp-frame.json") +#define MCP_MAX_REQUEST_BYTES (4 * 1024 * 1024) namespace { std::thread g_serverThread; std::atomic g_bRunning(false); SOCKET g_listenSocket = INVALID_SOCKET; + int g_nPort = MCP_SERVER_PORT; + std::string g_sToken; // 非空时要求客户端带 token + std::wstring g_sConfigPath; // 实际使用的配置文件全路径 HWND g_hMsgWnd = NULL; const wchar_t *g_szMsgClassName = L"AutoAgentMcpMsgWndClass"; @@ -42,6 +47,103 @@ namespace std::string rawJson; }; + // ------------------------------------------------------------------ + // 报文边界:客户端发完不等应答就等结果(不做 shutdown),所以服务端只能靠 + // "JSON 结构是否闭合" 判断一个请求是否收完。字符串内的括号不算。 + // ------------------------------------------------------------------ + bool IsJsonComplete(const std::string &s) + { + int nBrace = 0; + int nBracket = 0; + bool bInStr = false; + bool bEsc = false; + bool bAny = false; + + for (size_t i = 0; i < s.size(); ++i) + { + const char c = s[i]; + if (bInStr) + { + if (bEsc) { bEsc = false; } + else if (c == '\\') { bEsc = true; } + else if (c == '"') { bInStr = false; } + continue; + } + switch (c) + { + case '"': bInStr = true; bAny = true; break; + case '{': ++nBrace; bAny = true; break; + case '}': --nBrace; bAny = true; break; + case '[': ++nBracket; bAny = true; break; + case ']': --nBracket; bAny = true; break; + default: break; + } + if (bAny && nBrace == 0 && nBracket == 0 && !bInStr) + return true; + } + return false; + } + + // 循环接收直到 JSON 闭合(或超时/超长)。 + // 原来只 recv 一次、缓冲固定 2048,大请求会被截断,且 TCP 分包必失败。 + bool RecvOneRequest(SOCKET s, std::string &out) + { + out.clear(); + char buf[4096]; + const ULONGLONG nDeadline = ::GetTickCount64() + 30000; // 整个请求 30s + + for (;;) + { + fd_set readSet; + FD_ZERO(&readSet); + FD_SET(s, &readSet); + timeval tv = { 5, 0 }; // 单次等待 5s + const int ret = ::select(0, &readSet, nullptr, nullptr, &tv); + if (ret < 0) + return false; + if (ret == 0) + { + if (::GetTickCount64() > nDeadline) return false; + continue; + } + + const int nRecv = ::recv(s, buf, (int)sizeof(buf), 0); + if (nRecv <= 0) + return IsJsonComplete(out); // 对端关闭:已收完整才算成功 + + out.append(buf, (size_t)nRecv); + if (out.size() > MCP_MAX_REQUEST_BYTES) + return false; + if (IsJsonComplete(out)) + return true; + if (::GetTickCount64() > nDeadline) + return IsJsonComplete(out); + } + } + + // send 可能只发一部分,必须循环(tools/list 的应答可能上万字节) + bool SendAll(SOCKET s, const std::string &data) + { + size_t nSent = 0; + while (nSent < data.size()) + { + const int n = ::send(s, data.c_str() + nSent, (int)(data.size() - nSent), 0); + if (n <= 0) + return false; + nSent += (size_t)n; + } + return true; + } + + std::string MakeErrorResponse(const char *pszMessage, int nCode = -32603, int nId = 0) + { + nlohmann::json err; + err["jsonrpc"] = "2.0"; + err["id"] = nId; + err["error"] = { { "code", nCode }, { "message", pszMessage } }; + return err.dump(); + } + // 处理工具查询请求 std::string HandleToolsList(int msgId) { @@ -87,13 +189,27 @@ namespace if (req.is_discarded()) { // 非法 JSON 报文 - responseStr = R"({"jsonrpc": "2.0", "error": {"code": -32700, "message": "Parse error"}, "id": null})"; + responseStr = MakeErrorResponse("Parse error", -32700, 0); } else { std::string method = req.value("method", ""); int msgId = req.value("id", 0); + // 鉴权:配置里写了 token 就必须带对(请求根级的 token 字段) + if (!g_sToken.empty()) + { + const std::string sGot = req.value("token", ""); + if (sGot != g_sToken) + { + acutPrintf(_T("\n[MCP Server] 请求被拒:token 缺失或不匹配(客户端 IP 与本机相同路径也要带 token)。")); + responseStr = MakeErrorResponse("Unauthorized", -32001, msgId); + if (pTask->clientSocket != INVALID_SOCKET) + SendAll(pTask->clientSocket, responseStr); + return; + } + } + if (method == "tools/list") { responseStr = HandleToolsList(msgId); @@ -105,18 +221,14 @@ namespace else { // 找不到方法 - nlohmann::json err; - err["jsonrpc"] = "2.0"; - err["id"] = msgId; - err["error"] = { {"code", -32601}, {"message", "Method not found"} }; - responseStr = err.dump(); + responseStr = MakeErrorResponse("Method not found", -32601, msgId); } } // 通过传递过来的 Socket 将结果发送回大模型端 if (pTask->clientSocket != INVALID_SOCKET) { - send(pTask->clientSocket, responseStr.c_str(), responseStr.length(), 0); + SendAll(pTask->clientSocket, responseStr); } } @@ -136,64 +248,53 @@ namespace return DefWindowProc(hWnd, message, wParam, lParam); } - // TCP 监听后台线程 - void TcpServerLoop() + // TCP 监听后台线程(监听 socket 由主线程创建好并传入,失败在启动时就暴露) + void TcpServerLoop(SOCKET listenSocket) { - WSADATA wsaData; - WSAStartup(MAKEWORD(2, 2), &wsaData); - - g_listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - sockaddr_in serverAddr = { 0 }; - serverAddr.sin_family = AF_INET; - inet_pton(AF_INET, "127.0.0.1", &serverAddr.sin_addr); - serverAddr.sin_port = htons(MCP_SERVER_PORT); - - bind(g_listenSocket, (sockaddr *)&serverAddr, sizeof(serverAddr)); - listen(g_listenSocket, SOMAXCONN); - while (g_bRunning) { - // 使用 select 模型实现带超时的轮询,确保插件卸载时线程能正常退出 fd_set readSet; FD_ZERO(&readSet); - FD_SET(g_listenSocket, &readSet); + FD_SET(listenSocket, &readSet); timeval timeout = { 1, 0 }; // 1秒超时机制 int ret = select(0, &readSet, nullptr, nullptr, &timeout); - if (ret > 0 && FD_ISSET(g_listenSocket, &readSet)) + if (ret > 0 && FD_ISSET(listenSocket, &readSet)) { - SOCKET clientSocket = accept(g_listenSocket, nullptr, nullptr); - if (clientSocket != INVALID_SOCKET) - { - char recvBuf[2048] = { 0 }; - int bytesReceived = recv(clientSocket, recvBuf, sizeof(recvBuf) - 1, 0); - if (bytesReceived > 0) - { - // 将数据拷贝到堆内存,准备派发给主线程 - TaskData *pTask = new TaskData; - pTask->clientSocket = clientSocket; // 记录 Socket - pTask->rawJson = recvBuf; + SOCKET clientSocket = accept(listenSocket, nullptr, nullptr); + if (clientSocket == INVALID_SOCKET) + continue; - // 关键转变:通过 PostMessage 发送给主线程拥有的隐式窗口 - if (g_hMsgWnd != NULL) - { - PostMessage(g_hMsgWnd, WM_MCP_EXECUTE_TASK, 0, reinterpret_cast(pTask)); - } - else - { - delete pTask; - } - } + // 循环收直到 JSON 闭合;原来只 recv 一次 2048,大请求会被截断 + std::string rawJson; + const bool bOk = RecvOneRequest(clientSocket, rawJson); + if (!bOk || rawJson.empty()) + { + // 收包失败/超时:回一个错误并关闭,避免客户端干等 + SendAll(clientSocket, MakeErrorResponse("Bad request", -32700)); + ::closesocket(clientSocket); // 原来这里没关,会泄漏 socket + continue; + } + + // 将数据拷贝到堆内存,准备派发给主线程 + TaskData *pTask = new TaskData; + pTask->clientSocket = clientSocket; // 记录 Socket,由 TaskData 析构关闭 + pTask->rawJson = rawJson; + + // 关键转变:通过 PostMessage 发送给主线程拥有的隐式窗口 + if (g_hMsgWnd != NULL) + { + PostMessage(g_hMsgWnd, WM_MCP_EXECUTE_TASK, 0, reinterpret_cast(pTask)); } else { - closesocket(clientSocket); + delete pTask; } } } - closesocket(g_listenSocket); + closesocket(listenSocket); WSACleanup(); } @@ -201,6 +302,38 @@ namespace namespace mcp { + // 兼容两种配置文件名:先找 mcp_config.json,再找 cad-mcp-frame.json + static std::wstring ResolveConfigPath() + { + const fs::path dir = mcp_utils::getModelDirPath(); + fs::path p1 = dir / MCP_SERVER_CONFIG; + if (fs::exists(p1)) return p1.wstring(); + fs::path p2 = dir / MCP_SERVER_CONFIG_ALT; + if (fs::exists(p2)) return p2.wstring(); + return p1.wstring(); // 都不存在:返回默认名,后续加载会失败并报错 + } + + // 读取 server.port / server.token(可选) + static void LoadServerSettings(const std::wstring &wsConfig) + { + try + { + std::ifstream ifs(wsConfig); + if (!ifs.is_open()) return; + nlohmann::json cfg; + ifs >> cfg; + if (!cfg.contains("server")) return; + const nlohmann::json &srv = cfg["server"]; + const int nPort = srv.value("port", MCP_SERVER_PORT); + if (nPort > 0 && nPort < 65536) g_nPort = nPort; + g_sToken = srv.value("token", std::string()); + } + catch (...) + { + // 配置读坏了不影响默认值 + } + } + bool close_mcp_server() { g_bRunning = false; @@ -211,6 +344,15 @@ namespace mcp if (g_hMsgWnd != NULL) { + // 排空仍挂在本窗口消息队列里的任务,否则 TaskData(含 socket)会泄漏 + MSG msg; + int nGuard = 0; + while (nGuard++ < 1000 && PeekMessage(&msg, g_hMsgWnd, WM_MCP_EXECUTE_TASK, WM_MCP_EXECUTE_TASK, PM_REMOVE)) + { + TaskData *pTask = reinterpret_cast(msg.lParam); + if (pTask != NULL) delete pTask; + } + DestroyWindow(g_hMsgWnd); UnregisterClass(g_szMsgClassName, _hdllInstance); g_hMsgWnd = NULL; @@ -224,7 +366,51 @@ namespace mcp bool init_mcp_server() { - // 1. 在主线程注册并创建 Message-Only 窗口 + // 0. 配置文件与服务器设置(端口/可选 token) + g_sConfigPath = ResolveConfigPath(); + LoadServerSettings(g_sConfigPath); + + // 1. 先把监听 socket 建好:失败就在启动时暴露,不再静默 + WSADATA wsaData; + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + acutPrintf(_T("\n[MCP Server] Fatal: WSAStartup failed.\n")); + return false; + } + + SOCKET listenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (listenSocket == INVALID_SOCKET) + { + acutPrintf(_T("\n[MCP Server] Fatal: socket() failed, err=%d.\n"), ::WSAGetLastError()); + WSACleanup(); + return false; + } + + sockaddr_in serverAddr = { 0 }; + serverAddr.sin_family = AF_INET; + serverAddr.sin_port = htons((u_short)g_nPort); + inet_pton(AF_INET, "127.0.0.1", &serverAddr.sin_addr); + + if (bind(listenSocket, (sockaddr *)&serverAddr, sizeof(serverAddr)) != 0) + { + const int nErr = ::WSAGetLastError(); + acutPrintf(_T("\n[MCP Server] Fatal: bind 127.0.0.1:%d failed, err=%d(端口被占用?)\n"), g_nPort, nErr); + closesocket(listenSocket); + WSACleanup(); + return false; + } + + if (listen(listenSocket, SOMAXCONN) != 0) + { + acutPrintf(_T("\n[MCP Server] Fatal: listen failed, err=%d.\n"), ::WSAGetLastError()); + closesocket(listenSocket); + WSACleanup(); + return false; + } + + g_listenSocket = listenSocket; + + // 2. 在主线程注册并创建 Message-Only 窗口 WNDCLASSEX wc = { 0 }; wc.cbSize = sizeof(WNDCLASSEX); wc.lpfnWndProc = McpWndProc; @@ -242,32 +428,46 @@ namespace mcp _hdllInstance, NULL ); + if (g_hMsgWnd == NULL) + { + acutPrintf(_T("\n[MCP Server] Fatal: CreateWindowEx failed, err=%d.\n"), ::GetLastError()); + closesocket(listenSocket); + g_listenSocket = INVALID_SOCKET; + UnregisterClass(g_szMsgClassName, _hdllInstance); + WSACleanup(); + return false; + } + g_bRunning = true; try { - g_serverThread = std::thread(TcpServerLoop); - acutPrintf(_T("\n[MCP Server] Background TCP listening thread started (Port: 8080)...\n")); + g_serverThread = std::thread(TcpServerLoop, listenSocket); + acutPrintf(_T("\n[MCP Server] Background TCP listening thread started (Port: %d, token: %s)...\n"), + g_nPort, g_sToken.empty() ? _T("none") : _T("required")); } catch (const std::system_error &e) { - // 线程创建失败,重置状态标志并输出错误 g_bRunning = false; - // e.what() 返回的是 const char*,所以在 acutPrintf 中要用 %hs 而不是 %s 或 %ls acutPrintf(_T("\n[MCP Server] Fatal error: Unable to create background listening thread! Reason: %hs\n"), e.what()); + DestroyWindow(g_hMsgWnd); + g_hMsgWnd = NULL; + UnregisterClass(g_szMsgClassName, _hdllInstance); + closesocket(listenSocket); + g_listenSocket = INVALID_SOCKET; + WSACleanup(); + return false; } - // 如果监听跑起来了,则注册tools - if (g_bRunning) + // 3. 监听跑起来了才注册工具 + if (!mcp_ConfigParser::LoadAndRegister(g_sConfigPath, g_mcpTools)) { - if (!mcp_ConfigParser::LoadAndRegister(mcp_utils::getModelDirPath() / MCP_SERVER_CONFIG, g_mcpTools)) - { - acutPrintf(_T("\n[MCP Server] Warning: Failed to load tool configuration!\n[MCP Server] Automatic Shutdown.\n")); - g_bRunning = false; - } - - g_mcpTools.print(); + acutPrintf(_T("\n[MCP Server] Warning: Failed to load tool configuration!") + _T("\n[MCP Server] 只支持 mcp_config.json 或 cad-mcp-frame.json,且必须是合法 JSON。Automatic Shutdown.\n")); + close_mcp_server(); + return false; } + g_mcpTools.print(); return g_bRunning; } } diff --git a/cad_mcp_frame-review.md b/cad_mcp_frame-review.md index 59478e7..1016ee2 100644 --- a/cad_mcp_frame-review.md +++ b/cad_mcp_frame-review.md @@ -80,6 +80,10 @@ LLM/客户端 --TCP 127.0.0.1:8080--> 后台线程 select() 收包 ## 4. 问题清单 +> **P0 与 P1 已在本轮修复**,P2 保留待办。修复内容见本节末尾"已修复"小节。 + + + ### P0:请求会被截断 / 分包即失败 ```cpp @@ -185,6 +189,64 @@ return mcp_Tool_Utility::make_text_result(L"LISP inline command issued for execu 4. **实测**:本次只验证"编译 + 部署",没有在 CAD 里加载验证(`NETLOAD`/启动自动加载后 看命令行是否打印 `[MCP Server] ... started`,以及能否 `tools/list`)。 +## 6.5 已修复(本轮) + +### P0-1 收包协议 + +原来 `recv` 只读一次、缓冲固定 2048 字节。改为: + +- `IsJsonComplete()`:按 `{}`/`[]` 配平判断报文是否完整(跳过字符串内与转义字符); +- `RecvOneRequest()`:`select` + 循环 `recv` 追加,单次等待 5 s、整请求 30 s,上限 4 MB; +- `SendAll()`:`send` 循环到发完(原来单次 `send`,`tools/list` 的应答可能超一个包)。 + +这样既修好了"大请求被截断",也不用改客户端协议(客户端仍是 `sendall` 后等响应断开)。 + +### P0-2 socket 泄漏 + +`recv` 返回 <=0 的分支原来什么都不做。现在:收包失败/超时会回一个 JSON-RPC 错误帧并 +`closesocket`;`accept` 失败直接 `continue`(原代码对 `INVALID_SOCKET` 也调 `closesocket`)。 + +### P1-1 监听失败不再静默 + +`socket/bind/listen/CreateWindowEx/std::thread` 的失败全部检查,且**监听 socket 改在主线程创建**, +失败时 `init_mcp_server()` 直接返回 false 并打印原因(含 `WSAGetLastError()`)。 +端口被占用时会看到: + +``` +[MCP Server] Fatal: bind 127.0.0.1:8080 failed, err=10048(端口被占用?) +``` + +### P1-2 端口与配置文件名可配 + +- 端口:配置里 `server.port`(默认 8080); +- 配置文件名:先找 `mcp_config.json`,找不到再找 `cad-mcp-frame.json`, + 两者都没有才报错退出(解决"代码找 mcp_config.json、仓库里是 cad-mcp-frame.json"的问题); +- 启动日志会打印实际端口与是否需要 token。 + +### P1-3 可选 token 鉴权 + +配置里写了 `server.token` 就要求请求根级带 `"token"` 字段,不匹配返回 +`{"error":{"code":-32001,"message":"Unauthorized"}}` 且不执行任何工具; +没配 token 时保持原行为(不破坏现有客户端)。 + +```json +{ "server": { "port": 8080, "token": "换成你自己的随机串" } } +``` + +### 顺带修的 P2-1 + +`close_mcp_server()` 现在会先 `PeekMessage` 排空挂起的 `WM_MCP_EXECUTE_TASK` +并 `delete` 对应 `TaskData`,再销毁窗口(原来会漏 socket + 内存)。 + +### 仍未修 + +- 客户端 `agent_loop.py` 的 `tools/list` 仍是**单次 `recv(8192)`**,工具多时会被截断; + 服务端已经改好循环发送,客户端也建议改成"读到 JSON 闭合"(或循环 `recv`)。 +- LISP 工具异步无结果、加载期 `AfxMessageBox`、`.def` 的 LIBRARY 名、`g_hMsgWnd` 同步、 + `/Zc:forScope` 语义 —— 均属 P2,未动。 +- **没有在 CAD 里实测**:这些改动只验证了编译(R230 + Z2026),协议改动需要实际 + 跑一次 `tools/list` / 大参数 `tools/call` 才算验证。 + ## 7. 建议的优先顺序 1. 修 P0(收包协议 + socket 泄漏)——否则大参数请求根本用不了。