summaryrefslogtreecommitdiff
path: root/runtime/worker.rs
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2021-03-04 12:19:47 +0000
committerGitHub <noreply@github.com>2021-03-04 13:19:47 +0100
commit0f2121355f65baa27b530ef286c8b4ca0009fabf (patch)
tree646725573df762eb09035dd7533e9d4d40280461 /runtime/worker.rs
parentaf7e02124fbec3cd3b2d17f6fa88682b826e455e (diff)
fix(runtime/web_worker): Don't block self.onmessage with TLA (#9619)
This commit rewrites implementation of "JsRuntime::mod_evaluate". Event loop is no longer polled automatically and users must manually drive event loop forward after calling "mod_evaluate". Co-authored-by: Nayeem Rahman <nayeemrmn99@gmail.com> Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com>
Diffstat (limited to 'runtime/worker.rs')
-rw-r--r--runtime/worker.rs17
1 files changed, 16 insertions, 1 deletions
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 97466fadb..e63fdbe18 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -10,6 +10,7 @@ use crate::permissions::Permissions;
use deno_core::error::AnyError;
use deno_core::futures::future::poll_fn;
use deno_core::futures::future::FutureExt;
+use deno_core::futures::stream::StreamExt;
use deno_core::serde_json;
use deno_core::serde_json::json;
use deno_core::url::Url;
@@ -221,7 +222,21 @@ impl MainWorker {
) -> Result<(), AnyError> {
let id = self.preload_module(module_specifier).await?;
self.wait_for_inspector_session();
- self.js_runtime.mod_evaluate(id).await
+ let mut receiver = self.js_runtime.mod_evaluate(id);
+ tokio::select! {
+ maybe_result = receiver.next() => {
+ debug!("received module evaluate {:#?}", maybe_result);
+ let result = maybe_result.expect("Module evaluation result not provided.");
+ return result;
+ }
+
+ event_loop_result = self.run_event_loop() => {
+ event_loop_result?;
+ let maybe_result = receiver.next().await;
+ let result = maybe_result.expect("Module evaluation result not provided.");
+ return result;
+ }
+ }
}
fn wait_for_inspector_session(&mut self) {