Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(xhr): recognize Document as a native send body

ldm0793499865736
diff --git a/moli-renderer-v8/src/network_host/xhr/send/request.rs b/moli-renderer-v8/src/network_host/xhr/send/request.rs
index 68fc7348e..10ca609bd 100644
--- a/moli-renderer-v8/src/network_host/xhr/send/request.rs
+++ b/moli-renderer-v8/src/network_host/xhr/send/request.rs
@@ -209,7 +209,8 @@ pub(crate) fn convert_xhr_send_body_from_args<'s>(
return Ok(ConvertedXhrSendBody::Native(body));
}
if let Ok(object) = v8::Local::<v8::Object>::try_from(body)
- && (web_api_interfaces::Blob::is_instance(scope, object)
+ && (web_api_interfaces::Document::is_instance(scope, object)
+ || web_api_interfaces::Blob::is_instance(scope, object)
|| web_api_interfaces::FormData::is_instance(scope, object)
|| web_api_interfaces::URLSearchParams::is_instance(scope, object))
{
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/send_body.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/send_body.rs
index cc567ab62..66220cdf7 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/send_body.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/send_body.rs
@@ -3,7 +3,7 @@ use super::*;
const BODY_CONVERSION_PROBE: &str =
include_str!("../../../../tests/fixtures/xhr-send-body-conversion.js");
-fn assert_body_conversion_result(observed: &str) {
+fn assert_body_conversion_result(observed: &str, expected_checks: usize) {
let result: serde_json::Value = serde_json::from_str(observed).expect("body conversion result");
let checks = result["checks"].as_array().expect("body conversion checks");
let failures: Vec<_> = checks
@@ -14,23 +14,23 @@ fn assert_body_conversion_result(observed: &str) {
failures.is_empty(),
"body conversion failures: {failures:#?}"
);
- assert_eq!(checks.len(), 1451);
+ assert_eq!(checks.len(), expected_checks);
assert_eq!(result["state"], "pass");
}
#[test]
-fn window_xhr_send_body_validates_buffers_before_state_and_method() {
+fn window_xhr_send_body_converts_union_before_state_and_method() {
let mut vm = new_storage_test_vm("https://xhr-body-conversion.test/");
let observed = vm
.eval(&format!(
"{BODY_CONVERSION_PROBE}\nJSON.stringify(xhrSendBodyConversionProbe())"
))
.expect("Window body conversion probe");
- assert_body_conversion_result(&observed);
+ assert_body_conversion_result(&observed, 1751);
}
#[tokio::test(flavor = "current_thread")]
-async fn worker_xhr_send_body_validates_buffers_before_state_and_method() {
+async fn worker_xhr_send_body_converts_union_before_state_and_method() {
let loader = static_http_loader(std::iter::empty::<String>());
let mut vm =
new_page_task_executor_test_vm_with_loader("https://xhr-body-conversion.test/", &loader);
@@ -58,7 +58,7 @@ async fn worker_xhr_send_body_validates_buffers_before_state_and_method() {
let observed = vm
.eval("bodyConversionResult")
.expect("Worker conversion result");
- assert_body_conversion_result(&observed);
+ assert_body_conversion_result(&observed, 1451);
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
diff --git a/moli-renderer-v8/tests/fixtures/xhr-send-body-conversion.js b/moli-renderer-v8/tests/fixtures/xhr-send-body-conversion.js
index 13dbd1652..bcb2e3303 100644
--- a/moli-renderer-v8/tests/fixtures/xhr-send-body-conversion.js
+++ b/moli-renderer-v8/tests/fixtures/xhr-send-body-conversion.js
@@ -73,6 +73,49 @@ function xhrSendBodyConversionProbe() {
['unsent', 'pending', 'done'].includes(phase) ? 'InvalidStateError' : null);
xhr.abort();
}
+ // Document is a separate union member and is only exposed in Window.
+ if (typeof document !== 'undefined') {
+ const documents = [
+ ['html-document', () => document.implementation.createHTMLDocument(), true],
+ ['xml-document', () => document.implementation.createDocument('urn:xhr-body', 'root'), true],
+ ['document-without-prototype', () => Object.setPrototypeOf(
+ document.implementation.createHTMLDocument(), null), true],
+ ['document-prototype', () => Object.create(Document.prototype), false],
+ ['inherited-document', () => Object.create(document), false],
+ ['proxy-document', () => new Proxy(document.implementation.createHTMLDocument(), {}), false],
+ ];
+ for (const phase of ['unsent', 'GET', 'HEAD', 'pending', 'done']) {
+ for (const [kind, create, isDocument] of documents) {
+ for (const hook of ['method', 'getter']) {
+ const label = phase + '/' + kind + '/' + hook;
+ const xhr = new XMLHttpRequest();
+ if (phase === 'pending') { xhr.open('POST', nextDataUrl()); xhr.send(); }
+ else if (phase === 'done') { xhr.open('GET', nextDataUrl(), false); xhr.send(); }
+ else if (phase !== 'unsent') xhr.open(phase, nextDataUrl());
+ const before = [xhr.readyState, xhr.status, xhr.responseText];
+ let events = 0, coerced = 0;
+ for (const type of ['readystatechange', 'loadstart', 'progress', 'load', 'error', 'loadend'])
+ xhr.addEventListener(type, () => events++);
+ const marker = new RangeError('Document coercion');
+ const body = create();
+ const coerce = () => { coerced++; throw marker; };
+ Object.defineProperty(body, Symbol.toPrimitive,
+ hook === 'getter' ? {get: coerce} : {value: coerce});
+ let caught;
+ try { xhr.send(body); } catch (error) { caught = error; }
+ const allowed = isDocument && ['GET', 'HEAD'].includes(phase);
+ check(label + '/error', caught && caught.name || null,
+ isDocument ? (allowed ? null : 'InvalidStateError') : 'RangeError');
+ check(label + '/identity', isDocument ?
+ (allowed ? caught === undefined : caught instanceof DOMException) : caught === marker, true);
+ check(label + '/coercion', coerced, isDocument ? 0 : 1);
+ check(label + '/state', [xhr.readyState, xhr.status, xhr.responseText], before);
+ check(label + '/events', events, allowed ? 1 : 0);
+ xhr.abort();
+ }
+ }
+ }
+ }
const revoked = Proxy.revocable(new XMLHttpRequest(), {}); revoked.revoke();
for (const [index, receiver] of [null, {}, XMLHttpRequest.prototype,
Object.create(XMLHttpRequest.prototype), Object.create(new XMLHttpRequest()),