Canithesis/checkpoint
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxy: add experimental async mode

Browse Source
This commit is contained in:
Vaxry
2025-04-15 16:55:21 +01:00
parent 5d7f0bb322
commit 5893be77c3
6 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/core/Handler.cpp
View File

@@ -54,19 +54,6 @@ static std::string generateToken() {
return ss.str();
}
void CServerHandler::init() {
m_client = new Pistache::Http::Experimental::Client();
m_client->init(Pistache::Http::Experimental::Client::options().maxConnectionsPerHost(32).maxResponseSize(g_pConfig->m_config.max_request_size).threads(4));
}
void CServerHandler::finish() {
if (!m_client)
return;
m_client->shutdown();
delete m_client;
m_client = nullptr;
}
std::string CServerHandler::fingerprintForRequest(const Pistache::Http::Request& req) {
const auto HEADERS = req.headers();
std::shared_ptr<const Pistache::Http::Header::AcceptEncoding> acceptEncodingHeader;
@@ -373,11 +360,47 @@ void CServerHandler::serveStop(const Pistache::Http::Request& req, Pistache::Htt
}
void CServerHandler::proxyPass(const Pistache::Http::Request& req, Pistache::Http::ResponseWriter& response) {
if (g_pConfig->m_config.experimental.async_proxy) {
proxyPassAsync(req, response);
return;
}
proxyPassInternal(req, response);
}
void CServerHandler::proxyPassAsync(const Pistache::Http::Request& req, Pistache::Http::ResponseWriter& response) {
std::shared_ptr<SProxiedRequest> proxiedRequest;
{
std::lock_guard<std::mutex> lg(*m_asyncProxyQueue.queueMutex);
proxiedRequest = m_asyncProxyQueue.queue.emplace_back(std::make_shared<SProxiedRequest>(req, response));
Debug::log(TRACE, "proxyPassAsync: new request, queue size {}", m_asyncProxyQueue.queue.size());
}
if (!proxiedRequest) {
Debug::log(ERR, "Couldn't create an async proxy request struct?");
response.send(Pistache::Http::Code::Internal_Server_Error, "Internal Proxy Error");
return;
}
// TODO: add an option to limit the amount of threads (akin to a Java ThreadPool iirc it was called)
proxiedRequest->requestThread = std::thread([proxiedRequest, this]() {
proxyPassInternal(proxiedRequest->req, proxiedRequest->response, true);
std::lock_guard<std::mutex> lg(*m_asyncProxyQueue.queueMutex);
std::erase(m_asyncProxyQueue.queue, proxiedRequest);
Debug::log(TRACE, "proxyPassAsync: request done, queue size {}", m_asyncProxyQueue.queue.size());
});
proxiedRequest->requestThread.detach();
}
void CServerHandler::proxyPassInternal(const Pistache::Http::Request& req, Pistache::Http::ResponseWriter& response, bool async) {
const std::string FORWARD_ADDR = g_pConfig->m_config.forward_address;
Debug::log(TRACE, "Method ({}): Forwarding to {}", (uint32_t)req.method(), FORWARD_ADDR + req.resource());
auto builder = m_client->prepareRequest(FORWARD_ADDR + req.resource(), req.method());
Pistache::Http::Experimental::Client client;
client.init(Pistache::Http::Experimental::Client::options().maxConnectionsPerHost(32).maxResponseSize(g_pConfig->m_config.max_request_size).threads(4));
auto builder = client.prepareRequest(FORWARD_ADDR + req.resource(), req.method());
builder.body(req.body());
for (auto it = req.cookies().begin(); it != req.cookies().end(); ++it) {
builder.cookie(*it);
@@ -391,9 +414,13 @@ void CServerHandler::proxyPass(const Pistache::Http::Request& req, Pistache::Htt
continue;
}
// FIXME: this should be possible once pistache allows for live reading of T-E?
// for now, we wait for everything forever...
// same as the todo further below, essentially
if (HNAME == "Accept" && req.headers().getRaw(h->name()).value().contains("text/event-stream")) {
Debug::log(ERR, "FIXME: text/event-stream not supported via the proxy (it would have to be async)");
response.send(Pistache::Http::Code::Internal_Server_Error, "event-stream is not supported by checkpoint");
Debug::log(TRACE, "FIXME: proxyPassInternal: text/event-stream not supported");
response.send(Pistache::Http::Code::Internal_Server_Error, "Internal server error");
client.shutdown();
return;
}
@@ -446,4 +473,6 @@ void CServerHandler::proxyPass(const Pistache::Http::Request& req, Pistache::Htt
});
Pistache::Async::Barrier<Pistache::Http::Response> b(resp);
b.wait_for(std::chrono::seconds(g_pConfig->m_config.proxy_timeout_sec));
client.shutdown();
}