summaryrefslogtreecommitdiff
path: root/runtime/worker.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-12-20 00:34:22 +0100
committerGitHub <noreply@github.com>2020-12-20 00:34:22 +0100
commite924bbdf3606e83ff9eef3a8ed640c4ecc34444f (patch)
tree19847fac129a678c1e5efa5f3495c8414146fa22 /runtime/worker.rs
parent660f75e066226a635375b70225df165bcf759077 (diff)
fix: TLA in web worker (#8809)
Implementors of `deno_core::JsRuntime` might want to do additional actions during each turn of event loop, eg. `deno_runtime::Worker` polls inspector, `deno_runtime::WebWorker` receives/dispatches messages from/to worker host. Previously `JsRuntime::mod_evaluate` was implemented in such fashion that it only polled `JsRuntime`'s event loop. This behavior turned out to be wrong in the example of `WebWorker` which couldn't receive/dispatch messages because its implementation of event loop was never called. This commit rewrites "mod_evaluate" to return a handle to receiver that resolves when module's promise resolves. It is now implementors responsibility to poll event loop after calling `mod_evaluate`.
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 adb525c4c..b01da4553 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;
@@ -211,7 +212,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) {