支持 EventParsingError 事件.

Author: cyanray

examples/RepeatMessage.cpp

@@ -78,6 +78,18 @@ int main(int argc, char* argv[])
 			cout << "成功与 mirai-api-http 重新建立连接!" << endl;
 		});
 
+	bot.On<EventParsingError>([&](EventParsingError e)
+		{
+			try
+			{
+				e.Rethrow();
+			}
+			catch (const std::exception& ex)
+			{
+				cout << "解析事件时出现错误: " << ex.what() << endl;
+			}
+		});
+
 	string command;
 	while (cin >> command)
 	{

include/mirai/events/EventParsingError.hpp

@@ -0,0 +1,47 @@
+#pragma once
+#ifndef mirai_cpp_events_EventParsingError_hpp_H_
+#define mirai_cpp_events_EventParsingError_hpp_H_
+
+#include <string>
+#include "mirai/third-party/nlohmann/json.hpp"
+#include "event_interface.hpp"
+using std::string;
+namespace Cyan
+{
+	/**
+	 * \brief 解析事件错误 (一般因为与MAH版本不同导致)
+	 */
+	class EventParsingError : public EventBase
+	{
+	public:
+		EventParsingError(std::exception_ptr ptr) : eptr(ptr) {}
+
+		static MiraiEvent GetMiraiEvent()
+		{
+			return MiraiEvent::Default;
+		}
+
+		virtual bool Set(const json& j) override
+		{
+			throw std::logic_error("Function not yet implemented.");
+		}
+		virtual json ToJson() const override
+		{
+			throw std::logic_error("Function not yet implemented.");
+		}
+
+		void Rethrow()
+		{
+			if (eptr)
+			{
+				std::rethrow_exception(eptr);
+			}
+		}
+
+	private:
+		std::exception_ptr eptr;
+	};
+
+}
+
+#endif

include/mirai/events/events.hpp

@@ -54,4 +54,7 @@
 // 指令事件
 #include "Command.hpp"
 
+#include "LostConnection.hpp"
+#include "EventParsingError.hpp"
+
 #endif // !mirai_cpp_events_events_hpp_H_

include/mirai/mirai_bot.hpp

@@ -18,6 +18,7 @@
 #include "mirai/events/GroupMessage.hpp"
 #include "mirai/events/Message.hpp"
 #include "mirai/events/LostConnection.hpp"
+#include "mirai/events/EventParsingError.hpp"
 #include "mirai/SessionOptions.hpp"
 
 using std::string;
@@ -452,6 +453,7 @@ namespace Cyan
 		struct pimpl;
 		pimpl* pmem = nullptr;
 		EventCallback<LostConnection> lostConnectionCallback;
+		EventCallback<EventParsingError> eventParsingErrorCallback;
 		std::unordered_multimap<MiraiEvent, CallbackInvoker> processors;
 
 		template <typename T>
@@ -512,6 +514,16 @@ namespace Cyan
 		return *this;
 	}
 
+	/**
+	* @brief 对 EventParsingError 的偏特化
+	*/
+	template<>
+	inline MiraiBot& MiraiBot::OnEventReceived<EventParsingError>(const EventCallback<EventParsingError>& cb)
+	{
+		eventParsingErrorCallback = cb;
+		return *this;
+	}
+
 } // namespace Cyan
 
 #endif // !mirai_cpp__mirai_bot_hpp_H_

src/mirai_bot.cpp

@@ -202,32 +202,46 @@ namespace Cyan
 
 		pmem->eventClient.OnTextReceived([&](WebSocketClient& client, string text)
 			{
-				json event_json = json::parse(text)["data"];
-				if (!event_json.contains("type")) return;
-				string event_name = event_json["type"].get<string>();
-				MiraiEvent mirai_event = MiraiEventStr(event_name);
-				auto range = processors.equal_range(mirai_event);
-				for (auto& it = range.first; it != range.second; ++it)
+				try
 				{
-					auto& executor = it->second;
-					// 给 executor 传入 nullptr 可以创建一个 WeakEvent
-					WeakEvent pevent = executor(nullptr);
-					pevent->SetMiraiBot(this);
-					pevent->Set(event_json);
-
-					pmem->threadPool->enqueue([=]()
-						{
-							executor(pevent);
-						});
+					json event_json = json::parse(text)["data"];
+					if (!event_json.contains("type")) return;
+					string event_name = event_json["type"].get<string>();
+					MiraiEvent mirai_event = MiraiEventStr(event_name);
+					auto range = processors.equal_range(mirai_event);
+					for (auto& it = range.first; it != range.second; ++it)
+					{
+						auto& executor = it->second;
+						// 给 executor 传入 nullptr 可以创建一个 WeakEvent
+						WeakEvent pevent = executor(nullptr);
+						pevent->SetMiraiBot(this);
+						pevent->Set(event_json);
+
+						pmem->threadPool->enqueue([=]()
+							{
+								executor(pevent);
+							});
+					}
+
+				}
+				catch (...)
+				{
+					if (eventParsingErrorCallback)
+					{
+						eventParsingErrorCallback(EventParsingError(std::current_exception()));
+					}
 				}
 			});
 
 		pmem->eventClient.OnLostConnection([&](WebSocketClient& client, int code)
 			{
-				LostConnection result;
-				result.Code = code;
-				result.ErrorMessage = "与 mirai-api-http 失去连接.";
-				lostConnectionCallback(result);
+				if (lostConnectionCallback)
+				{
+					LostConnection result;
+					result.Code = code;
+					result.ErrorMessage = "与 mirai-api-http 失去连接.";
+					lostConnectionCallback(result);
+				}
 			});
 	}