From 89213e9a971524e0c5763c15d7c3a50978e773df Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Wed, 6 Aug 2025 17:16:50 +0200 Subject: [PATCH] refactor IServerSocket --- include/server/IServerSocket.h | 3 ++- include/server/socket/FakeSocket.h | 20 ++++++++++++++++++++ include/server/socket/TcpSocket.h | 19 ------------------- src/main.cpp | 4 ++-- src/server/IServerSocket.cpp | 4 ++++ src/server/socket/FakeSocket.cpp | 11 +++++++++++ src/server/socket/TcpSocket.cpp | 8 -------- 7 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 include/server/socket/FakeSocket.h delete mode 100644 include/server/socket/TcpSocket.h create mode 100644 src/server/socket/FakeSocket.cpp delete mode 100644 src/server/socket/TcpSocket.cpp diff --git a/include/server/IServerSocket.h b/include/server/IServerSocket.h index a91225d..c3f7af4 100644 --- a/include/server/IServerSocket.h +++ b/include/server/IServerSocket.h @@ -13,7 +13,7 @@ class IServerSocket { utils::Signal OnDisconnect; utils::Signal OnReceive; - virtual void Send(PlayerID, const protocol::PacketBase&) = 0; + void Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet); IServerSocket() {} virtual ~IServerSocket() {} @@ -25,6 +25,7 @@ class IServerSocket { void OnConnectPeer(PeerID a_PeerId); void OnDisconnectPeer(PeerID a_PeerId); void OnReceivePeer(PeerID a_PeerId, const protocol::PacketBase& a_Packet); + virtual void SendPeer(PeerID a_PeerId, const protocol::PacketBase& a_Packet) = 0; }; } // namespace server diff --git a/include/server/socket/FakeSocket.h b/include/server/socket/FakeSocket.h new file mode 100644 index 0000000..20b4f05 --- /dev/null +++ b/include/server/socket/FakeSocket.h @@ -0,0 +1,20 @@ +#pragma once + +#include + +namespace td { +namespace server { + +class FakeSocket : public IServerSocket { + public: + FakeSocket() {} + ~FakeSocket() {} + + utils::Signal OnSend; + + protected: + virtual void SendPeer(PeerID a_Peer, const protocol::PacketBase& a_Packet) override; +}; + +} // namespace server +} // namespace td diff --git a/include/server/socket/TcpSocket.h b/include/server/socket/TcpSocket.h deleted file mode 100644 index 229d677..0000000 --- a/include/server/socket/TcpSocket.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include - -namespace td { -namespace server { - -class TcpSocket : public IServerSocket { - private: - /* data */ - public: - TcpSocket(/* args */) {} - ~TcpSocket() {} - - virtual void Send(PlayerID, const protocol::PacketBase&) {} -}; - -} // namespace server -} // namespace td diff --git a/src/main.cpp b/src/main.cpp index 51c1b5f..aa9f185 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include class WorldApply : public td::protocol::PacketHandler { @@ -133,7 +133,7 @@ int main(int argc, char** argv) { // server - auto socket = std::make_shared(); + auto socket = std::make_shared(); td::server::Server server(socket); server.UpdateState(std::make_shared()); server.Update(1.0f); diff --git a/src/server/IServerSocket.cpp b/src/server/IServerSocket.cpp index 3fabde5..ccf9cda 100644 --- a/src/server/IServerSocket.cpp +++ b/src/server/IServerSocket.cpp @@ -17,5 +17,9 @@ void IServerSocket::OnReceivePeer(PeerID a_PeerId, const protocol::PacketBase& a OnReceive(m_Ids.GetPlayerId(a_PeerId), a_Packet); } +void IServerSocket::Send(PlayerID a_PlayerId, const protocol::PacketBase& a_Packet) { + SendPeer(m_Ids.GetPeerId(a_PlayerId), a_Packet); +} + } // namespace server } // namespace td diff --git a/src/server/socket/FakeSocket.cpp b/src/server/socket/FakeSocket.cpp new file mode 100644 index 0000000..ebe3a5d --- /dev/null +++ b/src/server/socket/FakeSocket.cpp @@ -0,0 +1,11 @@ +#include + +namespace td { +namespace server { + +void FakeSocket::SendPeer(PeerID a_Peer, const protocol::PacketBase& a_Packet) { + OnSend(a_Peer, a_Packet); +} + +} // namespace server +} // namespace td diff --git a/src/server/socket/TcpSocket.cpp b/src/server/socket/TcpSocket.cpp deleted file mode 100644 index 8c5acb5..0000000 --- a/src/server/socket/TcpSocket.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -namespace td { -namespace server { - - -} // namespace server -} // namespace td