mirror of
https://github.com/RGBCube/serenity
synced 2025-05-14 11:14:58 +00:00

This aligns Workers and Window and MessagePorts to all use the same mechanism for transferring serialized messages across realms. It also allows transferring more message ports into a worker. Re-enable the Worker-echo test, as none of the MessagePort tests have themselves been flaky, and those are now using the same underlying implementation.
73 lines
2.4 KiB
C++
73 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2023, Andrew Kaster <akaster@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <WebWorker/ConnectionFromClient.h>
|
|
#include <WebWorker/DedicatedWorkerHost.h>
|
|
#include <WebWorker/PageHost.h>
|
|
|
|
namespace WebWorker {
|
|
|
|
void ConnectionFromClient::die()
|
|
{
|
|
// FIXME: When handling multiple workers in the same process,
|
|
// this logic needs to be smarter (only when all workers are dead, etc).
|
|
Core::EventLoop::current().quit(0);
|
|
}
|
|
|
|
void ConnectionFromClient::request_file(Web::FileRequest request)
|
|
{
|
|
// FIXME: Route this to FSAS or Brower chrome as appropriate instead of allowing
|
|
// the WebWorker process filesystem access
|
|
auto path = request.path();
|
|
auto request_id = ++last_id;
|
|
|
|
m_requested_files.set(request_id, move(request));
|
|
|
|
auto file = Core::File::open(path, Core::File::OpenMode::Read);
|
|
|
|
if (file.is_error())
|
|
handle_file_return(file.error().code(), {}, request_id);
|
|
else
|
|
handle_file_return(0, IPC::File(*file.value()), request_id);
|
|
}
|
|
|
|
ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr<Core::LocalSocket> socket)
|
|
: IPC::ConnectionFromClient<WebWorkerClientEndpoint, WebWorkerServerEndpoint>(*this, move(socket), 1)
|
|
, m_page_host(PageHost::create(Web::Bindings::main_thread_vm(), *this))
|
|
{
|
|
}
|
|
|
|
ConnectionFromClient::~ConnectionFromClient() = default;
|
|
|
|
Web::Page& ConnectionFromClient::page()
|
|
{
|
|
return m_page_host->page();
|
|
}
|
|
|
|
Web::Page const& ConnectionFromClient::page() const
|
|
{
|
|
return m_page_host->page();
|
|
}
|
|
|
|
void ConnectionFromClient::start_dedicated_worker(AK::URL const& url, String const& type, String const&, String const&, Web::HTML::TransferDataHolder const& implicit_port)
|
|
{
|
|
m_worker_host = make_ref_counted<DedicatedWorkerHost>(url, type);
|
|
// FIXME: Yikes, const_cast to move? Feels like a LibIPC bug.
|
|
// We should be able to move non-copyable types from a Message type.
|
|
m_worker_host->run(page(), move(const_cast<Web::HTML::TransferDataHolder&>(implicit_port)));
|
|
}
|
|
|
|
void ConnectionFromClient::handle_file_return(i32 error, Optional<IPC::File> const& file, i32 request_id)
|
|
{
|
|
auto file_request = m_requested_files.take(request_id);
|
|
|
|
VERIFY(file_request.has_value());
|
|
VERIFY(file_request.value().on_file_request_finish);
|
|
|
|
file_request.value().on_file_request_finish(error != 0 ? Error::from_errno(error) : ErrorOr<i32> { file->take_fd() });
|
|
}
|
|
|
|
}
|