RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:58:11 +00:00
Code Issues Activity Actions

LibWeb: Pass around JS::HeapFunctions when fetching scripts

Browse source 
This patch replaces the use of JS::SafeFunction for the
OnFetchScriptComplete in various script fetching functions with
JS::HeapFunction. The same applies for callbacks in ModuleMap.

This also removes DescendantFetchingContext, which stashed the
on complete function in fetch_descendants_of_a_module_script
for multiple calls to fetch_internal_module_script_graph
previously.
This commit is contained in:
networkException 2023-10-29 01:46:02 +02:00 • committed by Andreas Kling
parent 33b40eaeed
commit 5aa7c51956
5 changed files with 83 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibWeb/HTML/HTMLScriptElement.cpp
View file

@ -379,24 +379,24 @@ void HTMLScriptElement::prepare_script()
// FIXME: 9. If el is currently render-blocking, then set options's render-blocking to true. // FIXME: 9. If el is currently render-blocking, then set options's render-blocking to true.
// 10. Let onComplete given result be the following steps: // 10. Let onComplete given result be the following steps:
OnFetchScriptComplete on_complete = [this](auto result) { OnFetchScriptComplete on_complete = create_on_fetch_script_complete(heap(), [this](auto result) {
// 1. Mark as ready el given result. // 1. Mark as ready el given result.
if (result) if (result)
mark_as_ready(Result { *result }); mark_as_ready(Result { *result });
else else
mark_as_ready(ResultState::Null {}); mark_as_ready(ResultState::Null {});
}; });
// 11. Switch on el's type: // 11. Switch on el's type:
// -> "classic" // -> "classic"
if (m_script_type == ScriptType::Classic) { if (m_script_type == ScriptType::Classic) {
// Fetch a classic script given url, settings object, options, classic script CORS setting, encoding, and onComplete. // Fetch a classic script given url, settings object, options, classic script CORS setting, encoding, and onComplete.
fetch_classic_script(*this, url, settings_object, move(options), classic_script_cors_setting, encoding.release_value(), move(on_complete)).release_value_but_fixme_should_propagate_errors(); fetch_classic_script(*this, url, settings_object, move(options), classic_script_cors_setting, encoding.release_value(), on_complete).release_value_but_fixme_should_propagate_errors();
} }
// -> "module" // -> "module"
else if (m_script_type == ScriptType::Module) { else if (m_script_type == ScriptType::Module) {
// Fetch an external module script graph given url, settings object, options, and onComplete. // Fetch an external module script graph given url, settings object, options, and onComplete.
fetch_external_module_script_graph(realm(), url, settings_object, options, move(on_complete)); fetch_external_module_script_graph(realm(), url, settings_object, options, on_complete);
} }
} }
@ -420,15 +420,17 @@ void HTMLScriptElement::prepare_script()
// 1. Set el's delaying the load event to true. // 1. Set el's delaying the load event to true.
begin_delaying_document_load_event(*m_preparation_time_document); begin_delaying_document_load_event(*m_preparation_time_document);
// 2. Fetch an inline module script graph, given source text, base URL, settings object, options, and with the following steps given result: auto steps = create_on_fetch_script_complete(heap(), [this](auto result) {
// FIXME: Pass options
fetch_inline_module_script_graph(realm(), m_document->url().to_deprecated_string(), source_text, base_url, document().relevant_settings_object(), [this](auto result) {
// 1. Mark as ready el given result. // 1. Mark as ready el given result.
if (!result) if (!result)
mark_as_ready(ResultState::Null {}); mark_as_ready(ResultState::Null {});
else else
mark_as_ready(Result(*result)); mark_as_ready(Result(*result));
}); });
// 2. Fetch an inline module script graph, given source text, base URL, settings object, options, and with the following steps given result:
// FIXME: Pass options
fetch_inline_module_script_graph(realm(), m_document->url().to_deprecated_string(), source_text, base_url, document().relevant_settings_object(), steps);
} }
// -> "importmap" // -> "importmap"
else if (m_script_type == ScriptType::ImportMap) { else if (m_script_type == ScriptType::ImportMap) {

101
Userland/Libraries/LibWeb/HTML/Scripting/Fetching.cpp
View file

@ -1,9 +1,10 @@
/* /*
* Copyright (c) 2022, networkException <networkexception@serenityos.org> * Copyright (c) 2022-2023, networkException <networkexception@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibJS/Heap/HeapFunction.h>
#include <LibJS/Runtime/ModuleRequest.h> #include <LibJS/Runtime/ModuleRequest.h>
#include <LibTextCodec/Decoder.h> #include <LibTextCodec/Decoder.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
@ -26,6 +27,11 @@
namespace Web::HTML { namespace Web::HTML {
OnFetchScriptComplete create_on_fetch_script_complete(JS::Heap& heap, Function<void(JS::GCPtr<Script>)> function)
{
return JS::create_heap_function(heap, move(function));
}
// https://html.spec.whatwg.org/multipage/webappapis.html#module-type-from-module-request // https://html.spec.whatwg.org/multipage/webappapis.html#module-type-from-module-request
DeprecatedString module_type_from_module_request(JS::ModuleRequest const& module_request) DeprecatedString module_type_from_module_request(JS::ModuleRequest const& module_request)
{ {
@ -279,7 +285,7 @@ WebIDL::ExceptionOr<void> fetch_classic_script(JS::NonnullGCPtr<HTMLScriptElemen
// - response's status is not an ok status, // - response's status is not an ok status,
if (body_bytes.template has<Empty>() || body_bytes.template has<Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag>() || !Fetch::Infrastructure::is_ok_status(response->status())) { if (body_bytes.template has<Empty>() || body_bytes.template has<Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag>() || !Fetch::Infrastructure::is_ok_status(response->status())) {
// then run onComplete given null, and abort these steps. // then run onComplete given null, and abort these steps.
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
@ -307,7 +313,7 @@ WebIDL::ExceptionOr<void> fetch_classic_script(JS::NonnullGCPtr<HTMLScriptElemen
auto script = ClassicScript::create(response_url.to_deprecated_string(), source_text, settings_object, response_url, 1, muted_errors); auto script = ClassicScript::create(response_url.to_deprecated_string(), source_text, settings_object, response_url, 1, muted_errors);
// 8. Run onComplete given script. // 8. Run onComplete given script.
on_complete(script); on_complete->function()(script);
}; };
TRY(Fetch::Fetching::fetch(element->realm(), request, Fetch::Infrastructure::FetchAlgorithms::create(vm, move(fetch_algorithms_input)))); TRY(Fetch::Fetching::fetch(element->realm(), request, Fetch::Infrastructure::FetchAlgorithms::create(vm, move(fetch_algorithms_input))));
@ -329,22 +335,24 @@ void fetch_internal_module_script_graph(JS::Realm& realm, JS::ModuleRequest cons
// 4. Assert: visited set contains (url, moduleType). // 4. Assert: visited set contains (url, moduleType).
VERIFY(visited_set.contains({ url, module_type })); VERIFY(visited_set.contains({ url, module_type }));
// 5. Fetch a single module script given url, fetch client settings object, destination, options, referringScript's settings object, // onSingleFetchComplete given result is the following algorithm:
// referringScript's base URL, moduleRequest, false, and onSingleFetchComplete as defined below. If performFetch was given, pass it along as well. auto on_single_fetch_complete = create_on_fetch_script_complete(realm.heap(), [&realm, on_complete, &fetch_client_settings_object, destination, visited_set](auto result) mutable {
// FIXME: Pass performFetch if given.
fetch_single_module_script(realm, url, fetch_client_settings_object, destination, options, referring_script.settings_object(), referring_script.base_url(), module_request, TopLevelModule::No, [&realm, on_complete = move(on_complete), &fetch_client_settings_object, destination, visited_set](auto result) mutable {
// onSingleFetchComplete given result is the following algorithm:
// 1. If result is null, run onComplete with null, and abort these steps. // 1. If result is null, run onComplete with null, and abort these steps.
if (!result) { if (!result) {
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
// 2. Fetch the descendants of result given fetch client settings object, destination, visited set, and with onComplete. If performFetch was given, pass it along as well. // 2. Fetch the descendants of result given fetch client settings object, destination, visited set, and with onComplete. If performFetch was given, pass it along as well.
// FIXME: Pass performFetch if given. // FIXME: Pass performFetch if given.
auto& module_script = verify_cast<JavaScriptModuleScript>(*result); auto& module_script = verify_cast<JavaScriptModuleScript>(*result);
fetch_descendants_of_a_module_script(realm, module_script, fetch_client_settings_object, destination, visited_set, move(on_complete)); fetch_descendants_of_a_module_script(realm, module_script, fetch_client_settings_object, destination, visited_set, on_complete);
}); });
// 5. Fetch a single module script given url, fetch client settings object, destination, options, referringScript's settings object,
// referringScript's base URL, moduleRequest, false, and onSingleFetchComplete as defined below. If performFetch was given, pass it along as well.
// FIXME: Pass performFetch if given.
fetch_single_module_script(realm, url, fetch_client_settings_object, destination, options, referring_script.settings_object(), referring_script.base_url(), module_request, TopLevelModule::No, on_single_fetch_complete);
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-the-descendants-of-a-module-script // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-the-descendants-of-a-module-script
@ -352,7 +360,7 @@ void fetch_descendants_of_a_module_script(JS::Realm& realm, JavaScriptModuleScri
{ {
// 1. If module script's record is null, run onComplete with module script and return. // 1. If module script's record is null, run onComplete with module script and return.
if (!module_script.record()) { if (!module_script.record()) {
on_complete(&module_script); on_complete->function()(&module_script);
return; return;
} }
@ -362,7 +370,7 @@ void fetch_descendants_of_a_module_script(JS::Realm& realm, JavaScriptModuleScri
// 3. If record is not a Cyclic Module Record, or if record.[[RequestedModules]] is empty, run onComplete with module script and return. // 3. If record is not a Cyclic Module Record, or if record.[[RequestedModules]] is empty, run onComplete with module script and return.
// FIXME: Currently record is always a cyclic module. // FIXME: Currently record is always a cyclic module.
if (record->requested_modules().is_empty()) { if (record->requested_modules().is_empty()) {
on_complete(&module_script); on_complete->function()(&module_script);
return; return;
} }
@ -400,44 +408,43 @@ void fetch_descendants_of_a_module_script(JS::Realm& realm, JavaScriptModuleScri
// 9. If pendingCount is zero, run onComplete with module script. // 9. If pendingCount is zero, run onComplete with module script.
if (pending_count == 0) { if (pending_count == 0) {
on_complete(&module_script); on_complete->function()(&module_script);
return; return;
} }
// 10. Let failed be false. // 10. Let failed be false.
auto context = DescendantFetchingContext::create(); bool failed = false;
context->set_pending_count(pending_count);
context->set_failed(false);
context->set_on_complete(move(on_complete));
// 11. For each moduleRequest in moduleRequests, perform the internal module script graph fetching procedure given moduleRequest, // 11. For each moduleRequest in moduleRequests, perform the internal module script graph fetching procedure given moduleRequest,
// fetch client settings object, destination, options, module script, visited set, and onInternalFetchingComplete as defined below. // fetch client settings object, destination, options, module script, visited set, and onInternalFetchingComplete as defined below.
// If performFetch was given, pass it along as well. // If performFetch was given, pass it along as well.
for (auto const& module_request : module_requests) { for (auto const& module_request : module_requests) {
// FIXME: Pass performFetch if given. // onInternalFetchingComplete given result is the following algorithm:
fetch_internal_module_script_graph(realm, module_request, fetch_client_settings_object, destination, options, module_script, visited_set, [context, &module_script](auto result) mutable { auto on_internal_fetching_complete = create_on_fetch_script_complete(realm.heap(), [failed, pending_count, &module_script, on_complete](auto result) mutable {
// onInternalFetchingComplete given result is the following algorithm:
// 1. If failed is true, then abort these steps. // 1. If failed is true, then abort these steps.
if (context->failed()) if (failed)
return; return;
// 2. If result is null, then set failed to true, run onComplete with null, and abort these steps. // 2. If result is null, then set failed to true, run onComplete with null, and abort these steps.
if (!result) { if (!result) {
context->set_failed(true); failed = true;
context->on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
// 3. Assert: pendingCount is greater than zero. // 3. Assert: pendingCount is greater than zero.
VERIFY(context->pending_count() > 0); VERIFY(pending_count > 0);
// 4. Decrement pendingCount by one. // 4. Decrement pendingCount by one.
context->decrement_pending_count(); --pending_count;
// 5. If pendingCount is zero, run onComplete with module script. // 5. If pendingCount is zero, run onComplete with module script.
if (context->pending_count() == 0) if (pending_count == 0)
context->on_complete(&module_script); on_complete->function()(&module_script);
}); });
// FIXME: Pass performFetch if given.
fetch_internal_module_script_graph(realm, module_request, fetch_client_settings_object, destination, options, module_script, visited_set, on_internal_fetching_complete);
} }
} }
@ -471,13 +478,13 @@ void fetch_single_module_script(JS::Realm& realm,
// 5. If moduleMap[(url, moduleType)] is "fetching", wait in parallel until that entry's value changes, // 5. If moduleMap[(url, moduleType)] is "fetching", wait in parallel until that entry's value changes,
// then queue a task on the networking task source to proceed with running the following steps. // then queue a task on the networking task source to proceed with running the following steps.
if (module_map.is_fetching(url, module_type)) { if (module_map.is_fetching(url, module_type)) {
module_map.wait_for_change(url, module_type, [on_complete = move(on_complete)](auto entry) { module_map.wait_for_change(realm.heap(), url, module_type, [on_complete](auto entry) -> void {
// FIXME: This should queue a task. // FIXME: This should queue a task.
// FIXME: This should run other steps, for now we just assume the script loaded. // FIXME: This should run other steps, for now we just assume the script loaded.
VERIFY(entry.type == ModuleMap::EntryType::ModuleScript); VERIFY(entry.type == ModuleMap::EntryType::ModuleScript);
on_complete(entry.module_script); on_complete->function()(entry.module_script);
}); });
return; return;
@ -486,7 +493,7 @@ void fetch_single_module_script(JS::Realm& realm,
// 6. If moduleMap[(url, moduleType)] exists, run onComplete given moduleMap[(url, moduleType)], and return. // 6. If moduleMap[(url, moduleType)] exists, run onComplete given moduleMap[(url, moduleType)], and return.
auto entry = module_map.get(url, module_type); auto entry = module_map.get(url, module_type);
if (entry.has_value() && entry->type == ModuleMap::EntryType::ModuleScript) { if (entry.has_value() && entry->type == ModuleMap::EntryType::ModuleScript) {
on_complete(entry->module_script); on_complete->function()(entry->module_script);
return; return;
} }
@ -516,14 +523,14 @@ void fetch_single_module_script(JS::Realm& realm,
// In both cases, let processResponseConsumeBody given response response and null, failure, or a byte sequence bodyBytes be the following algorithm: // In both cases, let processResponseConsumeBody given response response and null, failure, or a byte sequence bodyBytes be the following algorithm:
// FIXME: Run performFetch if given. // FIXME: Run performFetch if given.
Web::Fetch::Infrastructure::FetchAlgorithms::Input fetch_algorithms_input {}; Web::Fetch::Infrastructure::FetchAlgorithms::Input fetch_algorithms_input {};
fetch_algorithms_input.process_response_consume_body = [&module_map, url, module_type, &settings_object, on_complete = move(on_complete)](JS::NonnullGCPtr<Fetch::Infrastructure::Response> response, Fetch::Infrastructure::FetchAlgorithms::BodyBytes body_bytes) { fetch_algorithms_input.process_response_consume_body = [&module_map, url, module_type, &settings_object, on_complete](JS::NonnullGCPtr<Fetch::Infrastructure::Response> response, Fetch::Infrastructure::FetchAlgorithms::BodyBytes body_bytes) {
// 1. If either of the following conditions are met: // 1. If either of the following conditions are met:
// - bodyBytes is null or failure; or // - bodyBytes is null or failure; or
// - response's status is not an ok status, // - response's status is not an ok status,
if (body_bytes.has<Empty>() || body_bytes.has<Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag>() || !Fetch::Infrastructure::is_ok_status(response->status())) { if (body_bytes.has<Empty>() || body_bytes.has<Fetch::Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag>() || !Fetch::Infrastructure::is_ok_status(response->status())) {
// then set moduleMap[(url, moduleType)] to null, run onComplete given null, and abort these steps. // then set moduleMap[(url, moduleType)] to null, run onComplete given null, and abort these steps.
module_map.set(url, module_type, { ModuleMap::EntryType::Failed, nullptr }); module_map.set(url, module_type, { ModuleMap::EntryType::Failed, nullptr });
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
@ -551,7 +558,7 @@ void fetch_single_module_script(JS::Realm& realm,
// 10. Set moduleMap[(url, moduleType)] to moduleScript, and run onComplete given moduleScript. // 10. Set moduleMap[(url, moduleType)] to moduleScript, and run onComplete given moduleScript.
module_map.set(url, module_type, { ModuleMap::EntryType::ModuleScript, module_script }); module_map.set(url, module_type, { ModuleMap::EntryType::ModuleScript, module_script });
on_complete(module_script); on_complete->function()(module_script);
}; };
Fetch::Fetching::fetch(realm, request, Fetch::Infrastructure::FetchAlgorithms::create(realm.vm(), move(fetch_algorithms_input))).release_value_but_fixme_should_propagate_errors(); Fetch::Fetching::fetch(realm, request, Fetch::Infrastructure::FetchAlgorithms::create(realm.vm(), move(fetch_algorithms_input))).release_value_but_fixme_should_propagate_errors();
@ -563,11 +570,10 @@ void fetch_external_module_script_graph(JS::Realm& realm, AK::URL const& url, En
// 1. Disallow further import maps given settings object. // 1. Disallow further import maps given settings object.
settings_object.disallow_further_import_maps(); settings_object.disallow_further_import_maps();
// 2. Fetch a single module script given url, settings object, "script", options, settings object, "client", true, and with the following steps given result: auto steps = create_on_fetch_script_complete(realm.heap(), [&realm, &settings_object, on_complete, url](auto result) mutable {
fetch_single_module_script(realm, url, settings_object, Fetch::Infrastructure::Request::Destination::Script, options, settings_object, Web::Fetch::Infrastructure::Request::Referrer::Client, {}, TopLevelModule::Yes, [&realm, &settings_object, on_complete = move(on_complete), url](auto result) mutable {
// 1. If result is null, run onComplete given null, and abort these steps. // 1. If result is null, run onComplete given null, and abort these steps.
if (!result) { if (!result) {
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
@ -577,8 +583,11 @@ void fetch_external_module_script_graph(JS::Realm& realm, AK::URL const& url, En
// 3. Fetch the descendants of and link result given settings object, "script", visited set, and onComplete. // 3. Fetch the descendants of and link result given settings object, "script", visited set, and onComplete.
auto& module_script = verify_cast<JavaScriptModuleScript>(*result); auto& module_script = verify_cast<JavaScriptModuleScript>(*result);
fetch_descendants_of_and_link_a_module_script(realm, module_script, settings_object, Fetch::Infrastructure::Request::Destination::Script, move(visited_set), move(on_complete)); fetch_descendants_of_and_link_a_module_script(realm, module_script, settings_object, Fetch::Infrastructure::Request::Destination::Script, move(visited_set), on_complete);
}); });
// 2. Fetch a single module script given url, settings object, "script", options, settings object, "client", true, and with the following steps given result:
fetch_single_module_script(realm, url, settings_object, Fetch::Infrastructure::Request::Destination::Script, options, settings_object, Web::Fetch::Infrastructure::Request::Referrer::Client, {}, TopLevelModule::Yes, steps);
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-an-inline-module-script-graph // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-an-inline-module-script-graph
@ -592,7 +601,7 @@ void fetch_inline_module_script_graph(JS::Realm& realm, DeprecatedString const&
// 3. If script is null, run onComplete given null, and return. // 3. If script is null, run onComplete given null, and return.
if (!script) { if (!script) {
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
@ -600,20 +609,17 @@ void fetch_inline_module_script_graph(JS::Realm& realm, DeprecatedString const&
HashTable<ModuleLocationTuple> visited_set; HashTable<ModuleLocationTuple> visited_set;
// 5. Fetch the descendants of and link script, given settings object, the destination "script", visited set, and onComplete. // 5. Fetch the descendants of and link script, given settings object, the destination "script", visited set, and onComplete.
fetch_descendants_of_and_link_a_module_script(realm, *script, settings_object, Fetch::Infrastructure::Request::Destination::Script, visited_set, move(on_complete)); fetch_descendants_of_and_link_a_module_script(realm, *script, settings_object, Fetch::Infrastructure::Request::Destination::Script, visited_set, on_complete);
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#fetch-the-descendants-of-and-link-a-module-script // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-the-descendants-of-and-link-a-module-script
void fetch_descendants_of_and_link_a_module_script(JS::Realm& realm, JavaScriptModuleScript& module_script, EnvironmentSettingsObject& fetch_client_settings_object, Fetch::Infrastructure::Request::Destination destination, HashTable<ModuleLocationTuple> const& visited_set, OnFetchScriptComplete on_complete) void fetch_descendants_of_and_link_a_module_script(JS::Realm& realm, JavaScriptModuleScript& module_script, EnvironmentSettingsObject& fetch_client_settings_object, Fetch::Infrastructure::Request::Destination destination, HashTable<ModuleLocationTuple> const& visited_set, OnFetchScriptComplete on_complete)
{ {
// 1. Fetch the descendants of module script, given fetch client settings object, destination, visited set, and onFetchDescendantsComplete as defined below. auto on_fetch_descendants_complete = create_on_fetch_script_complete(realm.heap(), [&fetch_client_settings_object, on_complete](auto result) {
// If performFetch was given, pass it along as well.
// FIXME: Pass performFetch if given.
fetch_descendants_of_a_module_script(realm, module_script, fetch_client_settings_object, destination, visited_set, [&fetch_client_settings_object, on_complete = move(on_complete)](auto result) {
// onFetchDescendantsComplete given result is the following algorithm: // onFetchDescendantsComplete given result is the following algorithm:
// 1. If result is null, then run onComplete given result, and abort these steps. // 1. If result is null, then run onComplete given result, and abort these steps.
if (!result) { if (!result) {
on_complete(nullptr); on_complete->function()(nullptr);
return; return;
} }
@ -639,8 +645,13 @@ void fetch_descendants_of_and_link_a_module_script(JS::Realm& realm, JavaScriptM
} }
// 5. Run onComplete given result. // 5. Run onComplete given result.
on_complete(result); on_complete->function()(result);
}); });
// 1. Fetch the descendants of module script, given fetch client settings object, destination, visited set, and onFetchDescendantsComplete as defined below.
// If performFetch was given, pass it along as well.
// FIXME: Pass performFetch if given.
fetch_descendants_of_a_module_script(realm, module_script, fetch_client_settings_object, destination, visited_set, on_fetch_descendants_complete);
} }
} }

31
Userland/Libraries/LibWeb/HTML/Scripting/Fetching.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, networkException <networkexception@serenityos.org> * Copyright (c) 2022-2023, networkException <networkexception@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -15,7 +15,9 @@
namespace Web::HTML { namespace Web::HTML {
using OnFetchScriptComplete = JS::SafeFunction<void(JS::GCPtr<Script>)>; using OnFetchScriptComplete = JS::NonnullGCPtr<JS::HeapFunction<void(JS::GCPtr<Script>)>>;
OnFetchScriptComplete create_on_fetch_script_complete(JS::Heap& heap, Function<void(JS::GCPtr<Script>)> function);
// https://html.spec.whatwg.org/multipage/webappapis.html#script-fetch-options // https://html.spec.whatwg.org/multipage/webappapis.html#script-fetch-options
struct ScriptFetchOptions { struct ScriptFetchOptions {
@ -41,31 +43,6 @@ struct ScriptFetchOptions {
Fetch::Infrastructure::Request::Priority fetch_priority {}; Fetch::Infrastructure::Request::Priority fetch_priority {};
}; };
class DescendantFetchingContext : public RefCounted<DescendantFetchingContext> {
public:
static NonnullRefPtr<DescendantFetchingContext> create() { return adopt_ref(*new DescendantFetchingContext); }
~DescendantFetchingContext() = default;
size_t pending_count() const { return m_pending_count; }
void set_pending_count(size_t count) { m_pending_count = count; }
void decrement_pending_count() { --m_pending_count; }
bool failed() const { return m_failed; }
void set_failed(bool failed) { m_failed = failed; }
void on_complete(JavaScriptModuleScript* module_script) { m_on_complete(module_script); }
void set_on_complete(OnFetchScriptComplete on_complete) { m_on_complete = move(on_complete); }
private:
DescendantFetchingContext() = default;
size_t m_pending_count { 0 };
bool m_failed { false };
OnFetchScriptComplete m_on_complete;
};
DeprecatedString module_type_from_module_request(JS::ModuleRequest const&); DeprecatedString module_type_from_module_request(JS::ModuleRequest const&);
WebIDL::ExceptionOr<AK::URL> resolve_module_specifier(Optional<Script&> referring_script, DeprecatedString const& specifier); WebIDL::ExceptionOr<AK::URL> resolve_module_specifier(Optional<Script&> referring_script, DeprecatedString const& specifier);
WebIDL::ExceptionOr<Optional<AK::URL>> resolve_imports_match(DeprecatedString const& normalized_specifier, Optional<AK::URL> as_url, ModuleSpecifierMap const&); WebIDL::ExceptionOr<Optional<AK::URL>> resolve_imports_match(DeprecatedString const& normalized_specifier, Optional<AK::URL> as_url, ModuleSpecifierMap const&);

13
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.cpp
View file

@ -11,9 +11,12 @@ namespace Web::HTML {
void ModuleMap::visit_edges(Visitor& visitor) void ModuleMap::visit_edges(Visitor& visitor)
{ {
Base::visit_edges(visitor); Base::visit_edges(visitor);
for (auto& it : m_values) { for (auto& it : m_values)
visitor.visit(it.value.module_script); visitor.visit(it.value.module_script);
}
for (auto const& it : m_callbacks)
for (auto const& callback : it.value)
visitor.visit(callback);
} }
bool ModuleMap::is_fetching(AK::URL const& url, DeprecatedString const& type) const bool ModuleMap::is_fetching(AK::URL const& url, DeprecatedString const& type) const
@ -47,14 +50,14 @@ AK::HashSetResult ModuleMap::set(AK::URL const& url, DeprecatedString const& typ
auto callbacks = m_callbacks.get({ url, type }); auto callbacks = m_callbacks.get({ url, type });
if (callbacks.has_value()) if (callbacks.has_value())
for (auto const& callback : *callbacks) for (auto const& callback : *callbacks)
callback(entry); callback->function()(entry);
return value; return value;
} }
void ModuleMap::wait_for_change(AK::URL const& url, DeprecatedString const& type, Function<void(Entry)> callback) void ModuleMap::wait_for_change(JS::Heap& heap, AK::URL const& url, DeprecatedString const& type, Function<void(Entry)> callback)
{ {
m_callbacks.ensure({ url, type }).append(move(callback)); m_callbacks.ensure({ url, type }).append(JS::create_heap_function(heap, move(callback)));
} }
} }

9
Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, networkException <networkexception@serenityos.org> * Copyright (c) 2022-2023, networkException <networkexception@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,6 +8,7 @@
#include <AK/URL.h> #include <AK/URL.h>
#include <LibJS/Heap/Cell.h> #include <LibJS/Heap/Cell.h>
#include <LibJS/Heap/HeapFunction.h>
#include <LibWeb/HTML/Scripting/ModuleScript.h> #include <LibWeb/HTML/Scripting/ModuleScript.h>
namespace Web::HTML { namespace Web::HTML {
@ -52,6 +53,8 @@ public:
JS::GCPtr<JavaScriptModuleScript> module_script; JS::GCPtr<JavaScriptModuleScript> module_script;
}; };
using CallbackFunction = JS::NonnullGCPtr<JS::HeapFunction<void(Entry)>>;
bool is_fetching(AK::URL const& url, DeprecatedString const& type) const; bool is_fetching(AK::URL const& url, DeprecatedString const& type) const;
bool is_failed(AK::URL const& url, DeprecatedString const& type) const; bool is_failed(AK::URL const& url, DeprecatedString const& type) const;
@ -61,13 +64,13 @@ public:
AK::HashSetResult set(AK::URL const& url, DeprecatedString const& type, Entry); AK::HashSetResult set(AK::URL const& url, DeprecatedString const& type, Entry);
void wait_for_change(AK::URL const& url, DeprecatedString const& type, Function<void(Entry)> callback); void wait_for_change(JS::Heap&, AK::URL const& url, DeprecatedString const& type, Function<void(Entry)> callback);
private: private:
virtual void visit_edges(JS::Cell::Visitor&) override; virtual void visit_edges(JS::Cell::Visitor&) override;
HashMap<ModuleLocationTuple, Entry> m_values; HashMap<ModuleLocationTuple, Entry> m_values;
HashMap<ModuleLocationTuple, Vector<Function<void(Entry)>>> m_callbacks; HashMap<ModuleLocationTuple, Vector<CallbackFunction>> m_callbacks;
}; };
} }