2.0.0-rc (#9)

### Issues

* \#1 \[bug\] Unable to mount S3 due to 'item_not_found' exception
* \#2 Require bucket name for S3 mounts
* \#3 \[bug\] File size is not being updated in S3 mount
* \#4 Upgrade to libfuse-3.x.x
* \#5 Switch to renterd for Sia support
* \#6 Switch to cpp-httplib to further reduce dependencies
* \#7 Remove global_data and calculate used disk space per provider
* \#8 Switch to libcurl for S3 mount support

### Changes from v1.x.x

* Added read-only encrypt provider
  * Pass-through mount point that transparently encrypts source data using `XChaCha20-Poly1305`
* Added S3 encryption support via `XChaCha20-Poly1305`
* Added replay protection to remote mounts
* Added support base64 writes in remote FUSE
* Created static linked Linux binaries for `amd64` and `aarch64` using `musl-libc`
* Removed legacy Sia renter support
* Removed Skynet support
* Fixed multiple remote mount WinFSP API issues on \*NIX servers
* Implemented chunked read and write
  * Writes for non-cached files are performed in chunks of 8Mib
* Removed `repertory-ui` support
* Removed `FreeBSD` support
* Switched to `libsodium` over `CryptoPP`
* Switched to `XChaCha20-Poly1305` for remote mounts
* Updated `GoogleTest` to v1.14.0
* Updated `JSON for Modern C++` to v3.11.2
* Updated `OpenSSL` to v1.1.1w
* Updated `RocksDB` to v8.5.3
* Updated `WinFSP` to 2023
* Updated `boost` to v1.78.0
* Updated `cURL` to v8.3.0
* Updated `zlib` to v1.3
* Use `upload_manager` for all providers
  * Adds a delay to uploads to prevent excessive API calls
  * Supports re-upload after mount restart for incomplete uploads
  * NOTE: Uploads for all providers are full file (no resume support)
    * Multipart upload support is planned for S3

Reviewed-on: #9

include/comm/packet/client_pool.hpp

@@ -1,40 +1,45 @@
 /*
-  Copyright <2018-2022> <scott.e.graves@protonmail.com>
+  Copyright <2018-2023> <scott.e.graves@protonmail.com>
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-  associated documentation files (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge, publish, distribute,
-  sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or
-  substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-  OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 */
 #ifndef INCLUDE_COMM_PACKET_CLIENT_POOL_HPP_
 #define INCLUDE_COMM_PACKET_CLIENT_POOL_HPP_
 
-#include "common.hpp"
 #include "comm/packet/packet.hpp"
 #include "types/repertory.hpp"
 
 namespace repertory {
 class client_pool final {
 public:
-  typedef std::function<packet::error_type()> worker_callback;
-  typedef std::function<void(const packet::error_type &result)> worker_complete_callback;
+  using worker_callback = std::function<packet::error_type()>;
+  using worker_complete_callback =
+      std::function<void(const packet::error_type &)>;
 
 private:
   class pool final {
   private:
     struct work_item final {
-      work_item(const worker_callback &worker, const worker_complete_callback &worker_complete)
-          : work(worker), work_complete(worker_complete) {}
+      work_item(worker_callback worker,
+                worker_complete_callback worker_complete)
+          : work(std::move(worker)),
+            work_complete(std::move(worker_complete)) {}
 
       worker_callback work;
       worker_complete_callback work_complete;
@@ -47,7 +52,7 @@ private:
     };
 
   public:
-    explicit pool(const std::uint8_t &pool_size);
+    explicit pool(std::uint8_t pool_size);
 
     ~pool() { shutdown(); }
 
@@ -58,14 +63,14 @@ private:
     std::atomic<std::uint8_t> thread_index_;
 
   public:
-    void execute(const std::uint64_t &thread_id, const worker_callback &worker,
+    void execute(std::uint64_t thread_id, const worker_callback &worker,
                  const worker_complete_callback &worker_complete);
 
     void shutdown();
   };
 
 public:
-  explicit client_pool(const std::uint8_t &pool_size = 10u)
+  explicit client_pool(std::uint8_t pool_size = 10u)
       : pool_size_(pool_size ? pool_size : 10u) {}
 
   ~client_pool() { shutdown(); }
@@ -77,8 +82,9 @@ private:
   bool shutdown_ = false;
 
 public:
-  void execute(const std::string &client_id, const std::uint64_t &thread_id,
-               const worker_callback &worker, const worker_complete_callback &worker_complete);
+  void execute(const std::string &client_id, std::uint64_t thread_id,
+               const worker_callback &worker,
+               const worker_complete_callback &worker_complete);
 
   void remove_client(const std::string &client_id);
 

include/comm/packet/packet.hpp

@@ -1,110 +1,116 @@
 /*
-  Copyright <2018-2022> <scott.e.graves@protonmail.com>
+  Copyright <2018-2023> <scott.e.graves@protonmail.com>
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-  associated documentation files (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge, publish, distribute,
-  sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or
-  substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-  OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 */
 #ifndef INCLUDE_COMM_PACKET_PACKET_HPP_
 #define INCLUDE_COMM_PACKET_PACKET_HPP_
 
-#include "common.hpp"
 #include "types/remote.hpp"
 #include "types/repertory.hpp"
 
 namespace repertory {
-#define DECODE_OR_RETURN(p, value)                                                                 \
-  if ((ret = (p)->decode(value)) != 0)                                                             \
+#define DECODE_OR_RETURN(p, value)                                             \
+  if ((ret = (p)->decode(value)) != 0)                                         \
   return ret
-#define DECODE_OR_IGNORE(p, value)                                                                 \
-  if (ret == 0)                                                                                    \
+#define DECODE_OR_IGNORE(p, value)                                             \
+  if (ret == 0)                                                                \
   ret = (p)->decode(value)
 
 class packet final {
 public:
-  typedef std::int32_t error_type;
+  using error_type = std::int32_t;
 
 public:
   packet() = default;
 
-  explicit packet(std::vector<char> buffer) : buffer_(std::move(buffer)) {}
+  explicit packet(data_buffer buffer) : buffer_(std::move(buffer)) {}
 
-  explicit packet(std::vector<char> &&buffer) : buffer_(std::move(buffer)) {}
+  explicit packet(data_buffer &&buffer) : buffer_(std::move(buffer)) {}
 
-  packet(const packet &p) noexcept : buffer_(p.buffer_), decode_offset_(p.decode_offset_) {}
+  packet(const packet &p) noexcept = default;
 
-  packet(packet &&p) noexcept : buffer_(std::move(p.buffer_)), decode_offset_(p.decode_offset_) {}
+  packet(packet &&p) noexcept
+      : buffer_(std::move(p.buffer_)), decode_offset_(p.decode_offset_) {}
 
 private:
-  std::vector<char> buffer_;
+  data_buffer buffer_;
   std::size_t decode_offset_ = 0u;
 
 public:
-  static int decode_json(packet &response, json &json_data);
+  [[nodiscard]] static auto decode_json(packet &response, json &json_data)
+      -> int;
 
 public:
   void clear();
 
-  char *current_pointer() {
-    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_] : nullptr;
+  [[nodiscard]] auto current_pointer() -> char * {
+    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_]
+                                             : nullptr;
   }
 
-  const char *current_pointer() const {
-    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_] : nullptr;
+  [[nodiscard]] auto current_pointer() const -> const char * {
+    return (decode_offset_ < buffer_.size()) ? &buffer_[decode_offset_]
+                                             : nullptr;
   }
 
-  error_type decode(std::string &data);
+  [[nodiscard]] auto decode(std::string &data) -> error_type;
 
-  error_type decode(std::wstring &data);
+  [[nodiscard]] auto decode(std::wstring &data) -> error_type;
 
-  error_type decode(void *buffer, const size_t &size);
+  [[nodiscard]] auto decode(void *buffer, std::size_t size) -> error_type;
 
-  error_type decode(void *&ptr);
+  [[nodiscard]] auto decode(void *&ptr) -> error_type;
 
-  error_type decode(std::int8_t &i);
+  [[nodiscard]] auto decode(std::int8_t &i) -> error_type;
 
-  error_type decode(std::uint8_t &i);
+  [[nodiscard]] auto decode(std::uint8_t &i) -> error_type;
 
-  error_type decode(std::int16_t &i);
+  [[nodiscard]] auto decode(std::int16_t &i) -> error_type;
 
-  error_type decode(std::uint16_t &i);
+  [[nodiscard]] auto decode(std::uint16_t &i) -> error_type;
 
-  error_type decode(std::int32_t &i);
+  [[nodiscard]] auto decode(std::int32_t &i) -> error_type;
 
-  error_type decode(std::uint32_t &i);
+  [[nodiscard]] auto decode(std::uint32_t &i) -> error_type;
 
-  error_type decode(std::int64_t &i);
+  [[nodiscard]] auto decode(std::int64_t &i) -> error_type;
 
-  error_type decode(std::uint64_t &i);
+  [[nodiscard]] auto decode(std::uint64_t &i) -> error_type;
 
-  error_type decode(remote::open_flags &i) {
+  [[nodiscard]] auto decode(remote::open_flags &i) -> error_type {
     return decode(reinterpret_cast<std::uint32_t &>(i));
   }
 
-  error_type decode(remote::setattr_x &i);
+  [[nodiscard]] auto decode(remote::setattr_x &i) -> error_type;
 
-  error_type decode(remote::stat &i);
+  [[nodiscard]] auto decode(remote::stat &i) -> error_type;
 
-  error_type decode(remote::statfs &i);
+  [[nodiscard]] auto decode(remote::statfs &i) -> error_type;
 
-  error_type decode(remote::statfs_x &i);
+  [[nodiscard]] auto decode(remote::statfs_x &i) -> error_type;
 
-  error_type decode(remote::file_info &i);
+  [[nodiscard]] auto decode(remote::file_info &i) -> error_type;
 
-  error_type decrypt(const std::string &token);
+  [[nodiscard]] auto decrypt(const std::string &token) -> error_type;
 
-  void encode(const void *buffer, const std::size_t &size, bool should_reserve = true);
+  void encode(const void *buffer, std::size_t size, bool should_reserve = true);
 
   void encode(char *str) { encode(std::string(str ? str : "")); }
 
@@ -150,14 +156,16 @@ public:
 
   void encode(remote::file_info i);
 
-  void encode_top(const void *buffer, const std::size_t &size, bool should_reserve = true);
+  void encode_top(const void *buffer, std::size_t size,
+                  bool should_reserve = true);
 
   void encode_top(const std::string &str);
 
   void encode_top(const std::wstring &str);
 
   void encode_top(void *ptr) {
-    encode_top(static_cast<std::uint64_t>(reinterpret_cast<std::uintptr_t>(ptr)));
+    encode_top(
+        static_cast<std::uint64_t>(reinterpret_cast<std::uintptr_t>(ptr)));
   }
 
   void encode_top(std::int8_t i);
@@ -176,7 +184,9 @@ public:
 
   void encode_top(std::uint64_t i);
 
-  void encode_top(remote::open_flags i) { encode_top(static_cast<std::uint32_t>(i)); }
+  void encode_top(remote::open_flags i) {
+    encode_top(static_cast<std::uint32_t>(i));
+  }
 
   void encode_top(remote::setattr_x i);
 
@@ -190,24 +200,31 @@ public:
 
   void encrypt(const std::string &token);
 
-  std::uint32_t get_size() const { return static_cast<std::uint32_t>(buffer_.size()); }
+  [[nodiscard]] auto get_size() const -> std::uint32_t {
+    return static_cast<std::uint32_t>(buffer_.size());
+  }
 
-  void transfer_into(std::vector<char> &buffer);
+  void transfer_into(data_buffer &buffer);
 
 public:
-  packet &operator=(const std::vector<char> &buffer) noexcept;
+  auto operator=(const data_buffer &buffer) noexcept -> packet &;
 
-  packet &operator=(std::vector<char> &&buffer) noexcept;
+  auto operator=(data_buffer &&buffer) noexcept -> packet &;
 
-  packet &operator=(const packet &p) noexcept;
+  auto operator=(const packet &p) noexcept -> packet &;
 
-  packet &operator=(packet &&p) noexcept;
+  auto operator=(packet &&p) noexcept -> packet &;
 
-  char &operator[](const size_t &index) { return buffer_[index]; }
+  [[nodiscard]] auto operator[](std::size_t index) -> char & {
+    return buffer_[index];
+  }
 
-  const char &operator[](const size_t &index) const { return buffer_.at(index); }
+  [[nodiscard]] auto operator[](std::size_t index) const -> const char & {
+    return buffer_.at(index);
+  }
 };
-typedef packet packet;
+
+using packet = packet;
 } // namespace repertory
 
 #endif // INCLUDE_COMM_PACKET_PACKET_HPP_

include/comm/packet/packet_client.hpp

@@ -1,25 +1,27 @@
 /*
-  Copyright <2018-2022> <scott.e.graves@protonmail.com>
+  Copyright <2018-2023> <scott.e.graves@protonmail.com>
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-  associated documentation files (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge, publish, distribute,
-  sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or
-  substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-  OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 */
 #ifndef INCLUDE_COMM_PACKET_PACKET_CLIENT_HPP_
 #define INCLUDE_COMM_PACKET_PACKET_CLIENT_HPP_
 
-#include "common.hpp"
 #include "comm/packet/packet.hpp"
 
 using boost::asio::ip::tcp;
@@ -27,17 +29,17 @@ using boost::asio::ip::tcp;
 namespace repertory {
 class packet_client final {
 private:
-  struct client {
-    client(boost::asio::io_context &ctx) : nonce(""), socket(ctx) {}
+  struct client final {
+    explicit client(boost::asio::io_context &ctx) : nonce(""), socket(ctx) {}
 
     std::string nonce;
     tcp::socket socket;
   };
 
 public:
-  packet_client(std::string host_name_or_ip, const std::uint8_t &max_connections,
-                const std::uint16_t &port, const std::uint16_t &receive_timeout,
-                const std::uint16_t &send_timeout, std::string encryption_token);
+  packet_client(std::string host_name_or_ip, std::uint8_t max_connections,
+                std::uint16_t port, std::uint16_t receive_timeout,
+                std::uint16_t send_timeout, std::string encryption_token);
 
   ~packet_client();
 
@@ -52,7 +54,8 @@ private:
   std::string unique_id_;
 
   bool allow_connections_ = true;
-  boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type resolve_results_;
+  boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type
+      resolve_results_;
   std::mutex clients_mutex_;
   std::vector<std::shared_ptr<client>> clients_;
 
@@ -61,23 +64,27 @@ private:
 
   void close_all();
 
-  bool connect(client &c);
+  void connect(client &c);
 
-  std::shared_ptr<client> get_client();
+  [[nodiscard]] auto get_client() -> std::shared_ptr<client>;
 
   void put_client(std::shared_ptr<client> &c);
 
-  packet::error_type read_packet(client &c, packet &response);
+  [[nodiscard]] auto read_packet(client &c, packet &response)
+      -> packet::error_type;
 
   void resolve();
 
 public:
-  packet::error_type send(const std::string &method, std::uint32_t &service_flags);
+  [[nodiscard]] auto send(const std::string &method,
+                          std::uint32_t &service_flags) -> packet::error_type;
 
-  packet::error_type send(const std::string &method, packet &request, std::uint32_t &service_flags);
+  [[nodiscard]] auto send(const std::string &method, packet &request,
+                          std::uint32_t &service_flags) -> packet::error_type;
 
-  packet::error_type send(const std::string &method, packet &request, packet &response,
-                          std::uint32_t &service_flags);
+  [[nodiscard]] auto send(const std::string &method, packet &request,
+                          packet &response, std::uint32_t &service_flags)
+      -> packet::error_type;
 };
 } // namespace repertory
 

include/comm/packet/packet_server.hpp

@@ -1,26 +1,29 @@
 /*
-  Copyright <2018-2022> <scott.e.graves@protonmail.com>
+  Copyright <2018-2023> <scott.e.graves@protonmail.com>
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-  associated documentation files (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge, publish, distribute,
-  sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or
-  substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
-  OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
 */
 #ifndef INCLUDE_COMM_PACKET_PACKET_SERVER_HPP_
 #define INCLUDE_COMM_PACKET_PACKET_SERVER_HPP_
 
-#include "common.hpp"
 #include "comm/packet/client_pool.hpp"
+#include "types/repertory.hpp"
 #include "utils/utils.hpp"
 
 using namespace boost::asio;
@@ -29,28 +32,27 @@ using boost::asio::ip::tcp;
 namespace repertory {
 class packet_server final {
 public:
-  typedef std::function<void(const std::string &clientId)> closed_callback;
-  typedef client_pool::worker_complete_callback message_complete_callback;
-  typedef std::function<void(const std::uint32_t &service_flags, const std::string &client_id,
-                             const std::uint64_t &thread_id, const std::string &method,
-                             packet *request, packet &response,
-                             message_complete_callback message_complete)>
-      message_handler_callback;
+  using closed_callback = std::function<void(const std::string &)>;
+  using message_complete_callback = client_pool::worker_complete_callback;
+  using message_handler_callback = std::function<void(
+      std::uint32_t, const std::string &, std::uint64_t, const std::string &,
+      packet *, packet &, message_complete_callback)>;
 
 public:
-  packet_server(const std::uint16_t &port, std::string token, std::uint8_t pool_size,
-                closed_callback closed, message_handler_callback message_handler);
+  packet_server(std::uint16_t port, std::string token, std::uint8_t pool_size,
+                closed_callback closed,
+                message_handler_callback message_handler);
 
   ~packet_server();
 
 private:
   struct connection {
-    connection(boost::asio::io_service &io_service, tcp::acceptor &acceptor)
-        : socket(io_service), acceptor(acceptor) {}
+    connection(boost::asio::io_service &io_service, tcp::acceptor &acceptor_)
+        : socket(io_service), acceptor(acceptor_) {}
 
     tcp::socket socket;
     tcp::acceptor &acceptor;
-    std::vector<char> buffer;
+    data_buffer buffer;
     std::string client_id;
     std::string nonce;
 
@@ -78,12 +80,12 @@ private:
 
   void read_header(std::shared_ptr<connection> c);
 
-  void read_packet(std::shared_ptr<connection> c, const std::uint32_t &data_size);
+  void read_packet(std::shared_ptr<connection> c, std::uint32_t data_size);
 
   void remove_client(connection &c);
 
-  void send_response(std::shared_ptr<connection> c, const packet::error_type &result,
-                     packet &response);
+  void send_response(std::shared_ptr<connection> c,
+                     const packet::error_type &result, packet &response);
 };
 } // namespace repertory