summaryrefslogtreecommitdiff
path: root/cli/worker.rs
diff options
context:
space:
mode:
authorSatya Rohith <me@satyarohith.com>2024-04-16 19:15:41 +0530
committerGitHub <noreply@github.com>2024-04-16 13:45:41 +0000
commit50223c5c532332f4a296b12b027f85429f529690 (patch)
tree75d4494d1ade596038ad52ac0241addcc3a124c2 /cli/worker.rs
parent0a7f46b8c29d67b579e4ffd4681aa5d0b7e30c6b (diff)
fix(ext/node): dispatch beforeExit/exit events irrespective of listeners (#23382)
Closes https://github.com/denoland/deno/issues/23342 Closes https://github.com/denoland/deno/issues/21757
Diffstat (limited to 'cli/worker.rs')
-rw-r--r--cli/worker.rs21
1 files changed, 15 insertions, 6 deletions
diff --git a/cli/worker.rs b/cli/worker.rs
index 74ae1ef8f..070671e60 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -212,12 +212,17 @@ impl CliMainWorker {
.await?;
}
- if !self.worker.dispatch_beforeunload_event()? {
- break;
+ let web_continue = self.worker.dispatch_beforeunload_event()?;
+ if !web_continue {
+ let node_continue = self.worker.dispatch_process_beforeexit_event()?;
+ if !node_continue {
+ break;
+ }
}
}
self.worker.dispatch_unload_event()?;
+ self.worker.dispatch_process_exit_event()?;
if let Some(coverage_collector) = maybe_coverage_collector.as_mut() {
self
@@ -272,10 +277,13 @@ impl CliMainWorker {
Ok(()) => {}
Err(error) => break Err(error),
}
- match self.inner.worker.dispatch_beforeunload_event() {
- Ok(default_prevented) if default_prevented => {} // continue loop
- Ok(_) => break Ok(()),
- Err(error) => break Err(error),
+ let web_continue = self.inner.worker.dispatch_beforeunload_event()?;
+ if !web_continue {
+ let node_continue =
+ self.inner.worker.dispatch_process_beforeexit_event()?;
+ if !node_continue {
+ break Ok(());
+ }
}
};
self.pending_unload = false;
@@ -283,6 +291,7 @@ impl CliMainWorker {
result?;
self.inner.worker.dispatch_unload_event()?;
+ self.inner.worker.dispatch_process_exit_event()?;
Ok(())
}