better fields access

include/examples/DisconnectPacket.h

@@ -4,10 +4,15 @@
 #include <sp/protocol/Field.h>
 #include <sp/protocol/MessageBase.h>
 
-enum DisconnectPacketFields {
+enum DisconnectPacketFields { Reason = 0 };
-	Reason = 0
-};
 
 using DisconnectFields = std::tuple<std::string /*Reason*/>;
 
-DeclarePacket(Disconnect);
+DeclarePacket(Disconnect){
+  public: 
+    PacketConstructor(Disconnect)
+
+	const std::string& GetReason() const {
+		return GetField<Reason>();
+	}
+};

include/examples/KeepAlivePacket.h

@@ -17,4 +17,19 @@ using KeepAliveFields = std::tuple<
 		>
 	>;
 
-DeclarePacket(KeepAlive);
+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>();
+	}
+};

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)                                                                                                     \
+#define PacketConstructor(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 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

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) {}

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;
 };

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);