From b8799622d5772fc32aafc968844c75fa4e265142 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 19 Sep 2024 04:43:42 +0000 Subject: [PATCH] build: Move http code into its own lib --- CMakeLists.txt | 1 + .../sparkd/md/binance/BinanceSubscription.cpp | 4 +- .../md/binance_us/BinanceUsSubscription.cpp | 4 +- .../BinanceUsdsFuturesSubscription.cpp | 4 +- .../sparkd/md/ccapi/CCApiHttpParams.cpp | 4 +- .../sparkd/md/ccapi/CCApiHttpParams.h | 12 ++-- .../md/coinbase/CoinbaseSubscription.cpp | 4 +- src/lib_http/CMakeLists.txt | 12 ++++ src/lib_http/Config.cmake.in | 5 ++ .../http/curl_handle.cpp} | 3 +- .../http/curl_handle.h} | 0 .../http/http_client.cpp} | 20 +++---- .../http/http_client.h} | 14 ++--- .../http/http_headers.cpp} | 20 ++++--- src/lib_http/http/http_headers.h | 26 +++++++++ .../http/http_method.h} | 11 ++-- .../http/http_protocol.h} | 12 +--- src/lib_http/http/http_request.cpp | 17 ++++++ src/lib_http/http/http_request.h | 28 ++++++++++ src/lib_http/http/http_response.cpp | 26 +++++++++ src/lib_http/http/http_response.h | 35 ++++++++++++ src/lib_http/http/protobufs/query_param.proto | 7 +++ .../http/protobufs/url.proto} | 9 +-- .../http/query_params.cpp} | 6 +- .../http/query_params.h} | 4 +- .../io/URL.cpp => lib_http/http/url.cpp} | 56 +++++++++---------- .../spark/io/URL.h => lib_http/http/url.h} | 41 +++++++------- .../cmake/GetLinuxClientLinkLibraries.cmake | 2 +- .../cmake/GetLinuxServerLinkLibraries.cmake | 2 +- src/lib_spark/spark/io/http/HTTPHeaders.h | 24 -------- src/lib_spark/spark/io/http/HTTPRequest.cpp | 17 ------ src/lib_spark/spark/io/http/HTTPRequest.h | 26 --------- src/lib_spark/spark/io/http/HTTPResponse.cpp | 25 --------- src/lib_spark/spark/io/http/HTTPResponse.h | 33 ----------- .../WebsocketClientConfiguration.cpp | 4 +- .../websocket/WebsocketClientConfiguration.h | 6 +- .../websocket/tests/WebsocketClientTests.cpp | 3 +- 37 files changed, 275 insertions(+), 252 deletions(-) create mode 100644 src/lib_http/CMakeLists.txt create mode 100644 src/lib_http/Config.cmake.in rename src/{lib_spark/spark/io/http/CurlHandle.cpp => lib_http/http/curl_handle.cpp} (93%) rename src/{lib_spark/spark/io/http/CurlHandle.h => lib_http/http/curl_handle.h} (100%) rename src/{lib_spark/spark/io/http/HTTPClient.cpp => lib_http/http/http_client.cpp} (81%) rename src/{lib_spark/spark/io/http/HTTPClient.h => lib_http/http/http_client.h} (72%) rename src/{lib_spark/spark/io/http/HTTPHeaders.cpp => lib_http/http/http_headers.cpp} (58%) create mode 100644 src/lib_http/http/http_headers.h rename src/{lib_spark/spark/io/http/HttpMethod.h => lib_http/http/http_method.h} (77%) rename src/{lib_spark/spark/io/http/HttpProtocol.h => lib_http/http/http_protocol.h} (79%) create mode 100644 src/lib_http/http/http_request.cpp create mode 100644 src/lib_http/http/http_request.h create mode 100644 src/lib_http/http/http_response.cpp create mode 100644 src/lib_http/http/http_response.h create mode 100644 src/lib_http/http/protobufs/query_param.proto rename src/{lib_spark/spark/api/io/URL.proto => lib_http/http/protobufs/url.proto} (59%) rename src/{lib_spark/spark/io/QueryParams.cpp => lib_http/http/query_params.cpp} (78%) rename src/{lib_spark/spark/io/QueryParams.h => lib_http/http/query_params.h} (82%) rename src/{lib_spark/spark/io/URL.cpp => lib_http/http/url.cpp} (62%) rename src/{lib_spark/spark/io/URL.h => lib_http/http/url.h} (67%) delete mode 100644 src/lib_spark/spark/io/http/HTTPHeaders.h delete mode 100644 src/lib_spark/spark/io/http/HTTPRequest.cpp delete mode 100644 src/lib_spark/spark/io/http/HTTPRequest.h delete mode 100644 src/lib_spark/spark/io/http/HTTPResponse.cpp delete mode 100644 src/lib_spark/spark/io/http/HTTPResponse.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f6b1a362e..b5212240e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,6 +102,7 @@ endif() # subdirs add_subdirectory(src/lib_system) add_subdirectory(src/lib_domain) +add_subdirectory(src/lib_http) if (BUILD_SPARKD) add_subdirectory(src/lib_python_md) add_subdirectory(src/app_sparkd) diff --git a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp index 722db5f4d..ea5c4345f 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceSubscription.cpp @@ -2,9 +2,9 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "http/query_params.h" #include "spark/api/md/BinanceMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/io/QueryParams.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" @@ -40,8 +40,8 @@ using bts::domain::SecurityCriteria; using bts::domain::SecurityID; using bts::domain::protobufs::Venue; using bts::domain::protobufs::Venue_Name; +using bts::http::QueryParams; using bts::io::ProtoPrinter; -using bts::io::QueryParams; using bts::persistence::IDGenerator; using std::pair; using std::string; diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp index 3f7a2574d..abc47072d 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsSubscription.cpp @@ -2,9 +2,9 @@ #include "domain/protobufs/venue.pb.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "http/query_params.h" #include "spark/api/md/BinanceUsMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/io/QueryParams.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" @@ -42,8 +42,8 @@ using bts::domain::SecurityCriteria; using bts::domain::SecurityID; using bts::domain::protobufs::Venue; using bts::domain::protobufs::Venue_Name; +using bts::http::QueryParams; using bts::io::ProtoPrinter; -using bts::io::QueryParams; using bts::persistence::IDGenerator; using std::pair; using std::shared_ptr; diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp index b1e62c3b1..48309baa7 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesSubscription.cpp @@ -3,9 +3,9 @@ #include "domain/security.h" #include "domain/security_criteria.h" #include "domain/security_id.h" +#include "http/query_params.h" #include "spark/api/md/BinanceUsdsFuturesMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/io/QueryParams.h" #include "spark/logging/logging.h" #include "spark/md/IMarketDataListener.h" #include "spark/persistence/IDGenerator.h" @@ -36,8 +36,8 @@ using bts::domain::SecurityCriteria; using bts::domain::SecurityID; using bts::domain::protobufs::Venue; using bts::domain::protobufs::Venue_Name; +using bts::http::QueryParams; using bts::io::ProtoPrinter; -using bts::io::QueryParams; using bts::persistence::IDGenerator; using std::shared_ptr; using std::string; diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp index 55102f838..36d496bce 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.cpp @@ -6,8 +6,8 @@ namespace bts::md { using bts::algorithm::StringCaseConverter; -using bts::io::http::HttpMethod; -using bts::io::http::HttpProtocol; +using bts::http::HttpMethod; +using bts::http::HttpProtocol; using std::map; using std::string; diff --git a/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h index 15fab929c..f08fe2e60 100644 --- a/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h +++ b/src/app_sparkd/sparkd/md/ccapi/CCApiHttpParams.h @@ -1,8 +1,8 @@ #pragma once -#include "spark/io/QueryParams.h" -#include "spark/io/http/HttpMethod.h" -#include "spark/io/http/HttpProtocol.h" +#include "http/http_method.h" +#include "http/http_protocol.h" +#include "http/query_params.h" #include #include @@ -14,13 +14,13 @@ class CCApiHttpParams { public: std::map to_map() const; - io::http::HttpProtocol protocol{io::http::HttpProtocol::HTTPS}; + http::HttpProtocol protocol{http::HttpProtocol::HTTPS}; std::uint16_t port{0}; std::string path{"/"}; - io::http::HttpMethod method{io::http::HttpMethod::GET}; + http::HttpMethod method{http::HttpMethod::GET}; std::map headers{ {"Content-Type", "application/json"}}; - io::QueryParams query_params; + http::QueryParams query_params; }; } // namespace bts::md diff --git a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp index 984eec8f5..8dfdf0ab9 100644 --- a/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp +++ b/src/app_sparkd/sparkd/md/coinbase/CoinbaseSubscription.cpp @@ -1,9 +1,9 @@ #include "CoinbaseSubscription.h" #include "domain/security.h" #include "domain/security_criteria.h" +#include "http/query_params.h" #include "spark/api/md/CoinbaseMarketDataConfig.pb.h" #include "spark/io/ProtoPrinter.h" -#include "spark/io/QueryParams.h" #include "spark/md/IMarketDataListener.h" #include "spark/md/common.h" #include "spark/persistence/IDGenerator.h" @@ -31,7 +31,7 @@ using bts::api::md::CoinbaseMarketDataConfig; using bts::domain::Security; using bts::domain::SecurityCriteria; using bts::domain::SecurityID; -using bts::io::QueryParams; +using bts::http::QueryParams; using bts::io::ProtoPrinter; using bts::persistence::IDGenerator; using std::shared_ptr; diff --git a/src/lib_http/CMakeLists.txt b/src/lib_http/CMakeLists.txt new file mode 100644 index 000000000..a9873b27e --- /dev/null +++ b/src/lib_http/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.23) +project(http) +include(${CMAKE_SOURCE_DIR}/cmake/InitLibrary.cmake) + +init_library(STATIC) +target_link_libraries( + ${PROJECT_NAME} + PUBLIC + system + curl + protobuf +) diff --git a/src/lib_http/Config.cmake.in b/src/lib_http/Config.cmake.in new file mode 100644 index 000000000..8c9ad12aa --- /dev/null +++ b/src/lib_http/Config.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +check_required_components(@PROJECT_NAME@) diff --git a/src/lib_spark/spark/io/http/CurlHandle.cpp b/src/lib_http/http/curl_handle.cpp similarity index 93% rename from src/lib_spark/spark/io/http/CurlHandle.cpp rename to src/lib_http/http/curl_handle.cpp index 79db4d9ec..b45c8e2f9 100644 --- a/src/lib_spark/spark/io/http/CurlHandle.cpp +++ b/src/lib_http/http/curl_handle.cpp @@ -1,4 +1,5 @@ -#include "CurlHandle.h" +#include "http/curl_handle.h" + #include #include diff --git a/src/lib_spark/spark/io/http/CurlHandle.h b/src/lib_http/http/curl_handle.h similarity index 100% rename from src/lib_spark/spark/io/http/CurlHandle.h rename to src/lib_http/http/curl_handle.h diff --git a/src/lib_spark/spark/io/http/HTTPClient.cpp b/src/lib_http/http/http_client.cpp similarity index 81% rename from src/lib_spark/spark/io/http/HTTPClient.cpp rename to src/lib_http/http/http_client.cpp index ef0f069ae..90afd9fe0 100644 --- a/src/lib_spark/spark/io/http/HTTPClient.cpp +++ b/src/lib_http/http/http_client.cpp @@ -1,12 +1,12 @@ -#include "HTTPClient.h" -#include "HTTPRequest.h" -#include "HTTPResponse.h" -#include "spark/io/URL.h" -#include "spark/logging/logging.h" +#include "http_client.h" +#include "http/http_request.h" +#include "http/http_response.h" +#include "http/url.h" + #include #include -namespace bts::io::http { +namespace bts::http { static size_t write_data_( void *ptr, size_t size, size_t nmemb, std::string *data) { @@ -14,7 +14,7 @@ static size_t write_data_( return size * nmemb; } -HTTPResponse HTTPClient::get(const HTTPRequest &request) { +HttpResponse HttpClient::get(const HttpRequest &request) { auto *curl = curl_easy_init(); auto url_str = request.url().to_string(); // LOG(md, bts::Info, "do GET: {}", url_str); @@ -44,12 +44,12 @@ HTTPResponse HTTPClient::get(const HTTPRequest &request) { curl_easy_perform(curl); curl_easy_cleanup(curl); curl = NULL; - HTTPResponse response; - response.headers() = HTTPHeaders(response_header_string); + HttpResponse response; + response.headers() = HttpHeaders(response_header_string); response.body() = std::move(response_string); response.code() = response_code; // LOG(md, bts::Info, "do GET: {}. Received response:\n{}", url_str, response); return response; } -} // namespace bts::io::http +} // namespace bts::http diff --git a/src/lib_spark/spark/io/http/HTTPClient.h b/src/lib_http/http/http_client.h similarity index 72% rename from src/lib_spark/spark/io/http/HTTPClient.h rename to src/lib_http/http/http_client.h index c8eba9272..026bddf08 100644 --- a/src/lib_spark/spark/io/http/HTTPClient.h +++ b/src/lib_http/http/http_client.h @@ -21,15 +21,15 @@ #include #include -namespace bts::io::http { +namespace bts::http { -class HTTPRequest; -class HTTPResponse; +class HttpRequest; +class HttpResponse; -class HTTPClient { +class HttpClient { public: - // HTTPClient(const std::string &url); - HTTPResponse get(const HTTPRequest &request); + // HttpClient(const std::string &url); + HttpResponse get(const HttpRequest &request); }; -} // namespace bts::io::http +} // namespace bts::http diff --git a/src/lib_spark/spark/io/http/HTTPHeaders.cpp b/src/lib_http/http/http_headers.cpp similarity index 58% rename from src/lib_spark/spark/io/http/HTTPHeaders.cpp rename to src/lib_http/http/http_headers.cpp index 7c1bf3cdc..7e5afd3cc 100644 --- a/src/lib_spark/spark/io/http/HTTPHeaders.cpp +++ b/src/lib_http/http/http_headers.cpp @@ -1,14 +1,16 @@ -#include "HTTPHeaders.h" -#include "spark/utils/StringSplitter.h" +#include "http_headers.h" +#include "system/string_utils.h" #include -namespace bts::io::http { +namespace bts::http { -HTTPHeaders::HTTPHeaders(const std::string &str) { - auto item_strs = utils::StringSplitter::split(str, "\n"); +using bts::system::string_utils::split; + +HttpHeaders::HttpHeaders(const std::string &str) { + auto item_strs = split(str, "\n"); for (const auto &item_str : item_strs) { - auto kv = utils::StringSplitter::split(item_str, ":"); + auto kv = split(item_str, ":"); if (kv.empty()) { try_emplace("", ""); continue; @@ -21,7 +23,7 @@ HTTPHeaders::HTTPHeaders(const std::string &str) { } } -std::string HTTPHeaders::to_string() const { +std::string HttpHeaders::to_string() const { auto it = begin(); if (it == end()) { return ""; @@ -34,9 +36,9 @@ std::string HTTPHeaders::to_string() const { } std::ostream &operator<<( - std::ostream &out, const HTTPHeaders &headers) noexcept { + std::ostream &out, const HttpHeaders &headers) noexcept { out << headers.to_string(); return out; } -} // namespace bts::io::http +} // namespace bts::http diff --git a/src/lib_http/http/http_headers.h b/src/lib_http/http/http_headers.h new file mode 100644 index 000000000..694575758 --- /dev/null +++ b/src/lib_http/http/http_headers.h @@ -0,0 +1,26 @@ +#pragma once + +#include "system/collections/flat_unordered_map.h" + +#include + +namespace bts::http { + +class HttpHeaders + : public collections::FlatUnorderedMap { + public: + HttpHeaders() = default; + explicit HttpHeaders(const std::string &header_str); + + HttpHeaders(const HttpHeaders &) noexcept = default; + HttpHeaders(HttpHeaders &&) noexcept = default; + HttpHeaders &operator=(const HttpHeaders &) noexcept = default; + HttpHeaders &operator=(HttpHeaders &&) noexcept = default; + + std::string to_string() const; +}; + +std::ostream &operator<<( + std::ostream &out, const HttpHeaders &headers) noexcept; + +} // namespace bts::http diff --git a/src/lib_spark/spark/io/http/HttpMethod.h b/src/lib_http/http/http_method.h similarity index 77% rename from src/lib_spark/spark/io/http/HttpMethod.h rename to src/lib_http/http/http_method.h index f5a3d7ff6..9e396ffa0 100644 --- a/src/lib_spark/spark/io/http/HttpMethod.h +++ b/src/lib_http/http/http_method.h @@ -1,5 +1,4 @@ #pragma once -#ifdef SPARK_ENABLE_CCAPI #include "system/FMT_IMPL.h" #include "system/enum_macros.h" @@ -8,10 +7,10 @@ #include #include -namespace bts::io::http { +namespace bts::http { // clang-format off -#define FOR_ALL_VALUES(per_value) \ +#define FOR_ALL_VALUES(per_value) \ per_value(HttpMethod, NONE) \ per_value(HttpMethod, GET) \ per_value(HttpMethod, POST) @@ -24,8 +23,6 @@ ENUM_CLASS_DEF(HttpMethod, FOR_ALL_VALUES) #undef FOR_ALL_VALUES -} // namespace bts::io::http +} // namespace bts::http -FMT_IMPL(bts::io::http::HttpMethod, m, "{}", m.name()); - -#endif +FMT_IMPL(bts::http::HttpMethod, m, "{}", m.name()); diff --git a/src/lib_spark/spark/io/http/HttpProtocol.h b/src/lib_http/http/http_protocol.h similarity index 79% rename from src/lib_spark/spark/io/http/HttpProtocol.h rename to src/lib_http/http/http_protocol.h index 5b3fccadb..c0571fb55 100644 --- a/src/lib_spark/spark/io/http/HttpProtocol.h +++ b/src/lib_http/http/http_protocol.h @@ -1,9 +1,5 @@ #pragma once -#ifdef SPARK_ENABLE_CCAPI -#include "domain/protobufs/security_type.pb.h" -#include "spark/algorithm/StringCaseConverter.h" -#include "spark/domain_model/Security.pb.h" #include "system/FMT_IMPL.h" #include "system/enum_macros.h" @@ -12,7 +8,7 @@ #include #include -namespace bts::io::http { +namespace bts::http { // clang-format off #define FOR_ALL_VALUES(per_value) \ @@ -52,8 +48,6 @@ constexpr std::uint16_t HttpProtocol::default_port() const { #undef FOR_ALL_VALUES -} // namespace bts::io::http +} // namespace bts::http -FMT_IMPL(bts::io::http::HttpProtocol, p, "{}", p.name()); - -#endif +FMT_IMPL(bts::http::HttpProtocol, p, "{}", p.name()); diff --git a/src/lib_http/http/http_request.cpp b/src/lib_http/http/http_request.cpp new file mode 100644 index 000000000..a7cfe54a1 --- /dev/null +++ b/src/lib_http/http/http_request.cpp @@ -0,0 +1,17 @@ +#include "http_request.h" + +namespace bts::http { + +Url &HttpRequest::url() { return url_; } + +const Url &HttpRequest::url() const { return url_; } + +HttpHeaders &HttpRequest::headers() { return headers_; } + +const HttpHeaders &HttpRequest::headers() const { return headers_; } + +std::string &HttpRequest::body() { return body_; } + +const std::string &HttpRequest::body() const { return body_; } + +} // namespace bts::http diff --git a/src/lib_http/http/http_request.h b/src/lib_http/http/http_request.h new file mode 100644 index 000000000..c5856d535 --- /dev/null +++ b/src/lib_http/http/http_request.h @@ -0,0 +1,28 @@ +#pragma once + +#include "http/http_headers.h" +#include "http/url.h" + +#include +#include + +namespace bts::http { + +class HttpRequest { + public: + Url &url(); + const Url &url() const; + + HttpHeaders &headers(); + const HttpHeaders &headers() const; + + std::string &body(); + const std::string &body() const; + + private: + Url url_; + HttpHeaders headers_; + std::string body_; +}; + +} // namespace bts::http diff --git a/src/lib_http/http/http_response.cpp b/src/lib_http/http/http_response.cpp new file mode 100644 index 000000000..e97f66321 --- /dev/null +++ b/src/lib_http/http/http_response.cpp @@ -0,0 +1,26 @@ +#include "http_response.h" + +#include + +namespace bts::http { + +HttpHeaders &HttpResponse::headers() { return headers_; } + +const HttpHeaders &HttpResponse::headers() const { return headers_; } + +std::string &HttpResponse::body() { return body_; } + +const std::string &HttpResponse::body() const { return body_; } + +std::int64_t &HttpResponse::code() { return code_; } + +std::int64_t HttpResponse::code() const { return code_; } + +std::ostream &operator<<( + std::ostream &out, const HttpResponse &response) noexcept { + out << response.headers() << "\n" + << response.body() << "\nCode: " << response.code(); + return out; +} + +} // namespace bts::http diff --git a/src/lib_http/http/http_response.h b/src/lib_http/http/http_response.h new file mode 100644 index 000000000..1b407bb3f --- /dev/null +++ b/src/lib_http/http/http_response.h @@ -0,0 +1,35 @@ +#pragma once + +#include "http/url.h" +#include "http_headers.h" + +#include +#include + +namespace bts::http { + +class HttpResponse { + public: + Url &url(); + const Url &url() const; + + HttpHeaders &headers(); + const HttpHeaders &headers() const; + + std::string &body(); + const std::string &body() const; + + std::int64_t &code(); + std::int64_t code() const; + + private: + Url url_; + HttpHeaders headers_; + std::string body_; + std::int64_t code_; +}; + +std::ostream &operator<<( + std::ostream &out, const HttpResponse &response) noexcept; + +} // namespace bts::http diff --git a/src/lib_http/http/protobufs/query_param.proto b/src/lib_http/http/protobufs/query_param.proto new file mode 100644 index 000000000..5a81dde6c --- /dev/null +++ b/src/lib_http/http/protobufs/query_param.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; +package bts.http.protobufs; + +message QueryParam { + string key = 1; + string value = 2; +} diff --git a/src/lib_spark/spark/api/io/URL.proto b/src/lib_http/http/protobufs/url.proto similarity index 59% rename from src/lib_spark/spark/api/io/URL.proto rename to src/lib_http/http/protobufs/url.proto index 61913fae7..4dec2c887 100644 --- a/src/lib_spark/spark/api/io/URL.proto +++ b/src/lib_http/http/protobufs/url.proto @@ -1,12 +1,9 @@ syntax = "proto3"; -package bts.api.io; +package bts.http.protobufs; -message QueryParam { - string key = 1; - string value = 2; -} +import "http/protobufs/query_param.proto"; -message URL { +message Url { string protocol = 1; string host = 2; uint32 port = 3; diff --git a/src/lib_spark/spark/io/QueryParams.cpp b/src/lib_http/http/query_params.cpp similarity index 78% rename from src/lib_spark/spark/io/QueryParams.cpp rename to src/lib_http/http/query_params.cpp index 1387a200f..d2d87062f 100644 --- a/src/lib_spark/spark/io/QueryParams.cpp +++ b/src/lib_http/http/query_params.cpp @@ -1,6 +1,6 @@ -#include "QueryParams.h" +#include "http/query_params.h" -namespace bts::io { +namespace bts::http { std::string QueryParams::to_string() const { std::string rv; @@ -15,4 +15,4 @@ std::string QueryParams::to_string() const { return rv; } -} // namespace bts::io +} // namespace bts::http diff --git a/src/lib_spark/spark/io/QueryParams.h b/src/lib_http/http/query_params.h similarity index 82% rename from src/lib_spark/spark/io/QueryParams.h rename to src/lib_http/http/query_params.h index 23afa2c48..3bc10539d 100644 --- a/src/lib_spark/spark/io/QueryParams.h +++ b/src/lib_http/http/query_params.h @@ -4,7 +4,7 @@ #include -namespace bts::io { +namespace bts::http { class QueryParams : public collections::FlatUnorderedMap { @@ -12,4 +12,4 @@ class QueryParams std::string to_string() const; }; -} // namespace bts::io +} // namespace bts::http diff --git a/src/lib_spark/spark/io/URL.cpp b/src/lib_http/http/url.cpp similarity index 62% rename from src/lib_spark/spark/io/URL.cpp rename to src/lib_http/http/url.cpp index 6be8946a3..ca5df6572 100644 --- a/src/lib_spark/spark/io/URL.cpp +++ b/src/lib_http/http/url.cpp @@ -1,12 +1,12 @@ -#include "URL.h" -#include "spark/api/io/URL.pb.h" +#include "url.h" +#include "http/protobufs/url.pb.h" #include #include -namespace bts::io { +namespace bts::http { -URL::URL(const bts::api::io::URL &url) +Url::Url(const protobufs::Url &url) : protocol_(url.protocol()), host_(url.host()), port_(url.port()), path_(url.path()) { for (const auto &qp : url.query_params()) { @@ -14,14 +14,14 @@ URL::URL(const bts::api::io::URL &url) } } -std::vector> URL::well_known_ports_() { +std::vector> Url::well_known_ports_() { return std::vector>{ {"http", 80}, {"https", 443}, {"ws", 80}, {"wss", 443}, {"ssh", 22}, {"sftp", 22}, }; } -std::uint16_t URL::get_known_port_for_protocol(const std::string &protocol) { +std::uint16_t Url::get_known_port_for_protocol(const std::string &protocol) { auto wkps = well_known_ports_(); for (const auto &p : wkps) { if (p.first == protocol) { @@ -31,7 +31,7 @@ std::uint16_t URL::get_known_port_for_protocol(const std::string &protocol) { return 0; } -std::string URL::get_known_protocol_for_port(std::uint16_t port) { +std::string Url::get_known_protocol_for_port(std::uint16_t port) { auto wkps = well_known_ports_(); for (const auto &p : wkps) { if (p.second == port) { @@ -41,23 +41,23 @@ std::string URL::get_known_protocol_for_port(std::uint16_t port) { return ""; } -std::string &URL::protocol() { return protocol_; } -const std::string &URL::protocol() const { return protocol_; } +std::string &Url::protocol() { return protocol_; } +const std::string &Url::protocol() const { return protocol_; } -std::string &URL::host() { return host_; } -const std::string &URL::host() const { return host_; } +std::string &Url::host() { return host_; } +const std::string &Url::host() const { return host_; } -std::uint16_t &URL::port() { return port_; } -std::uint16_t URL::port() const { return port_; } +std::uint16_t &Url::port() { return port_; } +std::uint16_t Url::port() const { return port_; } -std::string &URL::path() { return path_; } -const std::string &URL::path() const { return path_; } +std::string &Url::path() { return path_; } +const std::string &Url::path() const { return path_; } -QueryParams &URL::query_params() { return query_params_; } +QueryParams &Url::query_params() { return query_params_; } -const QueryParams &URL::query_params() const { return query_params_; } +const QueryParams &Url::query_params() const { return query_params_; } -std::string URL::to_string() const { +std::string Url::to_string() const { auto rv = protocol() + "://"; if (host().empty()) { rv.append("localhost"); @@ -77,36 +77,36 @@ std::string URL::to_string() const { return rv; } -std::ostream &operator<<(std::ostream &out, const URL &url) noexcept { +std::ostream &operator<<(std::ostream &out, const Url &url) noexcept { out << url.to_string(); return out; } -void URL::fill_protocol(const std::string &protocol) { +void Url::fill_protocol(const std::string &protocol) { if (protocol_.empty()) { protocol_ = protocol; } } -void URL::fill_host(const std::string &host) { +void Url::fill_host(const std::string &host) { if (host_.empty()) { host_ = host; } } -void URL::fill_port(std::uint16_t port) { +void Url::fill_port(std::uint16_t port) { if (port_ == 0) { port_ = port; } } -void URL::fill_path(const std::string &path) { +void Url::fill_path(const std::string &path) { if (path_.empty()) { path_ = path; } } -void URL::fill_query_params( +void Url::fill_query_params( const QueryParams &query_params, bool add_missing_params) { if (query_params_.empty()) { query_params_ = query_params; @@ -117,7 +117,7 @@ void URL::fill_query_params( } } -void URL::fill_with(const URL &url) { +void Url::fill_with(const Url &url) { fill_path(url.path()); fill_host(url.host()); fill_protocol(url.protocol()); @@ -125,7 +125,7 @@ void URL::fill_with(const URL &url) { fill_query_params(url.query_params()); } -bool operator==(const URL &lhs, const URL &rhs) noexcept { +bool operator==(const Url &lhs, const Url &rhs) noexcept { bool rv = lhs.protocol() == rhs.protocol() && lhs.host() == rhs.host() && lhs.path() == rhs.path() && lhs.port() == rhs.port(); if (rv) { @@ -136,8 +136,8 @@ bool operator==(const URL &lhs, const URL &rhs) noexcept { return rv; } -bool operator!=(const URL &lhs, const URL &rhs) noexcept { +bool operator!=(const Url &lhs, const Url &rhs) noexcept { return !(lhs == rhs); } -} // namespace bts::io +} // namespace bts::http diff --git a/src/lib_spark/spark/io/URL.h b/src/lib_http/http/url.h similarity index 67% rename from src/lib_spark/spark/io/URL.h rename to src/lib_http/http/url.h index f9bf8fbed..b75056ed3 100644 --- a/src/lib_spark/spark/io/URL.h +++ b/src/lib_http/http/url.h @@ -1,5 +1,6 @@ #pragma once -#include "QueryParams.h" + +#include "http/query_params.h" #include "system/hash_phaser.h" #include @@ -9,21 +10,21 @@ #include #include -namespace bts::api::io { -class URL; +namespace bts::http::protobufs { +class Url; } -namespace bts::io { +namespace bts::http { -class URL { +class Url { public: - URL() = default; - explicit URL(const bts::api::io::URL &url); + Url() = default; + explicit Url(const protobufs::Url &url); - URL(const URL &) = default; - URL(URL &&) noexcept = default; - URL &operator=(const URL &) = default; - URL &operator=(URL &&) noexcept = default; + Url(const Url &) = default; + Url(Url &&) noexcept = default; + Url &operator=(const Url &) = default; + Url &operator=(Url &&) noexcept = default; std::string &protocol(); const std::string &protocol() const; @@ -48,7 +49,7 @@ class URL { void fill_port(std::uint16_t port); void fill_query_params( const QueryParams &query_params, bool add_missing_params = false); - void fill_with(const URL &url); + void fill_with(const Url &url); static std::uint16_t get_known_port_for_protocol( const std::string &protocol); @@ -65,18 +66,18 @@ class URL { well_known_ports_(); }; -bool operator==(const URL &lhs, const URL &rhs) noexcept; -bool operator!=(const URL &lhs, const URL &rhs) noexcept; +bool operator==(const Url &lhs, const Url &rhs) noexcept; +bool operator!=(const Url &lhs, const Url &rhs) noexcept; -std::ostream &operator<<(std::ostream &out, const URL &url) noexcept; +std::ostream &operator<<(std::ostream &out, const Url &url) noexcept; -} // namespace bts::io +} // namespace bts::http namespace std { template <> -struct hash { - std::size_t operator()(const bts::io::URL &url) const; +struct hash { + std::size_t operator()(const bts::http::Url &url) const; }; } // namespace std @@ -87,8 +88,8 @@ struct hash { namespace std { -inline std::size_t hash::operator()( - const bts::io::URL &url) const { +inline std::size_t hash::operator()( + const bts::http::Url &url) const { return bts::core::HashPhaser::auto_phase( url.protocol(), url.host(), url.port(), url.path(), url.query_params().size()); diff --git a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake index 4a73d1661..03f3b190a 100644 --- a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake @@ -3,7 +3,7 @@ function(get_link_libraries dest) set(${dest} system domain - curl + http tbb boost_system boost_thread diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index 74b64336c..5829de3da 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -3,6 +3,7 @@ function(get_link_libraries dest) set(${dest} system domain + http protobuf double-conversion boost_system @@ -14,7 +15,6 @@ function(get_link_libraries dest) boost_atomic SQLiteCpp sqlite3 - curl uuid ssl crypto diff --git a/src/lib_spark/spark/io/http/HTTPHeaders.h b/src/lib_spark/spark/io/http/HTTPHeaders.h deleted file mode 100644 index fbad071c0..000000000 --- a/src/lib_spark/spark/io/http/HTTPHeaders.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "system/collections/flat_unordered_map.h" - -namespace bts::io::http { - -class HTTPHeaders - : public collections::FlatUnorderedMap { - public: - HTTPHeaders() = default; - explicit HTTPHeaders(const std::string &header_str); - - HTTPHeaders(const HTTPHeaders &) noexcept = default; - HTTPHeaders(HTTPHeaders &&) noexcept = default; - HTTPHeaders &operator=(const HTTPHeaders &) noexcept = default; - HTTPHeaders &operator=(HTTPHeaders &&) noexcept = default; - - std::string to_string() const; -}; - -std::ostream &operator<<( - std::ostream &out, const HTTPHeaders &headers) noexcept; - -} // namespace bts::io::http diff --git a/src/lib_spark/spark/io/http/HTTPRequest.cpp b/src/lib_spark/spark/io/http/HTTPRequest.cpp deleted file mode 100644 index 70f953900..000000000 --- a/src/lib_spark/spark/io/http/HTTPRequest.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "HTTPRequest.h" - -namespace bts::io::http { - -io::URL &HTTPRequest::url() { return url_; } - -const io::URL &HTTPRequest::url() const { return url_; } - -HTTPHeaders &HTTPRequest::headers() { return headers_; } - -const HTTPHeaders &HTTPRequest::headers() const { return headers_; } - -std::string &HTTPRequest::body() { return body_; } - -const std::string &HTTPRequest::body() const { return body_; } - -} // namespace bts::io::http diff --git a/src/lib_spark/spark/io/http/HTTPRequest.h b/src/lib_spark/spark/io/http/HTTPRequest.h deleted file mode 100644 index 01627e6cb..000000000 --- a/src/lib_spark/spark/io/http/HTTPRequest.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include "HTTPHeaders.h" -#include "spark/io/URL.h" -#include -#include - -namespace bts::io::http { - -class HTTPRequest { - public: - io::URL &url(); - const io::URL &url() const; - - HTTPHeaders &headers(); - const HTTPHeaders &headers() const; - - std::string &body(); - const std::string &body() const; - - private: - io::URL url_; - HTTPHeaders headers_; - std::string body_; -}; - -} // namespace bts::io::http diff --git a/src/lib_spark/spark/io/http/HTTPResponse.cpp b/src/lib_spark/spark/io/http/HTTPResponse.cpp deleted file mode 100644 index cc7c14c91..000000000 --- a/src/lib_spark/spark/io/http/HTTPResponse.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "HTTPResponse.h" -#include - -namespace bts::io::http { - -HTTPHeaders &HTTPResponse::headers() { return headers_; } - -const HTTPHeaders &HTTPResponse::headers() const { return headers_; } - -std::string &HTTPResponse::body() { return body_; } - -const std::string &HTTPResponse::body() const { return body_; } - -std::int64_t &HTTPResponse::code() { return code_; } - -std::int64_t HTTPResponse::code() const { return code_; } - -std::ostream &operator<<( - std::ostream &out, const HTTPResponse &response) noexcept { - out << response.headers() << "\n" - << response.body() << "\nCode: " << response.code(); - return out; -} - -} // namespace bts::io::http diff --git a/src/lib_spark/spark/io/http/HTTPResponse.h b/src/lib_spark/spark/io/http/HTTPResponse.h deleted file mode 100644 index 4c4ef8c96..000000000 --- a/src/lib_spark/spark/io/http/HTTPResponse.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#include "HTTPHeaders.h" -#include "spark/io/URL.h" -#include -#include - -namespace bts::io::http { - -class HTTPResponse { - public: - io::URL &url(); - const io::URL &url() const; - - HTTPHeaders &headers(); - const HTTPHeaders &headers() const; - - std::string &body(); - const std::string &body() const; - - std::int64_t &code(); - std::int64_t code() const; - - private: - io::URL url_; - HTTPHeaders headers_; - std::string body_; - std::int64_t code_; -}; - -std::ostream &operator<<( - std::ostream &out, const HTTPResponse &response) noexcept; - -} // namespace bts::io::http diff --git a/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp index 5a283bcc7..c1552224e 100644 --- a/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp +++ b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.cpp @@ -1,10 +1,10 @@ #include "WebsocketClientConfiguration.h" -#include "spark/io/URL.h" +#include "http/url.h" namespace bts::io::websocket { WebsocketClientConfiguration WebsocketClientConfiguration::from_url( - const URL &url) { + const http::Url &url) { return WebsocketClientConfiguration{ url.host(), std::to_string(url.port()), url.host(), 0, 0, 1000}; } diff --git a/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h index 016fc07dd..1ecc68766 100644 --- a/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h +++ b/src/lib_spark/spark/io/websocket/WebsocketClientConfiguration.h @@ -1,8 +1,8 @@ #pragma once #include -namespace bts::io { -class URL; +namespace bts::http { +class Url; } namespace bts::io::websocket { @@ -17,7 +17,7 @@ class WebsocketClientConfiguration { const size_t msecs_bw_connection_tries; const size_t timer_ms; - static WebsocketClientConfiguration from_url(const URL &url); + static WebsocketClientConfiguration from_url(const http::Url &url); }; } // namespace bts::io::websocket diff --git a/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp b/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp index 0150c90c2..4d974e686 100644 --- a/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp +++ b/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp @@ -42,7 +42,6 @@ #include namespace beast = boost::beast; // from -namespace http = beast::http; // from namespace websocket_core = beast::websocket; // from namespace net = boost::asio; // from using tcp = boost::asio::ip::tcp; // from @@ -112,7 +111,7 @@ class SyncWebsocketEchoServer { ws.set_option(websocket_core::stream_base::decorator( [](websocket_core::response_type &res) { res.set( - http::field::server, + beast::http::field::server, std::string(BOOST_BEAST_VERSION_STRING) + " websocket-server-sync"); }));