Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

refactor(fetch): derive Response.json initialization dictionary

ldm0e570980d19fb
diff --git a/moli-renderer-v8/src/network_host/fetch_surface.rs b/moli-renderer-v8/src/network_host/fetch_surface.rs
index e2ed92600..3440c8844 100644
--- a/moli-renderer-v8/src/network_host/fetch_surface.rs
+++ b/moli-renderer-v8/src/network_host/fetch_surface.rs
@@ -1,5 +1,5 @@
use super::headers::{build_headers_object, headers_entries, headers_list, mark_headers_immutable};
-use super::response::{ParsedResponseInit, install_response_body_methods, parse_response_init};
+use super::response::{ParsedResponseInit, install_response_body_methods};
use super::*;
use crate::context_bootstrap::readable_stream_disturbed;
pub(in crate::network_host) use crate::util::constructor_prototype;
@@ -568,7 +568,7 @@ struct ResponseRedirectArgs {
struct ResponseJsonArgs<'s> {
#[webidl(required, converter = "raw")]
data: v8::Local<'s, v8::Value>,
- #[webidl(with = response_json_init_arg)]
+ #[webidl(dictionary)]
init: ParsedResponseInit,
}
@@ -739,17 +739,6 @@ fn response_json_body<'s>(
}
}
-fn response_json_init_arg<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: &v8::FunctionCallbackArguments<'s>,
- index: i32,
-) -> Result<ParsedResponseInit, webidl::WebIdlError> {
- if args.length() <= index {
- return Ok(ParsedResponseInit::default());
- }
- parse_response_init(scope, args.get(index))
-}
-
fn build_response_init_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
mut parsed: ParsedResponseInit,
diff --git a/moli-renderer-v8/src/network_host/response.rs b/moli-renderer-v8/src/network_host/response.rs
index 300d9d587..de08736da 100644
--- a/moli-renderer-v8/src/network_host/response.rs
+++ b/moli-renderer-v8/src/network_host/response.rs
@@ -9,8 +9,8 @@ use super::headers::{
};
use super::*;
+pub(in crate::network_host) use self::bindings::ParsedResponseInit;
pub(crate) use self::bindings::response_constructor_callback;
-pub(in crate::network_host) use self::bindings::{ParsedResponseInit, parse_response_init};
pub(super) use self::body_methods::install_response_body_methods;
pub(crate) use self::cors::{
FetchResponseSecurityViolation, cors_preflight_request_headers,
diff --git a/moli-renderer-v8/src/network_host/response/bindings.rs b/moli-renderer-v8/src/network_host/response/bindings.rs
index 02ce2507c..9c9327370 100644
--- a/moli-renderer-v8/src/network_host/response/bindings.rs
+++ b/moli-renderer-v8/src/network_host/response/bindings.rs
@@ -1,6 +1,7 @@
mod init;
-pub(in crate::network_host) use self::init::{ParsedResponseInit, parse_response_init};
+pub(in crate::network_host) use self::init::ParsedResponseInit;
+use self::init::parse_response_init;
use self::init::{install_response_body_stream, install_response_headers, response_body_init};
use super::super::fetch_surface::{RESPONSE_BODY_USED_SLOT, mark_response_object};
use super::*;
diff --git a/moli-renderer-v8/src/network_host/response/bindings/init.rs b/moli-renderer-v8/src/network_host/response/bindings/init.rs
index a85baf229..9e413cd5f 100644
--- a/moli-renderer-v8/src/network_host/response/bindings/init.rs
+++ b/moli-renderer-v8/src/network_host/response/bindings/init.rs
@@ -10,18 +10,12 @@ pub(super) fn response_body_init<'s>(
#[derive(webidl::WebIdlDictionary)]
#[webidl(prefix = "ResponseInit")]
-struct ResponseInitMembers {
- #[webidl(default = 200)]
- status: u16,
- #[webidl(converter = "byte_string", default = "")]
- status_text: String,
- #[webidl(with = response_init_headers_member)]
- headers: Vec<(String, String)>,
-}
-
pub(in crate::network_host) struct ParsedResponseInit {
+ #[webidl(default = 200)]
pub(in crate::network_host) status: u16,
+ #[webidl(converter = "byte_string", default = "")]
pub(in crate::network_host) status_text: String,
+ #[webidl(with = response_init_headers_member)]
pub(in crate::network_host) headers: Vec<(String, String)>,
}
@@ -29,19 +23,12 @@ pub(in crate::network_host) fn parse_response_init<'s>(
scope: &mut v8::PinScope<'s, '_>,
init_arg: v8::Local<'s, v8::Value>,
) -> Result<ParsedResponseInit, webidl::WebIdlError> {
- webidl::parse_dictionary::<ResponseInitMembers>(
+ webidl::parse_dictionary::<ParsedResponseInit>(
scope,
init_arg,
webidl::Context::argument("Response", 2),
)
- .map(|init| {
- init.map(|init| ParsedResponseInit {
- status: init.status,
- status_text: init.status_text,
- headers: init.headers,
- })
- .unwrap_or_default()
- })
+ .map(Option::unwrap_or_default)
}
fn response_init_headers_member<'s>(