From a60f56e248e05dde07132889d08634702ff3835d Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Tue, 12 Aug 2025 11:09:11 +0200
Subject: [PATCH] add ReadConcreteMessage

---
 include/sp/io/MessageStream.h   | 28 ++++++++++++++--------------
 include/sp/io/MessageStream.inl | 19 ++++++++++++++++---
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/include/sp/io/MessageStream.h b/include/sp/io/MessageStream.h
index 2c0d632..4ee378a 100644
--- a/include/sp/io/MessageStream.h
+++ b/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 {
 
@@ -20,28 +20,28 @@ class MessageStream {
   public:
 	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) :
-		m_Stream(std::move(a_Stream)){
-			m_Encapsulators.reserve(sizeof...(a_Encapsulators));
-			AddEncapsulators(std::move(a_Encapsulators ...));
-		}
+	template <typename... TEnc>
+	MessageStream(std::shared_ptr<IoInterface>&& a_Stream, TEnc&&... a_Encapsulators) : m_Stream(std::move(a_Stream)) {
+		m_Encapsulators.reserve(sizeof...(a_Encapsulators));
+		AddEncapsulators(std::move(a_Encapsulators...));
+	}
 
 	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>
-	void AddEncapsulators(Args&& ... a_Encapsulators) {
-		AddEncapsulators(std::move(std::make_tuple<>(a_Encapsulators ...)));
+	template <typename... Args>
+	void AddEncapsulators(Args&&... a_Encapsulators) {
+		AddEncapsulators(std::move(std::make_tuple<>(a_Encapsulators...)));
 	}
 
-	template<typename... Args>
+	template <typename... Args>
 	void AddEncapsulators(std::tuple<Args...>&& a_Encapsulators) {
-		TupleForEach([this](auto&& a_Encapsulator){
-			m_Encapsulators.push_back(std::move(a_Encapsulator));
-		}, a_Encapsulators);
+		TupleForEach([this](auto&& a_Encapsulator) { m_Encapsulators.push_back(std::move(a_Encapsulator)); }, a_Encapsulators);
 	}
 
   private:
diff --git a/include/sp/io/MessageStream.inl b/include/sp/io/MessageStream.inl
index b0f27e9..b425aa7 100644
--- a/include/sp/io/MessageStream.inl
+++ b/include/sp/io/MessageStream.inl
@@ -12,9 +12,10 @@ 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);
-	
+
 	for (auto& enc : m_Encapsulators) {
 		buffer = enc->Decapsulate(buffer);
 	}
@@ -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);
@@ -32,7 +45,7 @@ std::unique_ptr<typename TMessageFactory::MessageBaseType> MessageStream<TMessag
 
 template <typename TMessageFactory>
 std::unique_ptr<typename TMessageFactory::MessageBaseType> MessageStream<TMessageFactory>::ReadMessage(MessageIdType a_Id) {
-	
+
 	DataBuffer buffer = ReadAndDecapsulate();
 
 	return MakeMessage(buffer, a_Id);