Add TCP support (#12)

Reviewed-on: #12
Co-authored-by: Persson-dev <sim16.prib@gmail.com>
Co-committed-by: Persson-dev <sim16.prib@gmail.com>

include/sp/extensions/tcp/TcpSocket.h

@@ -41,6 +41,7 @@ class IOInterface<TcpTag> : private NonCopyable {
 	IOInterface();
 	IOInterface(const std::string& a_Host, std::uint16_t a_Port);
 	IOInterface(IOInterface&& a_Other);
+	IOInterface& operator=(IOInterface&& a_Other);
 	virtual ~IOInterface();
 
 	DataBuffer Read(std::size_t a_Amount);

include/sp/protocol/MessageDispatcher.h

@@ -17,7 +17,7 @@ namespace sp {
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 class MessageDispatcher {
   private:
-	std::map<MessageIdType, std::vector<std::shared_ptr<MessageHandler>>> m_Handlers;
+	std::map<MessageIdType, std::vector<MessageHandler*>> m_Handlers;
 
   public:
 	using MessageBaseType = MessageBase;
@@ -38,18 +38,20 @@ class MessageDispatcher {
 	 * \param type The packet type
 	 * \param handler The packet handler
 	 */
-	void RegisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler);
+	void RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
+	
 	/**
 	 * \brief Unregister a packet handler
 	 * \param type The packet type
 	 * \param handler The packet handler
 	 */
-	void UnregisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler);
+	void UnregisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
+	
 	/**
 	 * \brief Unregister a packet handler
 	 * \param handler The packet handler
 	 */
-	void UnregisterHandler(const std::shared_ptr<MessageHandler>& a_Handler);
+	void UnregisterHandler(MessageHandler* a_Handler);
 };
 
 #include <sp/protocol/message/MessageDispatcherImpl.inl>

include/sp/protocol/message/MessageDispatcherImpl.inl

@@ -1,34 +1,36 @@
 #pragma once
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler) {
+	assert(a_Handler);
 	auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler);
 	if (found == m_Handlers[a_MessageType].end())
 		m_Handlers[a_MessageType].push_back(a_Handler);
 }
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, const std::shared_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler) {
 	auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler);
 	if (found != m_Handlers[a_MessageType].end())
 		m_Handlers[a_MessageType].erase(found);
 }
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(const std::shared_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageHandler* a_Handler) {
 	for (auto& pair : m_Handlers) {
 		if (pair.second.empty())
 			continue;
 
 		MessageIdType type = pair.first;
 
-		m_Handlers[type].erase(std::remove(m_Handlers[type].begin(), m_Handlers[type].end(), a_Handler), m_Handlers[type].end());
+		pair.second.erase(std::remove(pair.second.begin(), pair.second.end(), a_Handler), pair.second.end());
 	}
 }
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::Dispatch(const MessageBase& a_Message) {
 	MessageIdType type = a_Message.GetId();
-	for (auto& handler : m_Handlers[type])
+	for (auto& handler : m_Handlers[type]) {
 		a_Message.Dispatch(*handler);
+	}
 }

src/sp/extensions/TcpSocket.cpp

@@ -44,7 +44,10 @@ TcpSocket::IOInterface(const std::string& a_Host, std::uint16_t a_Port) : IOInte
 	Connect(a_Host, a_Port);
 }
 
-TcpSocket::IOInterface(IOInterface&& a_Other) {}
+TcpSocket::IOInterface(IOInterface&& a_Other) {
+	std::swap(m_Handle, a_Other.m_Handle);
+	std::swap(m_Status, a_Other.m_Status);
+}
 
 TcpSocket::~IOInterface() {}
 
@@ -91,7 +94,8 @@ DataBuffer TcpSocket::Read(std::size_t a_Amount) {
 	std::size_t totalRecieved = 0;
 
 	while (totalRecieved < a_Amount) {
-		int recvAmount = recv(m_Handle, reinterpret_cast<char*>(buffer.data() + totalRecieved), static_cast<int>(a_Amount - totalRecieved), 0);
+		int recvAmount =
+			recv(m_Handle, reinterpret_cast<char*>(buffer.data() + totalRecieved), static_cast<int>(a_Amount - totalRecieved), 0);
 		if (recvAmount <= 0) {
 #if defined(_WIN32) || defined(WIN32)
 			int err = WSAGetLastError();
@@ -99,8 +103,8 @@ DataBuffer TcpSocket::Read(std::size_t a_Amount) {
 			int err = errno;
 #endif
 			if (err == WOULDBLOCK) {
-				m_Status = Status::Error;
-				throw SocketError("Error while reading");
+				// we are in non blocking mode and nothing is available
+				return {};
 			}
 
 			Disconnect();
@@ -119,7 +123,7 @@ void TcpSocket::Write(const sp::DataBuffer& a_Data) {
 	std::size_t sent = 0;
 
 	while (sent < a_Data.GetSize()) {
-		int cur = send(m_Handle, reinterpret_cast<const char*>(a_Data.GetSize() + sent), static_cast<int>(a_Data.GetSize() - sent), 0);
+		int cur = send(m_Handle, reinterpret_cast<const char*>(a_Data.data() + sent), static_cast<int>(a_Data.GetSize() - sent), 0);
 
 		if (cur <= 0) {
 			Disconnect();
@@ -150,8 +154,11 @@ void TcpSocket::Disconnect() {
 	m_Status = Status::Disconnected;
 }
 
-
+TcpSocket& TcpSocket::operator=(IOInterface&& a_Other) {
+	std::swap(m_Handle, a_Other.m_Handle);
+	std::swap(m_Status, a_Other.m_Status);
+	return *this;
+}
 
 }  // namespace io
-
 }  // namespace sp

test/test_file.cpp

@@ -23,8 +23,8 @@ int main() {
 	auto handler = std::make_shared<CustomPacketHandler>();
 
 	FileStream stream(sp::io::File{"test.txt", sp::io::FileTag::In | sp::io::FileTag::Out}, {});
-	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler);
-	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler.get());
+	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler.get());
 
 	stream.SendMessage(KeepAlivePacket{96});
 	stream.SendMessage(KeepAlivePacket{69});

test/test_io.cpp

@@ -23,13 +23,13 @@ int main() {
 	auto handler = std::make_shared<CustomPacketHandler>();
 
 	DataBufferStream stream;
-	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler.get());
 
 	// this should not be dispatched
 	stream.SendMessage(KeepAlivePacket{96});
 	stream.RecieveMessages();
 
-	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler.get());
 
 	stream.SendMessage(KeepAlivePacket{69});
 	stream.RecieveMessages();

test/test_packets.cpp

@@ -48,10 +48,10 @@ int main() {
 	packet->Dispatch(*handler);
 
 	sp::PacketDispatcher dispatcher;
-	dispatcher.RegisterHandler(PacketId::KeepAlive, handler);
+	dispatcher.RegisterHandler(PacketId::KeepAlive, handler.get());
 	dispatcher.Dispatch(*packet);
-	dispatcher.UnregisterHandler(PacketId::KeepAlive, handler);
-	dispatcher.UnregisterHandler(handler);
+	dispatcher.UnregisterHandler(PacketId::KeepAlive, handler.get());
+	dispatcher.UnregisterHandler(handler.get());
 
 	return 0;
 }

xmake.lua

@@ -12,7 +12,7 @@ local modules = {
     TcpSocket = {
         Option = "tcp",
         Deps = {},
-        Includes = {"include/(sp/extensions/Tcp.h)"},
+        Includes = {"include/(sp/extensions/Tcp.h)", "include/(sp/extensions/tcp/*.h)"},
         Sources = {"src/sp/extensions/Tcp*.cpp"}
     }
 }
@@ -71,11 +71,8 @@ target("SimpleProtocol")
     add_files("src/sp/**.cpp")
     set_group("Library")
     set_kind("$(kind)")
-    
-    local includeFolders = {"common", "default", "io", "protocol"}
-    for _, folder in ipairs(includeFolders) do
-        add_headerfiles("include/(sp/" .. folder .. "/**.h)")
-    end
+
+    add_headerfiles("include/(sp/**.h)", "include/(sp/**.inl)")
 
     -- adding extensions
     for name, module in table.orderpairs(modules) do
@@ -86,6 +83,7 @@ target("SimpleProtocol")
 
     -- we don't want extensions
     remove_files("src/sp/extensions/**.cpp")
+    remove_headerfiles("include/(sp/extension/**.h)")
 
     -- we need this for endian functions
     if is_os("windows") then