REF: refactor of socket component

Author: StormAxs

src/engine/shared/config_pulse.h

@@ -85,7 +85,7 @@ MACRO_CONFIG_INT(ClAntiRQ, cl_anti_rq_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SA
 //Chat
 MACRO_CONFIG_INT(ClCrossChatAutoConnect, cl_cross_chat_autoconnect, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Automatically connect to CrossChat on startup")
 MACRO_CONFIG_INT(ClCrossChatInGameChat, cl_cross_chat_ingame_chat, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable CrossChat integration with in-game chat")
-//MACRO_CONFIG_INT(ClCrossChatInGameChat, cl_cross_chat_ingame_chat, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable CrossChat integration with in-game chat")
+MACRO_CONFIG_INT(ClCrossChatDebug, cl_cross_chat_debug, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Enable CrossChat debug messages")
 
 //pulse server
 MACRO_CONFIG_STR(ClSocketNameserver, ntwr_nameserver, 256, "localhost:3000", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Nameserver for websockets") //TODO: actaual nameserver

src/game/client/components/comp_pulse/menus_pulse.cpp

@@ -924,11 +924,11 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 		// m_CrossChatMessages.emplace_back("[Server]: Добро пожаловать в CrossChat!");
 
 		char aBuf[64];
-		if(GameClient()->m_WebSocket.IsConnected())
+		if(GameClient()->m_WebSocket.m_IsConnected)
 			str_format(aBuf, sizeof(aBuf), "[Server]: Welcome to chat, %s", g_Config.m_PlayerName);
 		else
 			str_format(aBuf, sizeof(aBuf), "[Offline]: Try again later");
-		GameClient()->m_WebSocket.AddMessage(aBuf);
+		GameClient()->m_WebSocket.m_WebSocketChat.AddMessage(aBuf);
 	}
 
 	MainView.Draw(ColorRGBA(0, 0, 0, 0.5f), IGraphics::CORNER_ALL, 5.0f);
@@ -955,7 +955,7 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
 
 	CButtonContainer SReconnectButton;
-	bool Connected = GameClient()->m_WebSocket.IsConnected();
+	bool Connected = GameClient()->m_WebSocket.m_IsConnected;
 
 	ColorRGBA ButtonColor = Connected ? ColorRGBA(1.0f, 0.0f, 0.0f, 0.25f) // красная при подключении
 					    :
@@ -974,10 +974,6 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 		   ButtonColor))
 	{
 		GameClient()->m_WebSocket.SocketConnect();
-		if(Connected)
-		{
-			GameClient()->m_WebSocket.OnInit();
-		}
 	}
 	static bool s_settings_open = false;
 
@@ -1004,10 +1000,16 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 		LeftBar.HSplitBottom(LeftBar.h / 3, &LeftBar, &SettingsRect);
 		SettingsRect.Draw(ColorRGBA(0.0f, 0.5f, 1.0f, 0.25f), IGraphics::CORNER_ALL, 3.0f);
 		TextRender()->Text(SettingsRect.x + 5.0f, SettingsRect.y + 5.0f, 12.0f, FONT_ICON_GEAR, -1);
+		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
+		SettingsRect.VMargin(10.0f, &SettingsRect);
+		SettingsRect.HSplitTop(SettingsRect.h / 5, nullptr, &SettingsRect);
+
+
+		SettingsRect.HSplitTop(20.0f, &Button, &SettingsRect);
+		if(DoButton_CheckBox(&g_Config.m_ClCrossChatAutoConnect, Localize("Connect on startup"), g_Config.m_ClCrossChatAutoConnect, &Button))
+			g_Config.m_ClCrossChatAutoConnect ^= 1;
 
-		SettingsRect.HSplitTop(10.0f, &Button, &SettingsRect);
-		Ui()->DoLabel(&Button, Localize("Settings"), FontSize, TEXTALIGN_ML);
-		Button.HSplitTop(5.0f, nullptr, &Button);
+		
 	}
 
 	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
@@ -1027,40 +1029,38 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 		const char *pText = s_ChatInput.GetString();
 		int64_t Now = time_get();
 
-		if(GameClient()->m_WebSocket.IsConnected())
-		{
-			if(!GameClient()->m_WebSocket.m_IsTyping)
+
+			if(!GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping)
 			{
-				GameClient()->m_WebSocket.m_IsTyping = true;
-				GameClient()->m_SocketIO.socket()->emit("typing_start", sio::string_message::create(Client()->PlayerName()));
+				GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping = true;
+				GameClient()->m_WebSocket.m_WebSocketChat.SendTypingState(true);
 			}
 
-			GameClient()->m_WebSocket.m_LastTypeTime = Now;
-		}
+			GameClient()->m_WebSocket.m_WebSocketChat.m_LastTypeTime = Now;
+
 	}
 
-	if(GameClient()->m_WebSocket.m_IsTyping && time_get() - GameClient()->m_WebSocket.m_LastTypeTime > time_freq() * 2)
+	if(GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping && time_get() - GameClient()->m_WebSocket.m_WebSocketChat.m_LastTypeTime > time_freq() * 2)
 	{
-		GameClient()->m_WebSocket.m_IsTyping = false;
-		if(GameClient()->m_WebSocket.IsConnected())
-			GameClient()->m_SocketIO.socket()->emit("typing_stop", sio::string_message::create(Client()->PlayerName()));
+		GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping = false;
+		GameClient()->m_WebSocket.m_WebSocketChat.SendTypingState(false);
 	}
 
 	if(Input()->KeyPress(KEY_RETURN) || Input()->KeyPress(KEY_KP_ENTER))
 	{
 		const char *pText = s_ChatInput.GetString();
 		if(pText && pText[0])
 		{
-			GameClient()->m_WebSocket.SendChatMessage(pText);
+			GameClient()->m_WebSocket.m_WebSocketChat.SendChatMessage(pText);
 
-			s_ChatHistory.push_back(pText);
+			s_ChatHistory.emplace_back(pText);
 			s_HistoryIndex = -1;
 			s_ChatInput.Clear();
 
-			if(GameClient()->m_WebSocket.m_IsTyping)
+			if(GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping)
 			{
-				GameClient()->m_WebSocket.m_IsTyping = false;
-				GameClient()->m_SocketIO.socket()->emit("typing_stop", sio::string_message::create(Client()->PlayerName()));
+				GameClient()->m_WebSocket.m_WebSocketChat.m_IsTyping = false;
+				GameClient()->m_WebSocket.m_WebSocketChat.SendTypingState(false);
 			}
 		}
 	}
@@ -1094,15 +1094,15 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 		}
 	}
 
-	std::lock_guard<std::mutex> lock(GameClient()->m_WebSocket.m_OnlinePlayersMutex);
+	std::lock_guard<std::mutex> lock(GameClient()->m_WebSocket.m_WebSocketChat.m_OnlinePlayersMutex);
 	float yOnline = LeftBar.y + 10.0f;
-	for(const auto &player : GameClient()->m_WebSocket.m_OnlinePlayers)
+	for(const auto &player : GameClient()->m_WebSocket.m_WebSocketChat.m_OnlinePlayers)
 	{
 		TextRender()->Text(LeftBar.x + 5.0f, yOnline, 12.0f, player.c_str(), -1);
 		yOnline += 15.0f;
 	}
 
-	std::vector<CWebSocket::SChatMessage> Messages = GameClient()->m_WebSocket.GetMessages();
+	std::vector<CWebSocketChat::SChatMessage> Messages = GameClient()->m_WebSocket.m_WebSocketChat.GetMessages();
 	const float LineHeight = 12.0f;
 	float y = ChatView.y + ChatView.h - LineHeight;
 
@@ -1124,19 +1124,19 @@ void CMenus::RenderCrossChat(CUIRect MainView)
 	}
 
 	{
-		std::lock_guard<std::mutex> lock(GameClient()->m_WebSocket.m_TypingMutex);
-		if(!GameClient()->m_WebSocket.m_TypingUsers.empty())
+		std::lock_guard<std::mutex> lock(GameClient()->m_WebSocket.m_WebSocketChat.m_TypingMutex);
+		if(!GameClient()->m_WebSocket.m_WebSocketChat.m_TypingUsers.empty())
 		{
 			std::string TypingText;
-			size_t Count = GameClient()->m_WebSocket.m_TypingUsers.size();
+			size_t Count = GameClient()->m_WebSocket.m_WebSocketChat.m_TypingUsers.size();
 
 			if(Count == 1)
 			{
-				TypingText = *GameClient()->m_WebSocket.m_TypingUsers.begin() + " is typing...";
+				TypingText = *GameClient()->m_WebSocket.m_WebSocketChat.m_TypingUsers.begin() + " is typing...";
 			}
 			else if(Count == 2)
 			{
-				auto it = GameClient()->m_WebSocket.m_TypingUsers.begin();
+				auto it = GameClient()->m_WebSocket.m_WebSocketChat.m_TypingUsers.begin();
 				std::string first = *it++;
 				std::string second = *it;
 				TypingText = first + " and " + second + " are typing...";

src/game/client/components/comp_pulse/socket/modules/socket_chat.cpp

@@ -0,0 +1,129 @@
+#include "socket_chat.h"
+
+#include "../socket.h"
+#include "game/client/gameclient.h"
+
+
+void CWebSocketChat::ListenerInit()
+{
+
+	m_Socket->socket()->on("chat_message", [&](sio::event &ev) { HandleChatMessage(ev); });
+	m_Socket->socket()->on("online_update", [&](sio::event &ev) { HandleOnlineUpdate(ev); });
+
+	m_Socket->socket()->on("typing_start", [&](sio::event &ev) {HandleTypingStart(ev);});
+	m_Socket->socket()->on("typing_stop", [&](sio::event &ev) {HandleTypingStop(ev);});
+
+	dbg_msg("test", "%d", *m_IsConnected);
+}
+
+void CWebSocketChat::HandleTypingStart(sio::event &ev)
+{
+	auto Data = ev.get_message();
+	if(!Data || Data->get_flag() != sio::message::flag_object)
+		return;
+	std::string Nickname = Data->get_map()["nickname"]->get_string();
+
+	std::lock_guard<std::mutex> Lock(m_TypingMutex);
+	m_TypingUsers.insert(Nickname);
+}
+
+void CWebSocketChat::HandleTypingStop(sio::event &ev)
+{
+	auto Data = ev.get_message();
+	if(!Data || Data->get_flag() != sio::message::flag_object)
+		return;
+	std::string Nickname = Data->get_map()["nickname"]->get_string();
+
+	std::lock_guard<std::mutex> lock(m_TypingMutex);
+	m_TypingUsers.erase(Nickname);
+}
+
+void CWebSocketChat::HandleChatMessage(sio::event &ev)
+{
+	auto Data = ev.get_message();
+	if(!Data || Data->get_flag() != sio::message::flag_object)
+		return;
+
+	auto Map = Data->get_map();
+	std::string Nickname = Map["nickname"]->get_string();
+	std::string Message = Map["message"]->get_string();
+
+	ColorRGBA color(1.0f, 1.0f, 1.0f, 1.0f);
+	if(Map.contains("color"))
+	{
+		auto c = Map["color"]->get_map();
+		color.r = c["r"] ? (float)c["r"]->get_double() : 1.0f;
+		color.g = c["g"] ? (float)c["g"]->get_double() : 1.0f;
+		color.b = c["b"] ? (float)c["b"]->get_double() : 1.0f;
+		color.a = c["a"] ? (float)c["a"]->get_double() : 1.0f;
+	}
+
+	if(Map.contains("skin_name") && Map["skin_name"]->get_flag() == sio::message::flag_string)
+		std::string skin_name = Map["skin_name"]->get_string();
+
+
+	char aBuf[128];
+	str_format(aBuf, sizeof(aBuf), "%s: %s", Nickname.c_str(), Message.c_str());
+	AddMessage(aBuf, color);
+
+	if(g_Config.m_ClCrossChatDebug)
+	{
+		str_format(aBuf, sizeof(aBuf), "[Debug]: Got color: r=%.2f g=%.2f b=%.2f a=%.2f", color.r, color.g, color.b, color.a);
+		AddMessage(aBuf, ColorRGBA(0.0f, 1.0f, 0.0f, 1.0f));
+	}
+}
+
+void CWebSocketChat::HandleOnlineUpdate(sio::event &ev)
+{
+	auto Data = ev.get_message();
+	if(!Data || Data->get_flag() != sio::message::flag_object)
+		return;
+
+	auto UsersArray = Data->get_map()["users"]->get_vector();
+	std::vector<std::string> OnlinePlayers;
+	for(auto &userMsg : UsersArray)
+		if(userMsg->get_flag() == sio::message::flag_string)
+			OnlinePlayers.push_back(userMsg->get_string());
+
+	std::lock_guard<std::mutex> lock(m_OnlinePlayersMutex);
+	m_OnlinePlayers = OnlinePlayers;
+}
+
+void CWebSocketChat::SendChatMessage(const std::string &Msg) const
+{
+	if(!m_IsConnected)
+		return;
+	m_Socket->socket()->emit("chat_message", sio::string_message::create(Msg));
+}
+
+void CWebSocketChat::AddMessage(const std::string &Msg, ColorRGBA MsgColor)
+{
+	std::lock_guard<std::mutex> lock(m_MessageMutex);
+	SChatMessage MsgStruct;
+	MsgStruct.m_Text = Msg;
+	MsgStruct.m_Color = MsgColor;
+	m_ChatMessages.push_back(MsgStruct);
+	if(m_ChatMessages.size() > 100)
+		m_ChatMessages.erase(m_ChatMessages.begin());
+
+	dbg_msg("MSGGGGG", "%s" , Msg.c_str());
+}
+
+std::vector<CWebSocketChat::SChatMessage> CWebSocketChat::GetMessages()
+{
+	std::lock_guard<std::mutex> Lock(m_MessageMutex);
+	return m_ChatMessages;
+}
+
+void CWebSocketChat::SendTypingState(bool State)
+{
+	if(!m_IsConnected)
+		return;
+
+	if(State)
+		m_Socket->socket()->emit("typing_start", sio::string_message::create(g_Config.m_PlayerName));
+	else
+		m_Socket->socket()->emit("typing_stop", sio::string_message::create(g_Config.m_PlayerName));
+}
+
+

…t/components/comp_pulse/socket_request.h …/comp_pulse/socket/modules/socket_chat.hsrc/game/client/components/comp_pulse/socket_request.h renamed to src/game/client/components/comp_pulse/socket/modules/socket_chat.h src/game/client/components/comp_pulse/socket_request.h renamed to src/game/client/components/comp_pulse/socket/modules/socket_chat.h

@@ -1,36 +1,37 @@
-#ifndef GAME_CLIENT_COMPONENTS_COMP_PULSE_SOCKET_REQUEST_H
-#define GAME_CLIENT_COMPONENTS_COMP_PULSE_SOCKET_REQUEST_H
+#ifndef GAME_CLIENT_COMPONENTS_COMP_PULSE_SOCKET_MODULES_SOCKET_CHAT_H
+#define GAME_CLIENT_COMPONENTS_COMP_PULSE_SOCKET_MODULES_SOCKET_CHAT_H
 
-#include "base/color.h"
-
-#include <game/client/component.h>
+#include "../socket_component.h"
 
+#include "base/color.h"
 #include <sio_client.h>
 
 #include <mutex>
 #include <string>
 #include <unordered_set>
 #include <vector>
 
-class CWebSocket : public CComponent
+class CWebSocketChat : public CWebSocketComponent
 {
-	void SetupSocketListeners();
-	void HandleChatMessage(sio::event &Ev);
-	void HandleOnlineUpdate(sio::event &Ev);
-
-	std::mutex m_SkinMutex;
-
 public:
 	struct SChatMessage
 	{
 		std::string m_Text;
 		ColorRGBA m_Color;
 	};
+	std::vector<SChatMessage> GetMessages();
+
+	//sio::client m_Socket;
+
+	void HandleChatMessage(sio::event &Ev);
+	void SendChatMessage(const std::string &Msg) const;
+	void AddMessage(const std::string &Msg, ColorRGBA MsgColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f));
+	void HandleOnlineUpdate(sio::event &Ev);
+
+
 	std::mutex m_MessageMutex;
 	std::vector<SChatMessage> m_ChatMessages;
 
-	bool m_IsConnected;
-
 	std::vector<std::string> m_OnlinePlayers;
 	std::mutex m_OnlinePlayersMutex;
 
@@ -39,22 +40,16 @@ class CWebSocket : public CComponent
 	bool m_IsTyping = false;
 	int64_t m_LastTypeTime = 0;
 
-	void SocketConnect();
-	void SocketDisconnect();
-	void ConnectAndSetup();
-	void SocketListen(const std::string &Name);
-	void SendChatMessage(const std::string &Msg);
-	bool IsConnected() const;
 
-	void OnOpen();
-	void OnClose();
 
-	void AddMessage(const std::string &Msg, ColorRGBA MsgColor = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f));
-	std::vector<SChatMessage> GetMessages();
-	void SetPlayerSkin(const std::string &SkinName, const std::string &BodyColor, const std::string &FeetColor, bool IsCustomColor);
+	void ListenerInit() override;
+
+
+	void HandleTypingStart(sio::event &ev);
+	void HandleTypingStop(sio::event &ev);
+
+	void SendTypingState(bool State);
 
-	void OnInit() override;
-	int Sizeof() const override { return sizeof(*this); }
 };
 
 #endif