refactor

重构以加强 abi 的兼容性

src/cad_mcp_frame/mcp_ConfigParser.cpp

@@ -122,7 +122,9 @@ void mcp_ConfigParser::LoadDllTool(const nlohmann::json &toolConfig, const std::
 		if (pRealTool)
 		{
 			// 给真正的 DLL 实例也注入配置，以防第三方需要在内部读取
-			pRealTool->SetConfig(toolConfig);
+			std::string cfgStr = toolConfig.dump();
+			pRealTool->SetConfigAbiSafe(cfgStr.c_str());
+			//pRealTool->SetConfig(toolConfig);
 
 			// 实例化代理类，接管生命周期
 			auto pProxy = std::make_shared<mcp_Tool_DllProxy>(hMod, pRealTool, destroyFn);
@@ -145,7 +147,6 @@ void mcp_ConfigParser::LoadDllTool(const nlohmann::json &toolConfig, const std::
 
 #pragma endregion mcp_ConfigParser
 
-
 #pragma region mcp_Tools
 // 注册工具
 void mcp_Tools::Register(std::shared_ptr<mcp_Tool> pTool)
@@ -177,7 +178,7 @@ nlohmann::json mcp_Tools::Call(const std::string &name, const nlohmann::json &ar
 	}
 
 	// 找不到工具时，返回标准的 JSON-RPC 错误对象
-	return mcp_Tool_Utility::make_error(-32601, "Specified tool not found: " + name);
+	return mcp_Tool_Utility::make_error(-32601, L"Specified tool not found: " + mcp_utils::utf8ToWString(name));
 }
 
 void mcp_Tools::print()

src/cad_mcp_frame/mcp_tool.cpp

@@ -46,14 +46,14 @@ nlohmann::json mcp_Tool_LispInline::Execute(const nlohmann::json &args)
 	std::wstring finalScript;
 
 	if (!ReplaceTemplateArgs(tpl, args, finalScript))
-		return mcp_Tool_Utility::make_error(-32603, "Script template replacement failed.");
+		return mcp_Tool_Utility::make_error(-32603, L"Script template replacement failed.");
 
 	finalScript += _T(" "); // 尾部加空格，等同于在 CAD 命令行敲回车
 
 	// 异步推送到 AutoCAD 命令行执行
 	acDocManager->sendStringToExecute(acDocManager->curDocument(), finalScript.c_str());
 
-	return mcp_Tool_Utility::make_text_result("LISP inline command issued for execution (asynchronous)");
+	return mcp_Tool_Utility::make_text_result(L"LISP inline command issued for execution (asynchronous)");
 }
 #pragma endregion LispInline
 
@@ -66,7 +66,7 @@ nlohmann::json mcp_Tool_LispFile::Execute(const nlohmann::json &args)
 
 	if (!fs::exists(filePath))
 	{
-		return mcp_Tool_Utility::make_error(-32603, "LISP file does not exist: " + filePath.string());
+		return mcp_Tool_Utility::make_error(-32603, L"LISP file does not exist: " + mcp_utils::utf8ToWString(filePath.string()));
 	}
 
 	std::string callTpl = m_config["backend"].value("call_template", "");
@@ -76,7 +76,7 @@ nlohmann::json mcp_Tool_LispFile::Execute(const nlohmann::json &args)
 	std::wstring executeCmd;
 	if (!ReplaceTemplateArgs(callTpl, args, executeCmd))
 	{
-		return mcp_Tool_Utility::make_error(-32603, "Script template replacement failed.");
+		return mcp_Tool_Utility::make_error(-32603, L"Script template replacement failed.");
 	}
 	executeCmd += _T(" ");
 
@@ -84,7 +84,7 @@ nlohmann::json mcp_Tool_LispFile::Execute(const nlohmann::json &args)
 
 	acDocManager->sendStringToExecute(acDocManager->curDocument(), finalScript.c_str());
 
-	return mcp_Tool_Utility::make_text_result("LISP external file loaded and issued for execution (asynchronous)");
+	return mcp_Tool_Utility::make_text_result(L"LISP external file loaded and issued for execution (asynchronous)");
 }
 #pragma endregion LispFile
 
@@ -106,9 +106,12 @@ nlohmann::json mcp_Tool_DllProxy::Execute(const nlohmann::json &args)
 {
 	if (m_pRealTool)
 	{
-		return m_pRealTool->Execute(args); // 完美转发
+		std::string argStr = args.dump();
+		//return m_pRealTool->Execute(args); // 完美转发
+		const char* retStr = m_pRealTool->ExecuteAbiSafe(argStr.c_str());
+		return nlohmann::json::parse(retStr);
 	}
-	return mcp_Tool_Utility::make_error(-32603, "Underlying DLL tool instance is invalid");
+	return mcp_Tool_Utility::make_error(-32603, L"Underlying DLL tool instance is invalid");
 }
 #pragma endregion DllProxy
 

src/cad_mcp_frame/mcp_utils.cpp

@@ -3,33 +3,18 @@
 #include <Windows.h>
 #include <tchar.h>
 #include <ghc/filesystem.hpp>
+#include "mcp_plugin_api.h"
 
 namespace mcp_utils
 {
 	std::wstring utf8ToWString(const std::string &utf8Str)
 	{
-		if (utf8Str.empty()) return std::wstring();
-
-		// 第一次调用获取需要的宽字符缓冲区大小
-		int sizeNeeded = ::MultiByteToWideChar(CP_UTF8, 0, &utf8Str[0], (int)utf8Str.size(), NULL, 0);
-		std::wstring wstrTo(sizeNeeded, 0);
-
-		// 第二次调用真正进行转换
-		::MultiByteToWideChar(CP_UTF8, 0, &utf8Str[0], (int)utf8Str.size(), &wstrTo[0], sizeNeeded);
-		return wstrTo;
+		return mcp_Tool_Utility::utf8ToWString(utf8Str);
 	}
 
 	std::string WStringToUtf8(const std::wstring &wstr)
 	{
-		if (wstr.empty()) return std::string();
-
-		// 第一次调用获取需要的 UTF-8 缓冲区大小
-		int sizeNeeded = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
-		std::string strTo(sizeNeeded, 0);
-
-		// 第二次调用真正进行转换
-		WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &strTo[0], sizeNeeded, NULL, NULL);
-		return strTo;
+		return mcp_Tool_Utility::WStringToUtf8(wstr);
 	}
 
 	bool mcp_utils::hasFileExist(const std::wstring &filePath) { return _taccess(filePath.c_str(), 0) == 0; }

src/cad_mcp_plugins/mcp_plugins.cpp

@@ -61,11 +61,11 @@ public:
 		// 5. 返回标准 MCP 结果，如果失败可以根据 es 的值返回 make_error
 		if (es == Acad::eOk)
 		{
-			return mcp_Tool_Utility::make_text_result("C++底层接口已成功在模型空间生成圆形！");
+			return mcp_Tool_Utility::make_text_result(L"C++底层接口已成功在模型空间生成圆形！");
 		}
 		else
 		{
-			return mcp_Tool_Utility::make_error((int)es, "ObjectARX 内部错误");
+			return mcp_Tool_Utility::make_error((int)es, L"ObjectARX 内部错误");
 		}
 	}
 };