From e39f8de89836899a12a8e06108a91c1eb7058871 Mon Sep 17 00:00:00 2001
From: Persson-dev <sim16.prib@gmail.com>
Date: Sat, 15 Feb 2025 12:39:53 +0100
Subject: [PATCH] better fields access

---
 include/examples/DisconnectPacket.h | 13 +++++++++----
 include/examples/KeepAlivePacket.h  | 27 +++++++++++++++++++++------
 include/sp/default/DefaultPacket.h  | 20 +++++++++++---------
 include/sp/protocol/Field.h         |  5 +++++
 include/sp/protocol/MessageBase.h   |  5 +++++
 src/main.cpp                        |  5 ++++-
 6 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/include/examples/DisconnectPacket.h b/include/examples/DisconnectPacket.h
index 6a69371..c6a51bb 100644
--- a/include/examples/DisconnectPacket.h
+++ b/include/examples/DisconnectPacket.h
@@ -4,10 +4,15 @@
 #include <sp/protocol/Field.h>
 #include <sp/protocol/MessageBase.h>
 
-enum DisconnectPacketFields {
-	Reason = 0
-};
+enum DisconnectPacketFields { Reason = 0 };
 
 using DisconnectFields = std::tuple<std::string /*Reason*/>;
 
-DeclarePacket(Disconnect);
\ No newline at end of file
+DeclarePacket(Disconnect){
+  public: 
+    PacketConstructor(Disconnect)
+
+	const std::string& GetReason() const {
+		return GetField<Reason>();
+	}
+};
diff --git a/include/examples/KeepAlivePacket.h b/include/examples/KeepAlivePacket.h
index 7cfe3f6..02b63e2 100644
--- a/include/examples/KeepAlivePacket.h
+++ b/include/examples/KeepAlivePacket.h
@@ -10,11 +10,26 @@ enum KeepAlivePacketFields {
 };
 
 using KeepAliveFields = std::tuple<
-	std::uint64_t, 						//<- KeepAliveId 
+	std::uint64_t,			 				//<- KeepAliveId
 	sp::BitField<std::uint16_t, 
-		sp::Field<std::uint16_t, 12>, 	//<- m_Tower 
-		sp::Field<std::uint8_t, 4> 		//<- m_Upgrade 
-	>		
->;
+		sp::Field<std::uint16_t, 12>,  		//<- m_Tower
+		sp::Field<std::uint8_t, 4>			//<- m_Upgrade
+		>
+	>;
 
-DeclarePacket(KeepAlive);
\ No newline at end of file
+DeclarePacket(KeepAlive){
+  public: 
+	PacketConstructor(KeepAlive)
+
+	std::uint64_t GetKeepAliveId() const {
+		return GetField<KeepAlive>();
+	}
+
+	std::uint16_t GetTowerId() const {
+		return GetField<TestAlignField>().GetField<0>();
+	}
+
+	std::uint8_t GetTowerUpgrade() const {
+		return GetField<TestAlignField>().GetField<1>();
+	}
+};
\ No newline at end of file
diff --git a/include/sp/default/DefaultPacket.h b/include/sp/default/DefaultPacket.h
index 43a0770..63b7ae4 100644
--- a/include/sp/default/DefaultPacket.h
+++ b/include/sp/default/DefaultPacket.h
@@ -13,15 +13,17 @@ using PacketMessage = Message<option::MsgIdType<std::uint8_t>,	// add id() opera
 	option::Handler<PacketHandler>								// add dispatch() operation
 	>;
 
-#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>> {        \
-	  public:                                                                                                                         \
-		packetName##Packet() {}                                                                                                       \
-		template <typename... Args>                                                                                                   \
-		packetName##Packet(Args... args) {                                                                                            \
-			Construct(args...);                                                                                                       \
-		}                                                                                                                             \
+#define PacketConstructor(packetName)                                                                                                 \
+	packetName##Packet() {}                                                                                                           \
+	template <typename... Args>                                                                                                       \
+	packetName##Packet(Args... args) {                                                                                                \
+		Construct(args...);                                                                                                           \
 	}
 
+#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>>
+
+
+
 }  // namespace sp
diff --git a/include/sp/protocol/Field.h b/include/sp/protocol/Field.h
index 6bafa85..dc1f702 100644
--- a/include/sp/protocol/Field.h
+++ b/include/sp/protocol/Field.h
@@ -40,6 +40,11 @@ class BitField {
 		return std::get<FIndex>(this->GetFields()).GetValue();
 	}
 
+	template <std::size_t FIndex>
+	const auto& GetField() const {
+		return std::get<FIndex>(this->GetFields()).GetValue();
+	}
+
   private:
 	template <int IOffset, typename... T, std::enable_if_t<IOffset >= sizeof...(T), bool> = true>
 	void Apply(const std::tuple<T...>& args) {}
diff --git a/include/sp/protocol/MessageBase.h b/include/sp/protocol/MessageBase.h
index a489b7b..ce9a798 100644
--- a/include/sp/protocol/MessageBase.h
+++ b/include/sp/protocol/MessageBase.h
@@ -114,6 +114,11 @@ class MessageImplFieldsBase : public TBase {
 		return std::get<FIndex>(GetFields()).GetValue();
 	}
 
+	template <std::size_t FIndex>
+	const auto& GetField() const {
+		return std::get<FIndex>(GetFields()).GetValue();
+	}
+
   private:
 	AllFields m_Fields;
 };
diff --git a/src/main.cpp b/src/main.cpp
index 9eb8d25..d6d7347 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,10 @@ int main() {
 	auto keepAlive2 = std::make_unique<KeepAlivePacket>();
 	keepAlive2->Read(buffer);
 
-	std::cout << "KeepAlive2 : " << keepAlive2->GetField<KeepAliveId>() << "\n";
+	std::cout << "KeepAlive2 : " << keepAlive2->GetKeepAliveId() << "\n";
+
+	keepAlive2->GetField<TestAlignField>().GetField<0>();
+	std::cout << "Test : " << (unsigned) keepAlive2->GetTowerId() << "\n";
 
 	sp::PacketFactory factory;
 	auto packet = factory.CreateMessage(msgId);