From 5a3197d3ded3f826d0844c353692e8e1f4d1a1f8 Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Sat, 1 Mar 2025 19:19:27 +0100
Subject: [PATCH] change decapsulate signature

---
 include/sp/extensions/Compress.h  |  2 +-
 include/sp/io/IOInterface.h       |  4 ++--
 include/sp/io/IOInterfaceImpl.inl | 14 +++++++-------
 src/sp/extensions/Compress.cpp    |  5 ++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/sp/extensions/Compress.h b/include/sp/extensions/Compress.h
index 1ff2545..b3b06e3 100644
--- a/include/sp/extensions/Compress.h
+++ b/include/sp/extensions/Compress.h
@@ -47,7 +47,7 @@ template <>
 class MessageEncapsulator<option::ZlibCompress> {
   public:
 	static DataBuffer Encapsulate(const DataBuffer& a_Data, const option::ZlibCompress& a_Option);
-	static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option);
+	static DataBuffer Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option);
 };
 
 }  // namespace io
diff --git a/include/sp/io/IOInterface.h b/include/sp/io/IOInterface.h
index b1e4a77..aca8cbd 100644
--- a/include/sp/io/IOInterface.h
+++ b/include/sp/io/IOInterface.h
@@ -17,7 +17,7 @@ template <typename TOption>
 class MessageEncapsulator {
   public:
 	static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOption& a_Option);
-	static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option);
+	static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option);
 };
 
 template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
@@ -49,7 +49,7 @@ class Stream {
 
   private:
 	static DataBuffer Encapsulate(const DataBuffer& a_Data, const TOptions&... a_Options);
-	static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options);
+	static DataBuffer Decapsulate(DataBuffer& a_Data, const TOptions&... a_Options);
 };
 
 }  // namespace io
diff --git a/include/sp/io/IOInterfaceImpl.inl b/include/sp/io/IOInterfaceImpl.inl
index 539cf20..5aabee2 100644
--- a/include/sp/io/IOInterfaceImpl.inl
+++ b/include/sp/io/IOInterfaceImpl.inl
@@ -15,7 +15,7 @@ struct MessageEncapsulatorPack<> {
 	static DataBuffer Encapsulate(const DataBuffer& a_Data) {
 		return a_Data;
 	}
-	static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length) {
+	static DataBuffer Decapsulate(DataBuffer& a_Data) {
 		return a_Data;
 	}
 };
@@ -26,9 +26,9 @@ struct MessageEncapsulatorPack<TOption, TOptions...> {
 		DataBuffer data = io::MessageEncapsulator<TOption>::Encapsulate(a_Data, a_Option);
 		return MessageEncapsulatorPack<TOptions...>::Encapsulate(data, a_Options...);
 	}
-	static DataBuffer Decapsulate(DataBuffer& a_Data, std::size_t a_Length, const TOption& a_Option, const TOptions&... a_Options) {
-		DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Length, a_Option);
-		return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, data.GetSize(), a_Options...);
+	static DataBuffer Decapsulate(DataBuffer& a_Data, const TOption& a_Option, const TOptions&... a_Options) {
+		DataBuffer data = io::MessageEncapsulator<TOption>::Decapsulate(a_Data, a_Option);
+		return MessageEncapsulatorPack<TOptions...>::Decapsulate(data, a_Options...);
 	}
 };
 
@@ -94,7 +94,7 @@ void Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::RecieveMessa
 		buffer = m_Interface.Read(lenghtValue);
 
 		buffer = std::apply([&buffer, lenghtValue](const auto&... a_Options) {
-			return Decapsulate(buffer, lenghtValue, a_Options...);
+			return Decapsulate(buffer, a_Options...);
 		}, m_Options);
 
 		VarInt packetType;
@@ -120,8 +120,8 @@ DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Encaps
 
 template <typename IOTag, typename MessageDispatcher, typename MessageFactory, typename... TOptions>
 DataBuffer Stream<IOTag, MessageDispatcher, MessageFactory, TOptions...>::Decapsulate(
-	DataBuffer& a_Data, std::size_t a_Length, const TOptions&... a_Options) {
-	return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Length, a_Options...);
+	DataBuffer& a_Data, const TOptions&... a_Options) {
+	return details::MessageEncapsulatorPack<TOptions...>::Decapsulate(a_Data, a_Options...);
 }
 
 }  // namespace io
diff --git a/src/sp/extensions/Compress.cpp b/src/sp/extensions/Compress.cpp
index e93c3f1..7d50fd5 100644
--- a/src/sp/extensions/Compress.cpp
+++ b/src/sp/extensions/Compress.cpp
@@ -81,9 +81,8 @@ DataBuffer MessageEncapsulator<option::ZlibCompress>::Encapsulate(const DataBuff
 	return zlib::Compress(a_Data, a_Option.m_Enabled ? a_Option.m_CompressionThreshold : MAX_COMPRESS_THRESHOLD);
 }
 
-DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate(
-	DataBuffer& a_Data, std::size_t a_Length, const option::ZlibCompress& a_Option) {
-	return zlib::Decompress(a_Data, a_Length);
+DataBuffer MessageEncapsulator<option::ZlibCompress>::Decapsulate(DataBuffer& a_Data, const option::ZlibCompress& a_Option) {
+	return zlib::Decompress(a_Data, a_Data.GetSize());
 }
 
 }  // namespace io