Merge pull request #45 from MasterLaplace/44-bug-constant-connection-…

…using-the-protocol

44 bug constant connection using the protocol

.clang-format

@@ -2,7 +2,7 @@
 Language:          Cpp
 BasedOnStyle:      LLVM
 Standard:          c++20
-AccessModifierOffset: 0
+AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignArrayOfStructures: Left
 AlignConsecutiveMacros: Consecutive

.github/workflows/create_release.yml

@@ -28,6 +28,7 @@ jobs:
         uses: mathieudutour/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          default_bump: patch
           dry_run: true
 
       - name: Run version bump script

Flakkari/Engine/EntityComponentSystem/Entity.hpp

@@ -23,7 +23,7 @@ namespace Flakkari::Engine::ECS {
 class Registry;
 
 class Entity {
-    public:
+public:
     friend class Registry;
 
     explicit Entity(std::size_t id) : _id(id) {}
@@ -43,7 +43,7 @@ class Entity {
         return *this;
     }
 
-    private:
+private:
     std::size_t _id;
 };
 

Flakkari/Engine/EntityComponentSystem/EntityFactory.hpp

@@ -27,10 +27,10 @@
 namespace Flakkari::Engine::ECS {
 
 class EntityFactory {
-    public:
+public:
     using nl_template = nlohmann::json;
 
-    public:
+public:
     /**
      * @brief Create a Entity From Template object based on a template JSON
      *

Flakkari/Engine/EntityComponentSystem/Registry.hpp

@@ -30,7 +30,7 @@
 namespace Flakkari::Engine::ECS {
 
 class Registry {
-    public:
+public:
     using entity_type = Entity;
     using EraseFn = std::function<void(Registry &, const entity_type &)>;
     using SystemFn = std::function<void(Registry &)>;
@@ -214,7 +214,7 @@ class Registry {
      */
     void run_systems();
 
-    private:
+private:
     std::unordered_map<std::type_index, std::any> _components;
     std::unordered_map<std::type_index, EraseFn> _eraseFunctions;
     std::vector<SystemFn> _systems;

Flakkari/Engine/EntityComponentSystem/SparseArrays.hpp

@@ -23,7 +23,7 @@
 namespace Flakkari::Engine::ECS {
 
 template <typename Component> class SparseArrays {
-    public:
+public:
     using value_type = std::optional<Component>;
     using reference_type = value_type &;
     using const_reference_type = const value_type &;
@@ -32,7 +32,7 @@ template <typename Component> class SparseArrays {
     using iterator = typename container_type::iterator;
     using const_iterator = typename container_type::const_iterator;
 
-    public:
+public:
     SparseArrays() = default;
     SparseArrays(const SparseArrays &other) : _data(other._data){};
     SparseArrays(SparseArrays &&other) noexcept : _data(std::move(other._data)){};
@@ -185,7 +185,7 @@ template <typename Component> class SparseArrays {
         return std::distance(_data.begin(), it);
     }
 
-    private:
+private:
     container_type _data;
 };
 

Flakkari/Logger/Logger.hpp

@@ -97,14 +97,14 @@
 namespace Flakkari {
 
 class Logger {
-    public:
+public:
     enum class Mode {
         SILENT,
         NORMAL,
         DEBUG
     };
 
-    public:
+public:
     static void setMode(Mode mode) noexcept;
     static const std::string get_current_time() noexcept;
     static const std::string fatal_error_message() noexcept;

Flakkari/Network/Address.cpp

@@ -189,7 +189,7 @@ constexpr const char *Address::socketTypeToString(SocketType socket_type)
 Address::operator std::string() const
 {
     return std::string(toString().value_or("null") + " (" + socketTypeToString(_socket_type) + ", " +
-                       ipTypeToString(_ip_type) + ", " + std::to_string(getId()) + ")");
+                       ipTypeToString(_ip_type) + ")");
 }
 
 std::ostream &operator<<(std::ostream &os, const Address &addr)
@@ -199,8 +199,6 @@ std::ostream &operator<<(std::ostream &os, const Address &addr)
     os << Address::socketTypeToString(addr.getSocketType());
     os << ", ";
     os << Address::ipTypeToString(addr.getIpType());
-    os << ", ";
-    os << addr.getId();
     os << ")";
     return os;
 }

Flakkari/Network/Address.hpp

@@ -38,7 +38,7 @@
 namespace Flakkari::Network {
 
 class Address {
-    public:
+public:
     enum class IpType {
         None,
         IPv4, // Internet Protocol version 4
@@ -51,7 +51,7 @@ class Address {
         UDP, // User Datagram Protocol
     };
 
-    public:
+public:
     /**
      * @brief Convert IpType to string
      *
@@ -68,12 +68,12 @@ class Address {
      */
     static constexpr const char *socketTypeToString(SocketType socket_type);
 
-    public:
+public:
     using address_t = const std::string;
     using port_t = unsigned short;
     using id_t = short;
 
-    public:
+public:
     Address(address_t &address, port_t port, SocketType socket_type, IpType ip_type);
     Address(port_t port, SocketType socket_type, IpType ip_type);
     Address(const sockaddr_in &clientAddr, SocketType socket_type, IpType ip_type);
@@ -150,33 +150,18 @@ class Address {
      */
     [[nodiscard]] IpType getIpType() const { return _ip_type; }
 
-    /**
-     * @brief Get the Id object
-     *
-     * @return id_t  Id
-     */
-    [[nodiscard]] id_t getId() const { return _id; }
-
-    /**
-     * @brief Set the Id object
-     *
-     * @param id  Id
-     */
-    void setId(id_t id) { _id = id; }
-
     /**
      * @brief Convert Address to string (std::string)
      *
      * @return std::string  String representation of Address
      */
     operator std::string() const;
 
-    protected:
-    private:
+protected:
+private:
     std::shared_ptr<addrinfo> _addrInfo = nullptr;
     SocketType _socket_type = SocketType::None;
     IpType _ip_type = IpType::None;
-    id_t _id = -1;
 };
 
 /**

Flakkari/Network/Buffer.hpp

@@ -48,7 +48,7 @@ namespace Flakkari::Network {
  * @see Flakkari::Network::Socket
  */
 class Buffer : public std::vector<byte> {
-    public:
+public:
     using std::vector<byte>::operator=;
     using std::vector<byte>::operator[];
     using std::vector<byte>::at;
@@ -72,10 +72,10 @@ class Buffer : public std::vector<byte> {
     using std::vector<byte>::resize;
     using std::vector<byte>::swap;
 
-    public:
+public:
     using std::vector<byte>::vector;
 
-    public:
+public:
     /**
      * @brief Construct a new Buffer object
      *
@@ -238,8 +238,8 @@ class Buffer : public std::vector<byte> {
      */
     Buffer operator-=(const Buffer &otherBuffer);
 
-    protected:
-    private:
+protected:
+private:
 };
 
 /**

Flakkari/Network/IOMultiplexer.cpp

@@ -16,10 +16,7 @@ namespace Flakkari::Network {
 PSELECT::PSELECT(FileDescriptor fileDescriptor, long int seconds, long int microseconds)
 {
     if (fileDescriptor == -1)
-    {
-        FLAKKARI_LOG_ERROR("Socket is -1");
         throw std::runtime_error("Socket is -1");
-    }
 
     FD_ZERO(&_fds);
     _maxFd = fileDescriptor;
@@ -43,6 +40,7 @@ void PSELECT::addSocket(FileDescriptor socket)
         throw std::runtime_error("Socket is -1");
     if (socket > FD_SETSIZE)
         throw std::runtime_error("Index out of range");
+
     FD_SET(socket, &_fds);
     if (socket > _maxFd)
         _maxFd = socket;
@@ -55,6 +53,7 @@ void PSELECT::removeSocket(FileDescriptor socket)
         throw std::runtime_error("Socket is -1");
     if (socket > _maxFd)
         throw std::runtime_error("Index out of range");
+
     FD_CLR(socket, &_fds);
     _sockets.erase(std::remove(_sockets.begin(), _sockets.end(), socket), _sockets.end());
     _maxFd = *std::max_element(_sockets.begin(), _sockets.end());
@@ -78,6 +77,7 @@ bool PSELECT::isReady(FileDescriptor socket)
         throw std::runtime_error("Socket is -1");
     if (socket > _maxFd)
         throw std::runtime_error("Index out of range");
+
     return FD_ISSET(socket, &_fds);
 }
 
@@ -90,13 +90,11 @@ bool PSELECT::skipableError() { return errno == EINTR || errno == EAGAIN || errn
 PPOLL::PPOLL(FileDescriptor fileDescriptor, event_t events, long int seconds, long int microseconds)
 {
     if (fileDescriptor == -1)
-    {
-        FLAKKARI_LOG_ERROR("Socket is -1");
         throw std::runtime_error("Socket is -1");
-    }
 
     if (_pollfds.size() < std::size_t(fileDescriptor))
         _pollfds.resize(fileDescriptor + 1);
+
     _pollfds[fileDescriptor] = pollfd{fileDescriptor, events, 0};
 
     _timeout.tv_sec = seconds;
@@ -115,6 +113,7 @@ void PPOLL::addSocket(FileDescriptor socket)
         throw std::runtime_error("Socket is -1");
     if (_pollfds.size() < std::size_t(socket))
         _pollfds.resize(socket + 1);
+
     _pollfds[socket] = pollfd{socket, POLLIN | POLLPRI, 0};
 }
 
@@ -124,6 +123,7 @@ void PPOLL::addSocket(FileDescriptor socket, event_t events)
         throw std::runtime_error("Socket is -1");
     if (_pollfds.size() < std::size_t(socket))
         _pollfds.resize(socket + 1);
+
     _pollfds[socket] = pollfd{socket, events, 0};
 }
 
@@ -152,6 +152,7 @@ pollfd &PPOLL::operator[](std::size_t index)
 {
     if (_pollfds.size() < index)
         throw std::runtime_error("Index out of range");
+
     return _pollfds[index];
 }
 
@@ -161,13 +162,15 @@ pollfd &PPOLL::operator[](FileDescriptor socket)
         throw std::runtime_error("Socket is -1");
     if (_pollfds.size() < std::size_t(socket))
         throw std::runtime_error("Index out of range");
+
     return _pollfds[socket];
 }
 
 bool PPOLL::isReady(pollfd fd)
 {
     if (fd.fd == -1)
         throw std::runtime_error("Socket is -1");
+
     return fd.revents & (POLLIN | POLLPRI);
 }
 
@@ -179,6 +182,7 @@ bool PPOLL::isReady(FileDescriptor socket)
         throw std::runtime_error("Index out of range");
     if (_pollfds[socket].revents & (POLLIN | POLLPRI))
         return true;
+
     return false;
 }
 
@@ -191,7 +195,7 @@ bool PPOLL::skipableError() { return errno == EINTR || errno == EAGAIN || errno
 WSA::WSA(FileDescriptor socket, int seconds, int microseconds)
 {
     if (socket == -1)
-        FLAKKARI_LOG_FATAL("Socket is -1");
+        throw std::runtime_error("Socket is -1");
 
     _sockets.reserve(MAX_POLLFD);
     _fdArray.reserve(MAX_POLLFD);