Skip to content
Snippets Groups Projects
Commit ea82201d authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Remove beast and asio from headers

parent aaf69ad4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/mtxclient/crypto/utils.hpp
+ 0
− 2
View file @ ea82201d
......@@ -5,8 +5,6 @@
#include <sodium.h>
#include <boost/algorithm/string.hpp>
#include "mtx/common.hpp"
namespace mtx {
......
include/mtxclient/http/client.hpp
+ 46
− 66
View file @ ea82201d
#pragma once
#include <memory>
#include <mutex>
#include <optional>
#include <thread>
#include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
#include <boost/beast.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/signals2.hpp>
#include <boost/signals2/signal_type.hpp>
#include <boost/thread/thread.hpp>
#include <boost/beast/http/fields.hpp>
#include <nlohmann/json.hpp>
#include <mtx/requests.hpp>
......@@ -19,7 +12,6 @@
#include "mtxclient/crypto/client.hpp"
#include "mtxclient/http/errors.hpp"
#include "mtxclient/http/session.hpp"
#include "mtxclient/utils.hpp"
namespace mtx {
......@@ -49,6 +41,10 @@ using Callback = std::function<void(const Response &, RequestErr)>;
template<class Response>
using HeadersCallback = std::function<void(const Response &, HeaderFields, RequestErr)>;
using TypeErasedCallback = std::function<void(const HeaderFields &,
const std::string &,
const boost::system::error_code &,
boost::beast::http::status)>;
//! Sync configuration options.
struct SyncOpts
......@@ -89,18 +85,8 @@ struct ThumbOpts
std::string mxc_url;
};
struct ClientPrivate
{
boost::asio::io_service ios_;
//! Used to prevent the event loop from shutting down.
std::optional<boost::asio::io_context::work> work_{ios_};
//! Worker threads for the requests.
boost::thread_group thread_group_;
//! SSL context for requests.
boost::asio::ssl::context ssl_ctx_{boost::asio::ssl::context::sslv23_client};
//! All the active sessions will shutdown the connection.
boost::signals2::signal<void()> shutdown_signal;
};
struct ClientPrivate;
struct Session;
//! The main object that the user will interact.
class Client : public std::enable_shared_from_this<Client>
......@@ -138,7 +124,7 @@ public:
//! Generate a new transaction id.
std::string generate_txn_id() { return client::utils::random_token(32, false); }
//! Abort all active pending requests.
void shutdown() { p->shutdown_signal(); }
void shutdown();
//! Remove all saved configuration.
void clear()
{
......@@ -366,14 +352,27 @@ private:
bool requires_auth = true,
const std::string &endpoint_namespace = "/_matrix");
// type erased versions of http verbs
void post(const std::string &endpoint,
const json &req,
TypeErasedCallback cb,
bool requires_auth,
const std::string &content_type);
void put(const std::string &endpoint,
const json &req,
TypeErasedCallback cb,
bool requires_auth);
void get(const std::string &endpoint,
TypeErasedCallback cb,
bool requires_auth,
const std::string &endpoint_namespace);
template<class Response>
std::shared_ptr<Session> create_session(HeadersCallback<Response> callback);
TypeErasedCallback prepare_callback(HeadersCallback<Response> callback);
std::shared_ptr<Session> create_session(
std::function<void(const HeaderFields &,
const std::string &,
const boost::system::error_code &,
boost::beast::http::status)> type_erased_cb);
std::shared_ptr<Session> create_session(TypeErasedCallback type_erased_cb);
//! Setup http header with the access token if needed.
void setup_auth(Session *session, bool auth);
......@@ -404,17 +403,13 @@ mtx::http::Client::post(const std::string &endpoint,
bool requires_auth,
const std::string &content_type)
{
auto session = create_session<Response>(
[callback](const Response &res, HeaderFields, RequestErr err) { callback(res, err); });
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<Request, boost::beast::http::verb::post>(
session.get(), req, endpoint, content_type);
session->run();
post(
endpoint,
client::utils::serialize(req),
prepare_callback<Response>(
[callback](const Response &res, HeaderFields, RequestErr err) { callback(res, err); }),
requires_auth,
content_type);
}
// put function for the PUT HTTP requests that send responses
......@@ -425,17 +420,12 @@ mtx::http::Client::put(const std::string &endpoint,
Callback<Response> callback,
bool requires_auth)
{
auto session = create_session<Response>(
[callback](const Response &res, HeaderFields, RequestErr err) { callback(res, err); });
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<Request, boost::beast::http::verb::put>(
session.get(), req, endpoint, "application/json");
session->run();
put(
endpoint,
client::utils::serialize(req),
prepare_callback<Response>(
[callback](const Response &res, HeaderFields, RequestErr err) { callback(res, err); }),
requires_auth);
}
// provides PUT functionality for the endpoints which dont respond with a body
......@@ -460,21 +450,12 @@ mtx::http::Client::get(const std::string &endpoint,
bool requires_auth,
const std::string &endpoint_namespace)
{
auto session = create_session<Response>(callback);
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<std::string, boost::beast::http::verb::get>(
session.get(), {}, endpoint, "", endpoint_namespace);
session->run();
get(endpoint, prepare_callback<Response>(callback), requires_auth, endpoint_namespace);
}
template<class Response>
std::shared_ptr<mtx::http::Session>
mtx::http::Client::create_session(HeadersCallback<Response> callback)
mtx::http::TypeErasedCallback
mtx::http::Client::prepare_callback(HeadersCallback<Response> callback)
{
auto type_erased_cb = [callback](const HeaderFields &headers,
const std::string &body,
......@@ -524,8 +505,7 @@ mtx::http::Client::create_session(HeadersCallback<Response> callback)
}
};
return create_session(type_erased_cb);
return type_erased_cb;
}
template<class Payload, mtx::events::EventType Event>
......
include/mtxclient/http/errors.hpp
+ 2
− 1
View file @ ea82201d
#pragma once
#include "mtx/errors.hpp"
#include <boost/beast.hpp>
#include <boost/beast/http/status.hpp>
#include <boost/system/error_code.hpp>
namespace mtx {
namespace http {
......
include/mtxclient/http/session.hpp
+ 3
− 3
View file @ ea82201d
......@@ -78,10 +78,10 @@ private:
std::atomic_bool is_shutting_down_;
};
template<class Request, boost::beast::http::verb HttpVerb>
template<boost::beast::http::verb HttpVerb>
void
setup_headers(mtx::http::Session *session,
const Request &req,
const nlohmann::json &req,
const std::string &endpoint,
const std::string &content_type = "",
const std::string &endpoint_namespace = "/_matrix")
......@@ -92,7 +92,7 @@ setup_headers(mtx::http::Session *session,
session->request.method(HttpVerb);
session->request.target(endpoint_namespace + endpoint);
session->request.body() = client::utils::serialize(req);
session->request.body() = req;
session->request.prepare_payload();
if (!content_type.empty())
......
lib/http/client.cpp
+ 89
− 1
View file @ ea82201d
#include "mtxclient/http/client.hpp"
#include <mutex>
#include <thread>
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
#include <boost/utility/typed_in_place_factory.hpp>
#include "mtxclient/http/client.hpp"
#include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
#include <boost/beast.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/signals2.hpp>
#include <boost/signals2/signal_type.hpp>
#include <boost/thread/thread.hpp>
#include "mtxclient/http/session.hpp"
#include "mtxclient/utils.hpp"
#include "mtx/requests.hpp"
......@@ -11,6 +24,21 @@
using namespace mtx::http;
using namespace boost::beast;
namespace mtx::http {
struct ClientPrivate
{
boost::asio::io_service ios_;
//! Used to prevent the event loop from shutting down.
std::optional<boost::asio::io_context::work> work_{ios_};
//! Worker threads for the requests.
boost::thread_group thread_group_;
//! SSL context for requests.
boost::asio::ssl::context ssl_ctx_{boost::asio::ssl::context::sslv23_client};
//! All the active sessions will shutdown the connection.
boost::signals2::signal<void()> shutdown_signal;
};
}
Client::Client(const std::string &server, uint16_t port)
: server_{server}
, port_{port}
......@@ -66,6 +94,66 @@ Client::create_session(std::function<void(const HeaderFields &,
return session;
}
void
Client::shutdown()
{
p->shutdown_signal();
}
void
mtx::http::Client::post(const std::string &endpoint,
const nlohmann::json &req,
mtx::http::TypeErasedCallback cb,
bool requires_auth,
const std::string &content_type)
{
auto session = create_session(cb);
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<boost::beast::http::verb::post>(session.get(), req, endpoint, content_type);
session->run();
}
void
mtx::http::Client::put(const std::string &endpoint,
const nlohmann::json &req,
mtx::http::TypeErasedCallback cb,
bool requires_auth)
{
auto session = create_session(cb);
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<boost::beast::http::verb::put>(
session.get(), req, endpoint, "application/json");
session->run();
}
void
mtx::http::Client::get(const std::string &endpoint,
mtx::http::TypeErasedCallback cb,
bool requires_auth,
const std::string &endpoint_namespace)
{
auto session = create_session(cb);
if (!session)
return;
setup_auth(session.get(), requires_auth);
setup_headers<boost::beast::http::verb::get>(
session.get(), client::utils::serialize(std::string{}), endpoint, "", endpoint_namespace);
session->run();
}
void
Client::set_server(const std::string &server)
{
......
tests/test_helpers.hpp
+ 1
− 0
View file @ ea82201d
......@@ -3,6 +3,7 @@
#include "gtest/gtest.h"
#include <iostream>
#include <limits>
#include <random>
#include <string>
#include <thread>
#include <vector>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment