BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-01 23:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reuse HTTP connections (#339)

Browse Source 
fix #223
This commit is contained in:
Lion 2024-06-16 03:10:29 +02:00 committed by GitHub
commit a998a7c091
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Http.cpp
View File

@ -28,15 +28,42 @@
#include <random> #include <random>
#include <stdexcept> #include <stdexcept>
// TODO: Add sentry error handling back
using json = nlohmann::json; using json = nlohmann::json;
struct Connection {
std::string host{};
int port{};
Connection() = default;
Connection(std::string host, int port)
: host(host)
, port(port) {};
};
constexpr uint8_t CONNECTION_AMOUNT = 10;
static thread_local uint8_t write_index = 0;
static thread_local std::array<Connection, CONNECTION_AMOUNT> connections;
static thread_local std::array<std::shared_ptr<httplib::SSLClient>, CONNECTION_AMOUNT> clients;
[[nodiscard]] static std::shared_ptr<httplib::SSLClient> getClient(Connection connectionInfo) {
for (uint8_t i = 0; i < CONNECTION_AMOUNT; i++) {
if (connectionInfo.host == connections[i].host
&& connectionInfo.port == connections[i].port) {
beammp_tracef("Old client reconnected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
return clients[i];
}
}
uint8_t i = write_index;
write_index++;
write_index %= CONNECTION_AMOUNT;
clients[i] = std::make_shared<httplib::SSLClient>(connectionInfo.host, connectionInfo.port);
connections[i] = {connectionInfo.host, connectionInfo.port};
beammp_tracef("New client connected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
return clients[i];
}
std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) { std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
httplib::SSLClient client(host, port); std::shared_ptr<httplib::SSLClient> client = getClient({host, port});
client.enable_server_certificate_verification(false); client->enable_server_certificate_verification(false);
client.set_address_family(AF_INET); client->set_address_family(AF_INET);
auto res = client.Get(target.c_str()); auto res = client->Get(target.c_str());
if (res) { if (res) {
if (status) { if (status) {
*status = res->status; *status = res->status;
@ -48,12 +75,12 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
} }
std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) { std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
httplib::SSLClient client(host, port); std::shared_ptr<httplib::SSLClient> client = getClient({host, port});
client.set_read_timeout(std::chrono::seconds(10)); client->set_read_timeout(std::chrono::seconds(10));
beammp_assert(client.is_valid()); beammp_assert(client->is_valid());
client.enable_server_certificate_verification(false); client->enable_server_certificate_verification(false);
client.set_address_family(AF_INET); client->set_address_family(AF_INET);
auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str()); auto res = client->Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
if (res) { if (res) {
if (status) { if (status) {
*status = res->status; *status = res->status;