PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: error callback in network.get, .get_binary, .post

Browse Source
This commit is contained in:
MihailRis 2025-04-30 19:15:39 +03:00
parent 76fb2e42d3
commit 556a561f1c
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/logic/scripting/lua/libs/libnetwork.cpp
View File

@ -12,11 +12,20 @@ static int l_get(lua::State* L, network::Network& network) {
lua::pushvalue(L, 2);
auto onResponse = lua::create_lambda_nothrow(L);
network::OnReject onReject = nullptr;
if (lua::gettop(L) >= 3) {
lua::pushvalue(L, 3);
auto callback = lua::create_lambda_nothrow(L);
onReject = [callback](int code) {
callback({code});
};
}
network.get(url, [onResponse](std::vector<char> bytes) {
engine->postRunnable([=]() {
onResponse({std::string(bytes.data(), bytes.size())});
});
});
}, std::move(onReject));
return 0;
}
@ -26,6 +35,15 @@ static int l_get_binary(lua::State* L, network::Network& network) {
lua::pushvalue(L, 2);
auto onResponse = lua::create_lambda_nothrow(L);
network::OnReject onReject = nullptr;
if (lua::gettop(L) >= 3) {
lua::pushvalue(L, 3);
auto callback = lua::create_lambda_nothrow(L);
onReject = [callback](int code) {
callback({code});
};
}
network.get(url, [onResponse](std::vector<char> bytes) {
auto buffer = std::make_shared<util::Buffer<ubyte>>(
reinterpret_cast<const ubyte*>(bytes.data()), bytes.size()
@ -33,7 +51,7 @@ static int l_get_binary(lua::State* L, network::Network& network) {
engine->postRunnable([=]() {
onResponse({buffer});
});
});
}, std::move(onReject));
return 0;
}
@ -44,12 +62,22 @@ static int l_post(lua::State* L, network::Network& network) {
lua::pushvalue(L, 3);
auto onResponse = lua::create_lambda_nothrow(L);
network::OnReject onReject = nullptr;
if (lua::gettop(L) >= 4) {
lua::pushvalue(L, 4);
auto callback = lua::create_lambda_nothrow(L);
onReject = [callback](int code) {
callback({code});
};
}
std::string string;
if (data.isString()) {
string = data.asString();
} else {
string = json::stringify(data, false);
}
engine->getNetwork().post(url, string, [onResponse](std::vector<char> bytes) {
auto buffer = std::make_shared<util::Buffer<ubyte>>(
reinterpret_cast<const ubyte*>(bytes.data()), bytes.size()
@ -57,7 +85,7 @@ static int l_post(lua::State* L, network::Network& network) {
engine->postRunnable([=]() {
onResponse({std::string(bytes.data(), bytes.size())});
});
});
}, std::move(onReject));
return 0;
}

11
src/network/Network.cpp
View File

@ -30,6 +30,9 @@ using SOCKET = int;
using namespace network;
inline constexpr int HTTP_OK = 200;
inline constexpr int HTTP_BAD_GATEWAY = 502;
static debug::Logger logger("network");
static size_t write_callback(
@ -149,7 +152,7 @@ public:
auto message = curl_multi_strerror(res);
logger.error() << message << " (" << url << ")";
if (onReject) {
onReject(message);
onReject(HTTP_BAD_GATEWAY);
}
url = "";
}
@ -164,7 +167,7 @@ public:
auto message = curl_multi_strerror(res);
logger.error() << message << " (" << url << ")";
if (onReject) {
onReject(message);
onReject(HTTP_BAD_GATEWAY);
}
curl_multi_remove_handle(multiHandle, curl);
url = "";
@ -176,7 +179,7 @@ public:
}
int response;
curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &response);
if (response == 200) {
if (response == HTTP_OK) {
long size;
if (!curl_easy_getinfo(curl, CURLINFO_REQUEST_SIZE, &size)) {
totalUpload += size;
@ -191,7 +194,7 @@ public:
} else {
logger.error() << "response code " << response << " (" << url << ")";
if (onReject) {
onReject(std::to_string(response).c_str());
onReject(response);
}
}
url = "";

2
src/network/Network.hpp
View File

@ -11,7 +11,7 @@
namespace network {
using OnResponse = std::function<void(std::vector<char>)>;
using OnReject = std::function<void(const char*)>;
using OnReject = std::function<void(int)>;
class Requests {
public: