This commit is contained in:
fluttershy 2025-01-27 18:15:34 +05:00
parent f5341d6ea5
commit 84d6b3d71c
4 changed files with 67 additions and 55 deletions

View File

@ -14,6 +14,10 @@ set(TESTS ${CMAKE_SOURCE_DIR}/tests)
set(ADDITIONAL_CXX_FLAGS_DEBUG "-march=native -pipe -Wall -Wextra -fsanitize=address -O0")
set(ADDITIONAL_CXX_FLAGS_RELEASE "-march=native -pipe -Wall -Wextra -O2 -flto")
file(GLOB NETWORK_SOURCES libs/network/*.cpp)
file(GLOB WEBSOCKET_SOURCES libs/gateway/*.cpp)
find_package(CURL REQUIRED)
find_path(IXWEBSOCKET_INCLUDE_DIR ixwebsocket)
find_library(IXWEBSOCKET_LIBRARIES ixwebsocket)
@ -43,7 +47,7 @@ endif()
message(STATUS "Current compiler: ${CMAKE_CXX_COMPILER}")
message(STATUS "${CMAKE_BUILD_TYPE}")
add_executable(${PROJECT_NAME} ${SOURCE})
add_executable(${PROJECT_NAME} ${SOURCE} ${NETWORK_SOURCES} ${WEBSOCKET_SOURCES})
#add_library(sparkles STATIC ${SOURCE})
add_executable(tests ${TESTS}/tests.cpp)

53
libs/network/network.cpp Normal file
View File

@ -0,0 +1,53 @@
#include "network.hpp"
NetworkManager::NetworkManager() : web(WebSocket::getInstance()) {
Log::create(INFO, NETWORK, "Network init");
curl_global_init(CURL_GLOBAL_DEFAULT);
curl = curl_easy_init();
if (!curl) {
Log::create(CRITICAL, NETWORK, "Failed to initialize CURL");
abort();
}
}
NetworkManager::~NetworkManager() {
if (curl) {
curl_easy_cleanup(curl);
}
curl_global_cleanup();
}
unsigned long NetworkManager::WriteCallback(void* contents, unsigned long size, unsigned long nmemb, void* userp) {
((std::string*)userp)->append((char*)contents, size * nmemb);
return size * nmemb;
}
NetworkManager& NetworkManager::getInstance() {
Log::create(INFO, NETWORK, "Instance event");
static NetworkManager instance;
return instance;
}
unsigned long NetworkManager::getLatency() const {
return 0;
}
std::string NetworkManager::request(const std::string& method, const std::string& path, const std::string& data) {
std::string response;
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, path.c_str());
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.c_str());
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data.c_str());
curl_slist* headers = nullptr;
headers = curl_slist_append(headers, "Accept: application/json");
headers = curl_slist_append(headers, "Content-Type: application/json");
headers = curl_slist_append(headers, ("Authorization: " + web.getToken()).c_str());
headers = curl_slist_append(headers, "User-Agent: DiscordBot");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_3ONLY);
if ((res = curl_easy_perform(curl)) != 0) {
Log::create(ERROR, NETWORK, "curl_easy_perform() failed: " + std::string(curl_easy_strerror(res)));
}
curl_slist_free_all(headers);
}
#ifdef DEBUG
Log::create(INFO, NETWORK, response);
#endif
return response;
}

View File

@ -8,63 +8,16 @@ private:
CURL* curl;
CURLcode res;
WebSocket& web;
//std::chrono::duration<double, std::milli> duration;
NetworkManager& operator=(const NetworkManager&) = delete;
NetworkManager& operator=(NetworkManager&&) = delete;
NetworkManager(NetworkManager&&) = delete;
NetworkManager(const NetworkManager&) = delete;
NetworkManager() : web(WebSocket::getInstance()) {
Log::create(INFO, NETWORK, "Network init");
curl_global_init(CURL_GLOBAL_DEFAULT);
curl = curl_easy_init();
if (!curl) {
Log::create(CRITICAL, NETWORK, "Failed to initialize CURL");
abort();
}
}
~NetworkManager() {
if (curl) {
curl_easy_cleanup(curl);
}
curl_global_cleanup();
}
static unsigned long WriteCallback(void* contents, unsigned long size, unsigned long nmemb, void* userp) {
((std::string*)userp)->append((char*)contents, size * nmemb);
return size * nmemb;
}
NetworkManager();
~NetworkManager();
static unsigned long WriteCallback(void* contents, unsigned long size, unsigned long nmemb, void* userp);
public:
static NetworkManager& getInstance() {
Log::create(INFO, NETWORK, "Instance event");
static NetworkManager instance;
return instance;
}
unsigned long getLatency() const {
return 0;
}
std::string request(const std::string& method, const std::string& path, const std::string& data = "") {
std::string response;
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, path.c_str());
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.c_str());
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data.c_str());
curl_slist* headers = nullptr;
headers = curl_slist_append(headers, "Accept: application/json");
headers = curl_slist_append(headers, "Content-Type: application/json");
headers = curl_slist_append(headers, ("Authorization: " + web.getToken()).c_str());
headers = curl_slist_append(headers, "User-Agent: DiscordBot");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_3ONLY);
//auto start = std::chrono::steady_clock::now();
if ((res = curl_easy_perform(curl)) != 0) Log::create(ERROR, NETWORK, "curl_easy_perform() failed: " + std::string(curl_easy_strerror(res)));
curl_slist_free_all(headers);
//duration = std::chrono::steady_clock::now() - start;
}
#ifdef DEBUG
Log::create(INFO, NETWORK, response);
#endif
return response;
}
static NetworkManager& getInstance();
unsigned long getLatency() const;
std::string request(const std::string& method, const std::string& path, const std::string& data = "");
};
#endif

View File

@ -1,3 +1,4 @@
/*
#include <gtest/gtest.h>
#include <includes.hpp>
#include <net.hpp>
@ -5,3 +6,4 @@ TEST(NetworkManagerTest, RequestReturnsExpectedValue) {
NetworkManager& networkManager = NetworkManager::getInstance();
EXPECT_FALSE(networkManager.request(HttpMethods::POST, DiscordEndpoints::details::latest + "/channels/939957962972229634/messages", { "content", "test" }).empty());
}
*/