summaryrefslogtreecommitdiff
path: root/runtime/web_worker.rs
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/web_worker.rs')
-rw-r--r--runtime/web_worker.rs25
1 files changed, 1 insertions, 24 deletions
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 235cb2c7e..c1713f815 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -315,28 +315,7 @@ impl WebWorker {
module_specifier: &ModuleSpecifier,
) -> Result<(), AnyError> {
let id = self.js_runtime.load_module(module_specifier, None).await?;
-
- let mut receiver = self.js_runtime.mod_evaluate(id);
- tokio::select! {
- maybe_result = receiver.next() => {
- debug!("received worker module evaluate {:#?}", maybe_result);
- // If `None` is returned it means that runtime was destroyed before
- // evaluation was complete. This can happen in Web Worker when `self.close()`
- // is called at top level.
- let result = maybe_result.unwrap_or(Ok(()));
- return result;
- }
-
- event_loop_result = self.run_event_loop() => {
- if self.has_been_terminated() {
- return Ok(());
- }
- event_loop_result?;
- let maybe_result = receiver.next().await;
- let result = maybe_result.unwrap_or(Ok(()));
- return result;
- }
- }
+ self.js_runtime.mod_evaluate(id).await
}
/// Returns a way to communicate with the Worker from other threads.
@@ -395,8 +374,6 @@ impl WebWorker {
let msg = String::from_utf8(msg.to_vec()).unwrap();
let script = format!("workerMessageRecvCallback({})", msg);
- // TODO(bartlomieju): set proper script name like "deno:runtime/web_worker.js"
- // so it's dimmed in stack trace instead of using "__anonymous__"
if let Err(e) = self.execute(&script) {
// If execution was terminated during message callback then
// just ignore it