Persson-dev/Simple-Protocol-Lib
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor DataBufferOperators
All checks were successful
Linux arm64 / Build (push) Successful in 17s
Details

Browse Source
This commit is contained in:
Simon Pribylski
2025-08-03 19:46:11 +02:00
parent 695d15588f
commit 0c82680af0
1 changed files with 275 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

363
include/sp/common/DataBufferOperators.h
View File

@@ -1,16 +1,84 @@
#pragma once #pragma once
#include <sp/common/DataBuffer.h>
#include <boost/pfr.hpp> #include <boost/pfr.hpp>
#include <sp/common/DataBuffer.h>
namespace sp { namespace sp {
template<typename T> template <typename T>
using is_default_serializable = std::bool_constant<(std::is_class_v<T> && std::is_aggregate_v<T>) || !std::is_class_v<T>>; using is_default_serializable = std::bool_constant<(std::is_class_v<T> && std::is_aggregate_v<T>) || !std::is_class_v<T>>;
template<typename T> template <typename T>
static constexpr bool is_default_serializable_v = is_default_serializable<T>::value; static constexpr bool is_default_serializable_v = is_default_serializable<T>::value;
namespace details {
template <typename T>
void WriteRaw(DataBuffer& a_Buffer, T a_Data);
template <typename T>
void WriteFields(DataBuffer& a_Buffer, const T& a_Data);
template <typename T>
void WriteSharedPtr(DataBuffer& a_Buffer, const std::shared_ptr<T>& a_Data);
template <typename T>
void WriteUniquePtr(DataBuffer& a_Buffer, const std::unique_ptr<T>& a_Data);
template <typename T>
void WriteVector(DataBuffer& a_Buffer, const std::vector<T>& a_Data);
template <typename T>
void WriteList(DataBuffer& a_Buffer, const std::list<T>& a_Data);
template <typename K, typename V>
void WriteMap(DataBuffer& a_Buffer, const std::map<K, V>& a_Data);
template <typename K, typename V>
void WriteUnorderedMap(DataBuffer& a_Buffer, const std::unordered_map<K, V>& a_Data);
template <typename K, typename V>
void WritePair(DataBuffer& a_Buffer, const std::pair<K, V>& a_Data);
template <typename T, std::size_t S>
void WriteArray(DataBuffer& a_Buffer, const std::array<T, S>& a_Data);
template <typename T>
void ReadRaw(DataBuffer& a_Buffer, T& a_Data);
template <typename T>
void ReadFields(DataBuffer& a_Buffer, T& a_Data);
template <typename T>
void ReadSharedPtr(DataBuffer& a_Buffer, std::shared_ptr<T>& a_Data);
template <typename T>
void ReadUniquePtr(DataBuffer& a_Buffer, std::unique_ptr<T>& a_Data);
template <typename T>
void ReadVector(DataBuffer& a_Buffer, std::vector<T>& a_Data);
template <typename T>
void ReadList(DataBuffer& a_Buffer, std::list<T>& a_Data);
template <typename K, typename V>
void ReadMap(DataBuffer& a_Buffer, std::map<K, V>& a_Data);
template <typename K, typename V>
void ReadUnorderedMap(DataBuffer& a_Buffer, std::unordered_map<K, V>& a_Data);
template <typename K, typename V>
void ReadPair(DataBuffer& a_Buffer, std::pair<K, V>& a_Data);
template <typename T, std::size_t S>
void ReadArray(DataBuffer& a_Buffer, std::array<T, S>& a_Data);
} // namespace details
/** /**
* \brief Append data to the buffer (converted to big endian) * \brief Append data to the buffer (converted to big endian)
@@ -18,10 +86,9 @@ static constexpr bool is_default_serializable_v = is_default_serializable<T>::va
template <typename T, typename = typename std::enable_if_t<is_default_serializable_v<T>>> template <typename T, typename = typename std::enable_if_t<is_default_serializable_v<T>>>
DataBuffer& operator<<(DataBuffer& a_Buffer, const T& a_Data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const T& a_Data) {
if constexpr (std::is_class_v<T>) { if constexpr (std::is_class_v<T>) {
boost::pfr::for_each_field(a_Data, [&a_Buffer](const auto& a_Field) { a_Buffer << a_Field; }); details::WriteFields(a_Buffer, a_Data);
} else { } else {
a_Buffer.Append(a_Data); details::WriteRaw(a_Buffer, a_Data);
SwapBytes(a_Buffer.data() + a_Buffer.GetReadOffset() - sizeof(T), a_Buffer.data() + a_Buffer.GetReadOffset());
} }
return a_Buffer; return a_Buffer;
} }
@@ -43,8 +110,9 @@ std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer);
* \param data The data to append * \param data The data to append
*/ */
template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>> template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::shared_ptr<T>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::shared_ptr<T>& a_Data) {
return a_Buffer << *data; details::WriteSharedPtr(a_Buffer, a_Data);
return a_Buffer;
} }
/** /**
@@ -52,8 +120,9 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::shared_ptr<T>& data) {
* \param data The data to append * \param data The data to append
*/ */
template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>> template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unique_ptr<T>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unique_ptr<T>& a_Data) {
return a_Buffer << *data; details::WriteUniquePtr(a_Buffer, a_Data);
return a_Buffer;
} }
/** /**
@@ -61,11 +130,8 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unique_ptr<T>& data) {
* \param data The vector to append * \param data The vector to append
*/ */
template <typename T> template <typename T>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::vector<T>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::vector<T>& a_Data) {
a_Buffer << VarInt{data.size()}; details::WriteVector(a_Buffer, a_Data);
for (const auto& element : data) {
a_Buffer << element;
}
return a_Buffer; return a_Buffer;
} }
@@ -74,11 +140,8 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::vector<T>& data) {
* \param data The list to append * \param data The list to append
*/ */
template <typename T> template <typename T>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::list<T>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::list<T>& a_Data) {
a_Buffer << VarInt{data.size()}; details::WriteList(a_Buffer, a_Data);
for (const auto& element : data) {
a_Buffer << element;
}
return a_Buffer; return a_Buffer;
} }
@@ -87,11 +150,8 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::list<T>& data) {
* \param data The map to append * \param data The map to append
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::map<K, V>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::map<K, V>& a_Data) {
a_Buffer << VarInt{data.size()}; details::WriteMap(a_Buffer, a_Data);
for (const auto& [key, value] : data) {
a_Buffer << key << value;
}
return a_Buffer; return a_Buffer;
} }
@@ -100,11 +160,8 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::map<K, V>& data) {
* \param data The map to append * \param data The map to append
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unordered_map<K, V>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unordered_map<K, V>& a_Data) {
a_Buffer << VarInt{data.size()}; details::WriteUnorderedMap(a_Buffer, a_Data);
for (const auto& [key, value] : data) {
a_Buffer << key << value;
}
return a_Buffer; return a_Buffer;
} }
@@ -113,8 +170,9 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::unordered_map<K, V>& dat
* \param data The pair to append * \param data The pair to append
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::pair<K, V>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::pair<K, V>& a_Data) {
return a_Buffer << data.first << data.second; details::WritePair(a_Buffer, a_Data);
return a_Buffer;
} }
/** /**
@@ -122,10 +180,8 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::pair<K, V>& data) {
* \param data The buffer to append * \param data The buffer to append
*/ */
template <typename T, std::size_t Size> template <typename T, std::size_t Size>
DataBuffer& operator<<(DataBuffer& a_Buffer, const std::array<T, Size>& data) { DataBuffer& operator<<(DataBuffer& a_Buffer, const std::array<T, Size>& a_Data) {
for (const auto& element : data) { details::WriteArray(a_Buffer, a_Data);
a_Buffer << element;
}
return a_Buffer; return a_Buffer;
} }
@@ -139,10 +195,9 @@ DataBuffer& operator<<(DataBuffer& a_Buffer, const std::array<T, Size>& data) {
template <typename T, typename = typename std::enable_if_t<is_default_serializable_v<T>>> template <typename T, typename = typename std::enable_if_t<is_default_serializable_v<T>>>
DataBuffer& operator>>(DataBuffer& a_Buffer, T& a_Data) { DataBuffer& operator>>(DataBuffer& a_Buffer, T& a_Data) {
if constexpr (std::is_class_v<T>) { if constexpr (std::is_class_v<T>) {
boost::pfr::for_each_field(a_Data, [&a_Buffer](auto& a_Field) { a_Buffer >> a_Field; }); details::ReadFields(a_Buffer, a_Data);
} else { } else {
a_Buffer.Read(a_Data); details::ReadRaw(a_Buffer, a_Data);
SwapBytes(a_Data);
} }
return a_Buffer; return a_Buffer;
} }
@@ -151,7 +206,7 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, T& a_Data) {
* \brief Read some data from the buffer and assign to the new buffer * \brief Read some data from the buffer and assign to the new buffer
* \param data The buffer to assign * \param data The buffer to assign
*/ */
DataBuffer& operator>>(DataBuffer& a_Buffer, DataBuffer& data); DataBuffer& operator>>(DataBuffer& a_Buffer, DataBuffer& a_Data);
/** /**
* \brief Read a string from the buffer * \brief Read a string from the buffer
@@ -164,18 +219,18 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::string& str);
* \brief Read a pointer * \brief Read a pointer
*/ */
template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>> template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::shared_ptr<T>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::shared_ptr<T>& a_Data) {
data = std::make_shared<T>(); details::ReadSharedPtr(a_Buffer, a_Data);
return a_Buffer >> *data; return a_Buffer;
} }
/** /**
* \brief Read a pointer * \brief Read a pointer
*/ */
template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>> template <typename T, typename = typename std::enable_if_t<!std::is_abstract_v<T>>>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::unique_ptr<T>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::unique_ptr<T>& a_Data) {
data = std::make_unique<T>(); details::ReadUniquePtr(a_Buffer, a_Data);
return a_Buffer >> *data; return a_Buffer;
} }
/** /**
@@ -183,14 +238,8 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::unique_ptr<T>& data) {
* \pre The vector is assumed to be empty * \pre The vector is assumed to be empty
*/ */
template <typename T> template <typename T>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::vector<T>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::vector<T>& a_Data) {
VarInt arraySize; details::ReadVector(a_Buffer, a_Data);
a_Buffer >> arraySize;
for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
T newElement;
a_Buffer >> newElement;
data.push_back(newElement);
}
return a_Buffer; return a_Buffer;
} }
@@ -199,14 +248,8 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::vector<T>& data) {
* \pre The list is assumed to be empty * \pre The list is assumed to be empty
*/ */
template <typename T> template <typename T>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::list<T>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::list<T>& a_Data) {
VarInt arraySize; details::ReadList(a_Buffer, a_Data);
a_Buffer >> arraySize;
for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
T newElement;
a_Buffer >> newElement;
data.push_back(newElement);
}
return a_Buffer; return a_Buffer;
} }
@@ -215,15 +258,8 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::list<T>& data) {
* \pre The map is assumed to be empty * \pre The map is assumed to be empty
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::map<K, V>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::map<K, V>& a_Data) {
VarInt mapSize; details::ReadMap(a_Buffer, a_Data);
a_Buffer >> mapSize;
for (std::size_t i = 0; i < mapSize.GetValue(); i++) {
K newKey;
V newValue;
a_Buffer >> newKey >> newValue;
data.emplace(newKey, newValue);
}
return a_Buffer; return a_Buffer;
} }
@@ -232,15 +268,8 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::map<K, V>& data) {
* \pre The map is assumed to be empty * \pre The map is assumed to be empty
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::unordered_map<K, V>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::unordered_map<K, V>& a_Data) {
VarInt mapSize; details::ReadUnorderedMap(a_Buffer, a_Data);
a_Buffer >> mapSize;
for (std::size_t i = 0; i < mapSize.GetValue(); i++) {
K newKey;
V newValue;
a_Buffer >> newKey >> newValue;
data.emplace(newKey, newValue);
}
return a_Buffer; return a_Buffer;
} }
@@ -248,21 +277,179 @@ DataBuffer& operator>>(DataBuffer& a_Buffer, std::unordered_map<K, V>& data) {
* \brief Read a pair * \brief Read a pair
*/ */
template <typename K, typename V> template <typename K, typename V>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::pair<K, V>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::pair<K, V>& a_Data) {
return a_Buffer >> data.first >> data.second; details::ReadPair(a_Buffer, a_Data);
return a_Buffer;
} }
/** /**
* \brief Read an array from the buffer * \brief Read an array from the buffer
*/ */
template <std::size_t Size, typename T> template <std::size_t Size, typename T>
DataBuffer& operator>>(DataBuffer& a_Buffer, std::array<T, Size>& data) { DataBuffer& operator>>(DataBuffer& a_Buffer, std::array<T, Size>& a_Data) {
for (std::size_t i = 0; i < Size; i++) { details::ReadArray(a_Buffer, a_Data);
T newElement;
a_Buffer >> newElement;
data[i] = newElement;
}
return a_Buffer; return a_Buffer;
} }
namespace details {
template <typename T>
void WriteRaw(DataBuffer& a_Buffer, T a_Data) {
a_Buffer.Append(a_Data);
SwapBytes(a_Buffer.data() + a_Buffer.GetReadOffset() - sizeof(T), a_Buffer.data() + a_Buffer.GetReadOffset());
}
template <typename T>
void WriteFields(DataBuffer& a_Buffer, const T& a_Data) {
boost::pfr::for_each_field(a_Data, [&a_Buffer](const auto& a_Field) { a_Buffer << a_Field; });
}
template <typename T>
void WriteSharedPtr(DataBuffer& a_Buffer, const std::shared_ptr<T>& a_Data) {
a_Buffer << *a_Data;
}
template <typename T>
void WriteUniquePtr(DataBuffer& a_Buffer, const std::unique_ptr<T>& a_Data) {
a_Buffer << *a_Data;
}
template <typename T>
void WriteVector(DataBuffer& a_Buffer, const std::vector<T>& a_Data) {
a_Buffer << VarInt{a_Data.size()};
for (const auto& element : a_Data) {
a_Buffer << element;
}
}
template <typename T>
void WriteList(DataBuffer& a_Buffer, const std::list<T>& a_Data) {
a_Buffer << VarInt{a_Data.size()};
for (const auto& element : a_Data) {
a_Buffer << element;
}
}
template <typename K, typename V>
void WriteMap(DataBuffer& a_Buffer, const std::map<K, V>& a_Data) {
a_Buffer << VarInt{a_Data.size()};
for (const auto& [key, value] : a_Data) {
a_Buffer << key << value;
}
}
template <typename K, typename V>
void WriteUnorderedMap(DataBuffer& a_Buffer, const std::unordered_map<K, V>& a_Data) {
a_Buffer << VarInt{a_Data.size()};
for (const auto& [key, value] : a_Data) {
a_Buffer << key << value;
}
}
template <typename K, typename V>
void WritePair(DataBuffer& a_Buffer, const std::pair<K, V>& a_Data) {
a_Buffer << a_Data.first << a_Data.second;
}
template <typename T, std::size_t S>
void WriteArray(DataBuffer& a_Buffer, const std::array<T, S>& a_Data) {
for (const auto& element : a_Data) {
a_Buffer << element;
}
}
template <typename T>
void ReadRaw(DataBuffer& a_Buffer, T& a_Data) {
a_Buffer.Read(a_Data);
SwapBytes(a_Data);
}
template <typename T>
void ReadFields(DataBuffer& a_Buffer, T& a_Data) {
boost::pfr::for_each_field(a_Data, [&a_Buffer](auto& a_Field) { a_Buffer >> a_Field; });
}
template <typename T>
void ReadSharedPtr(DataBuffer& a_Buffer, std::shared_ptr<T>& a_Data) {
a_Data = std::make_shared<T>();
a_Buffer >> *a_Data;
}
template <typename T>
void ReadUniquePtr(DataBuffer& a_Buffer, std::unique_ptr<T>& a_Data) {
a_Data = std::make_unique<T>();
a_Buffer >> *a_Data;
}
template <typename T>
void ReadVector(DataBuffer& a_Buffer, std::vector<T>& a_Data) {
VarInt arraySize;
a_Buffer >> arraySize;
for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
T newElement;
a_Buffer >> newElement;
a_Data.push_back(newElement);
}
}
template <typename T>
void ReadList(DataBuffer& a_Buffer, std::list<T>& a_Data) {
VarInt arraySize;
a_Buffer >> arraySize;
for (std::size_t i = 0; i < arraySize.GetValue(); i++) {
T newElement;
a_Buffer >> newElement;
a_Data.push_back(newElement);
}
}
template <typename K, typename V>
void ReadMap(DataBuffer& a_Buffer, std::map<K, V>& a_Data) {
VarInt mapSize;
a_Buffer >> mapSize;
for (std::size_t i = 0; i < mapSize.GetValue(); i++) {
K newKey;
V newValue;
a_Buffer >> newKey >> newValue;
a_Data.emplace(newKey, newValue);
}
}
template <typename K, typename V>
void ReadUnorderedMap(DataBuffer& a_Buffer, std::unordered_map<K, V>& a_Data) {
VarInt mapSize;
a_Buffer >> mapSize;
for (std::size_t i = 0; i < mapSize.GetValue(); i++) {
K newKey;
V newValue;
a_Buffer >> newKey >> newValue;
a_Data.emplace(newKey, newValue);
}
}
template <typename K, typename V>
void ReadPair(DataBuffer& a_Buffer, std::pair<K, V>& a_Data) {
a_Buffer >> a_Data.first >> a_Data.a_Data;
}
template <typename T, std::size_t S>
void ReadArray(DataBuffer& a_Buffer, std::array<T, S>& a_Data) {
for (std::size_t i = 0; i < S; i++) {
T newElement;
a_Buffer >> newElement;
a_Data[i] = newElement;
}
}
} // namespace details
} // namespace sp } // namespace sp