diff options
author | Kenneth Myhra <kennethmyhra@gmail.com> | 2022-07-10 18:31:17 +0200 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-07-17 00:23:19 +0100 |
commit | df8c49f6bf1783825764e28854d4b6d52a8b71c1 (patch) | |
tree | 75b5c87c4f5f8ac30cf9dad5e8c3f379047a506b | |
parent | 0153514314eb82ac3751c42d8e4916bcdb2333a4 (diff) | |
download | serenity-df8c49f6bf1783825764e28854d4b6d52a8b71c1.zip |
LibWeb: Introduce Blob
-rw-r--r-- | Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp | 9 | ||||
-rw-r--r-- | Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/main.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h | 3 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/FileAPI/Blob.cpp | 197 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/FileAPI/Blob.h | 58 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/FileAPI/Blob.idl | 23 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/Forward.h | 6 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/idl_files.cmake | 1 |
9 files changed, 299 insertions, 1 deletions
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp index 00de95247a..da61c83a33 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/IDLGenerators.cpp @@ -54,6 +54,8 @@ static bool is_wrappable_type(Type const& type) return true; if (type.name == "URLSearchParams") return true; + if (type.name == "Blob") + return true; return false; } @@ -1973,6 +1975,7 @@ void generate_implementation(IDL::Interface const& interface) using namespace Web::CSS; using namespace Web::DOM; using namespace Web::DOMParsing; +using namespace Web::FileAPI; using namespace Web::Geometry; using namespace Web::HTML; using namespace Web::IntersectionObserver; @@ -2849,6 +2852,8 @@ void generate_constructor_implementation(IDL::Interface const& interface) # include <LibWeb/DOM/@name@.h> #elif __has_include(<LibWeb/Encoding/@name@.h>) # include <LibWeb/Encoding/@name@.h> +#elif __has_include(<LibWeb/FileAPI/@name@.h>) +# include <LibWeb/FileAPI/@name@.h> #elif __has_include(<LibWeb/Geometry/@name@.h>) # include <LibWeb/Geometry/@name@.h> #elif __has_include(<LibWeb/HTML/@name@.h>) @@ -2889,6 +2894,7 @@ void generate_constructor_implementation(IDL::Interface const& interface) using namespace Web::CSS; using namespace Web::DOM; using namespace Web::DOMParsing; +using namespace Web::FileAPI; using namespace Web::Geometry; using namespace Web::HTML; using namespace Web::IntersectionObserver; @@ -3167,6 +3173,7 @@ using namespace Web::Crypto; using namespace Web::CSS; using namespace Web::DOM; using namespace Web::DOMParsing; +using namespace Web::FileAPI; using namespace Web::Geometry; using namespace Web::HTML; using namespace Web::IntersectionObserver; @@ -3617,6 +3624,7 @@ void generate_iterator_implementation(IDL::Interface const& interface) using namespace Web::CSS; using namespace Web::DOM; using namespace Web::DOMParsing; +using namespace Web::FileAPI; using namespace Web::Geometry; using namespace Web::HTML; using namespace Web::IntersectionObserver; @@ -3731,6 +3739,7 @@ void generate_iterator_prototype_implementation(IDL::Interface const& interface) using namespace Web::CSS; using namespace Web::DOM; using namespace Web::DOMParsing; +using namespace Web::FileAPI; using namespace Web::Geometry; using namespace Web::HTML; using namespace Web::IntersectionObserver; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/main.cpp index bd934bf346..03b76a36c7 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/main.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator/main.cpp @@ -85,7 +85,7 @@ int main(int argc, char** argv) auto& interface = IDL::Parser(path, data, import_base_path).parse(); - if (namespace_.is_one_of("Crypto", "CSS", "DOM", "DOMParsing", "Encoding", "HTML", "UIEvents", "Geometry", "HighResolutionTime", "IntersectionObserver", "NavigationTiming", "RequestIdleCallback", "ResizeObserver", "SVG", "Selection", "URL", "WebGL", "WebSockets", "XHR")) { + if (namespace_.is_one_of("Crypto", "CSS", "DOM", "DOMParsing", "Encoding", "FileAPI", "HTML", "UIEvents", "Geometry", "HighResolutionTime", "IntersectionObserver", "NavigationTiming", "RequestIdleCallback", "ResizeObserver", "SVG", "Selection", "URL", "WebGL", "WebSockets", "XHR")) { StringBuilder builder; builder.append(namespace_); builder.append("::"sv); diff --git a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h b/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h index cbde5e5752..c4e39a3433 100644 --- a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h +++ b/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h @@ -15,6 +15,8 @@ #include <LibWeb/Bindings/AbstractRangeConstructor.h> #include <LibWeb/Bindings/AbstractRangePrototype.h> #include <LibWeb/Bindings/AudioConstructor.h> +#include <LibWeb/Bindings/BlobConstructor.h> +#include <LibWeb/Bindings/BlobPrototype.h> #include <LibWeb/Bindings/CDATASectionConstructor.h> #include <LibWeb/Bindings/CDATASectionPrototype.h> #include <LibWeb/Bindings/CSSConditionRuleConstructor.h> @@ -382,6 +384,7 @@ ADD_WINDOW_OBJECT_INTERFACE(AbortController) \ ADD_WINDOW_OBJECT_INTERFACE(AbortSignal) \ ADD_WINDOW_OBJECT_INTERFACE(AbstractRange) \ + ADD_WINDOW_OBJECT_INTERFACE(Blob) \ ADD_WINDOW_OBJECT_INTERFACE(CDATASection) \ ADD_WINDOW_OBJECT_INTERFACE(CSSConditionRule) \ ADD_WINDOW_OBJECT_INTERFACE(CSSFontFaceRule) \ diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index d74b1b66f9..28da303ba3 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -125,6 +125,7 @@ set(SOURCES Fetch/Infrastructure/HTTP/Requests.cpp Fetch/Infrastructure/HTTP/Responses.cpp Fetch/Infrastructure/HTTP/Statuses.cpp + FileAPI/Blob.cpp FontCache.cpp Geometry/DOMRectList.cpp HTML/AttributeNames.cpp diff --git a/Userland/Libraries/LibWeb/FileAPI/Blob.cpp b/Userland/Libraries/LibWeb/FileAPI/Blob.cpp new file mode 100644 index 0000000000..e6c6618490 --- /dev/null +++ b/Userland/Libraries/LibWeb/FileAPI/Blob.cpp @@ -0,0 +1,197 @@ +/* + * Copyright (c) 2022, Kenneth Myhra <kennethmyhra@serenityos.org> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include <AK/StdLibExtras.h> +#include <LibJS/Runtime/ArrayBuffer.h> +#include <LibWeb/Bindings/DOMExceptionWrapper.h> +#include <LibWeb/Bindings/IDLAbstractOperations.h> +#include <LibWeb/FileAPI/Blob.h> + +namespace Web::FileAPI { + +Blob::Blob(ByteBuffer const& byte_buffer, String const& type) + : m_byte_buffer(move(byte_buffer)) + , m_type(move(type)) +{ +} + +// https://w3c.github.io/FileAPI/#ref-for-dom-blob-blob +DOM::ExceptionOr<NonnullRefPtr<Blob>> Blob::create(Optional<Vector<BlobPart>> const& blob_parts, Optional<BlobPropertyBag> const& options) +{ + // 1. If invoked with zero parameters, return a new Blob object consisting of 0 bytes, with size set to 0, and with type set to the empty string. + if (!blob_parts.has_value() && !options.has_value()) + return adopt_ref(*new Blob()); + + ByteBuffer byte_buffer {}; + // 2. Let bytes be the result of processing blob parts given blobParts and options. + if (blob_parts.has_value()) { + byte_buffer = TRY(process_blob_parts(blob_parts.value())); + } + + String type = String::empty(); + // 3. If the type member of the options argument is not the empty string, run the following sub-steps: + if (options.has_value() && !options->type.is_empty()) { + // FIXME: 1. Let t be the type dictionary member. If t contains any characters outside the range U+0020 to U+007E, then set t to the empty string and return from these substeps. + + // 2. Convert every character in t to ASCII lowercase. + type = options->type.to_lowercase(); + } + + // 4. Return a Blob object referring to bytes as its associated byte sequence, with its size set to the length of bytes, and its type set to the value of t from the substeps above. + return adopt_ref(*new Blob(byte_buffer, type)); +} + +DOM::ExceptionOr<NonnullRefPtr<Blob>> Blob::create_with_global_object(Bindings::WindowObject&, Optional<Vector<BlobPart>> const& blob_parts, Optional<BlobPropertyBag> const& options) +{ + return Blob::create(blob_parts, options); +} + +// https://w3c.github.io/FileAPI/#process-blob-parts +DOM::ExceptionOr<ByteBuffer> Blob::process_blob_parts(Vector<BlobPart> const& blob_parts) +{ + // 1. Let bytes be an empty sequence of bytes. + ByteBuffer bytes {}; + + // 2. For each element in parts: + for (auto const& blob_part : blob_parts) { + auto error = blob_part.visit( + // 1. If element is a USVString, run the following sub-steps: + [&](String const& string) -> ErrorOr<void> { + // NOTE: This step is handled by the lambda expression. + // 1. Let s be element. + + // FIXME: 2. If the endings member of options is "native", set s to the result of converting line endings to native of element. + + // NOTE: The AK::String is always UTF-8. + // 3. Append the result of UTF-8 encoding s to bytes. + return bytes.try_append(string.to_byte_buffer()); + }, + // 2. If element is a BufferSource, get a copy of the bytes held by the buffer source, and append those bytes to bytes. + [&](JS::Handle<JS::Object> const& buffer_source) -> ErrorOr<void> { + auto data_buffer = Bindings::IDL::get_buffer_source_copy(*buffer_source.cell()); + if (data_buffer.has_value()) + return bytes.try_append(data_buffer->bytes()); + return {}; + }, + // 3. If element is a Blob, append the bytes it represents to bytes. + [&](NonnullRefPtr<Blob> const& blob) -> ErrorOr<void> { + return bytes.try_append(blob->m_byte_buffer.bytes()); + }); + if (error.is_error()) + return DOM::UnknownError::create("Out of memory. Failed to process blob parts."sv); + } + return bytes; +} + +// https://w3c.github.io/FileAPI/#dfn-slice +DOM::ExceptionOr<NonnullRefPtr<Blob>> Blob::slice(Optional<i64> start, Optional<i64> end, Optional<String> const& content_type) +{ + // 1. The optional start parameter is a value for the start point of a slice() call, and must be treated as a byte-order position, with the zeroth position representing the first byte. + // User agents must process slice() with start normalized according to the following: + i64 relative_start; + if (!start.has_value()) { + // a. If the optional start parameter is not used as a parameter when making this call, let relativeStart be 0. + relative_start = 0; + } else { + auto start_value = start.value(); + // b. If start is negative, let relativeStart be max((size + start), 0). + if (start_value < 0) { + relative_start = max((size() + start_value), 0); + } + // c. Else, let relativeStart be min(start, size). + else { + relative_start = min(start_value, size()); + } + } + + // 2. The optional end parameter is a value for the end point of a slice() call. User agents must process slice() with end normalized according to the following: + i64 relative_end; + if (!end.has_value()) { + // a. If the optional end parameter is not used as a parameter when making this call, let relativeEnd be size. + relative_end = size(); + } else { + auto end_value = end.value(); + // b. If end is negative, let relativeEnd be max((size + end), 0). + if (end_value < 0) { + relative_end = max((size() + end_value), 0); + } + // c Else, let relativeEnd be min(end, size). + else { + relative_end = min(end_value, size()); + } + } + + // 3. The optional contentType parameter is used to set the ASCII-encoded string in lower case representing the media type of the Blob. + // User agents must process the slice() with contentType normalized according to the following: + String relative_content_type; + if (!content_type.has_value()) { + // a. If the contentType parameter is not provided, let relativeContentType be set to the empty string. + relative_content_type = ""; + } else { + // b. Else let relativeContentType be set to contentType and run the substeps below: + + // FIXME: 1. If relativeContentType contains any characters outside the range of U+0020 to U+007E, then set relativeContentType to the empty string and return from these substeps. + + // 2. Convert every character in relativeContentType to ASCII lowercase. + relative_content_type = content_type->to_lowercase(); + } + + // 4. Let span be max((relativeEnd - relativeStart), 0). + auto span = max((relative_end - relative_start), 0); + + // 5. Return a new Blob object S with the following characteristics: + // a. S refers to span consecutive bytes from this, beginning with the byte at byte-order position relativeStart. + // b. S.size = span. + // c. S.type = relativeContentType. + auto byte_buffer_or_error = m_byte_buffer.slice(relative_start, span); + if (byte_buffer_or_error.is_error()) + return DOM::UnknownError::create("Out of memory."sv); + return adopt_ref(*new Blob(byte_buffer_or_error.release_value(), relative_content_type)); +} + +// https://w3c.github.io/FileAPI/#dom-blob-text +JS::Promise* Blob::text() +{ + auto& global_object = wrapper()->global_object(); + + // FIXME: 1. Let stream be the result of calling get stream on this. + // FIXME: 2. Let reader be the result of getting a reader from stream. If that threw an exception, return a new promise rejected with that exception. + + // FIXME: We still need to implement ReadableStream for this step to be fully valid. + // 3. Let promise be the result of reading all bytes from stream with reader + auto* promise = JS::Promise::create(global_object); + auto* result = JS::js_string(global_object.heap(), String { m_byte_buffer.bytes() }); + + // 4. Return the result of transforming promise by a fulfillment handler that returns the result of running UTF-8 decode on its first argument. + promise->fulfill(result); + return promise; +} + +// https://w3c.github.io/FileAPI/#dom-blob-arraybuffer +JS::Promise* Blob::array_buffer() +{ + auto& global_object = wrapper()->global_object(); + + // FIXME: 1. Let stream be the result of calling get stream on this. + // FIXME: 2. Let reader be the result of getting a reader from stream. If that threw an exception, return a new promise rejected with that exception. + + // FIXME: We still need to implement ReadableStream for this step to be fully valid. + // 3. Let promise be the result of reading all bytes from stream with reader. + auto* promise = JS::Promise::create(global_object); + auto buffer_result = JS::ArrayBuffer::create(global_object, m_byte_buffer.size()); + if (buffer_result.is_error()) { + promise->reject(buffer_result.release_error().value().release_value()); + return promise; + } + auto* buffer = buffer_result.release_value(); + buffer->buffer().overwrite(0, m_byte_buffer.data(), m_byte_buffer.size()); + + // 4. Return the result of transforming promise by a fulfillment handler that returns a new ArrayBuffer whose contents are its first argument. + promise->fulfill(buffer); + return promise; +} + +} diff --git a/Userland/Libraries/LibWeb/FileAPI/Blob.h b/Userland/Libraries/LibWeb/FileAPI/Blob.h new file mode 100644 index 0000000000..5498a99ccc --- /dev/null +++ b/Userland/Libraries/LibWeb/FileAPI/Blob.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2022, Kenneth Myhra <kennethmyhra@serenityos.org> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include <AK/NonnullRefPtr.h> +#include <AK/RefCounted.h> +#include <AK/String.h> +#include <AK/Vector.h> +#include <LibWeb/Bindings/BlobWrapper.h> +#include <LibWeb/Bindings/WindowObject.h> +#include <LibWeb/Bindings/Wrappable.h> +#include <LibWeb/DOM/ExceptionOr.h> +#include <LibWeb/Forward.h> +#include <LibWeb/HTML/Window.h> + +namespace Web::FileAPI { + +using BlobPart = Variant<JS::Handle<JS::Object>, NonnullRefPtr<Blob>, String>; + +struct BlobPropertyBag { + String type = String::empty(); + Bindings::EndingType endings; +}; + +class Blob + : public RefCounted<Blob> + , public Weakable<Blob> + , public Bindings::Wrappable { + +public: + using WrapperType = Bindings::BlobWrapper; + + Blob(ByteBuffer const& byte_buffer, String const& type); + + static DOM::ExceptionOr<NonnullRefPtr<Blob>> create(Optional<Vector<BlobPart>> const& blob_parts = {}, Optional<BlobPropertyBag> const& options = {}); + static DOM::ExceptionOr<NonnullRefPtr<Blob>> create_with_global_object(Bindings::WindowObject&, Optional<Vector<BlobPart>> const& blob_parts = {}, Optional<BlobPropertyBag> const& options = {}); + + u64 size() const { return m_byte_buffer.size(); } + String type() const& { return m_type; } + + DOM::ExceptionOr<NonnullRefPtr<Blob>> slice(Optional<i64> start = {}, Optional<i64> end = {}, Optional<String> const& content_type = {}); + + JS::Promise* text(); + JS::Promise* array_buffer(); + +private: + Blob() = default; + static DOM::ExceptionOr<ByteBuffer> process_blob_parts(Vector<BlobPart> const& blob_parts); + + ByteBuffer m_byte_buffer {}; + String m_type {}; +}; + +} diff --git a/Userland/Libraries/LibWeb/FileAPI/Blob.idl b/Userland/Libraries/LibWeb/FileAPI/Blob.idl new file mode 100644 index 0000000000..d002f8cba9 --- /dev/null +++ b/Userland/Libraries/LibWeb/FileAPI/Blob.idl @@ -0,0 +1,23 @@ +[Exposed=(Window,Worker), Serializable] +interface Blob { + constructor(optional sequence<BlobPart> blobParts, optional BlobPropertyBag options = {}); + + readonly attribute unsigned long long size; + readonly attribute DOMString type; + + // slice Blob into byte-ranged chunks + Blob slice(optional long long start, optional long long end, optional DOMString contentType); + + // read from the Blob. + [NewObject] Promise<USVString> text(); + [NewObject] Promise<ArrayBuffer> arrayBuffer(); +}; + +enum EndingType { "transparent", "native" }; + +dictionary BlobPropertyBag { + DOMString type = ""; + EndingType endings = "transparent"; +}; + +typedef (BufferSource or Blob or USVString) BlobPart; diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index 431d31d69e..40a24448bc 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -177,6 +177,10 @@ class Request; class Response; } +namespace Web::FileAPI { +class Blob; +} + namespace Web::Geometry { class DOMPoint; class DOMPointReadOnly; @@ -425,6 +429,7 @@ class AbstractRangeWrapper; class AbortControllerWrapper; class AbortSignalWrapper; class AttributeWrapper; +class BlobWrapper; struct CallbackType; class CanvasGradientWrapper; class CanvasRenderingContext2DWrapper; @@ -623,6 +628,7 @@ class XMLHttpRequestPrototype; class XMLHttpRequestWrapper; class XMLSerializerWrapper; enum class CanPlayTypeResult; +enum class EndingType; enum class DOMParserSupportedType; enum class ResizeObserverBoxOptions; enum class XMLHttpRequestResponseType; diff --git a/Userland/Libraries/LibWeb/idl_files.cmake b/Userland/Libraries/LibWeb/idl_files.cmake index ca6f0c5429..3de3b944e4 100644 --- a/Userland/Libraries/LibWeb/idl_files.cmake +++ b/Userland/Libraries/LibWeb/idl_files.cmake @@ -53,6 +53,7 @@ libweb_js_wrapper(DOM/TreeWalker) libweb_js_wrapper(DOMParsing/XMLSerializer) libweb_js_wrapper(Encoding/TextDecoder) libweb_js_wrapper(Encoding/TextEncoder) +libweb_js_wrapper(FileAPI/Blob) libweb_js_wrapper(Geometry/DOMPoint) libweb_js_wrapper(Geometry/DOMPointReadOnly) libweb_js_wrapper(Geometry/DOMRect) |