Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(fetch): share Body MIME extraction
ldm0bc215b9fa88e
diff --git a/moli-renderer-v8/src/network_host/response/body_methods.rs b/moli-renderer-v8/src/network_host/response/body_methods.rsindex 436ca5b01..0807d8aa0 100644--- a/moli-renderer-v8/src/network_host/response/body_methods.rs+++ b/moli-renderer-v8/src/network_host/response/body_methods.rs@@ -7,7 +7,6 @@ use super::super::fetch_surface::{use super::*;use moli_web_mime::{extract_response_mime_type, is_form_urlencoded_mime, multipart_form_data_boundary,- response_content_type,};use self::binary::{@@ -54,7 +53,7 @@ fn response_form_data_callback<'s>(return;};- let content_type = body_content_type(scope, &consumption);+ let content_type = body_mime_type(scope, &consumption);let multipart_boundary = multipart_form_data_boundary(&content_type);if !is_urlencoded_content_type(&content_type)&& multipart_boundary.is_none()@@ -162,16 +161,6 @@ fn reject_body_form_data<'s>(reject_body_type_error(scope, resolver, message);}-fn body_content_type<'s>(- scope: &mut v8::PinScope<'s, '_>,- consumption: &BodyConsumptionPromise<'s>,-) -> String {- body_headers(scope, consumption.object, consumption.receiver)- .as_deref()- .and_then(response_content_type)- .unwrap_or_default()-}-fn body_headers<'s>(scope: &mut v8::PinScope<'s, '_>,object: v8::Local<'s, v8::Object>,@@ -192,7 +181,7 @@ fn is_urlencoded_content_type(content_type: &str) -> bool {is_form_urlencoded_mime(content_type)}-fn response_blob_mime_type_from_object<'s>(+fn body_mime_type<'s>(scope: &mut v8::PinScope<'s, '_>,consumption: &BodyConsumptionPromise<'s>,) -> String {diff --git a/moli-renderer-v8/src/network_host/response/body_methods/binary.rs b/moli-renderer-v8/src/network_host/response/body_methods/binary.rsindex d00551d21..d12b2e2a5 100644--- a/moli-renderer-v8/src/network_host/response/body_methods/binary.rs+++ b/moli-renderer-v8/src/network_host/response/body_methods/binary.rs@@ -24,7 +24,7 @@ pub(super) fn response_blob_callback<'s>(let Some(consumption) = begin_body_consumption_promise(scope, &args, &mut rv) else {return;};- let mime_type = response_blob_mime_type_from_object(scope, &consumption);+ let mime_type = body_mime_type(scope, &consumption);finish_body_consumption(scope,&mut rv,diff --git a/moli-renderer-v8/src/script_vm/tests/body_mime_consolidation.rs b/moli-renderer-v8/src/script_vm/tests/body_mime_consolidation.rsnew file mode 100644index 000000000..01552c73e--- /dev/null+++ b/moli-renderer-v8/src/script_vm/tests/body_mime_consolidation.rs@@ -0,0 +1,65 @@+use super::*;++#[tokio::test(flavor = "current_thread")]+async fn body_methods_share_mime_extraction_in_windows_and_workers() {+ let loader = static_http_loader(std::iter::empty::<String>());+ let mut vm = new_page_task_executor_test_vm_with_loader(+ "https://body-mime-consolidation.test/",+ &loader,+ );+ let probe = r#"(async () => {+ for (const C of [Request, Response]) {+ const create = (headers, body = 'a=1') => C === Request+ ? new C('https://body-mime.test/', {method:'POST',body,headers})+ : new C(body, {headers});+ const headers=[['Content-Type','text/plain'],['Content-Type','application/x-www-form-urlencoded; charset=UTF-8']];+ const form=await create(headers).formData();+ if(form.get('a')!=='1')throw Error('duplicate MIME extraction '+C.name);+ const blob=await create(headers).blob();+ if(blob.type!=='application/x-www-form-urlencoded;charset=UTF-8')throw Error('shared Blob extraction '+blob.type);+ const multipart=[['Content-Type','text/plain'],['Content-Type','multipart/form-data; boundary=AaB']];+ const bytes='--AaB\r\nContent-Disposition: form-data; name="field"\r\n\r\nvalue\r\n--AaB--\r\n';+ if((await create(multipart,bytes).formData()).get('field')!=='value')throw Error('multipart boundary case');+ const malformed=[['Content-Type','application/x-www-form-urlencoded'],['Content-Type','not-a-mime']];+ if((await create(malformed).formData()).get('a')!=='1')throw Error('invalid later MIME masks valid entry');+ let caught;try{await create({'Content-Type':'text/plain'}).formData();}catch(error){caught=error;}+ if(!(caught instanceof TypeError))throw Error('unsupported MIME');+ }+ return 'ok';+ })()"#;+ for worker in [false, true] {+ vm.eval("globalThis.bodyMimeConsolidation = null;").unwrap();+ let script = if worker {+ let source =+ format!("({probe}).then(postMessage, error => postMessage(String(error)));");+ format!(+ r#"(() => {{+ const url=URL.createObjectURL(new Blob([{}], {{type:'text/javascript'}}));+ const worker=new Worker(url);+ const finish=value=>{{bodyMimeConsolidation=value;worker.terminate();URL.revokeObjectURL(url);}};+ worker.onmessage=event=>finish(event.data);+ worker.onerror=event=>{{finish(event.message);event.preventDefault();}};+ }})()"#,+ serde_json::to_string(&source).unwrap()+ )+ } else {+ format!(+ "({probe}).then(value => bodyMimeConsolidation=value, error=>bodyMimeConsolidation=String(error));"+ )+ };+ vm.eval(&script).unwrap();+ advance_page_task_executor_until_eval_equals(+ &mut vm,+ &loader,+ "String(bodyMimeConsolidation !== null)",+ "true",+ "shared Body MIME",+ )+ .await;+ assert_eq!(+ vm.eval("bodyMimeConsolidation").unwrap(),+ "ok",+ "worker={worker}"+ );+ }+}diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rsindex 41c466c2d..002c3d987 100644--- a/moli-renderer-v8/src/script_vm/tests/mod.rs+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs@@ -2191,6 +2191,7 @@ mod extracted;mod navigation_timing_inheritance;mod payment_response_interfaces;+mod body_mime_consolidation;mod response_blob_mime;mod intersection_target_order;