add ReadConcreteMessage

include/sp/io/MessageStream.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <memory>
 #include <sp/common/DataBuffer.h>
 #include <sp/io/IoInterface.h>
 #include <sp/io/MessageEncapsulator.h>
 #include <vector>
-#include <memory>
 
 namespace sp {
 
@@ -21,8 +21,7 @@ class MessageStream {
 	MessageStream(std::shared_ptr<IoInterface>&& a_Stream) : m_Stream(std::move(a_Stream)) {}
 
 	template <typename... TEnc>
-	MessageStream(std::shared_ptr<IoInterface>&& a_Stream, TEnc&&... a_Encapsulators) :
+	MessageStream(std::shared_ptr<IoInterface>&& a_Stream, TEnc&&... a_Encapsulators) : m_Stream(std::move(a_Stream)) {
-		m_Stream(std::move(a_Stream)){
 		m_Encapsulators.reserve(sizeof...(a_Encapsulators));
 		AddEncapsulators(std::move(a_Encapsulators...));
 	}
@@ -30,6 +29,9 @@ class MessageStream {
 	std::unique_ptr<MessageBaseType> ReadMessage();
 	std::unique_ptr<MessageBaseType> ReadMessage(MessageIdType a_Id);
 
+	template <typename TMessage>
+	std::unique_ptr<TMessage> ReadConcreteMessage();
+
 	void WriteMessage(const MessageBaseType& a_Message, bool a_WriteId = true);
 
 	template <typename... Args>
@@ -39,9 +41,7 @@ class MessageStream {
 
 	template <typename... Args>
 	void AddEncapsulators(std::tuple<Args...>&& a_Encapsulators) {
-		TupleForEach([this](auto&& a_Encapsulator){
+		TupleForEach([this](auto&& a_Encapsulator) { m_Encapsulators.push_back(std::move(a_Encapsulator)); }, a_Encapsulators);
-			m_Encapsulators.push_back(std::move(a_Encapsulator));
-		}, a_Encapsulators);
 	}
 
   private:

include/sp/io/MessageStream.inl

@@ -12,6 +12,7 @@ DataBuffer MessageStream<TMessageFactory>::ReadAndDecapsulate() {
 		DataBuffer buffer = m_Stream->Read(1);
 		data = *buffer.data();
 	});
+
 	std::size_t amount = messageLength.GetValue();
 	DataBuffer buffer = m_Stream->Read(amount);
 
@@ -23,7 +24,19 @@ DataBuffer MessageStream<TMessageFactory>::ReadAndDecapsulate() {
 }
 
 template <typename TMessageFactory>
-std::unique_ptr<typename TMessageFactory::MessageBaseType> MessageStream<TMessageFactory>::MakeMessage(DataBuffer& buffer, MessageIdType a_Id) {
+template <typename TMessage>
+std::unique_ptr<TMessage> MessageStream<TMessageFactory>::ReadConcreteMessage() {
+	DataBuffer buffer = ReadAndDecapsulate();
+
+	auto m_Message = std::make_unique<TMessage>();
+	m_Message->Read(buffer);
+
+	return m_Message;
+}
+
+template <typename TMessageFactory>
+std::unique_ptr<typename TMessageFactory::MessageBaseType> MessageStream<TMessageFactory>::MakeMessage(
+	DataBuffer& buffer, MessageIdType a_Id) {
 	static const TMessageFactory FACTORY;
 	auto message = FACTORY.CreateMessage(a_Id);
 	message->Read(buffer);