improve packet interface

src/blitz/network/EnetClient.cpp

@@ -0,0 +1,69 @@
+#include <blitz/network/EnetClient.h>
+
+#include <iostream>
+
+namespace blitz {
+namespace network {
+
+
+
+
+EnetClient::EnetClient(const Nz::IpAddress& address) : m_Running(true) {
+	m_Host.Create(Nz::IpAddress::LoopbackIpV4, 1);
+	m_Peer = m_Host.Connect(address);
+	m_Thread = std::thread(&EnetClient::WorkerThread, this);
+	m_Connexion.SetPeer(m_Peer);
+}
+
+EnetClient::~EnetClient() {
+	if (m_Peer->IsConnected())
+		Disconnect();
+	m_Host.Destroy();
+	m_Running = false;
+	m_Thread.join();
+}
+
+void EnetClient::Disconnect() {
+	m_Peer->DisconnectNow(0);
+	m_Connexion.SetPeer(nullptr);
+}
+
+void EnetClient::WorkerThread() {
+	while (m_Running) {
+		Update();
+	}
+}
+
+void EnetClient::Update() {
+	Nz::ENetEvent event;
+	int service = m_Host.Service(&event, 5);
+	if (service > 0) {
+		do {
+			switch (event.type) {
+				case Nz::ENetEventType::Disconnect:
+					OnDisconnect();
+					break;
+
+				case Nz::ENetEventType::DisconnectTimeout:
+					OnDisconnectTimeout();
+					break;
+
+				case Nz::ENetEventType::OutgoingConnect:
+					OnConnect();
+					break;
+
+				case Nz::ENetEventType::Receive:
+					m_Connexion.Recieve(event.packet.m_packet->data);
+					break;
+
+				case Nz::ENetEventType::None:
+				case Nz::ENetEventType::IncomingConnect:
+					break;
+			}
+		} while (m_Host.CheckEvents(&event));
+	}
+}
+
+
+}  // namespace network
+}  // namespace blitz

src/blitz/network/EnetConnexion.cpp

@@ -0,0 +1,48 @@
+#include <blitz/network/EnetConnexion.h>
+
+#include <blitz/protocol/PacketSerializer.h>
+#include <blitz/protocol/PacketVisitor.h>
+
+namespace blitz {
+namespace network {
+
+namespace packets = blitz::protocol::packets;
+
+
+#define DeclarePacket(PacketName, ...)                                                                                                \
+	void Visit(const protocol::packets::PacketName& a_Packet) {                                                                       \
+		m_Connexion.On##PacketName(a_Packet.m_Data);                                                                                  \
+	}
+
+
+
+class PacketDispatcher : public protocol::PacketVisitor {
+  public:
+	PacketDispatcher(EnetConnexion& a_Connexion) : m_Connexion(a_Connexion) {}
+
+	DeclareAllPacket();
+
+  private:
+	EnetConnexion& m_Connexion;
+};
+
+
+
+
+
+EnetConnexion::EnetConnexion(Nz::ENetPeer* a_Peer) : m_Peer(a_Peer) {}
+
+void EnetConnexion::SetPeer(Nz::ENetPeer* a_Peer) {
+	m_Peer = a_Peer;
+}
+
+void EnetConnexion::Recieve(Nz::ByteArray& a_Data) {
+	auto packet = protocol::PacketSerializer::Deserialize(a_Data);
+	if (!packet)
+		return;
+	PacketDispatcher dispatcher(*this);
+	dispatcher.Check(*packet.get());
+}
+
+}  // namespace network
+}  // namespace blitz

src/blitz/network/EnetServer.cpp

@@ -0,0 +1,94 @@
+#include <blitz/network/EnetServer.h>
+
+#include <Nazara/Core/ByteStream.hpp>
+
+namespace blitz {
+namespace network {
+
+EnetServer::EnetServer(std::uint16_t port) : m_Running(true) {
+	m_Host.Create(Nz::NetProtocol::Any, port, 80);
+	m_Host.AllowsIncomingConnections(true);
+	m_Thread = std::thread(&EnetServer::WorkerThread, this);
+}
+
+void EnetServer::WorkerThread() {
+	while (m_Running) {
+		Update();
+	}
+}
+
+EnetServer::~EnetServer() {
+	if (m_Running)
+		Destroy();
+}
+
+void EnetServer::Update() {
+	Nz::ENetEvent event;
+	int service = m_Host.Service(&event, 5);
+	if (service > 0) {
+		do {
+			switch (event.type) {
+				case Nz::ENetEventType::Disconnect: {
+					EnetConnexion* connexion = GetConnexion(event.peer->GetPeerId());
+					if (!connexion)
+						break;
+					OnClientDisconnect(*connexion);
+					break;
+				}
+
+				case Nz::ENetEventType::DisconnectTimeout: {
+					EnetConnexion* connexion = GetConnexion(event.peer->GetPeerId());
+					if (!connexion)
+						break;
+					OnClientDisconnectTimeout(*connexion);
+					break;
+				}
+
+				case Nz::ENetEventType::IncomingConnect: {
+					Nz::ENetPeer* peer = event.peer;
+					m_Connexion.insert({peer->GetPeerId(), EnetConnexion(peer)});
+					OnClientConnect(*GetConnexion(peer->GetPeerId()));
+					break;
+				}
+
+				case Nz::ENetEventType::Receive: {
+					EnetConnexion* connexion = GetConnexion(event.peer->GetPeerId());
+					if (!connexion)
+						break;
+					connexion->Recieve(event.packet.m_packet->data);
+					break;
+				}
+
+				case Nz::ENetEventType::OutgoingConnect:
+				case Nz::ENetEventType::None:
+					break;
+			}
+		} while (m_Host.CheckEvents(&event));
+	}
+}
+
+EnetConnexion* EnetServer::GetConnexion(std::uint16_t a_PeerId) {
+	auto it = m_Connexion.find(a_PeerId);
+
+	if (it == m_Connexion.end())
+		return nullptr;
+
+	return &it->second;
+}
+
+void EnetServer::BroadcastPacket(const protocol::Packet& a_Packet, Nz::ENetPacketFlags a_Flags) {
+	// m_Host.Broadcast(0, a_Flags, std::move(a_Data));
+}
+
+void EnetServer::RemoveConnexion(std::uint16_t a_PeerId) {
+	m_Connexion.erase(a_PeerId);
+}
+
+void EnetServer::Destroy() {
+	m_Running = false;
+	m_Thread.join();
+	m_Host.Destroy();
+}
+
+}  // namespace network
+}  // namespace blitz

src/blitz/protocol/PacketSerializer.cpp

@@ -32,6 +32,9 @@ namespace PacketSerializer {
 	void DeserializePacketData(ClassName::PacketDataType& a_Packet)
 
 
+#define DeclarePacket(PacketName, ...) \
+	VisitSerialize(packets::PacketName)
+
 class Serializer : public PacketVisitor {
   private:
 	Nz::ByteStream& m_Buffer;
@@ -44,24 +47,13 @@ class Serializer : public PacketVisitor {
 		Check(a_Packet);
 	}
 
-	VisitSerialize(packets::PlayerLogin);
-	VisitSerialize(packets::UpdateHealth);
-	VisitSerialize(packets::LoggingSuccess);
-	VisitSerialize(packets::PlayerDeath);
-	VisitSerialize(packets::PlayerJoin);
-	VisitSerialize(packets::PlayerLeave);
-	VisitSerialize(packets::PlayerList);
-	VisitSerialize(packets::PlayerStats);
-	VisitSerialize(packets::ServerConfig);
-	VisitSerialize(packets::ServerTps);
-	VisitSerialize(packets::UpdateGameState);
-	VisitSerialize(packets::KeepAlive);
-	VisitSerialize(packets::Disconnect);
-	VisitSerialize(packets::ChatMessage);
-	VisitSerialize(packets::PlayerPositionAndRotation);
-	VisitSerialize(packets::PlayerShoot);
+	DeclareAllPacket()
 };
 
+#undef DeclarePacket
+#define DeclarePacket(PacketName, ...) \
+	VisitDeserialize(packets::PacketName)
+
 class Deserializer : public PacketVisitor {
   private:
 	Nz::ByteStream& m_Buffer;
@@ -83,22 +75,7 @@ class Deserializer : public PacketVisitor {
 		return m_Packet;
 	}
 
-	VisitDeserialize(packets::PlayerLogin);
-	VisitDeserialize(packets::UpdateHealth);
-	VisitDeserialize(packets::LoggingSuccess);
-	VisitDeserialize(packets::PlayerDeath);
-	VisitDeserialize(packets::PlayerJoin);
-	VisitDeserialize(packets::PlayerLeave);
-	VisitDeserialize(packets::PlayerList);
-	VisitDeserialize(packets::PlayerStats);
-	VisitDeserialize(packets::ServerConfig);
-	VisitDeserialize(packets::ServerTps);
-	VisitDeserialize(packets::UpdateGameState);
-	VisitDeserialize(packets::KeepAlive);
-	VisitDeserialize(packets::Disconnect);
-	VisitDeserialize(packets::ChatMessage);
-	VisitDeserialize(packets::PlayerPositionAndRotation);
-	VisitDeserialize(packets::PlayerShoot);
+	DeclareAllPacket()
 };