RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 16:47:34 +00:00
Code Issues Activity Actions

Userland: Update IPC calls to use proxies

Browse source 
This updates all existing code to use the auto-generated client
methods instead of post_message/send_sync.
This commit is contained in:
Gunnar Beutner 2021-05-03 13:33:59 +02:00 • committed by Andreas Kling
parent 78803ce384
commit 5bb79ea0a7
63 changed files with 303 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibProtocol/RequestClient.cpp
View file

@ -18,12 +18,12 @@ RequestClient::RequestClient()
void RequestClient::handshake()
{
send_sync<Messages::RequestServer::Greet>();
greet();
}
bool RequestClient::is_supported_protocol(const String& protocol)
{
return send_sync<Messages::RequestServer::IsSupportedProtocol>(protocol)->supported();
return IPCProxy::is_supported_protocol(protocol).supported();
}
template<typename RequestHashMapTraits>
@ -33,29 +33,30 @@ RefPtr<Request> RequestClient::start_request(const String& method, const String&
for (auto& it : request_headers)
header_dictionary.add(it.key, it.value);
auto response = send_sync<Messages::RequestServer::StartRequest>(method, url, header_dictionary, ByteBuffer::copy(request_body));
auto request_id = response->request_id();
if (request_id < 0 || !response->response_fd().has_value())
auto response = IPCProxy::start_request(method, url, header_dictionary, ByteBuffer::copy(request_body));
auto request_id = response.request_id();
if (request_id < 0 || !response.response_fd().has_value())
return nullptr;
auto response_fd = response->response_fd().value().take_fd();
auto response_fd = response.response_fd().value().take_fd();
auto request = Request::create_from_id({}, *this, request_id);
request->set_request_fd({}, response_fd);
m_requests.set(request_id, request);
return request;
return nullptr;
}
bool RequestClient::stop_request(Badge<Request>, Request& request)
{
if (!m_requests.contains(request.id()))
return false;
return send_sync<Messages::RequestServer::StopRequest>(request.id())->success();
return IPCProxy::stop_request(request.id()).success();
}
bool RequestClient::set_certificate(Badge<Request>, Request& request, String certificate, String key)
{
if (!m_requests.contains(request.id()))
return false;
return send_sync<Messages::RequestServer::SetCertificate>(request.id(), move(certificate), move(key))->success();
return IPCProxy::set_certificate(request.id(), move(certificate), move(key)).success();
}
void RequestClient::request_finished(i32 request_id, bool success, u32 total_size)

14
Userland/Libraries/LibProtocol/WebSocketClient.cpp
View file

@ -17,7 +17,7 @@ WebSocketClient::WebSocketClient()
void WebSocketClient::handshake()
{
send_sync<Messages::WebSocketServer::Greet>();
greet();
}
RefPtr<WebSocket> WebSocketClient::connect(const URL& url, const String& origin, const Vector<String>& protocols, const Vector<String>& extensions, const HashMap<String, String>& request_headers)
@ -25,8 +25,8 @@ RefPtr<WebSocket> WebSocketClient::connect(const URL& url, const String& origin,
IPC::Dictionary header_dictionary;
for (auto& it : request_headers)
header_dictionary.add(it.key, it.value);
auto response = send_sync<Messages::WebSocketServer::Connect>(url, origin, protocols, extensions, header_dictionary);
auto connection_id = response->connection_id();
auto response = IPCProxy::connect(url, origin, protocols, extensions, header_dictionary);
auto connection_id = response.connection_id();
if (connection_id < 0)
return nullptr;
auto connection = WebSocket::create_from_id({}, *this, connection_id);
@ -38,28 +38,28 @@ u32 WebSocketClient::ready_state(Badge<WebSocket>, WebSocket& connection)
{
if (!m_connections.contains(connection.id()))
return (u32)WebSocket::ReadyState::Closed;
return send_sync<Messages::WebSocketServer::ReadyState>(connection.id())->ready_state();
return IPCProxy::ready_state(connection.id()).ready_state();
}
void WebSocketClient::send(Badge<WebSocket>, WebSocket& connection, ByteBuffer data, bool is_text)
{
if (!m_connections.contains(connection.id()))
return;
post_message(Messages::WebSocketServer::Send(connection.id(), is_text, move(data)));
async_send(connection.id(), is_text, move(data));
}
void WebSocketClient::close(Badge<WebSocket>, WebSocket& connection, u16 code, String message)
{
if (!m_connections.contains(connection.id()))
return;
post_message(Messages::WebSocketServer::Close(connection.id(), code, move(message)));
async_close(connection.id(), code, move(message));
}
bool WebSocketClient::set_certificate(Badge<WebSocket>, WebSocket& connection, String certificate, String key)
{
if (!m_connections.contains(connection.id()))
return false;
return send_sync<Messages::WebSocketServer::SetCertificate>(connection.id(), move(certificate), move(key))->success();
return IPCProxy::set_certificate(connection.id(), move(certificate), move(key)).success();
}
void WebSocketClient::connected(i32 connection_id)