feat: rename packet queue methods for clarity and add separate send queue handling in Client class

Author: MasterLaplace

Flakkari/Server/Client/Client.cpp

@@ -44,10 +44,16 @@ bool Client::incrementWarningCount()
     return _warningCount >= _maxWarningCount;
 }
 
-void Client::addPacketToQueue(const Protocol::Packet<Protocol::CommandId> &packet)
+void Client::addPacketToReceiveQueue(const Protocol::Packet<Protocol::CommandId> &packet)
 {
     _apiVersion = packet.header._apiVersion;
     _receiveQueue.push_back(packet);
 }
 
+void Client::addPacketToSendQueue(const Protocol::Packet<Protocol::CommandId> &packet)
+{
+    _apiVersion = packet.header._apiVersion;
+    _sendQueue.push_back(packet);
+}
+
 } /* namespace Flakkari */

Flakkari/Server/Client/Client.hpp

@@ -81,13 +81,21 @@ class Client {
      */
     bool incrementWarningCount();
 
+    /**
+     * @brief Add a packet to the client's receive queue and set the api version
+     * used by the client
+     *
+     * @param packet  The packet to add
+     */
+    void addPacketToReceiveQueue(const Protocol::Packet<Protocol::CommandId> &packet);
+
     /**
      * @brief Add a packet to the client's send queue and set the api version
      * used by the client
      *
      * @param packet  The packet to add
      */
-    void addPacketToQueue(const Protocol::Packet<Protocol::CommandId> &packet);
+    void addPacketToSendQueue(const Protocol::Packet<Protocol::CommandId> &packet);
 
     /**
      * @brief Get the client's address
@@ -126,6 +134,8 @@ class Client {
         return _receiveQueue;
     }
 
+    [[nodiscard]] Network::PacketQueue<Protocol::Packet<Protocol::CommandId>> &getSendQueue() { return _sendQueue; }
+
 private:
     std::chrono::steady_clock::time_point _lastActivity;
     std::shared_ptr<Network::Address> _address;

Flakkari/Server/Client/ClientManager.cpp

@@ -130,7 +130,7 @@ ClientManager::receivePacketFromClient(const std::shared_ptr<Network::Address> &
     if (packet.deserialize(buffer))
     {
         FLAKKARI_LOG_LOG("Client " + clientName + " sent a valid packet: " + packet.to_string());
-        tmp_client->addPacketToQueue(packet);
+        tmp_client->addPacketToReceiveQueue(packet);
         return std::nullopt;
     }
 

Flakkari/Server/Game/Game.cpp

@@ -44,7 +44,7 @@ void Game::loadSystems(Engine::ECS::Registry &registry, const std::string &scene
     if (sysName == "position")
         registry.add_system([this](Engine::ECS::Registry &r) { Engine::ECS::Systems::_2D::position(r, _deltaTime); });
 
-    else if (name == "apply_movable")
+    else if (sysName == "apply_movable")
         registry.add_system(
             [this](Engine::ECS::Registry &r) { Engine::ECS::Systems::_3D::apply_movable(r, _deltaTime); });
 
@@ -158,8 +158,7 @@ void Game::sendOnSameScene(const std::string &sceneName, Protocol::Packet<Protoc
 
         packet.header._apiVersion = player->getApiVersion();
 
-        ClientManager::GetInstance().sendPacketToClient(player->getAddress(), packet.serialize());
-        ClientManager::UnlockInstance();
+        player->addPacketToSendQueue(packet);
     }
 }
 
@@ -179,8 +178,7 @@ void Game::sendOnSameSceneExcept(const std::string &sceneName, Protocol::Packet<
 
         packet.header._apiVersion = player->getApiVersion();
 
-        ClientManager::GetInstance().sendPacketToClient(player->getAddress(), packet.serialize());
-        ClientManager::UnlockInstance();
+        player->addPacketToSendQueue(packet);
     }
 }
 
@@ -343,21 +341,44 @@ void Game::updateIncomingPackets(unsigned char maxMessagePerFrame)
             FLAKKARI_LOG_INFO("packet received: " + packet.to_string());
             messageCount--;
 
-            if (packet.header._commandId == Protocol::CommandId::REQ_USER_UPDATE)
-                handleEvent(player, packet);
+            if (packet.header._commandId == Protocol::CommandId::REQ_USER_UPDATES)
+                handleEvents(player, packet);
 
-            if (packet.header._commandId == Protocol::CommandId::REQ_HEARTBEAT)
+            else if (packet.header._commandId == Protocol::CommandId::REQ_HEARTBEAT)
             {
                 Protocol::Packet<Protocol::CommandId> repPacket;
-                repPacket.header._commandId = Protocol::CommandId::REP_HEARTBEAT;
                 repPacket.header._apiVersion = packet.header._apiVersion;
-                ClientManager::GetInstance().sendPacketToClient(player->getAddress(), repPacket.serialize());
-                ClientManager::UnlockInstance();
+                repPacket.header._commandId = Protocol::CommandId::REP_HEARTBEAT;
+
+                player->addPacketToSendQueue(repPacket);
             }
         }
     }
 }
 
+void Game::updateOutcomingPackets(unsigned char maxMessagePerFrame)
+{
+    for (auto &player : _players)
+    {
+        if (!player->isConnected())
+            continue;
+        auto &packets = player->getSendQueue();
+        auto messageCount = maxMessagePerFrame;
+
+        Network::Buffer buffer;
+
+        while (!packets.empty() && messageCount > 0)
+        {
+            auto packet = packets.pop_front();
+            messageCount--;
+
+            buffer += packet.serialize();
+            ClientManager::GetInstance().sendPacketToClient(player->getAddress(), buffer);
+                ClientManager::UnlockInstance();
+        }
+    }
+}
+
 void Game::update()
 {
     auto now = std::chrono::steady_clock::now();