better print override

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

include/examples/UpgradeTowerPacket.h

@@ -14,7 +14,8 @@ using UpgradeTowerFields = std::tuple<
 	sp::BitField<std::uint16_t, 
 		sp::Field<std::uint16_t, 12>,  		//<- m_Tower
 		sp::Field<std::uint8_t, 4>			//<- m_Upgrade
-		>
+		>,
+	sp::VarInt								//<- just for testing
 	>;
 
 DeclarePacket(UpgradeTower){

include/sp/common/DataBuffer.h

@@ -35,6 +35,7 @@ class DataBuffer {
 	typedef Data::difference_type difference_type;
 
 	DataBuffer();
+	DataBuffer(std::size_t a_InitialSize);
 	DataBuffer(const DataBuffer& other);
 	DataBuffer(const DataBuffer& other, difference_type offset);
 	DataBuffer(DataBuffer&& other);

include/sp/common/NonCopyable.h

@@ -0,0 +1,25 @@
+#pragma once
+
+/**
+ * \file NonCopyable.h
+ * \brief File containing the sp::NonCopyable class
+ */
+
+namespace sp {
+
+/**
+ * \class NonCopyable
+ * \brief Class used to make a class non copyable
+ * \note Inherit from this class privately to make a class non copyable
+ */
+class NonCopyable {
+  public:
+	NonCopyable(const NonCopyable&) = delete;
+	NonCopyable& operator=(const NonCopyable&) = delete;
+
+  protected:
+	NonCopyable() {}
+	~NonCopyable() {}
+};
+
+}  // namespace sp

include/sp/common/Reflection.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <cxxabi.h>
+#include <string>
+
+namespace sp {
+
+template <typename T>
+std::string GetBasicClassName(const T& a_Value) {
+	int status;
+	char* demangled = abi::__cxa_demangle(typeid(a_Value).name(), 0, 0, &status);
+	if (status != 0)
+		return "";
+	return std::string(demangled);
+}
+
+template <typename T>
+std::string GetBasicClassName() {
+	int status;
+	char* demangled = abi::__cxa_demangle(typeid(T).name(), 0, 0, &status);
+	if (status != 0)
+		return "";
+	return std::string(demangled);
+}
+
+template <typename T>
+struct Reflector {
+	static std::string GetClassName() {
+		return GetBasicClassName<T>();
+	}
+};
+
+template <>
+struct Reflector<std::string> {
+	static std::string GetClassName() {
+		return "std::string";
+	}
+};
+
+template <typename K, typename V>
+struct Reflector<std::map<K, V>> {
+	static std::string GetClassName();
+};
+
+template <typename T>
+struct Reflector<std::vector<T>> {
+	static std::string GetClassName();
+};
+
+template <typename T>
+std::string Reflector<std::vector<T>>::GetClassName() {
+	return "std::vector<" + Reflector<T>::GetClassName() + ">";
+}
+
+template <typename K, typename V>
+std::string Reflector<std::map<K, V>>::GetClassName() {
+	return "std::map<" + Reflector<K>::GetClassName() + ", " + Reflector<V>::GetClassName() + ">";
+}
+
+}  // namespace sp

include/sp/common/Templates.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <string>
 
 namespace sp {
 
@@ -50,4 +51,48 @@ void TupleForEach(TFunc&& func, TTuple&& tuple) {
 	details::TupleForEachHelper<TupleSize>::Exec(std::forward<TTuple>(tuple), std::forward<TFunc>(func));
 }
 
+
+
+
+
+
+
+
+
+namespace details {
+
+template <typename T, typename U = void>
+struct is_mappish_impl : std::false_type {};
+
+template <typename T>
+struct is_mappish_impl<T, std::void_t<typename T::key_type, typename T::mapped_type,
+							  decltype(std::declval<T&>()[std::declval<const typename T::key_type&>()])>> : std::true_type {};
+
+template <typename T, typename U = void>
+struct is_vectish_impl : std::false_type {};
+
+template <typename T>
+struct is_vectish_impl<T,
+	std::void_t<typename T::value_type, decltype(std::declval<T&>()[std::declval<const typename T::value_type&>()])>>
+	: std::true_type {};
+
+template <typename T, typename U = void>
+struct is_pairish_impl : std::false_type {};
+
+template <typename T>
+struct is_pairish_impl<T,
+	std::void_t<typename T::first_type, decltype(std::declval<T&>()[std::declval<const typename T::first_type&>()])>>
+	: std::true_type {};
+
+template <typename T>
+using is_general_t = std::integral_constant<bool,
+	(std::is_same_v<T, std::string> || (!std::is_same_v<T, char> && !std::is_same_v<T, unsigned char> && !std::is_arithmetic_v<T> &&
+										   !is_pairish_impl<T>::value && !is_mappish_impl<T>::value && !is_vectish_impl<T>::value))>;
+
+template <typename T>
+using is_primitive =
+	std::integral_constant<bool, std::is_same_v<T, char> || std::is_same_v<T, unsigned char> || std::is_arithmetic_v<T>>;
+
+}  // namespace details
+
 }  // namespace sp

include/sp/common/VarInt.h

@@ -7,6 +7,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <sp/protocol/MessagePrinter.h>
 
 namespace sp {
 
@@ -57,4 +58,9 @@ class VarInt {
 	friend DataBuffer& operator>>(DataBuffer& in, VarInt& var);
 };
 
+template<>
+inline std::string PrintData(const VarInt& a_VarInt) {
+	return PrintData(a_VarInt.GetValue());
+}
+
 }  // namespace sp

include/sp/default/DefaultPacket.h

@@ -11,7 +11,8 @@ using PacketMessage = Message<
 	option::ReadOperations,										// add read() operation
 	option::WriteOperations,									// add write() operation
 	option::WriteId,											// write id before data
-	option::Handler<PacketHandler>			// add dispatch() operation
+	option::Handler<PacketHandler>,								// add dispatch() operation
+	option::DebugPrint											// add ToString() operator
 	>;
 
 #define PacketConstructor(packetName)                                                                                                 \
@@ -23,7 +24,8 @@ using PacketMessage = Message<
 
 #define DeclarePacket(packetName)                                                                                                     \
 	class packetName##Packet : public sp::MessageBase<sp::PacketMessage, sp::option::StaticNumIdImpl<packetName>,                     \
-								   sp::option::DispatchImpl<packetName##Packet>, sp::option::FieldsImpl<packetName##Fields>>
+								   sp::option::DispatchImpl<packetName##Packet>, sp::option::FieldsImpl<packetName##Fields>>,         \
+							   sp::option::ToStringImpl<packetName##Packet>
 
 
 

include/sp/extensions/Extensions.h

@@ -3,3 +3,7 @@
 #if __has_include(<sp/extensions/Compress.h>)
 	#include <sp/extensions/Compress.h>
 #endif
+
+#if __has_include(<sp/extensions/Tcp.h>)
+	#include <sp/extensions/Tcp.h>
+#endif

include/sp/extensions/Tcp.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#include <sp/extensions/tcp/TcpListener.h>
+#include <sp/extensions/tcp/TcpSocket.h>

include/sp/extensions/tcp/TcpListener.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <sp/extensions/tcp/TcpSocket.h>
+
+namespace sp {
+namespace io {
+
+/**
+ * \class TcpListener
+ */
+class TcpListener : private NonCopyable {
+  public:
+	/**
+	 * \brief Starts listening for guests to connect
+	 * \param port The port to listen to
+	 * \param maxConnexions The maximum amount of connexion that can happen at the same time. \n
+	 * Every other guests will be kicked if this amount is reached.
+	 * \return Whether this action was succesfull
+	 */
+	TcpListener(std::uint16_t a_Port, int a_MaxConnexions);
+
+	/**
+	 * \brief Default destructor
+	 */
+	~TcpListener();
+
+	/**
+	 * \brief Tries to accept an incoming request to connect
+	 * \return the new socket if a new connexion was accepted or nullptr
+	 */
+	std::unique_ptr<TcpSocket> Accept();
+
+	/**
+	 * \brief Closes the socket
+	 */
+	void Close();
+
+	/**
+	 * \brief Allows to set the socket in non blocking/blocking mode
+	 * \param a_Blocking If set to true, every call to Read will wait until the socket receives something
+	 * \return true if the operation was successful
+	 */
+	bool SetBlocking(bool a_Blocking);
+
+	/**
+	 * \brief Getter of the m_Port member
+	 * \return The port which the socket listen to
+	 */
+	std::uint16_t GetListeningPort() const;
+
+	/**
+	 * \brief Getter of the m_MaxConnections member
+	 * \return The maximum amount of connexions that can happen at the same time.
+	 */
+	int GetMaximumConnections() const;
+
+  private:
+	SocketHandle m_Handle;
+	std::uint16_t m_Port;
+	int m_MaxConnections;
+};
+
+
+}  // namespace io
+}  // namespace sp

include/sp/extensions/tcp/TcpSocket.h

@@ -0,0 +1,86 @@
+#pragma once
+
+#include <sp/common/NonCopyable.h>
+#include <sp/io/IOInterface.h>
+
+namespace sp {
+namespace io {
+
+using SocketHandle = int;
+
+struct TcpTag {};
+
+class SocketError : public std::exception {
+  private:
+	std::string m_Error;
+
+  public:
+	SocketError(std::string&& a_Msg) : m_Error(std::move(a_Msg)) {}
+
+	virtual const char* what() const noexcept override {
+		return m_Error.c_str();
+	}
+};
+
+template <>
+class IOInterface<TcpTag> : private NonCopyable {
+  public:
+	/**
+	 * \enum Status
+	 * \brief Describes the state of a socket
+	 */
+	enum class Status {
+		/** The socket is connected */
+		Connected,
+		/** The socket is not connected */
+		Disconnected,
+		/** Something bad happened */
+		Error,
+	};
+
+	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);
+	void Write(const sp::DataBuffer& a_Data);
+
+	/**
+	 * \brief Allows to set the socket in non blocking/blocking mode
+	 * \param a_Block If set to true, every call to Read will wait until the socket receives something
+	 * \return true if the operation was successful
+	 */
+	bool SetBlocking(bool a_Block);
+
+	/**
+	 * \brief Getter of the m_Status member
+	 * \return The TcpSocket::Status of this socket
+	 */
+	Status GetStatus() const;
+
+	/**
+	 * \brief Disconnects the socket from the remote
+	 * \note Does nothing if the socket is not connected. \n
+	 * 	This function is also called by the destructor.
+	 */
+	void Disconnect();
+
+
+  private:
+	SocketHandle m_Handle;
+	Status m_Status;
+
+	void Connect(const std::string& a_Host, std::uint16_t a_Port);
+
+	friend class TcpListener;
+};
+
+/**
+ * \typedef TcpSocket
+ */
+using TcpSocket = IOInterface<TcpTag>;
+
+}  // namespace io
+}  // namespace sp

include/sp/io/IOInterfaceImpl.inl

@@ -48,11 +48,12 @@ Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Stream(
 template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
 void Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::SendMessage(const MessageBase& a_Message) {
 	DataBuffer data = a_Message.Write();
-	DataBuffer encapsulated = std::apply([&data](const auto&... a_Options) {
-		return Encapsulate(data, a_Options...);
+	TupleForEach([&data](const auto&... a_Options) {
+		data = Encapsulate(data, a_Options...);
 	}, m_Options);
 	DataBuffer finalData;
-	finalData << VarInt{encapsulated.GetSize()} << encapsulated;
+	finalData.Reserve(data.GetSize() + sizeof(VarInt::MAX_VALUE));
+	finalData << VarInt{data.GetSize()} << data;
 	m_Interface.Write(finalData);
 }
 
@@ -93,8 +94,8 @@ void Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::RecieveMessa
 		DataBuffer buffer;
 		buffer = m_Interface.Read(lenghtValue);
 
-		buffer = std::apply([&buffer, lenghtValue](const auto&... a_Options) {
-			return Decapsulate(buffer, a_Options...);
+		TupleForEach([&buffer, lenghtValue](const auto&... a_Options) {
+			buffer = Decapsulate(buffer, a_Options...);
 		}, m_Options);
 
 		VarInt packetType;

include/sp/protocol/Field.h

@@ -70,29 +70,32 @@ class BitField {
  * \tparam ValueType the type of the value to store
  * \tparam IAlignment 0 means no alignment
  */
-template <typename ValueType, int IAlignment>
+template <typename ValueType, std::size_t IAlignment>
 class Field {
   public:
+	using StorageType = ValueType;
+	static constexpr std::size_t AlignmentValue = IAlignment;
+
 	// Provide an access to the stored value
-	ValueType& GetValue() {
+	StorageType& GetValue() {
 		return m_Value;
 	}
 
-	const ValueType& GetValue() const {
+	const StorageType& GetValue() const {
 		return m_Value;
 	}
 
-	Field& operator=(const ValueType& value) {
+	Field& operator=(const StorageType& value) {
 		m_Value = value;
 		return *this;
 	}
 
-	constexpr int GetAlignment() const {
+	constexpr std::size_t GetAlignment() const {
 		return IAlignment;
 	}
 
   private:
-	ValueType m_Value;
+	StorageType m_Value;
 };
 
 namespace details {

include/sp/protocol/MessageBase.h

@@ -14,3 +14,5 @@ template <typename TBase, typename... TOptions>
 class MessageBase : public details::MessageImplBuilder<TBase, TOptions...>::Type {};
 
 }  // namespace sp
+
+#include <sp/protocol/message/MessagePrinterImpl.h>

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/MessagePrinter.h

@@ -0,0 +1,55 @@
+#pragma once
+
+#include <map>
+#include <sp/common/Templates.h>
+#include <string>
+#include <vector>
+
+namespace sp {
+
+template <typename T, std::enable_if_t<details::is_general_t<T>::value, bool> = true>
+inline std::string PrintData(const T& a_Data);
+
+template <typename T, std::enable_if_t<details::is_primitive<T>::value, bool> = true>
+inline std::string PrintData(T a_Data) {
+	return std::to_string(a_Data);
+}
+
+template <>
+inline std::string PrintData(const std::string& a_Data) {
+	return "\"" + a_Data + "\"";
+}
+
+template <typename K, typename V>
+std::string PrintData(const std::pair<K, V>& a_Data);
+
+template <typename K, typename V>
+std::string PrintData(const std::map<K, V>& a_Data);
+
+template <typename T>
+std::string PrintData(const std::vector<T>& a_Data);
+
+template <typename K, typename V>
+std::string PrintData(const std::pair<K, V>& a_Data) {
+	return "{" + PrintData(a_Data.first) + " => " + PrintData(a_Data.second) + "}";
+}
+
+template <typename K, typename V>
+std::string PrintData(const std::map<K, V>& a_Data) {
+	std::string result = "{";
+	for (const auto& pair : a_Data) {
+		result += PrintData(pair) + ", ";
+	}
+	return result.substr(0, result.size() - 2) + "}";
+}
+
+template <typename T>
+std::string PrintData(const std::vector<T>& a_Data) {
+	std::string result = "{";
+	for (const T& value : a_Data) {
+		result += PrintData(value) + ", ";
+	}
+	return result.substr(0, result.size() - 2) + "}";
+}
+
+}  // namespace sp

include/sp/protocol/message/ArrayFillerImpl.h

@@ -31,7 +31,7 @@ struct ArrayFiller<TBase, TMessage, TMessages...> {
 template <typename TBase, typename TMessage>
 struct ArrayFiller<TBase, TMessage> {
 	static void ArrayAppend(details::ArrayType<TBase>& array) {
-		array.push_back([]() -> std::unique_ptr<TBase> { return std::make_unique<TMessage>(); });
+		array.emplace_back([]() -> std::unique_ptr<TBase> { return std::make_unique<TMessage>(); });
 	}
 };
 

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);
 	}
+}

include/sp/protocol/message/MessageImplBuilder.h

@@ -37,8 +37,12 @@ struct MessageImplBuilder {
 	static const bool HasValidImpl = InterfaceOptions::HasValid && ImplOptions::HasFieldsImpl;
 	using Base6 = typename MessageImplProcessValidFields<Base5, HasValidImpl>::Type;
 
+	// Provide ToStringImpl() if possible
+	static const bool HasToStringImpl = InterfaceOptions::HasToString;
+	using Base7 = typename MessageImplProcessToString<Base6, ImplOptions, HasToStringImpl>::Type;
+
 	// The last BaseN must be taken as final type.
-	using Type = Base6;
+	using Type = Base7;
 };
 
 }  // namespace details

include/sp/protocol/message/MessageImplOptions.h

@@ -4,7 +4,7 @@ namespace sp {
 namespace option {
 
 // Provide static numeric ID, to facilitate implementation of GetIdImpl()
-template <std::intmax_t TId>
+template <std::uintmax_t TId>
 struct StaticNumIdImpl {};
 
 // Facilitate implementation of DispatchImpl()
@@ -16,6 +16,11 @@ struct DispatchImpl {};
 template <typename TFields>
 struct FieldsImpl {};
 
+// Print fields of the message, facilitate implementation of
+// ToStringImpl()
+template <typename TActual>
+struct ToStringImpl {};
+
 }  // namespace option
 
 
@@ -39,10 +44,10 @@ struct MessageImplParsedOptions<> {
 
 
 
-template <std::intmax_t TId, typename... TOptions>
+template <std::uintmax_t TId, typename... TOptions>
 struct MessageImplParsedOptions<option::StaticNumIdImpl<TId>, TOptions...> : public MessageImplParsedOptions<TOptions...> {
 	static const bool HasStaticNumIdImpl = true;
-	static const std::intmax_t MsgId = TId;
+	static const std::uintmax_t MsgId = TId;
 };
 
 template <typename TActual, typename... TOptions>

include/sp/protocol/message/MessageImplProcess.h

@@ -4,6 +4,20 @@ namespace sp {
 namespace details {
 
 
+// ToString impl
+template <typename TBase, typename ParsedImplOptions, bool TImplement>
+struct MessageImplProcessToString;
+
+template <typename TBase, typename ParsedImplOptions>
+struct MessageImplProcessToString<TBase, ParsedImplOptions, true> {
+	using Type = MessageImplToStringBase<TBase, typename ParsedImplOptions::ActualMessage>;
+};
+
+template <typename TBase, typename ParsedImplOptions>
+struct MessageImplProcessToString<TBase, ParsedImplOptions, false> {
+	using Type = TBase;
+};
+
 
 // id impl
 template <typename TBase, typename ParsedImplOptions, bool TImplement>

include/sp/protocol/message/MessageInterfaceBuilder.h

@@ -33,8 +33,11 @@ struct MessageInterfaceBuilder {
 	// add write id functionality if write id and write was provided
 	using Base7 = typename MessageInterfaceProcessWriteId<Base6, ParsedOptions::HasWriteId && ParsedOptions::HasWriteOperations>::Type;
 
-	// The last Base7 must be taken as final type.
-	using Type = Base7;
+	// add ToString() if HasToString was provided
+	using Base8 = typename MessageInterfaceProcessToString<Base7, ParsedOptions::HasToString>::Type;
+
+	// The last Base8 must be taken as final type.
+	using Type = Base8;
 };
 
 }  // namespace details

include/sp/protocol/message/MessageInterfaceProcess.h

@@ -101,5 +101,19 @@ struct MessageInterfaceProcessWriteId<TBase, false> {
 	using Type = TBase;
 };
 
+// Build to string 
+template <typename TBase, bool THasToString>
+struct MessageInterfaceProcessToString;
+
+template <typename TBase>
+struct MessageInterfaceProcessToString<TBase, true> {
+	using Type = MessageInterfaceToStringBase<TBase>;
+};
+
+template <typename TBase>
+struct MessageInterfaceProcessToString<TBase, false> {
+	using Type = TBase;
+};
+
 }  // namespace details
 }  // namespace sp

include/sp/protocol/message/MessageInterfacesImpl.h

@@ -129,5 +129,17 @@ class MessageInterfaceWriteIdBase : public TBase {
 	}
 };
 
+// Debug print functionality chunk
+template <typename TBase>
+class MessageInterfaceToStringBase : public TBase {
+  public:
+	std::string ToString() const {
+		return ToStringImpl();
+	}
+
+  protected:
+	virtual std::string ToStringImpl() const = 0;
+};
+
 }  // namespace details
 }  // namespace sp

include/sp/protocol/message/MessageInterfacesOptions.h

@@ -16,6 +16,7 @@ struct MessageInterfaceParsedOptions<> {
 	static const bool HasWriteId = false;
 	static const bool HasHandler = false;
 	static const bool HasValid = false;
+	static const bool HasToString = false;
 };
 
 
@@ -59,5 +60,10 @@ struct MessageInterfaceParsedOptions<option::ValidCheckInterface, TOptions...> :
 	static const bool HasValid = true;
 };
 
+template <typename... TOptions>
+struct MessageInterfaceParsedOptions<option::DebugPrint, TOptions...> : public MessageInterfaceParsedOptions<TOptions...> {
+	static const bool HasToString = true;
+};
+
 }  // namespace details
 }  // namespace sp

include/sp/protocol/message/MessageOptions.h

@@ -24,6 +24,9 @@ struct LittleEndian {};
 // Include validity check in public interface
 struct ValidCheckInterface {};
 
+// Add a ToString() method containing fields
+struct DebugPrint {};
+
 // Define handler class
 template <typename T>
 struct Handler {

include/sp/protocol/message/MessagePrinterImpl.h

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <sp/common/Reflection.h>
+#include <sp/common/Templates.h>
+#include <sp/protocol/MessagePrinter.h>
+
+namespace sp {
+namespace details {
+
+template <typename... TOptions>
+struct IdPrinter {};
+
+template <>
+struct IdPrinter<> {
+	static std::string PrintMessageId() {
+		return "";
+	}
+};
+
+template <typename TOption, typename... TOptions>
+struct IdPrinter<TOption, TOptions...> {
+	static std::string PrintMessageId() {
+		return IdPrinter<TOptions...>::PrintMessageId();
+	}
+};
+
+template <typename... TOptions, std::uintmax_t TId>
+struct IdPrinter<option::StaticNumIdImpl<TId>, TOptions...> {
+	static std::string PrintMessageId() {
+		return "(Id: " + std::to_string(TId) + ")";
+	}
+};
+
+template <typename... TFields>
+std::string PrintFields(const std::tuple<TFields...>& a_Fields);
+
+template <typename TField, unsigned int IAlignment>
+struct FieldPrinter {
+	static std::string PrintField(const sp::Field<TField, IAlignment>& a_Field) {
+		return Reflector<TField>::GetClassName() + "=" + PrintData(a_Field.GetValue());
+	}
+};
+
+template <unsigned int IAlignment, typename TContainer, typename... TFields>
+struct FieldPrinter<BitField<TContainer, TFields...>, IAlignment> {
+	static std::string PrintField(const Field<BitField<TContainer, TFields...>, IAlignment>& a_Field) {
+		return "BitField<" + Reflector<TContainer>::GetClassName() + ">[" + PrintFields(a_Field.GetValue().GetFields()) + "]";
+	}
+};
+
+template <typename... TFields>
+std::string PrintFields(const std::tuple<TFields...>& a_Fields) {
+	std::string concat;
+	TupleForEach(
+		[&concat](const auto& a_Field) {
+			using TField = typename std::decay<decltype(a_Field)>::type;
+			constexpr std::size_t alignment = TField::AlignmentValue;
+			concat += FieldPrinter<typename TField::StorageType, alignment>::PrintField(a_Field) + ", ";
+		},
+		a_Fields);
+	return concat.substr(0, concat.size() - 2);
+}
+
+template <typename TBase, typename... TOptions>
+std::string PrintMessage(const MessageBase<TBase, TOptions...>& a_Message) {
+	return sp::GetBasicClassName(a_Message) + sp::details::IdPrinter<TOptions...>::PrintMessageId() + "[" +
+		   sp::details::PrintFields(a_Message.GetFields()) + "]";
+}
+
+}  // namespace details
+}  // namespace sp

include/sp/protocol/message/MessagesImpl.h

@@ -1,8 +1,24 @@
 #pragma once
 
 namespace sp {
+
+template <typename TBase, typename... TOptions>
+class MessageBase;
+
 namespace details {
 
+template <typename TBase, typename... TOptions>
+std::string PrintMessage(const MessageBase<TBase, TOptions...>& a_Message);
+
+// ID information chunk
+template <typename TBase, typename TActual>
+class MessageImplToStringBase : public TBase {
+  protected:
+	virtual std::string ToStringImpl() const override {
+		return PrintMessage(static_cast<const TActual&>(*this));
+	}
+};
+
 
 
 // ID information chunk
@@ -18,6 +34,8 @@ class MessageImplStaticNumIdBase : public TBase {
 	}
 };
 
+
+
 // Dispatch implementation chunk
 template <typename TBase, typename TActual>
 class MessageImplDispatchBase : public TBase {
@@ -81,7 +99,7 @@ class MessageImplFieldsReadBase : public TBase {
 	}
 
 	// reading field in bitfield
-	template <typename TFieldType, typename TField, int IAlignment>
+	template <typename TFieldType, typename TField, std::size_t IAlignment>
 	void ReadField(Field<TField, IAlignment>& field, TFieldType data, std::size_t offset) {
 		static constexpr std::size_t TotalBitCount = sizeof(TFieldType) * 8;
 		// we suppose that the first element is at the highest bits
@@ -118,7 +136,7 @@ class MessageImplFieldsWriteBase : public TBase {
 	}
 
 	// writing field in bitfield
-	template <typename TFieldType, typename TField, int IAlignment>
+	template <typename TFieldType, typename TField, std::size_t IAlignment>
 	void WriteField(const Field<TField, IAlignment>& field, TFieldType& data, std::size_t offset) const {
 		static constexpr std::size_t TotalBitCount = sizeof(TFieldType) * 8;
 		// we suppose that the first element is at the highest bits

src/sp/common/DataBuffer.cpp

@@ -8,6 +8,8 @@ namespace sp {
 
 DataBuffer::DataBuffer() : m_ReadOffset(0) {}
 
+DataBuffer::DataBuffer(std::size_t a_InitialSize) : m_Buffer(a_InitialSize), m_ReadOffset(0) {}
+
 DataBuffer::DataBuffer(const DataBuffer& other) : m_Buffer(other.m_Buffer), m_ReadOffset(other.m_ReadOffset) {}
 
 DataBuffer::DataBuffer(DataBuffer&& other) : m_Buffer(std::move(other.m_Buffer)), m_ReadOffset(std::move(other.m_ReadOffset)) {}

src/sp/common/VarInt.cpp

@@ -1,7 +1,7 @@
 #include <sp/common/VarInt.h>
 
-#include <stdexcept>
 #include <sp/common/DataBuffer.h>
+#include <stdexcept>
 
 namespace sp {
 

src/sp/extensions/Compress.cpp

@@ -11,7 +11,7 @@ static DataBuffer Inflate(const std::uint8_t* source, std::size_t size, std::siz
 	DataBuffer result;
 	result.Resize(uncompressedSize);
 
-	uncompress(static_cast<Bytef*>(result.data()), static_cast<uLongf*>(&uncompressedSize), static_cast<const Bytef*>(source),
+	uncompress(static_cast<Bytef*>(result.data()), reinterpret_cast<uLongf*>(&uncompressedSize), static_cast<const Bytef*>(source),
 		static_cast<uLong>(size));
 
 	assert(result.GetSize() == uncompressedSize);

src/sp/extensions/TcpListener.cpp

@@ -0,0 +1,114 @@
+#include <sp/extensions/tcp/TcpListener.h>
+
+
+#ifdef _WIN32
+
+// Windows
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#define ioctl ioctlsocket
+#define WOULDBLOCK WSAEWOULDBLOCK
+#define MSG_DONTWAIT 0
+
+#else
+
+// Linux/Unix
+
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#define closesocket close
+#define WOULDBLOCK EWOULDBLOCK
+#define SD_BOTH SHUT_RDWR
+
+#endif
+
+
+
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
+
+namespace sp {
+namespace io {
+
+TcpListener::TcpListener(std::uint16_t a_Port, int a_MaxConnexions) {
+	if ((m_Handle = static_cast<SocketHandle>(socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))) < 0) {
+		throw SocketError("Failed to create server socket");
+	}
+
+	struct sockaddr_in address;
+	address.sin_family = AF_INET;
+	address.sin_addr.s_addr = INADDR_ANY;
+	address.sin_port = htons(a_Port);
+
+	if (bind(m_Handle, reinterpret_cast<sockaddr*>(&address), sizeof(address)) < 0)
+		throw SocketError("Failed to create server socket");
+
+	if (listen(m_Handle, a_MaxConnexions) < 0)
+		throw SocketError("Failed to create server socket");
+
+	socklen_t len = sizeof(address);
+	if (getsockname(m_Handle, reinterpret_cast<sockaddr*>(&address), &len) < 0)
+		throw SocketError("Failed to create server socket");
+
+	m_Port = ntohs(address.sin_port);
+	m_MaxConnections = a_MaxConnexions;
+}
+
+
+TcpListener::~TcpListener() {
+	Close();
+}
+
+std::unique_ptr<TcpSocket> TcpListener::Accept() {
+	sockaddr remoteAddress;
+	int addrlen = sizeof(remoteAddress);
+
+	auto newSocket = std::make_unique<TcpSocket>();
+
+	newSocket->m_Handle = static_cast<SocketHandle>(
+		accept(m_Handle, reinterpret_cast<sockaddr*>(&remoteAddress), reinterpret_cast<socklen_t*>(&addrlen)));
+
+	if (newSocket->m_Handle < 0)
+		return nullptr;
+
+	newSocket->m_Status = TcpSocket::Status::Connected;
+	return newSocket;
+}
+
+void TcpListener::Close() {
+	if (m_Handle > 0) {
+		closesocket(m_Handle);
+		shutdown(m_Handle, SD_BOTH);
+	}
+}
+
+bool TcpListener::SetBlocking(bool a_Blocking) {
+	unsigned long mode = !a_Blocking;
+
+	if (ioctl(m_Handle, FIONBIO, &mode) < 0) {
+		return false;
+	}
+
+	return true;
+}
+
+std::uint16_t TcpListener::GetListeningPort() const {
+	return m_Port;
+}
+
+int TcpListener::GetMaximumConnections() const {
+	return m_MaxConnections;
+}
+
+}  // namespace io
+}  // namespace sp

src/sp/extensions/TcpSocket.cpp

@@ -0,0 +1,164 @@
+#include <sp/extensions/tcp/TcpSocket.h>
+
+#ifdef _WIN32
+
+// Windows
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#define ioctl ioctlsocket
+#define WOULDBLOCK WSAEWOULDBLOCK
+#define MSG_DONTWAIT 0
+
+#else
+
+// Linux/Unix
+
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#define closesocket close
+#define WOULDBLOCK EWOULDBLOCK
+
+#endif
+
+
+
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
+
+namespace sp {
+namespace io {
+
+TcpSocket::IOInterface() : m_Handle(static_cast<SocketHandle>(INVALID_SOCKET)), m_Status(Status::Disconnected) {}
+
+TcpSocket::IOInterface(const std::string& a_Host, std::uint16_t a_Port) : IOInterface() {
+	Connect(a_Host, a_Port);
+}
+
+TcpSocket::IOInterface(IOInterface&& a_Other) {
+	std::swap(m_Handle, a_Other.m_Handle);
+	std::swap(m_Status, a_Other.m_Status);
+}
+
+TcpSocket::~IOInterface() {}
+
+void TcpSocket::Connect(const std::string& a_Host, std::uint16_t a_Port) {
+	struct addrinfo hints {};
+
+	struct addrinfo* result = nullptr;
+
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+
+	m_Status = Status::Error;
+
+	if (getaddrinfo(a_Host.c_str(), std::to_string(static_cast<int>(a_Port)).c_str(), &hints, &result) != 0) {
+		throw SocketError("Failed to get address info");
+	}
+
+	m_Handle = static_cast<SocketHandle>(socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
+	if (m_Handle < 0) {
+		throw SocketError("Failed to create socket");
+	}
+
+	struct addrinfo* ptr = nullptr;
+	for (ptr = result; ptr != nullptr; ptr = ptr->ai_next) {
+		struct sockaddr* sockaddr = ptr->ai_addr;
+		if (connect(m_Handle, sockaddr, sizeof(sockaddr_in)) == 0) {
+			break;
+		}
+	}
+
+	freeaddrinfo(result);
+
+	if (!ptr) {
+		throw SocketError("Could not find a suitable interface for connecting");
+	}
+
+	m_Status = Status::Connected;
+}
+
+DataBuffer TcpSocket::Read(std::size_t a_Amount) {
+	DataBuffer buffer(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);
+		if (recvAmount <= 0) {
+#if defined(_WIN32) || defined(WIN32)
+			int err = WSAGetLastError();
+#else
+			int err = errno;
+#endif
+			if (err == WOULDBLOCK) {
+				// we are in non blocking mode and nothing is available
+				return {};
+			}
+
+			Disconnect();
+			m_Status = Status::Error;
+			throw SocketError("Error while reading");
+		}
+		totalRecieved += recvAmount;
+	}
+	return buffer;
+}
+
+void TcpSocket::Write(const sp::DataBuffer& a_Data) {
+	if (GetStatus() != Status::Connected)
+		return;
+
+	std::size_t sent = 0;
+
+	while (sent < a_Data.GetSize()) {
+		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();
+			m_Status = Status::Error;
+			return;
+		}
+		sent += static_cast<std::size_t>(cur);
+	}
+}
+
+bool TcpSocket::SetBlocking(bool a_Block) {
+	unsigned long mode = !a_Block;
+
+	if (ioctl(m_Handle, FIONBIO, &mode) < 0) {
+		return false;
+	}
+
+	return true;
+}
+
+TcpSocket::Status TcpSocket::GetStatus() const {
+	return m_Status;
+}
+
+void TcpSocket::Disconnect() {
+	if (m_Handle > 0)
+		closesocket(m_Handle);
+	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

@@ -8,7 +8,8 @@
 
 class KeepAliveHandler : public sp::PacketHandler {
 	void Handle(const KeepAlivePacket& packet) {
-		std::cout << "KeepAlive handled !\n";
+		std::cout << "KeepAlive handled !!\n";
+		std::cout << packet.ToString() << std::endl;
 	}
 
 	void Handle(const DisconnectPacket& packet) {
@@ -21,12 +22,14 @@ class KeepAliveHandler : public sp::PacketHandler {
 };
 
 int main() {
-	auto upgradeTower = std::make_unique<UpgradeTowerPacket>(std::make_tuple(666, 9));
+	auto upgradeTower = std::make_unique<UpgradeTowerPacket>(std::make_tuple(666, 9), 789);
+	auto keepAlive = std::make_unique<KeepAlivePacket>(6969);
 
 	sp::PacketMessage* msg = upgradeTower.get();
 
 	auto handler = std::make_shared<KeepAliveHandler>();
 	msg->Dispatch(*handler);
+	keepAlive->Dispatch(*handler);
 
 	sp::DataBuffer buffer = msg->Write();
 
@@ -36,7 +39,7 @@ int main() {
 	auto upgradeTower2 = std::make_unique<UpgradeTowerPacket>();
 	upgradeTower2->Read(buffer);
 
-	std::cout << "Test : " << (unsigned)upgradeTower2->GetTowerId() << "\n";
+	std::cout << "Test : " << msg->ToString() << "\n";
 
 	sp::PacketFactory factory;
 	auto packet = factory.CreateMessage(msgId);
@@ -48,10 +51,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

@@ -6,12 +6,21 @@ local modules = {
     Compression = {
         Option = "zlib",
         Deps = {"zlib"},
-        Packages = {"zlib"},
         Includes = {"include/(sp/extensions/Compress.h)"},
         Sources = {"src/sp/extensions/Compress.cpp"}
+    },
+    TcpSocket = {
+        Option = "tcp",
+        Deps = {},
+        Includes = {"include/(sp/extensions/Tcp.h)", "include/(sp/extensions/tcp/*.h)"},
+        Sources = {"src/sp/extensions/Tcp*.cpp"}
     }
 }
 
+
+
+
+
 -- Map modules to options
 for name, module in table.orderpairs(modules) do
 	if module.Option then
@@ -19,6 +28,10 @@ for name, module in table.orderpairs(modules) do
     end
 end
 
+
+
+
+
 -- Add modules requirements
 for name, module in table.orderpairs(modules) do
 	if module.Deps then
@@ -26,6 +39,10 @@ for name, module in table.orderpairs(modules) do
     end
 end
 
+
+
+
+
 -- Add modules targets
 for name, module in table.orderpairs(modules) do
 	if module.Deps and has_config(module.Option) then
@@ -37,7 +54,7 @@ for name, module in table.orderpairs(modules) do
             for _, source in table.orderpairs(module.Sources) do
                 add_files(source)
             end
-            for _, package in table.orderpairs(module.Packages) do
+            for _, package in table.orderpairs(module.Deps) do
                 add_packages(package)
             end
             set_group("Library")
@@ -45,14 +62,17 @@ for name, module in table.orderpairs(modules) do
     end
 end
 
+
+
+
+
 target("SimpleProtocol")
     add_includedirs("include")
     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
@@ -63,8 +83,14 @@ target("SimpleProtocol")
 
     -- we don't want extensions
     remove_files("src/sp/extensions/**.cpp")
-    set_group("Library")
-    set_kind("$(kind)")
+    remove_headerfiles("include/(sp/extension/**.h)")
+
+    -- we need this for endian functions
+    if is_os("windows") then
+        add_links("ws2_32")
+    end
+
+
 
 -- Tests
 for _, file in ipairs(os.files("test/**.cpp")) do