Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(streams): use intrinsic cancellation promise chaining

ldm0bb6df040496a
diff --git a/moli-renderer-v8/src/context_bootstrap/stream_adapter.rs b/moli-renderer-v8/src/context_bootstrap/stream_adapter.rs
index ad4e9eb88..0b188dc69 100644
--- a/moli-renderer-v8/src/context_bootstrap/stream_adapter.rs
+++ b/moli-renderer-v8/src/context_bootstrap/stream_adapter.rs
@@ -112,8 +112,8 @@ pub(super) use readable_state::{
};
pub(in crate::context_bootstrap::stream_adapter) use transform_finish::transform_stream_readable_cancel_callback;
pub(super) use utils::{
- done_result, promise_then_undefined, reject_pending_read, rejected_promise_value,
- resolved_promise_value, set_resolved_promise, suppress_pending_read_unhandled_rejection,
+ done_result, reject_pending_read, rejected_promise_value, resolved_promise_value,
+ set_resolved_promise, suppress_pending_read_unhandled_rejection,
suppress_promise_unhandled_rejection, value_buffer_source_bytes,
};
pub(in crate::context_bootstrap) use writable::register_writable_stream_pipe_owner;
diff --git a/moli-renderer-v8/src/context_bootstrap/stream_adapter/readable.rs b/moli-renderer-v8/src/context_bootstrap/stream_adapter/readable.rs
index 661e92fa4..c39c83d08 100644
--- a/moli-renderer-v8/src/context_bootstrap/stream_adapter/readable.rs
+++ b/moli-renderer-v8/src/context_bootstrap/stream_adapter/readable.rs
@@ -427,8 +427,11 @@ pub(crate) fn cancel_readable_stream<'s>(
Ok(result) => result.unwrap_or_else(|| v8::undefined(scope).into()),
Err(error) => return rejected_promise_value(scope, error),
};
- if let Some(promise) = promise_then_undefined(scope, result) {
- return Some(promise);
+ if let Ok(promise) = v8::Local::<v8::Promise>::try_from(result) {
+ let on_fulfilled =
+ v8::Function::builder(super::utils::promise_return_undefined_callback)
+ .build(scope)?;
+ return promise.then(scope, on_fulfilled).map(Into::into);
}
}
resolved_promise_value(scope, v8::undefined(scope).into())
diff --git a/moli-renderer-v8/src/context_bootstrap/stream_adapter/utils.rs b/moli-renderer-v8/src/context_bootstrap/stream_adapter/utils.rs
index bd2634eac..6fa809b46 100644
--- a/moli-renderer-v8/src/context_bootstrap/stream_adapter/utils.rs
+++ b/moli-renderer-v8/src/context_bootstrap/stream_adapter/utils.rs
@@ -469,20 +469,6 @@ pub(in crate::context_bootstrap) fn rejected_promise_value<'s>(
Some(promise.into())
}
-pub(in crate::context_bootstrap) fn promise_then_undefined<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- promise: v8::Local<'s, v8::Value>,
-) -> Option<v8::Local<'s, v8::Value>> {
- let promise_object = v8::Local::<v8::Object>::try_from(promise).ok()?;
- let then = promise_object
- .get(scope, v8str(scope, "then").into())
- .and_then(|value| v8::Local::<v8::Function>::try_from(value).ok())?;
- let on_fulfilled = v8::Function::builder(promise_return_undefined_callback)
- .length(0)
- .build(scope)?;
- then.call(scope, promise, &[on_fulfilled.into()])
-}
-
pub(in crate::context_bootstrap) fn promise_return_undefined_callback<'s>(
_scope: &mut v8::PinScope<'s, '_>,
_args: v8::FunctionCallbackArguments<'s>,
diff --git a/moli-renderer-v8/src/script_vm/tests/streams.rs b/moli-renderer-v8/src/script_vm/tests/streams.rs
index 5364e51d8..04e9d63ac 100644
--- a/moli-renderer-v8/src/script_vm/tests/streams.rs
+++ b/moli-renderer-v8/src/script_vm/tests/streams.rs
@@ -5461,3 +5461,46 @@ fn readable_stream_pipe_options_getter_errors_keep_entrypoint_semantics_and_orde
r#"["pipeThrough:preventAbort:threw:preventAbort:preventAbort","pipeThrough:preventCancel:threw:preventCancel:preventAbort,preventCancel","pipeThrough:preventClose:threw:preventClose:preventAbort,preventCancel,preventClose","pipeThrough:signal:threw:signal:preventAbort,preventCancel,preventClose,signal","pipeTo:preventAbort:rejected:preventAbort:preventAbort","pipeTo:preventAbort:returned:true","pipeTo:preventCancel:rejected:preventCancel:preventAbort,preventCancel","pipeTo:preventCancel:returned:true","pipeTo:preventClose:rejected:preventClose:preventAbort,preventCancel,preventClose","pipeTo:preventClose:returned:true","pipeTo:signal:rejected:signal:preventAbort,preventCancel,preventClose,signal","pipeTo:signal:returned:true"]"#
);
}
+
+#[test]
+fn readable_cancel_uses_intrinsic_promise_chaining() {
+ let mut vm = new_storage_test_vm("https://shared-binding-regression.test/");
+ vm.eval(
+ r#"
+ globalThis.cancelResults = [];
+ globalThis.cancelThenReads = 0;
+ const reason = new Error('cancel reason');
+ const streams = [
+ new ReadableStream({cancel() { return 'ignored'; }}),
+ new ReadableStream({cancel() { throw reason; }})
+ ];
+ const descriptor = Object.getOwnPropertyDescriptor(Promise.prototype, 'then');
+ try {
+ Object.defineProperty(Promise.prototype, 'then', {configurable: true, get() {
+ cancelThenReads++;
+ throw new Error('internal chaining must not read public then');
+ }});
+ for (const stream of streams) {
+ const result = stream.cancel(reason);
+ descriptor.value.call(result,
+ value => cancelResults.push(value === undefined),
+ error => cancelResults.push(error === reason)
+ );
+ }
+ } finally {
+ Object.defineProperty(Promise.prototype, 'then', descriptor);
+ }
+ "#,
+ )
+ .unwrap();
+ for _ in 0..8 {
+ if vm.eval("cancelResults.length === 2").unwrap() == "true" {
+ break;
+ }
+ }
+ assert_eq!(
+ vm.eval("JSON.stringify([cancelThenReads, cancelResults])")
+ .unwrap(),
+ "[0,[true,true]]"
+ );
+}
diff --git a/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs b/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs
index 639b49269..86cfa36ca 100644
--- a/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs
+++ b/moli-renderer-v8/src/webidl_callback_source_boundary_tests.rs
@@ -116,7 +116,8 @@ const DIRECT_V8_CALL_ALLOWLIST: &[AllowedDirectCallFile] = &[
),
allowed(
"context_bootstrap/stream_adapter/utils.rs",
- 9,
+ // Cancellation continuations now use the native Promise API.
+ 8,
DirectCallOwner::BrowserAlgorithm,
),
allowed(