Skip to content

Fix beforeunload handler crash during browser closure #2763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zabil merged 1 commit into from
Nov 26, 2025
Merged

Fix beforeunload handler crash during browser closure #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const connect_to_cri = async (target, options = {}) => {

const closeConnection = async (promisesToBeResolvedBeforeCloseBrowser) => {
if (_client) {
// remove listeners other than JS dialog for beforeUnload on client first to stop executing them when closing
pageHandler.setClosingBrowserFlag(true);
await _client.removeAllListeners();
pageHandler.addJavascriptDialogOpeningListener();
if (!defaultConfig.firefox) {
Expand All @@ -161,6 +161,7 @@ const closeConnection = async (promisesToBeResolvedBeforeCloseBrowser) => {
: await closeBrowser();
await _client.close();
_client = null;
pageHandler.setClosingBrowserFlag(false);
};

async function reconnect() {
Expand Down
12 changes: 12 additions & 0 deletions lib/handlers/pageHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const { isSameUrl } = require("../util");
let page;
let framePromises;
let frameNavigationPromise;
let isClosingBrowser = false;

const createdSessionListener = async (client) => {
let resolve;
Expand Down Expand Up @@ -71,6 +72,12 @@ const addJavascriptDialogOpeningListener = () => {
if (eventName) {
eventHandler.emit(eventName, data);
eventRegexMap.delete(eventName);
} else if (data.type === "beforeunload" && isClosingBrowser) {
page
.handleJavaScriptDialog({
accept: true,
})
.catch(() => {});
} else {
throw new Error(
`There is no handler registered for ${data.type} popup displayed on the page ${data.url}.
Expand Down Expand Up @@ -258,6 +265,10 @@ const navigateToHistoryEntry = async (entryId) => {
await page.navigateToHistoryEntry({ entryId });
};

const setClosingBrowserFlag = (value) => {
isClosingBrowser = value;
};

module.exports = {
handleNavigation,
resetPromises,
Expand All @@ -268,4 +279,5 @@ module.exports = {
navigateToHistoryEntry,
handleJavaScriptDialog,
getNavigationHistory,
setClosingBrowserFlag,
};