Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(file-api): remove the initial UTF-8 BOM from Blob.text

ldm0e6cd316c2771
diff --git a/moli-renderer-v8/src/blob.rs b/moli-renderer-v8/src/blob.rs
index b1f03ce8b..f55a9e400 100644
--- a/moli-renderer-v8/src/blob.rs
+++ b/moli-renderer-v8/src/blob.rs
@@ -134,9 +134,8 @@ pub(super) fn blob_text_callback<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let text = blob_bytes_from_object(scope, args.this())
- .map(|bytes| String::from_utf8_lossy(&bytes).into_owned())
- .unwrap_or_default();
+ let bytes = blob_bytes_from_object(scope, args.this()).unwrap_or_default();
+ let text = moli_encoding::decode_utf8(&bytes);
let Some(value) = v8_string(scope, &text) else {
rv.set(v8::undefined(scope).into());
return;
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/blob_text.rs b/moli-renderer-v8/src/runtime/page_vm/tests/blob_text.rs
new file mode 100644
index 000000000..aeb36ba86
--- /dev/null
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/blob_text.rs
@@ -0,0 +1,60 @@
+use super::*;
+
+#[tokio::test(flavor = "current_thread")]
+async fn blob_text_decodes_utf8_and_removes_only_the_initial_utf8_bom() {
+ run_blob_fixture(
+ include_str!("../../../../tests/fixtures/blob-text-utf8.js"),
+ "JSON.stringify(__blobTextProgress)",
+ "https://blob-text-utf8.test/",
+ 240,
+ )
+ .await;
+}
+
+async fn run_blob_fixture(
+ fixture: &'static str,
+ progress_expression: &'static str,
+ url: &'static str,
+ expected_checks: usize,
+) {
+ run_page_vm_async_test(async move {
+ let loader =
+ crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader");
+ let (mut page, _resource_source, _owner_wake) =
+ page_vm_with_bound_task_sources_and_owner_wake(&loader, Url::parse(url)?);
+ page.vm_mut().eval(fixture)?;
+ let deadline = Instant::now() + Duration::from_secs(20);
+ while page.vm_mut().eval("typeof __uiEventResults")? == "undefined" {
+ let _ = page
+ .run_next_child_frame_task_source_for_semantic_test()
+ .await;
+ for selector in [
+ PageSelectedTaskTestSelector::ResourceCompletion,
+ PageSelectedTaskTestSelector::WorkerHostBridge,
+ PageSelectedTaskTestSelector::DedicatedWorkerClientEvent,
+ ] {
+ let _ = page
+ .run_exact_selected_page_task_for_test(selector, &loader)
+ .await?;
+ }
+ anyhow::ensure!(
+ Instant::now() < deadline,
+ "Blob fixture did not finish: {}",
+ page.vm_mut().eval(progress_expression)?
+ );
+ tokio::time::sleep(Duration::from_millis(1)).await;
+ }
+ let facts: serde_json::Value =
+ serde_json::from_str(&page.vm_mut().eval("JSON.stringify(__uiEventResults)")?)?;
+ let checks = facts["checks"].as_array().unwrap();
+ let failures = checks
+ .iter()
+ .filter(|check| check["passed"] != true)
+ .collect::<Vec<_>>();
+ assert!(failures.is_empty(), "{failures:#?}");
+ assert_eq!(checks.len(), expected_checks);
+ Ok::<_, anyhow::Error>(())
+ })
+ .await
+ .expect("Blob fixture should preserve all specified checks");
+}
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
index 8dac9e8b8..56d32a2f3 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
@@ -2258,3 +2258,5 @@ pub(super) async fn drain_page_work_until_no_pending_subresources(
)
}
mod extracted;
+
+mod blob_text;
diff --git a/moli-renderer-v8/tests/fixtures/blob-text-utf8.js b/moli-renderer-v8/tests/fixtures/blob-text-utf8.js
new file mode 100644
index 000000000..723ec14b2
--- /dev/null
+++ b/moli-renderer-v8/tests/fixtures/blob-text-utf8.js
@@ -0,0 +1,34 @@
+(async () => {
+ const checks = [];
+ globalThis.__blobTextProgress = {stage: 'setup', checks};
+ async function runMatrix(owner, callee, prefix, checks) {
+ const cases = [
+ ['empty', [], ''], ['BOM only', [239,187,191], ''],
+ ['leading BOM', [239,187,191,65], 'A'],
+ ['repeated BOM', [239,187,191,239,187,191,65], '\uFEFFA'],
+ ['embedded BOM', [65,239,187,191], 'A\uFEFF'],
+ ['incomplete BOM', [239,187], '\uFFFD'],
+ ['UTF-16LE BOM is not sniffed', [255,254,65,0], '\uFFFD\uFFFDA\u0000'],
+ ['invalid UTF-8', [192,128,245,65], '\uFFFD\uFFFD\uFFFDA']
+ ];
+ for (const kind of ['Blob','File']) for (const type of ['', 'text/plain;charset=utf-16le', 'application/octet-stream']) {
+ for (const [name, bytes, expected] of cases) {
+ const source = kind === 'Blob' ? new owner.Blob([new owner.Uint8Array(bytes)], {type})
+ : new owner.File([new owner.Uint8Array(bytes)], 'text', {type});
+ const actual = await callee.Blob.prototype.text.call(source);
+ checks.push({name: `${prefix}/${kind}/${type}/${name}`, passed: actual === expected, detail: {actual, expected}});
+ }
+ }
+ }
+ const frame = document.createElement('iframe'); document.body.appendChild(frame);
+ const realms = [['top', window], ['child', frame.contentWindow]];
+ for (const [ownerName, owner] of realms) for (const [calleeName, callee] of realms) {
+ await runMatrix(owner, callee, `${ownerName}/${calleeName}`, checks);
+ }
+ const body = async runMatrix => {const checks=[];await runMatrix(globalThis,globalThis,'worker',checks);postMessage(checks);close();};
+ const url=URL.createObjectURL(new Blob([`(${body})(${runMatrix})`],{type:'text/javascript'}));
+ const worker=new Worker(url);
+ try {checks.push(...await new Promise((resolve,reject)=>{worker.onmessage=e=>resolve(e.data);worker.onerror=e=>reject(Error(e.message));}));}
+ finally {worker.terminate(); URL.revokeObjectURL(url); frame.remove();}
+ globalThis.__uiEventResults={checks};
+})().catch(error=>{const checks=__blobTextProgress.checks;checks.push({name:'fixture completion',passed:false,detail:String(error.stack||error)});globalThis.__uiEventResults={checks};});