配置Session开启WebSocket;

Author: cyanray

include/mirai_bot.hpp

@@ -48,17 +48,21 @@ namespace Cyan
 	{
 	public:
 		MiraiBot() :
-			qq_(0), 
-			pool_(4), 
+			qq_(0),
+			pool_(4),
 			http_client_("localhost", 8080),
 			host_("localhost"),
-			port_(8080) {}
-		MiraiBot(const string& host, int port) : 
-			qq_(0), 
-			pool_(4), 
-			http_client_(host, port), 
+			port_(8080),
+			cacheSize_(4096), 
+			ws_enabled_(false) {}
+		MiraiBot(const string& host, int port) :
+			qq_(0),
+			pool_(4),
+			http_client_(host, port),
 			host_(host),
-			port_(port) {}
+			port_(port),
+			cacheSize_(4096),
+			ws_enabled_(false) {}
 		~MiraiBot()
 		{
 			Release();
@@ -122,11 +126,26 @@ namespace Cyan
 			std::this_thread::sleep_for(std::chrono::milliseconds(ms));
 		}
 
+		MiraiBot& UseWebSocket()
+		{
+			this->ws_enabled_ = true;
+			SessionConfigure(cacheSize_, ws_enabled_);
+			return *this;
+		}
+
+		MiraiBot& UseHTTP()
+		{
+			this->ws_enabled_ = false;
+			SessionConfigure(cacheSize_, ws_enabled_);
+			return *this;
+		}
+
 		void EventLoop(function<void(const char*)> errLogger = nullptr);
 
 	private:
 		bool SessionVerify();
 		bool SessionRelease();
+		bool SessionConfigure(int cacheSize, bool enableWebsocket);
 		unsigned int FetchEvents_HTTP(unsigned int count = 10);
 		void FetchEvents_WS();
 		void ProcessEvents(const nlohmann::json& ele);
@@ -151,7 +170,7 @@ namespace Cyan
 			}
 
 		}
-		
+
 		// 因为 httplib 使用 string 来保存文件内容，这里适配一下
 		inline string ReadFile(const string& filename)
 		{
@@ -170,6 +189,8 @@ namespace Cyan
 		string sessionKey_;
 		string host_;
 		int port_;
+		int cacheSize_;
+		bool ws_enabled_;
 		httplib::Client http_client_;
 		unordered_map<MiraiEvent, function<void(WeakEvent)> > processors_;
 		ThreadPool pool_;

src/mirai_bot.cpp

@@ -569,13 +569,16 @@ namespace Cyan
 	{
 		const unsigned count_per_loop = 20;
 		const unsigned time_interval = 100;
+		SessionConfigure(cacheSize_, ws_enabled_);
 		while (true)
 		{
 			unsigned count = 0;
 			try
 			{
-				FetchEvents_WS();
-				count = FetchEvents_HTTP(count_per_loop);
+				if (ws_enabled_)
+					FetchEvents_WS();
+				else
+					count = FetchEvents_HTTP(count_per_loop);
 			}
 			catch (const std::exception& ex)
 			{
@@ -659,6 +662,38 @@ namespace Cyan
 		return false;
 	}
 
+	bool MiraiBot::SessionConfigure(int cacheSize, bool enableWebsocket)
+	{
+		json data =
+		{
+			{ "sessionKey", sessionKey_ },
+			{ "cacheSize", cacheSize },
+			{ "enableWebsocket", enableWebsocket }
+		};
+
+		auto res = http_client_.Post("/config", data.dump(), "application/json;charset=UTF-8");
+		if (res)
+		{
+			if (res->status != 200)
+				throw std::runtime_error("[mirai-api-http error]: " + res->body);
+			json reJson;
+			reJson = reJson.parse(res->body);
+			int code = reJson["code"].get<int>();
+			if (code == 0)
+				return true;
+			else
+			{
+				string msg = reJson["msg"].get<string>();
+				throw runtime_error(msg);
+			}
+
+		}
+		else
+			throw std::runtime_error("网络错误");
+		return false;
+
+	}
+
 
 	unsigned int MiraiBot::FetchEvents_HTTP(unsigned int count)
 	{
@@ -713,16 +748,20 @@ namespace Cyan
 		{
 			throw std::runtime_error("无法建立 WebSocket 连接!");
 		}
-		while (ws->getReadyState() != WebSocket::CLOSED)
+		string eventJsonStr;
+		while (ws->getReadyState() != WebSocket::CLOSED && this->ws_enabled_)
 		{
+			
 			ws->poll();
-			string eventJsonStr;
 			ws->dispatch([&](const std::string& message)
 				{
-					eventJsonStr = message;
+					eventJsonStr = std::move(message);
 				});
-			json j = json::parse(eventJsonStr);
-			ProcessEvents(j);
+			if (!eventJsonStr.empty())
+			{
+				json j = json::parse(eventJsonStr);
+				ProcessEvents(j);
+			}
 		}
 	}