diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-10-14 14:04:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-14 14:04:09 +0200 |
commit | 135053486c4bd112ebd7d0b25c94a8dd346472e6 (patch) | |
tree | 24eae514d8de332a0968de869172f651b30b5078 /cli/ops/worker_host.rs | |
parent | 10654fa95553866c63a56a7f84c7ec47fb7aac9c (diff) |
fix: top-level-await module execution (#7946)
This commit changes implementation of top-level-await in "deno_core".
Previously promise returned from module evaluation was not awaited,
leading to out-of-order execution of modules that have TLA. It's been
fixed by changing "JsRuntime::mod_evaluate" to be an async function
that resolves when the promise returned from module evaluation also
resolves. When waiting for promise resolution event loop is polled
repeatedly, until there are no more dynamic imports or pending
ops.
Diffstat (limited to 'cli/ops/worker_host.rs')
-rw-r--r-- | cli/ops/worker_host.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cli/ops/worker_host.rs b/cli/ops/worker_host.rs index 8ebf8b9e6..ad915f7f7 100644 --- a/cli/ops/worker_host.rs +++ b/cli/ops/worker_host.rs @@ -153,9 +153,15 @@ fn run_worker_thread( rt.block_on(load_future) }; - if let Err(e) = result { - let mut sender = worker.internal_channels.sender.clone(); + let mut sender = worker.internal_channels.sender.clone(); + // If sender is closed it means that worker has already been closed from + // within using "globalThis.close()" + if sender.is_closed() { + return; + } + + if let Err(e) = result { sender .try_send(WorkerEvent::TerminalError(e)) .expect("Failed to post message to host"); |