LibWeb: Add basic Navigator send beacon support
This commit is contained in:
parent
d262670729
commit
9939b028c6
Notes:
sideshowbarker
2024-07-17 08:25:15 +09:00
Author: https://github.com/bplaat Commit: https://github.com/SerenityOS/serenity/commit/9939b028c6 Pull-request: https://github.com/SerenityOS/serenity/pull/21032 Reviewed-by: https://github.com/ADKaster ✅
9 changed files with 156 additions and 0 deletions
|
@ -129,6 +129,7 @@ source_set("HTML") {
|
|||
"NavigationHistoryEntry.cpp",
|
||||
"NavigationTransition.cpp",
|
||||
"Navigator.cpp",
|
||||
"NavigatorBeacon.cpp",
|
||||
"NavigatorID.cpp",
|
||||
"Numbers.cpp",
|
||||
"PageTransitionEvent.cpp",
|
||||
|
|
3
Tests/LibWeb/Text/expected/HTML/navigator-beacon.txt
Normal file
3
Tests/LibWeb/Text/expected/HTML/navigator-beacon.txt
Normal file
|
@ -0,0 +1,3 @@
|
|||
1. true
|
||||
2. Exception: TypeError
|
||||
3. Exception: TypeError
|
23
Tests/LibWeb/Text/input/HTML/navigator-beacon.html
Normal file
23
Tests/LibWeb/Text/input/HTML/navigator-beacon.html
Normal file
|
@ -0,0 +1,23 @@
|
|||
<script src="../include.js"></script>
|
||||
<script>
|
||||
test(() => {
|
||||
let testCounter = 1;
|
||||
function testPart(part) {
|
||||
try {
|
||||
println(`${testCounter}. ${JSON.stringify(part())}`);
|
||||
} catch (e) {
|
||||
println(`${testCounter}. Exception: ${e.name}`);
|
||||
}
|
||||
testCounter++;
|
||||
}
|
||||
|
||||
// 1. Send beacon
|
||||
testPart(() => navigator.sendBeacon('https://example.com/') == true);
|
||||
|
||||
// 2. Send beacon with wrong URL
|
||||
testPart(() => navigator.sendBeacon('dsfhdsaklfhdasklf'));
|
||||
|
||||
// 3. Send beacon with wrong scheme
|
||||
testPart(() => navigator.sendBeacon('wss://example.com/'));
|
||||
});
|
||||
</script>
|
|
@ -361,6 +361,7 @@ set(SOURCES
|
|||
HTML/NavigationHistoryEntry.cpp
|
||||
HTML/NavigationTransition.cpp
|
||||
HTML/Navigator.cpp
|
||||
HTML/NavigatorBeacon.cpp
|
||||
HTML/NavigatorID.cpp
|
||||
HTML/Numbers.cpp
|
||||
HTML/PageTransitionEvent.cpp
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include <LibWeb/Bindings/PlatformObject.h>
|
||||
#include <LibWeb/HTML/MimeTypeArray.h>
|
||||
#include <LibWeb/HTML/NavigatorBeacon.h>
|
||||
#include <LibWeb/HTML/NavigatorConcurrentHardware.h>
|
||||
#include <LibWeb/HTML/NavigatorID.h>
|
||||
#include <LibWeb/HTML/NavigatorLanguage.h>
|
||||
|
@ -17,6 +18,7 @@
|
|||
namespace Web::HTML {
|
||||
|
||||
class Navigator : public Bindings::PlatformObject
|
||||
, public NavigatorBeaconMixin
|
||||
, public NavigatorConcurrentHardwareMixin
|
||||
, public NavigatorIDMixin
|
||||
, public NavigatorLanguageMixin
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#import <HTML/MimeTypeArray.idl>
|
||||
#import <HTML/NavigatorBeacon.idl>
|
||||
#import <HTML/NavigatorID.idl>
|
||||
#import <HTML/NavigatorLanguage.idl>
|
||||
#import <HTML/NavigatorOnLine.idl>
|
||||
|
@ -38,6 +39,7 @@ interface mixin NavigatorAutomationInformation {
|
|||
readonly attribute boolean webdriver;
|
||||
};
|
||||
|
||||
Navigator includes NavigatorBeacon;
|
||||
Navigator includes NavigatorID;
|
||||
Navigator includes NavigatorLanguage;
|
||||
Navigator includes NavigatorOnLine;
|
||||
|
|
92
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.cpp
Normal file
92
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.cpp
Normal file
|
@ -0,0 +1,92 @@
|
|||
/*
|
||||
* Copyright (c) 2023, Bastiaan van der Plaat <bastiaan.v.d.plaat@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibWeb/DOM/Document.h>
|
||||
#include <LibWeb/Fetch/Fetching/Fetching.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/FetchAlgorithms.h>
|
||||
#include <LibWeb/HTML/Navigator.h>
|
||||
#include <LibWeb/HTML/NavigatorBeacon.h>
|
||||
#include <LibWeb/HTML/Scripting/Environments.h>
|
||||
#include <LibWeb/HTML/Window.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
||||
// https://w3c.github.io/beacon/#sendbeacon-method
|
||||
WebIDL::ExceptionOr<bool> NavigatorBeaconMixin::send_beacon(String const& url, Optional<Fetch::BodyInit> const& data)
|
||||
{
|
||||
auto& navigator = verify_cast<Navigator>(*this);
|
||||
auto& realm = navigator.realm();
|
||||
auto& vm = realm.vm();
|
||||
auto& relevant_settings_object = HTML::relevant_settings_object(navigator);
|
||||
|
||||
// 1. Set base to this's relevant settings object's API base URL.
|
||||
auto base_url = relevant_settings_object.api_base_url();
|
||||
|
||||
// 2. Set origin to this's relevant settings object's origin.
|
||||
auto origin = relevant_settings_object.origin();
|
||||
|
||||
// 3. Set parsedUrl to the result of the URL parser steps with url and base. If the algorithm returns an error, or if parsedUrl's scheme is not "http" or "https", throw a "TypeError" exception and terminate these steps.
|
||||
auto parsed_url = URLParser::basic_parse(url, base_url);
|
||||
if (!parsed_url.is_valid())
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, MUST(String::formatted("Beacon URL {} is invalid.", url)) };
|
||||
if (parsed_url.scheme() != "http" && parsed_url.scheme() != "https")
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, MUST(String::formatted("Beacon URL {} must be either http:// or https://.", url)) };
|
||||
|
||||
// 4. Let headerList be an empty list.
|
||||
auto header_list = Fetch::Infrastructure::HeaderList::create(vm);
|
||||
|
||||
// 5. Let corsMode be "no-cors".
|
||||
auto cors_mode = Fetch::Infrastructure::Request::Mode::NoCORS;
|
||||
|
||||
// 6. If data is not null:
|
||||
Optional<JS::NonnullGCPtr<Fetch::Infrastructure::Body>> transmitted_data;
|
||||
if (data.has_value()) {
|
||||
// 6.1 Set transmittedData and contentType to the result of extracting data's byte stream with the keepalive flag set.
|
||||
auto body_with_type = TRY(Fetch::extract_body(realm, data.value(), true));
|
||||
transmitted_data = body_with_type.body;
|
||||
auto& content_type = body_with_type.type;
|
||||
|
||||
// 6.2 If the amount of data that can be queued to be sent by keepalive enabled requests is exceeded by the size of transmittedData (as defined in HTTP-network-or-cache fetch), set the return value to false and terminate these steps.
|
||||
// FIXME: We don't have a size limit in Fetching::fetch
|
||||
|
||||
// 6.3 If contentType is not null:
|
||||
if (content_type.has_value()) {
|
||||
// Set corsMode to "cors".
|
||||
cors_mode = Fetch::Infrastructure::Request::Mode::CORS;
|
||||
|
||||
// If contentType value is a CORS-safelisted request-header value for the Content-Type header, set corsMode to "no-cors".
|
||||
auto content_type_header = MUST(Fetch::Infrastructure::Header::from_string_pair("Content-Type"sv, content_type.value()));
|
||||
if (Fetch::Infrastructure::is_cors_safelisted_request_header(content_type_header))
|
||||
cors_mode = Fetch::Infrastructure::Request::Mode::NoCORS;
|
||||
|
||||
// Append a Content-Type header with value contentType to headerList.
|
||||
MUST(header_list->append(content_type_header));
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: 7. Set the return value to true, return the sendBeacon() call, and continue to run the following steps in parallel:
|
||||
|
||||
// 7.1 Let req be a new request, initialized as follows:
|
||||
auto req = Fetch::Infrastructure::Request::create(vm);
|
||||
req->set_method(MUST(ByteBuffer::copy("POST"sv.bytes()))); // method: POST
|
||||
req->set_client(&relevant_settings_object); // client: this's relevant settings object
|
||||
req->set_url_list({ parsed_url }); // url: parsedUrl
|
||||
req->set_header_list(header_list); // header list: headerList
|
||||
req->set_origin(origin); // origin: origin
|
||||
req->set_keepalive(true); // keepalive: true
|
||||
if (transmitted_data.has_value())
|
||||
req->set_body(transmitted_data.value()); // body: transmittedData
|
||||
req->set_mode(cors_mode); // mode: corsMode
|
||||
req->set_credentials_mode(Fetch::Infrastructure::Request::CredentialsMode::Include); // credentials mode: include
|
||||
req->set_initiator_type(Fetch::Infrastructure::Request::InitiatorType::Beacon); // initiator type: "beacon"
|
||||
|
||||
// 7.2 Fetch req.
|
||||
(void)Fetch::Fetching::fetch(realm, req, Fetch::Infrastructure::FetchAlgorithms::create(vm, {}));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
25
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.h
Normal file
25
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.h
Normal file
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Copyright (c) 2023, Bastiaan van der Plaat <bastiaan.v.d.plaat@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibWeb/Fetch/BodyInit.h>
|
||||
#include <LibWeb/HTML/Navigator.h>
|
||||
#include <LibWeb/WebIDL/ExceptionOr.h>
|
||||
|
||||
namespace Web::HTML {
|
||||
|
||||
class NavigatorBeaconMixin {
|
||||
public:
|
||||
WebIDL::ExceptionOr<bool> send_beacon(String const& url, Optional<Fetch::BodyInit> const& data = {});
|
||||
|
||||
private:
|
||||
virtual ~NavigatorBeaconMixin() = default;
|
||||
|
||||
friend class Navigator;
|
||||
};
|
||||
|
||||
}
|
7
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.idl
Normal file
7
Userland/Libraries/LibWeb/HTML/NavigatorBeacon.idl
Normal file
|
@ -0,0 +1,7 @@
|
|||
#import <Fetch/BodyInit.idl>
|
||||
|
||||
// https://w3c.github.io/beacon/#sendbeacon-method
|
||||
// FIXME: This is a partial interface not an interface mixin
|
||||
interface mixin NavigatorBeacon {
|
||||
boolean sendBeacon(USVString url, optional BodyInit? data = null);
|
||||
};
|
Loading…
Add table
Reference in a new issue